diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 0000000..26a9d02
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 0000000..c499530
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index f74085f..3cc4948 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 0000000..3ca3458
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 0000000..9366118
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 0000000..7877e96
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 304732f..3cc4948 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index c647d81..fbede71 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 2bb4769..a87a9e4 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index e8a2188..a118b08 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 21bfa5e..9ca502d 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index ab31fc9..4be2893 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 0000000..5fef228
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 06952be..dbc9ea9 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 0000000..d0a68e9
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cb1ef88..0d1fa8f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/assets/payment_logo.png b/assets/payment_logo.png
new file mode 100644
index 0000000..80b7500
Binary files /dev/null and b/assets/payment_logo.png differ
diff --git a/assets/rules_alpha.png b/assets/rules_alpha.png
new file mode 100644
index 0000000..d7e01e2
Binary files /dev/null and b/assets/rules_alpha.png differ
diff --git a/assets/rules_apple_pay.png b/assets/rules_apple_pay.png
new file mode 100644
index 0000000..65f3cd6
Binary files /dev/null and b/assets/rules_apple_pay.png differ
diff --git a/assets/rules_belcard.png b/assets/rules_belcard.png
new file mode 100644
index 0000000..1726a04
Binary files /dev/null and b/assets/rules_belcard.png differ
diff --git a/assets/rules_mastercard.png b/assets/rules_mastercard.png
new file mode 100644
index 0000000..2dead04
Binary files /dev/null and b/assets/rules_mastercard.png differ
diff --git a/assets/rules_mastercard_id.png b/assets/rules_mastercard_id.png
new file mode 100644
index 0000000..3810853
Binary files /dev/null and b/assets/rules_mastercard_id.png differ
diff --git a/assets/rules_samsung_pay.png b/assets/rules_samsung_pay.png
new file mode 100644
index 0000000..b90f6e1
Binary files /dev/null and b/assets/rules_samsung_pay.png differ
diff --git a/assets/rules_visa.png b/assets/rules_visa.png
new file mode 100644
index 0000000..0ef285a
Binary files /dev/null and b/assets/rules_visa.png differ
diff --git a/assets/rules_visa_secure.png b/assets/rules_visa_secure.png
new file mode 100644
index 0000000..1258c70
Binary files /dev/null and b/assets/rules_visa_secure.png differ
diff --git a/assets/support_bottom.svg b/assets/support_bottom.svg
index a847e08..6539007 100644
--- a/assets/support_bottom.svg
+++ b/assets/support_bottom.svg
@@ -1,237 +1,237 @@
-<svg width="272" height="198" viewBox="0 0 272 198" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M86.9458 169.19C84.6971 169.19 82.5499 168.73 80.9476 167.79L2.44141 121.761C0.867247 120.839 0 119.553 0 118.144C0 116.452 1.24586 114.752 3.41865 113.478L153.144 25.6898C157.214 23.3031 163.4 23.045 166.932 25.1165L245.439 71.146C247.013 72.0691 247.88 73.3534 247.88 74.7632C247.88 76.4545 246.634 78.1553 244.461 79.4292L94.7356 167.216C92.5117 168.52 89.655 169.19 86.9458 169.19ZM81.1164 167.492C84.5556 169.508 90.5887 169.253 94.5668 166.919L244.292 79.1313C246.358 77.9215 247.542 76.3289 247.542 74.7632C247.542 73.4824 246.736 72.3029 245.27 71.4439L166.764 25.4144C163.325 23.4001 157.291 23.6555 153.313 25.9877L3.58835 113.775C1.52301 114.985 0.338542 116.577 0.338542 118.143C0.338542 119.424 1.14525 120.603 2.61111 121.462L81.1164 167.492Z" fill="#42E8E0"/>
-<path d="M247.712 53.4998L236.435 55.4717L166.85 14.672C163.359 12.6248 157.262 12.882 153.231 15.2453L20.1062 93.2993L0.171626 96.785L0.169922 103.962L0.179303 103.961C0.169923 105.269 0.935693 106.521 2.52691 107.453L81.0322 153.483C84.5234 155.53 90.6205 155.273 94.6514 152.909L244.377 65.1215C246.547 63.8494 247.665 62.2265 247.7 60.6789L247.711 60.6772V53.4998H247.712Z" fill="url(#paint0_linear_1173_5301)"/>
-<path d="M81.0324 146.258L2.52711 100.228C-0.964028 98.1812 -0.525729 94.6064 3.50519 92.2431L153.23 4.45523C157.261 2.09192 163.359 1.83473 166.849 3.88194L245.355 49.9114C248.846 51.9586 248.407 55.5335 244.376 57.8968L94.6516 145.685C90.6207 148.048 84.5236 148.304 81.0324 146.258Z" fill="#24126A"/>
-<path d="M244.376 57.8967L94.6507 145.685C90.6198 148.048 84.5218 148.305 81.0315 146.258L2.5262 100.228C1.12599 99.4074 0.368746 98.3396 0.210988 97.2043C-0.00560889 98.6782 0.748227 100.118 2.5262 101.16L81.0315 147.19C84.5227 149.237 90.6198 148.98 94.6507 146.616L244.376 58.8285C246.79 57.4126 247.905 55.5637 247.67 53.8672C247.462 55.2857 246.355 56.7371 244.376 57.8967Z" fill="white"/>
-<path opacity="0.51" d="M81.1867 144.474L5.47921 100.072C2.10149 98.0917 2.52446 94.632 6.42576 92.3449L153.374 6.20849C157.274 3.92139 163.175 3.67285 166.553 5.65339L242.261 50.0548C245.638 52.0353 245.215 55.495 241.314 57.7821L94.3659 143.918C90.4654 146.206 84.5653 146.454 81.1867 144.474Z" fill="#453C9E"/>
-<path opacity="0.8" d="M86.9081 144.07C84.7174 144.07 82.6256 143.622 81.0642 142.707L5.35677 98.3058C3.80734 97.3974 2.95459 96.1287 2.95459 94.7353C2.95459 93.0683 4.17487 91.3978 6.30332 90.149L153.252 4.01258C157.213 1.68998 163.234 1.44057 166.675 3.45748L242.382 47.8589C243.931 48.7673 244.784 50.036 244.784 51.4294C244.784 53.0956 243.564 54.7678 241.436 56.0157L94.4873 142.152C92.323 143.421 89.5448 144.07 86.9081 144.07ZM81.3081 142.277C84.6134 144.216 90.4155 143.966 94.2434 141.722L241.192 55.5853C243.165 54.4283 244.297 52.9128 244.297 51.4285C244.297 50.2196 243.53 49.1033 242.138 48.2876L166.431 3.88615C163.126 1.94718 157.323 2.19659 153.495 4.44125L6.5472 90.5777C4.5748 91.7346 3.44235 93.2493 3.44235 94.7345C3.44235 95.9434 4.20897 97.0597 5.60065 97.8754L81.3081 142.277Z" fill="url(#paint1_linear_1173_5301)"/>
-<path opacity="0.5" d="M81.1867 142.492L5.47921 98.0908C2.10149 96.1102 2.52446 92.6506 6.42576 90.3635L153.374 4.22704C157.274 1.93994 163.175 1.6914 166.553 3.67194L242.261 48.0734C245.638 50.0539 245.215 53.5135 241.314 55.8006L94.3659 141.937C90.4654 144.224 84.5653 144.473 81.1867 142.492Z" fill="url(#paint2_radial_1173_5301)"/>
-<path opacity="0.4" d="M226.092 55.4437C224.936 56.1209 223.063 56.1209 221.907 55.4437C220.752 54.7665 220.752 53.6675 221.907 52.9903C223.063 52.3131 224.936 52.3131 226.092 52.9903C227.247 53.6675 227.247 54.7665 226.092 55.4437Z" fill="#24126A"/>
-<path opacity="0.4" d="M210.118 43.6242L218.309 48.427C219.31 49.0141 219.184 50.0386 218.029 50.7167C216.873 51.3939 215.125 51.4675 214.124 50.8812L205.931 46.0784C204.93 45.4913 205.057 44.4668 206.212 43.7896C207.368 43.1115 209.116 43.0379 210.118 43.6242Z" fill="#24126A"/>
-<path opacity="0.4" d="M163.387 14.8164L171.579 19.6192C172.579 20.2055 172.454 21.2308 171.299 21.908C170.143 22.5852 168.395 22.6589 167.394 22.0726L159.202 17.2698C158.201 16.6826 158.328 15.6581 159.483 14.9801C160.638 14.3028 162.386 14.2292 163.387 14.8164Z" fill="#24126A"/>
-<path d="M226.092 52.4622C224.936 53.1395 223.063 53.1395 221.907 52.4622C220.752 51.785 220.752 50.6861 221.907 50.0089C223.063 49.3317 224.936 49.3317 226.092 50.0089C227.247 50.6861 227.247 51.7842 226.092 52.4622Z" fill="#42E8E0"/>
-<path d="M210.118 40.6418L218.309 45.4446C219.31 46.0317 219.184 47.0562 218.029 47.7343C216.873 48.4115 215.125 48.4851 214.124 47.8988L205.931 43.096C204.93 42.5088 205.057 41.4844 206.212 40.8072C207.368 40.1291 209.116 40.0555 210.118 40.6418Z" fill="#42E8E0"/>
-<path d="M163.387 11.8339L171.579 16.6367C172.579 17.2239 172.454 18.2483 171.299 18.9264C170.143 19.6036 168.395 19.6772 167.394 19.0909L159.202 14.2881C158.201 13.701 158.328 12.6765 159.483 11.9984C160.638 11.3203 162.386 11.2467 163.387 11.8339Z" fill="#42E8E0"/>
-<g opacity="0.3">
-<path d="M272 157.32V153.439L270.943 152.842C270.644 154.674 268.522 155.881 266.747 156.131L254.66 163.31L249.385 165.244L232.548 156.421L232.937 156.193C231.497 155.51 230.723 153.949 229.945 152.524L228.811 153.211L228.138 153.403V157.384C228.138 158.144 228.631 158.904 229.619 159.484L246.487 169.373C248.462 170.531 251.676 170.531 253.651 169.373L270.518 159.484C271.489 158.914 271.983 158.169 271.999 157.421C271.999 157.387 271.998 157.354 271.997 157.32H272Z" fill="url(#paint3_linear_1173_5301)"/>
-<path opacity="0.3" d="M266.746 156.131L254.66 163.309L250.068 164.992V170.24C251.365 170.24 252.663 169.951 253.651 169.372L270.518 159.482C271.489 158.912 271.983 158.167 271.998 157.419C271.999 157.385 271.997 157.352 271.997 157.319L271.999 157.32V153.438L271.033 152.893H270.932C270.603 154.696 268.505 155.882 266.746 156.131Z" fill="#0F054C"/>
-<path d="M246.488 165.428L229.619 155.538C227.644 154.38 227.644 152.496 229.619 151.338L246.487 141.448C248.462 140.291 251.675 140.291 253.651 141.448L270.519 151.338C272.494 152.496 272.494 154.38 270.519 155.538L253.651 165.428C251.676 166.586 248.462 166.586 246.488 165.428Z" fill="url(#paint4_linear_1173_5301)"/>
-<g opacity="0.3">
-<path d="M246.488 165.428L229.619 155.538C227.644 154.38 227.644 152.496 229.619 151.338L246.487 141.448C248.462 140.291 251.675 140.291 253.651 141.448L270.519 151.338C272.494 152.496 272.494 154.38 270.519 155.538L253.651 165.428C251.676 166.586 248.462 166.586 246.488 165.428Z" fill="#0F054C"/>
-</g>
-</g>
-<path d="M250.07 152.927C248.919 152.927 247.768 152.669 246.891 152.156L230.023 142.266C229.146 141.752 228.665 141.06 228.665 140.314C228.665 139.57 229.147 138.878 230.023 138.364L246.889 128.473C248.644 127.447 251.495 127.445 253.248 128.473L270.116 138.364C270.992 138.878 271.475 139.571 271.475 140.315C271.475 141.059 270.993 141.753 270.116 142.266L253.249 152.156C252.373 152.669 251.222 152.927 250.07 152.927ZM250.07 128C248.972 128 247.874 128.244 247.038 128.735L230.17 138.626C229.39 139.083 228.96 139.683 228.96 140.315C228.96 140.947 229.39 141.549 230.171 142.006L247.039 151.896C248.711 152.877 251.429 152.877 253.102 151.896L269.969 142.006C270.749 141.549 271.179 140.948 271.179 140.316C271.179 139.684 270.749 139.083 269.969 138.626L253.101 128.735C252.266 128.244 251.168 128 250.07 128Z" fill="#42E8E0"/>
-<path opacity="0.4" d="M272 136.52V130.655L270.943 130.058C270.644 131.89 268.522 133.097 266.747 133.348L254.66 140.525L249.385 142.46L232.548 133.636L232.937 133.408C231.497 132.725 230.723 131.164 229.945 129.739L228.811 130.426L228.138 130.618V136.583C228.138 137.344 228.631 138.104 229.619 138.683L246.487 148.574C248.462 149.732 251.676 149.732 253.651 148.574L270.518 138.684C271.489 138.114 271.983 137.37 271.999 136.621C271.999 136.588 271.998 136.555 271.997 136.521L272 136.52Z" fill="#42E8E0"/>
-<path d="M272 131.306V127.424L270.943 126.827C270.644 128.659 268.522 129.866 266.747 130.117L254.66 137.294L249.385 139.229L232.548 130.405L232.937 130.177C231.497 129.495 230.723 127.933 229.945 126.509L228.811 127.196L228.138 127.388V131.368C228.138 132.128 228.631 132.889 229.619 133.468L246.487 143.358C248.462 144.516 251.676 144.516 253.651 143.358L270.518 133.469C271.489 132.899 271.983 132.154 271.999 131.406C271.999 131.373 271.998 131.339 271.997 131.306H272Z" fill="url(#paint5_linear_1173_5301)"/>
-<path opacity="0.3" d="M266.746 130.118L254.66 137.295L250.068 138.979V144.227C251.365 144.227 252.663 143.937 253.651 143.358L270.518 133.468C271.489 132.898 271.983 132.154 271.998 131.405C271.999 131.373 271.997 131.339 271.997 131.305L271.999 131.306V127.424L271.033 126.879H270.932C270.603 128.682 268.505 129.869 266.746 130.118Z" fill="#0F054C"/>
-<path d="M246.488 139.415L229.619 129.526C227.644 128.368 227.644 126.483 229.619 125.325L246.487 115.436C248.462 114.278 251.675 114.278 253.651 115.436L270.519 125.326C272.494 126.484 272.494 128.369 270.519 129.526L253.651 139.416C251.676 140.573 248.462 140.573 246.488 139.415Z" fill="url(#paint6_linear_1173_5301)"/>
-<path d="M270.519 129.524L253.652 139.414C251.677 140.572 248.463 140.572 246.488 139.414L229.62 129.524C228.737 129.007 228.25 128.344 228.156 127.666C228.04 128.505 228.527 129.368 229.62 130.008L246.488 139.898C248.463 141.056 251.677 141.056 253.652 139.898L270.519 130.009C271.611 129.368 272.098 128.506 271.982 127.667C271.889 128.344 271.402 129.007 270.519 129.524Z" fill="white"/>
-<g opacity="0.3">
-<path d="M196.899 180.4V176.519L195.842 175.922C195.543 177.754 193.42 178.961 191.645 179.211L179.559 186.39L174.284 188.324L157.447 179.501L157.836 179.273C156.396 178.59 155.622 177.029 154.844 175.604L153.71 176.291L153.037 176.483V180.464C153.037 181.224 153.53 181.984 154.518 182.564L171.386 192.453C173.361 193.611 176.575 193.611 178.55 192.453L195.417 182.564C196.388 181.994 196.882 181.249 196.898 180.501C196.899 180.467 196.898 180.434 196.897 180.4H196.899Z" fill="url(#paint7_linear_1173_5301)"/>
-<path opacity="0.3" d="M191.646 179.212L179.559 186.39L174.968 188.073V193.321C176.265 193.321 177.563 193.032 178.551 192.453L195.418 182.563C196.389 181.993 196.883 181.248 196.899 180.5C196.9 180.466 196.898 180.434 196.897 180.4L196.9 180.401V176.519L195.934 175.974H195.833C195.502 177.777 193.404 178.963 191.646 179.212Z" fill="#0F054C"/>
-<path d="M171.387 188.508L154.519 178.618C152.544 177.46 152.544 175.576 154.519 174.418L171.386 164.529C173.361 163.371 176.575 163.371 178.55 164.529L195.418 174.418C197.393 175.576 197.393 177.46 195.418 178.618L178.551 188.508C176.576 189.667 173.362 189.667 171.387 188.508Z" fill="url(#paint8_linear_1173_5301)"/>
-<g opacity="0.3">
-<path d="M171.387 188.508L154.519 178.618C152.544 177.46 152.544 175.576 154.519 174.418L171.386 164.529C173.361 163.371 176.575 163.371 178.55 164.529L195.418 174.418C197.393 175.576 197.393 177.46 195.418 178.618L178.551 188.508C176.576 189.667 173.362 189.667 171.387 188.508Z" fill="#0F054C"/>
-</g>
-</g>
-<path opacity="0.4" d="M174.97 191.669C164.683 191.669 154.397 189.373 146.565 184.781C138.949 180.316 134.755 174.37 134.755 168.039C134.755 161.709 138.949 155.764 146.564 151.299C162.226 142.117 187.711 142.115 203.373 151.299C210.989 155.764 215.183 161.71 215.183 168.042C215.183 174.372 210.989 180.317 203.374 184.781C195.543 189.372 185.257 191.669 174.97 191.669ZM174.969 144.707C164.736 144.707 154.502 146.992 146.712 151.559C139.193 155.968 135.051 161.82 135.051 168.038C135.051 174.258 139.192 180.111 146.713 184.52C162.295 193.656 187.647 193.654 203.226 184.52C210.745 180.111 214.887 174.259 214.887 168.041C214.887 161.821 210.746 155.968 203.226 151.559C195.435 146.992 185.202 144.707 174.969 144.707Z" fill="#42E8E0"/>
-<path opacity="0.2" d="M174.97 198C161.915 198 148.863 195.088 138.924 189.26C129.267 183.598 123.949 176.062 123.949 168.038C123.949 160.015 129.266 152.478 138.922 146.817C158.798 135.163 191.138 135.164 211.013 146.818C220.67 152.48 225.988 160.016 225.988 168.039C225.988 176.063 220.67 183.599 211.015 189.26C201.078 195.087 188.022 198 174.97 198ZM174.967 138.374C161.967 138.374 148.967 141.275 139.07 147.079C129.509 152.684 124.245 160.127 124.245 168.039C124.245 175.951 129.51 183.394 139.071 189C158.866 200.606 191.073 200.607 210.867 189.001C220.427 183.395 225.692 175.952 225.692 168.04C225.692 160.128 220.426 152.684 210.866 147.079C200.969 141.275 187.968 138.374 174.967 138.374Z" fill="#42E8E0"/>
-<path d="M174.97 186.68C166.863 186.68 158.756 184.87 152.584 181.252C146.577 177.73 143.269 173.038 143.268 168.04C143.268 163.043 146.577 158.351 152.583 154.828C164.926 147.592 185.01 147.591 197.353 154.828C203.361 158.35 206.67 163.042 206.67 168.04C206.67 173.038 203.362 177.729 197.354 181.252C191.183 184.87 183.076 186.68 174.97 186.68ZM174.969 149.697C166.916 149.697 158.862 151.494 152.731 155.089C146.819 158.555 143.564 163.154 143.564 168.04C143.564 172.927 146.82 177.527 152.732 180.992C164.994 188.183 184.946 188.183 197.208 180.992C203.12 177.527 206.375 172.926 206.375 168.041C206.375 163.154 203.119 158.555 197.207 155.089C191.075 151.494 183.021 149.697 174.969 149.697Z" fill="#42E8E0"/>
-<path d="M174.969 174.121C173.817 174.121 172.666 173.864 171.791 173.351L154.922 163.46C154.047 162.946 153.564 162.254 153.564 161.509C153.564 160.764 154.046 160.071 154.922 159.558L171.79 149.668C173.543 148.642 176.394 148.642 178.148 149.668L195.016 159.558C195.892 160.072 196.374 160.764 196.374 161.51C196.374 162.254 195.892 162.946 195.016 163.46L178.149 173.35C177.272 173.864 176.12 174.121 174.969 174.121ZM171.937 173.091C173.609 174.071 176.329 174.07 178 173.09L194.868 163.2C195.649 162.743 196.078 162.143 196.078 161.511C196.078 160.878 195.649 160.277 194.867 159.819L178 149.93C176.328 148.948 173.609 148.948 171.937 149.93L155.07 159.819C154.29 160.277 153.86 160.878 153.86 161.51C153.86 162.142 154.29 162.743 155.07 163.2L171.937 173.091Z" fill="#42E8E0"/>
-<path opacity="0.4" d="M196.899 157.713V151.847L195.842 151.25C195.543 153.082 193.42 154.289 191.645 154.539L179.559 161.717L174.284 163.651L157.447 154.828L157.836 154.6C156.396 153.918 155.622 152.355 154.844 150.932L153.71 151.618L153.037 151.811V157.776C153.037 158.536 153.53 159.296 154.518 159.876L171.386 169.765C173.361 170.923 176.575 170.923 178.55 169.765L195.417 159.876C196.388 159.306 196.882 158.561 196.898 157.813C196.899 157.779 196.898 157.746 196.897 157.712L196.899 157.713Z" fill="#42E8E0"/>
-<path d="M196.899 152.5V148.618L195.842 148.022C195.543 149.853 193.42 151.061 191.645 151.311L179.559 158.488L174.284 160.423L157.447 151.599L157.836 151.371C156.396 150.689 155.622 149.128 154.844 147.703L153.71 148.39L153.037 148.582V152.562C153.037 153.323 153.53 154.083 154.518 154.662L171.386 164.552C173.361 165.71 176.575 165.71 178.55 164.552L195.417 154.662C196.388 154.092 196.882 153.348 196.898 152.599C196.899 152.566 196.898 152.533 196.897 152.499L196.899 152.5Z" fill="url(#paint9_linear_1173_5301)"/>
-<path opacity="0.3" d="M191.646 151.311L179.559 158.488L174.968 160.172V165.42C176.265 165.42 177.563 165.131 178.551 164.551L195.418 154.662C196.389 154.092 196.883 153.347 196.899 152.599C196.9 152.565 196.898 152.532 196.897 152.498L196.9 152.499V148.618L195.934 148.072H195.833C195.502 149.875 193.404 151.063 191.646 151.311Z" fill="#0F054C"/>
-<path d="M171.387 160.609L154.519 150.719C152.544 149.561 152.544 147.677 154.519 146.519L171.386 136.629C173.361 135.471 176.575 135.471 178.55 136.629L195.418 146.519C197.393 147.677 197.393 149.561 195.418 150.719L178.551 160.609C176.576 161.766 173.362 161.766 171.387 160.609Z" fill="url(#paint10_linear_1173_5301)"/>
-<path d="M174.968 158.813C173.928 158.813 172.888 158.581 172.096 158.116L158.918 150.389C158.124 149.923 157.687 149.295 157.687 148.618C157.687 147.942 158.124 147.313 158.918 146.847L172.096 139.12C173.68 138.193 176.256 138.193 177.84 139.121L191.019 146.847C191.813 147.313 192.25 147.943 192.25 148.619C192.25 149.295 191.813 149.924 191.019 150.389L177.84 158.116C177.049 158.581 176.009 158.813 174.968 158.813ZM172.244 157.857C173.746 158.738 176.191 158.738 177.693 157.857L190.871 150.129C191.569 149.72 191.954 149.184 191.954 148.62C191.954 148.055 191.569 147.518 190.87 147.109L177.692 139.382C176.189 138.502 173.745 138.501 172.243 139.382L159.065 147.109C158.366 147.518 157.981 148.055 157.981 148.619C157.981 149.183 158.366 149.72 159.065 150.129L172.244 157.857Z" fill="#5351AF"/>
-<path d="M195.418 150.718L178.551 160.607C176.576 161.765 173.362 161.765 171.387 160.607L154.519 150.718C153.636 150.2 153.149 149.537 153.055 148.859C152.939 149.699 153.426 150.561 154.519 151.201L171.387 161.091C173.362 162.249 176.576 162.249 178.551 161.091L195.418 151.201C196.51 150.56 196.997 149.699 196.881 148.859C196.787 149.537 196.301 150.2 195.418 150.718Z" fill="white"/>
-<g opacity="0.3">
-<path d="M52.6433 42.7195V38.8381L51.586 38.2414C51.2875 40.073 49.1642 41.2802 47.3896 41.5305L35.3028 48.7079L30.0277 50.6425L13.1912 41.8189L13.58 41.5902C12.1406 40.9078 11.3663 39.3464 10.5877 37.9219L9.45444 38.6086L8.78076 38.8009V42.781C8.78076 43.5413 9.2745 44.3017 10.262 44.881L27.1301 54.7707C29.1051 55.9285 32.3191 55.9285 34.294 54.7707L51.1613 44.881C52.1326 44.3112 52.6263 43.5664 52.6417 42.8182C52.6425 42.7844 52.6408 42.7515 52.6399 42.7178L52.6433 42.7195Z" fill="url(#paint11_linear_1173_5301)"/>
-<path opacity="0.3" d="M47.3894 41.5308L35.3026 48.7082L30.7114 50.3917V55.6396C32.0084 55.6396 33.3063 55.3504 34.2938 54.771L51.1611 44.8814C52.1324 44.3115 52.6261 43.5668 52.6415 42.8186C52.6423 42.7848 52.6406 42.7519 52.6397 42.7181L52.6423 42.719V38.8376L51.6762 38.292H51.5755C51.2464 40.0959 49.1478 41.2823 47.3894 41.5308Z" fill="#0F054C"/>
-<path d="M27.1306 50.8283L10.2625 40.9386C8.28751 39.7808 8.28751 37.8964 10.2625 36.7385L27.1297 26.8488C29.1047 25.691 32.3187 25.691 34.2937 26.8488L51.1618 36.7385C53.1367 37.8964 53.1367 39.7808 51.1618 40.9386L34.2945 50.8283C32.3187 51.987 29.1055 51.987 27.1306 50.8283Z" fill="url(#paint12_linear_1173_5301)"/>
-<g opacity="0.3">
-<path d="M27.1306 50.8283L10.2625 40.9386C8.28751 39.7808 8.28751 37.8964 10.2625 36.7385L27.1297 26.8488C29.1047 25.691 32.3187 25.691 34.2937 26.8488L51.1618 36.7385C53.1367 37.8964 53.1367 39.7808 51.1618 40.9386L34.2945 50.8283C32.3187 51.987 29.1055 51.987 27.1306 50.8283Z" fill="#0F054C"/>
-</g>
-</g>
-<path d="M30.7127 38.3613C29.5615 38.3613 28.4103 38.1041 27.5337 37.5905L10.6655 27.7008C9.78977 27.1873 9.30713 26.4937 9.30713 25.7498C9.30713 25.0059 9.78892 24.3122 10.6655 23.7987L27.5328 13.909C29.2861 12.8819 32.1376 12.8819 33.8909 13.909L50.759 23.7987C51.6348 24.3122 52.1175 25.0059 52.1175 25.7498C52.1175 26.4937 51.6356 27.1873 50.759 27.7008L33.8917 37.5905C33.016 38.1041 31.8648 38.3613 30.7127 38.3613ZM27.6812 37.3299C29.3526 38.3102 32.072 38.3119 33.7451 37.3299L50.6123 27.4402C51.3926 26.9829 51.8224 26.3819 51.8224 25.7498C51.8224 25.1167 51.3926 24.5166 50.6123 24.0593L33.7442 14.1696C32.072 13.1885 29.3534 13.1885 27.6812 14.1696L10.8139 24.0593C10.0337 24.5166 9.60388 25.1176 9.60388 25.7498C9.60388 26.3819 10.0337 26.9829 10.8139 27.4402L27.6812 37.3299Z" fill="#42E8E0"/>
-<path opacity="0.4" d="M52.6433 21.9537V16.0875L51.586 15.4908C51.2875 17.3224 49.1642 18.5296 47.3896 18.7807L35.3028 25.959L30.0277 27.8936L13.1912 19.0699L13.58 18.8422C12.1406 18.1598 11.3663 16.5984 10.5877 15.1738L9.45444 15.8606L8.78076 16.0528V22.0178C8.78076 22.7781 9.2745 23.5385 10.262 24.1178L27.1301 34.0075C29.1051 35.1654 32.3191 35.1654 34.294 34.0075L51.1613 24.1178C52.1326 23.548 52.6263 22.8033 52.6417 22.055C52.6425 22.0213 52.6408 21.9884 52.6399 21.9546L52.6433 21.9537Z" fill="#42E8E0"/>
-<path d="M52.6433 16.7401V12.8587L51.586 12.262C51.2875 14.0936 49.1642 15.3008 47.3896 15.552L35.3028 22.7293L30.0277 24.664L13.1912 15.8403L13.58 15.6117C12.1406 14.9293 11.3663 13.3679 10.5877 11.9434L9.45444 12.6301L8.78076 12.8223V16.8025C8.78076 17.5628 9.2745 18.3232 10.262 18.9025L27.1301 28.7922C29.1051 29.95 32.3191 29.95 34.294 28.7922L51.1613 18.9025C52.1326 18.3327 52.6263 17.5879 52.6417 16.8397C52.6425 16.8059 52.6408 16.773 52.6399 16.7392L52.6433 16.7401Z" fill="url(#paint13_linear_1173_5301)"/>
-<path opacity="0.3" d="M47.3894 15.5504L35.3026 22.7277L30.7114 24.4112V29.6592C32.0084 29.6592 33.3063 29.3699 34.2938 28.7906L51.1611 18.9009C52.1324 18.3311 52.6261 17.5863 52.6415 16.8381C52.6423 16.8043 52.6406 16.7714 52.6397 16.7376L52.6423 16.7385V12.8571L51.6762 12.3115H51.5755C51.2464 14.1154 49.1478 15.3018 47.3894 15.5504Z" fill="#0F054C"/>
-<path d="M27.1306 24.8478L10.2625 14.9582C8.28751 13.8003 8.28751 11.9159 10.2625 10.7581L27.1297 0.868379C29.1047 -0.28946 32.3187 -0.28946 34.2937 0.868379L51.1618 10.7581C53.1367 11.9159 53.1367 13.8003 51.1618 14.9582L34.2945 24.8478C32.3187 26.0065 29.1055 26.0065 27.1306 24.8478Z" fill="url(#paint14_linear_1173_5301)"/>
-<path d="M30.7124 23.0509C29.672 23.0509 28.6325 22.8188 27.8403 22.3547L14.662 14.6282C13.8673 14.1623 13.4307 13.5328 13.4307 12.8564C13.4307 12.1809 13.8681 11.5514 14.662 11.0863L27.8403 3.35903C29.423 2.43241 32 2.43241 33.5844 3.35903L46.7627 11.0863C47.5566 11.5522 47.9941 12.1809 47.9941 12.8573C47.9941 13.5336 47.5566 14.1623 46.7627 14.6282L33.5844 22.3547C32.7931 22.8188 31.7527 23.0509 30.7124 23.0509ZM30.7124 2.95894C29.7257 2.95894 28.7391 3.1789 27.9878 3.61969L14.8096 11.347C14.1112 11.7566 13.7265 12.2927 13.7257 12.8564C13.7257 13.421 14.1103 13.958 14.8096 14.3676L27.9878 22.094C29.4895 22.9756 31.9335 22.9756 33.4369 22.094L46.6152 14.3676C47.3136 13.958 47.699 13.421 47.699 12.8573C47.699 12.2935 47.3136 11.7566 46.6152 11.347L33.4369 3.61969C32.6856 3.17977 31.6981 2.95894 30.7124 2.95894Z" fill="#5351AF"/>
-<path d="M51.1621 14.959L34.2948 24.8487C32.3198 26.0065 29.1058 26.0065 27.1309 24.8487L10.2628 14.959C9.38017 14.4411 8.89325 13.7787 8.79944 13.1006C8.68347 13.9397 9.17039 14.8023 10.2628 15.4422L27.1309 25.3319C29.1058 26.4898 32.3198 26.4898 34.2948 25.3319L51.1621 15.4422C52.2544 14.8023 52.7413 13.9397 52.6254 13.1006C52.5316 13.7795 52.0446 14.442 51.1621 14.959Z" fill="white"/>
-<g opacity="0.4">
-<path d="M117.898 105.45L71.0659 77.9914C69.6844 77.1817 69.6844 75.157 71.0659 74.3464L140.343 33.7276C142.733 32.3265 145.677 32.3265 148.067 33.7276L194.899 61.1858C196.28 61.9955 196.28 64.0202 194.899 64.8308L125.622 105.45C123.232 106.851 120.287 106.851 117.898 105.45Z" fill="#24126A"/>
-</g>
-<path d="M148.135 38.2887L141.3 34.28L142.79 33.4062L149.626 37.415L148.135 38.2887Z" fill="#42E8E0"/>
-<path d="M153.969 41.7096L150.551 39.7048L152.042 38.8311L155.46 40.835L153.969 41.7096Z" fill="#42E8E0"/>
-<path d="M146.658 41.52L143.746 39.8123L145.236 38.9385L148.148 40.6462L146.658 41.52Z" fill="#42E8E0"/>
-<path d="M151.536 44.3806L148.118 42.3767L149.609 41.5029L153.027 43.5068L151.536 44.3806Z" fill="#42E8E0"/>
-<path d="M153.682 49.7383L140.25 41.8621L141.74 40.9883L155.173 48.8645L153.682 49.7383Z" fill="#42E8E0"/>
-<path d="M115.349 65.3243L101.917 57.4489L103.408 56.5742L116.84 64.4505L115.349 65.3243Z" fill="#42E8E0"/>
-<path d="M120.516 68.3523L117.099 66.3484L118.589 65.4746L122.007 67.4785L120.516 68.3523Z" fill="#42E8E0"/>
-<path d="M139.668 45.6195L136.755 43.9118L138.245 43.0371L141.158 44.7449L139.668 45.6195Z" fill="#42E8E0"/>
-<path d="M144.546 48.4792L141.128 46.4752L142.619 45.6006L146.037 47.6054L144.546 48.4792Z" fill="#42E8E0"/>
-<path d="M140.644 50.2897L133.26 45.9597L134.751 45.0859L142.135 49.4151L140.644 50.2897Z" fill="#42E8E0"/>
-<path d="M145.587 53.1873L142.169 51.1834L143.66 50.3096L147.078 52.3135L145.587 53.1873Z" fill="#42E8E0"/>
-<path d="M150.556 56.1004L147.138 54.0964L148.628 53.2227L152.046 55.2266L150.556 56.1004Z" fill="#42E8E0"/>
-<path d="M158.574 60.8037L152.106 57.0115L153.597 56.1377L160.064 59.9299L158.574 60.8037Z" fill="#42E8E0"/>
-<path d="M147.707 62.6277L144.289 60.6238L145.78 59.75L149.198 61.7539L147.707 62.6277Z" fill="#42E8E0"/>
-<path d="M155.726 67.3301L149.258 63.5379L150.749 62.6641L157.216 66.4563L155.726 67.3301Z" fill="#42E8E0"/>
-<path d="M129.688 52.0631L126.271 50.0592L127.761 49.1846L131.179 51.1894L129.688 52.0631Z" fill="#42E8E0"/>
-<path d="M134.657 54.9762L131.239 52.9723L132.729 52.0977L136.148 54.1024L134.657 54.9762Z" fill="#42E8E0"/>
-<path d="M142.675 59.6766L136.207 55.8844L137.698 55.0098L144.165 58.8028L142.675 59.6766Z" fill="#42E8E0"/>
-<path d="M156.055 63.4245L152.638 61.4197L154.128 60.5459L157.546 62.5498L156.055 63.4245Z" fill="#42E8E0"/>
-<path d="M161.025 66.3385L157.606 64.3338L159.097 63.46L162.516 65.4639L161.025 66.3385Z" fill="#42E8E0"/>
-<path d="M125.863 71.4871L122.445 69.4832L123.936 68.6094L127.354 70.6133L125.863 71.4871Z" fill="#42E8E0"/>
-<path d="M133.882 76.1904L127.414 72.3982L128.904 71.5244L135.372 75.3166L133.882 76.1904Z" fill="#42E8E0"/>
-<path d="M122.698 56.1609L119.279 54.157L120.77 53.2832L124.189 55.2871L122.698 56.1609Z" fill="#42E8E0"/>
-<path d="M130.716 60.8623L124.248 57.0701L125.739 56.1963L132.207 59.9885L130.716 60.8623Z" fill="#42E8E0"/>
-<path d="M126.713 76.0846L123.295 74.0798L124.786 73.2061L128.203 75.2108L126.713 76.0846Z" fill="#42E8E0"/>
-<path d="M134.731 80.7851L128.263 76.9929L129.753 76.1191L136.221 79.9113L134.731 80.7851Z" fill="#42E8E0"/>
-<path d="M163.9 55.7292L160.482 53.7253L161.973 52.8506L165.391 54.8545L163.9 55.7292Z" fill="#42E8E0"/>
-<path d="M158.732 52.698L155.314 50.6941L156.805 49.8203L160.223 51.8242L158.732 52.698Z" fill="#42E8E0"/>
-<path d="M171.918 60.4287L165.451 56.6365L166.942 55.7627L173.409 59.5549L171.918 60.4287Z" fill="#42E8E0"/>
-<path d="M132.849 49.8168L129.765 48.0086L131.255 47.1348L134.34 48.943L132.849 49.8168Z" fill="#42E8E0"/>
-<path d="M141.994 55.1799L134.498 50.7849L135.989 49.9111L143.484 54.3061L141.994 55.1799Z" fill="#42E8E0"/>
-<path d="M151.139 60.5402L143.643 56.1453L145.134 55.2715L152.629 59.6664L151.139 60.5402Z" fill="#42E8E0"/>
-<path d="M130.336 56.5422L122.841 52.1472L124.331 51.2734L131.827 55.6684L130.336 56.5422Z" fill="#42E8E0"/>
-<path d="M134.289 58.8577L131.986 57.5076L133.477 56.6338L135.779 57.9839L134.289 58.8577Z" fill="#42E8E0"/>
-<path d="M138.248 61.1799L135.946 59.8298L137.437 58.9561L139.738 60.3061L138.248 61.1799Z" fill="#42E8E0"/>
-<path d="M145.57 65.4722L139.906 62.152L141.396 61.2773L147.06 64.5984L145.57 65.4722Z" fill="#42E8E0"/>
-<path d="M147.108 66.3756L141.445 63.0545L142.935 62.1807L148.599 65.5018L147.108 66.3756Z" fill="#42E8E0"/>
-<path d="M162.397 63.0432L160.095 61.694L161.586 60.8193L163.887 62.1694L162.397 63.0432Z" fill="#42E8E0"/>
-<path d="M108.253 69.3591L100.869 65.0291L102.359 64.1553L109.743 68.4853L108.253 69.3591Z" fill="#42E8E0"/>
-<path d="M113.196 72.2585L109.778 70.2545L111.269 69.3799L114.687 71.3847L113.196 72.2585Z" fill="#42E8E0"/>
-<path d="M118.164 75.1706L114.746 73.1666L116.236 72.292L119.655 74.2968L118.164 75.1706Z" fill="#42E8E0"/>
-<path d="M126.183 79.8729L119.715 76.0807L121.205 75.2061L127.673 78.9983L126.183 79.8729Z" fill="#42E8E0"/>
-<path d="M115.15 81.6003L111.731 79.5955L113.222 78.7217L116.64 80.7256L115.15 81.6003Z" fill="#42E8E0"/>
-<path d="M123.168 86.2998L116.7 82.5076L118.19 81.6338L124.658 85.426L123.168 86.2998Z" fill="#42E8E0"/>
-<path d="M97.2962 71.1326L93.8784 69.1287L95.369 68.2549L98.7868 70.2588L97.2962 71.1326Z" fill="#42E8E0"/>
-<path d="M102.265 74.0447L98.8467 72.0408L100.337 71.167L103.756 73.1709L102.265 74.0447Z" fill="#42E8E0"/>
-<path d="M110.284 78.7461L103.816 74.9539L105.307 74.0801L111.775 77.8723L110.284 78.7461Z" fill="#42E8E0"/>
-<path d="M100.457 68.888L97.373 67.0798L98.8637 66.2061L101.948 68.0143L100.457 68.888Z" fill="#42E8E0"/>
-<path d="M109.603 74.2492L102.107 69.8543L103.598 68.9805L111.093 73.3754L109.603 74.2492Z" fill="#42E8E0"/>
-<path d="M118.748 79.6105L111.252 75.2156L112.743 74.3418L120.238 78.7367L118.748 79.6105Z" fill="#42E8E0"/>
-<path d="M91.8989 72.0656L84.4033 67.6707L85.8939 66.7969L93.3895 71.1918L91.8989 72.0656Z" fill="#42E8E0"/>
-<path d="M95.8507 74.3831L93.5483 73.0338L95.0389 72.1592L97.3413 73.5093L95.8507 74.3831Z" fill="#42E8E0"/>
-<path d="M99.8112 76.7053L97.5088 75.3561L98.9994 74.4814L101.302 75.8315L99.8112 76.7053Z" fill="#42E8E0"/>
-<path d="M79.7811 95.3645L77.4795 94.0144L78.9701 93.1406L81.2717 94.4907L79.7811 95.3645Z" fill="#42E8E0"/>
-<path d="M107.132 80.9968L101.468 77.6765L102.959 76.8027L108.623 80.123L107.132 80.9968Z" fill="#42E8E0"/>
-<path d="M108.671 81.899L103.007 78.5788L104.498 77.7041L110.161 81.0252L108.671 81.899Z" fill="#42E8E0"/>
-<path d="M106.77 64.3928L104.469 63.0427L105.959 62.1689L108.261 63.519L106.77 64.3928Z" fill="#42E8E0"/>
-<path d="M114.092 68.6851L108.428 65.364L109.919 64.4902L115.583 67.8113L114.092 68.6851Z" fill="#42E8E0"/>
-<path d="M121.571 73.0709L115.908 69.7498L117.399 68.876L123.062 72.1971L121.571 73.0709Z" fill="#42E8E0"/>
-<path d="M112.213 54.1125L109.91 52.7625L111.401 51.8887L113.703 53.2388L112.213 54.1125Z" fill="#42E8E0"/>
-<path d="M119.534 58.4039L113.871 55.0828L115.361 54.209L121.024 57.5301L119.534 58.4039Z" fill="#42E8E0"/>
-<path d="M127.014 62.7896L121.35 59.4694L122.84 58.5947L128.503 61.9158L127.014 62.7896Z" fill="#42E8E0"/>
-<path d="M121.76 99.9813C120.394 99.9813 119.03 99.6245 117.813 98.9109L70.9822 71.4527C70.2804 71.0405 69.8608 70.3044 69.8608 69.4817C69.8608 68.659 70.2795 67.9221 70.9822 67.5107L140.259 26.892C142.693 25.464 145.718 25.4648 148.152 26.892L194.984 54.3502C195.686 54.7624 196.104 55.4985 196.104 56.3212C196.104 57.1439 195.686 57.8808 194.984 58.2922L125.706 98.9109C124.488 99.6245 123.124 99.9813 121.76 99.9813ZM144.205 26.1628C142.898 26.1628 141.592 26.5049 140.427 27.1882L71.1502 67.8069C70.5541 68.1559 70.1985 68.782 70.1985 69.4809C70.1985 70.1797 70.5541 70.805 71.1502 71.1548L117.982 98.613C120.312 99.9796 123.207 99.9796 125.537 98.613L194.814 57.9943C195.41 57.6453 195.766 57.0192 195.766 56.3203C195.766 55.6214 195.41 54.9962 194.814 54.6463L147.982 27.1882C146.818 26.5049 145.511 26.1628 144.205 26.1628Z" fill="#42E8E0"/>
-<path opacity="0.4" d="M95.0911 118.606L48.2592 91.1483C46.8778 90.3386 46.8778 88.3139 48.2592 87.5033L55.4086 83.2755C57.798 81.8743 60.7426 81.8743 63.1328 83.2755L109.965 110.734C111.346 111.543 111.346 113.568 109.965 114.379L102.815 118.606C100.425 120.008 97.4805 120.008 95.0911 118.606Z" fill="#24126A"/>
-<path d="M71.646 90.5402L64.1504 86.1453L65.641 85.2715L73.1366 89.6664L71.646 90.5402Z" fill="#42E8E0"/>
-<path d="M92.7765 103.238L90.4741 101.887L91.9647 101.014L94.2671 102.364L92.7765 103.238Z" fill="#42E8E0"/>
-<path d="M75.9885 93.1536L73.686 91.8035L75.1766 90.9297L77.479 92.2798L75.9885 93.1536Z" fill="#42E8E0"/>
-<path d="M98.9527 113.136C97.5874 113.136 96.2231 112.779 95.0062 112.066L48.1752 84.6077C47.4734 84.1964 47.0547 83.4603 47.0547 82.6367C47.0547 81.814 47.4742 81.077 48.1752 80.6666L55.3246 76.4379C57.7583 75.0099 60.7839 75.0107 63.2176 76.4379L110.049 103.896C110.751 104.308 111.17 105.044 111.17 105.867C111.17 106.69 110.751 107.427 110.049 107.838L102.901 112.066C101.682 112.779 100.317 113.136 98.9527 113.136ZM59.2702 75.7096C57.9638 75.7096 56.6574 76.0517 55.4926 76.7349L48.3432 80.9636C47.7471 81.3126 47.3915 81.9378 47.3915 82.6367C47.3915 83.3364 47.7471 83.9608 48.3432 84.3107L95.1742 111.769C97.5039 113.135 100.399 113.135 102.73 111.769L109.878 107.541C110.474 107.192 110.83 106.566 110.83 105.867C110.83 105.168 110.474 104.543 109.878 104.193L63.047 76.7349C61.8831 76.0517 60.5766 75.7096 59.2702 75.7096Z" fill="#42E8E0"/>
-<defs>
-<linearGradient id="paint0_linear_1173_5301" x1="0.169666" y1="84.0781" x2="247.712" y2="84.0781" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.151" stop-color="#A3A7F5"/>
-<stop offset="0.3866" stop-color="#8289E8"/>
-<stop offset="0.6124" stop-color="#6A73DF"/>
-<stop offset="0.8221" stop-color="#5C66D9"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1173_5301" x1="158.419" y1="119.644" x2="87.9546" y2="27.5651" gradientUnits="userSpaceOnUse">
-<stop stop-color="#42E8E0"/>
-<stop offset="0.1055" stop-color="#37B6BF"/>
-<stop offset="0.2197" stop-color="#2C87A1"/>
-<stop offset="0.338" stop-color="#235F87"/>
-<stop offset="0.4587" stop-color="#1C3F72"/>
-<stop offset="0.5824" stop-color="#162561"/>
-<stop offset="0.7105" stop-color="#121355"/>
-<stop offset="0.8458" stop-color="#10084E"/>
-<stop offset="1" stop-color="#0F054C"/>
-</linearGradient>
-<radialGradient id="paint2_radial_1173_5301" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(87.6672 87.584) scale(193.753 196.764)">
-<stop stop-color="#42E8E0"/>
-<stop offset="0.1055" stop-color="#37B6BF"/>
-<stop offset="0.2197" stop-color="#2C87A1"/>
-<stop offset="0.338" stop-color="#235F87"/>
-<stop offset="0.4587" stop-color="#1C3F72"/>
-<stop offset="0.5824" stop-color="#162561"/>
-<stop offset="0.7105" stop-color="#121355"/>
-<stop offset="0.8458" stop-color="#10084E"/>
-<stop offset="1" stop-color="#0F054C"/>
-</radialGradient>
-<linearGradient id="paint3_linear_1173_5301" x1="232.502" y1="145.726" x2="267.569" y2="165.662" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint4_linear_1173_5301" x1="228.138" y1="153.438" x2="272" y2="153.438" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-<linearGradient id="paint5_linear_1173_5301" x1="232.502" y1="119.712" x2="267.569" y2="139.648" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint6_linear_1173_5301" x1="228.138" y1="127.425" x2="272" y2="127.425" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-<linearGradient id="paint7_linear_1173_5301" x1="157.401" y1="168.806" x2="192.468" y2="188.742" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint8_linear_1173_5301" x1="153.038" y1="176.518" x2="196.899" y2="176.518" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-<linearGradient id="paint9_linear_1173_5301" x1="157.401" y1="140.906" x2="192.468" y2="160.842" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint10_linear_1173_5301" x1="153.038" y1="148.619" x2="196.899" y2="148.619" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-<linearGradient id="paint11_linear_1173_5301" x1="13.1453" y1="31.1254" x2="48.2119" y2="51.0614" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint12_linear_1173_5301" x1="8.78134" y1="38.8387" x2="52.6427" y2="38.8387" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-<linearGradient id="paint13_linear_1173_5301" x1="13.1453" y1="5.14606" x2="48.2119" y2="25.082" gradientUnits="userSpaceOnUse">
-<stop stop-color="#BCBEFF"/>
-<stop offset="0.2271" stop-color="#AAADF8"/>
-<stop offset="0.6802" stop-color="#7C83E5"/>
-<stop offset="1" stop-color="#5761D7"/>
-</linearGradient>
-<linearGradient id="paint14_linear_1173_5301" x1="8.78134" y1="12.8582" x2="52.6427" y2="12.8582" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E9E9FD"/>
-<stop offset="0.3601" stop-color="#D3D2F9"/>
-<stop offset="0.7062" stop-color="#C5C4F7"/>
-<stop offset="1" stop-color="#C0BFF6"/>
-</linearGradient>
-</defs>
-</svg>
+<svg width="272" height="198" viewBox="0 0 272 198" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M86.9458 169.19C84.6971 169.19 82.5499 168.73 80.9476 167.79L2.44141 121.761C0.867247 120.839 0 119.553 0 118.144C0 116.452 1.24586 114.752 3.41865 113.478L153.144 25.6898C157.214 23.3031 163.4 23.045 166.932 25.1165L245.439 71.146C247.013 72.0691 247.88 73.3534 247.88 74.7632C247.88 76.4545 246.634 78.1553 244.461 79.4292L94.7356 167.216C92.5117 168.52 89.655 169.19 86.9458 169.19ZM81.1164 167.492C84.5556 169.508 90.5887 169.253 94.5668 166.919L244.292 79.1313C246.358 77.9215 247.542 76.3289 247.542 74.7632C247.542 73.4824 246.736 72.3029 245.27 71.4439L166.764 25.4144C163.325 23.4001 157.291 23.6555 153.313 25.9877L3.58835 113.775C1.52301 114.985 0.338542 116.577 0.338542 118.143C0.338542 119.424 1.14525 120.603 2.61111 121.462L81.1164 167.492Z" fill="#42E8E0"/>
+<path d="M247.712 53.4998L236.435 55.4717L166.85 14.672C163.359 12.6248 157.262 12.882 153.231 15.2453L20.1062 93.2993L0.171626 96.785L0.169922 103.962L0.179303 103.961C0.169923 105.269 0.935693 106.521 2.52691 107.453L81.0322 153.483C84.5234 155.53 90.6205 155.273 94.6514 152.909L244.377 65.1215C246.547 63.8494 247.665 62.2265 247.7 60.6789L247.711 60.6772V53.4998H247.712Z" fill="url(#paint0_linear_1173_5301)"/>
+<path d="M81.0324 146.258L2.52711 100.228C-0.964028 98.1812 -0.525729 94.6064 3.50519 92.2431L153.23 4.45523C157.261 2.09192 163.359 1.83473 166.849 3.88194L245.355 49.9114C248.846 51.9586 248.407 55.5335 244.376 57.8968L94.6516 145.685C90.6207 148.048 84.5236 148.304 81.0324 146.258Z" fill="#24126A"/>
+<path d="M244.376 57.8967L94.6507 145.685C90.6198 148.048 84.5218 148.305 81.0315 146.258L2.5262 100.228C1.12599 99.4074 0.368746 98.3396 0.210988 97.2043C-0.00560889 98.6782 0.748227 100.118 2.5262 101.16L81.0315 147.19C84.5227 149.237 90.6198 148.98 94.6507 146.616L244.376 58.8285C246.79 57.4126 247.905 55.5637 247.67 53.8672C247.462 55.2857 246.355 56.7371 244.376 57.8967Z" fill="white"/>
+<path opacity="0.51" d="M81.1867 144.474L5.47921 100.072C2.10149 98.0917 2.52446 94.632 6.42576 92.3449L153.374 6.20849C157.274 3.92139 163.175 3.67285 166.553 5.65339L242.261 50.0548C245.638 52.0353 245.215 55.495 241.314 57.7821L94.3659 143.918C90.4654 146.206 84.5653 146.454 81.1867 144.474Z" fill="#453C9E"/>
+<path opacity="0.8" d="M86.9081 144.07C84.7174 144.07 82.6256 143.622 81.0642 142.707L5.35677 98.3058C3.80734 97.3974 2.95459 96.1287 2.95459 94.7353C2.95459 93.0683 4.17487 91.3978 6.30332 90.149L153.252 4.01258C157.213 1.68998 163.234 1.44057 166.675 3.45748L242.382 47.8589C243.931 48.7673 244.784 50.036 244.784 51.4294C244.784 53.0956 243.564 54.7678 241.436 56.0157L94.4873 142.152C92.323 143.421 89.5448 144.07 86.9081 144.07ZM81.3081 142.277C84.6134 144.216 90.4155 143.966 94.2434 141.722L241.192 55.5853C243.165 54.4283 244.297 52.9128 244.297 51.4285C244.297 50.2196 243.53 49.1033 242.138 48.2876L166.431 3.88615C163.126 1.94718 157.323 2.19659 153.495 4.44125L6.5472 90.5777C4.5748 91.7346 3.44235 93.2493 3.44235 94.7345C3.44235 95.9434 4.20897 97.0597 5.60065 97.8754L81.3081 142.277Z" fill="url(#paint1_linear_1173_5301)"/>
+<path opacity="0.5" d="M81.1867 142.492L5.47921 98.0908C2.10149 96.1102 2.52446 92.6506 6.42576 90.3635L153.374 4.22704C157.274 1.93994 163.175 1.6914 166.553 3.67194L242.261 48.0734C245.638 50.0539 245.215 53.5135 241.314 55.8006L94.3659 141.937C90.4654 144.224 84.5653 144.473 81.1867 142.492Z" fill="url(#paint2_radial_1173_5301)"/>
+<path opacity="0.4" d="M226.092 55.4437C224.936 56.1209 223.063 56.1209 221.907 55.4437C220.752 54.7665 220.752 53.6675 221.907 52.9903C223.063 52.3131 224.936 52.3131 226.092 52.9903C227.247 53.6675 227.247 54.7665 226.092 55.4437Z" fill="#24126A"/>
+<path opacity="0.4" d="M210.118 43.6242L218.309 48.427C219.31 49.0141 219.184 50.0386 218.029 50.7167C216.873 51.3939 215.125 51.4675 214.124 50.8812L205.931 46.0784C204.93 45.4913 205.057 44.4668 206.212 43.7896C207.368 43.1115 209.116 43.0379 210.118 43.6242Z" fill="#24126A"/>
+<path opacity="0.4" d="M163.387 14.8164L171.579 19.6192C172.579 20.2055 172.454 21.2308 171.299 21.908C170.143 22.5852 168.395 22.6589 167.394 22.0726L159.202 17.2698C158.201 16.6826 158.328 15.6581 159.483 14.9801C160.638 14.3028 162.386 14.2292 163.387 14.8164Z" fill="#24126A"/>
+<path d="M226.092 52.4622C224.936 53.1395 223.063 53.1395 221.907 52.4622C220.752 51.785 220.752 50.6861 221.907 50.0089C223.063 49.3317 224.936 49.3317 226.092 50.0089C227.247 50.6861 227.247 51.7842 226.092 52.4622Z" fill="#42E8E0"/>
+<path d="M210.118 40.6418L218.309 45.4446C219.31 46.0317 219.184 47.0562 218.029 47.7343C216.873 48.4115 215.125 48.4851 214.124 47.8988L205.931 43.096C204.93 42.5088 205.057 41.4844 206.212 40.8072C207.368 40.1291 209.116 40.0555 210.118 40.6418Z" fill="#42E8E0"/>
+<path d="M163.387 11.8339L171.579 16.6367C172.579 17.2239 172.454 18.2483 171.299 18.9264C170.143 19.6036 168.395 19.6772 167.394 19.0909L159.202 14.2881C158.201 13.701 158.328 12.6765 159.483 11.9984C160.638 11.3203 162.386 11.2467 163.387 11.8339Z" fill="#42E8E0"/>
+<g opacity="0.3">
+<path d="M272 157.32V153.439L270.943 152.842C270.644 154.674 268.522 155.881 266.747 156.131L254.66 163.31L249.385 165.244L232.548 156.421L232.937 156.193C231.497 155.51 230.723 153.949 229.945 152.524L228.811 153.211L228.138 153.403V157.384C228.138 158.144 228.631 158.904 229.619 159.484L246.487 169.373C248.462 170.531 251.676 170.531 253.651 169.373L270.518 159.484C271.489 158.914 271.983 158.169 271.999 157.421C271.999 157.387 271.998 157.354 271.997 157.32H272Z" fill="url(#paint3_linear_1173_5301)"/>
+<path opacity="0.3" d="M266.746 156.131L254.66 163.309L250.068 164.992V170.24C251.365 170.24 252.663 169.951 253.651 169.372L270.518 159.482C271.489 158.912 271.983 158.167 271.998 157.419C271.999 157.385 271.997 157.352 271.997 157.319L271.999 157.32V153.438L271.033 152.893H270.932C270.603 154.696 268.505 155.882 266.746 156.131Z" fill="#0F054C"/>
+<path d="M246.488 165.428L229.619 155.538C227.644 154.38 227.644 152.496 229.619 151.338L246.487 141.448C248.462 140.291 251.675 140.291 253.651 141.448L270.519 151.338C272.494 152.496 272.494 154.38 270.519 155.538L253.651 165.428C251.676 166.586 248.462 166.586 246.488 165.428Z" fill="url(#paint4_linear_1173_5301)"/>
+<g opacity="0.3">
+<path d="M246.488 165.428L229.619 155.538C227.644 154.38 227.644 152.496 229.619 151.338L246.487 141.448C248.462 140.291 251.675 140.291 253.651 141.448L270.519 151.338C272.494 152.496 272.494 154.38 270.519 155.538L253.651 165.428C251.676 166.586 248.462 166.586 246.488 165.428Z" fill="#0F054C"/>
+</g>
+</g>
+<path d="M250.07 152.927C248.919 152.927 247.768 152.669 246.891 152.156L230.023 142.266C229.146 141.752 228.665 141.06 228.665 140.314C228.665 139.57 229.147 138.878 230.023 138.364L246.889 128.473C248.644 127.447 251.495 127.445 253.248 128.473L270.116 138.364C270.992 138.878 271.475 139.571 271.475 140.315C271.475 141.059 270.993 141.753 270.116 142.266L253.249 152.156C252.373 152.669 251.222 152.927 250.07 152.927ZM250.07 128C248.972 128 247.874 128.244 247.038 128.735L230.17 138.626C229.39 139.083 228.96 139.683 228.96 140.315C228.96 140.947 229.39 141.549 230.171 142.006L247.039 151.896C248.711 152.877 251.429 152.877 253.102 151.896L269.969 142.006C270.749 141.549 271.179 140.948 271.179 140.316C271.179 139.684 270.749 139.083 269.969 138.626L253.101 128.735C252.266 128.244 251.168 128 250.07 128Z" fill="#42E8E0"/>
+<path opacity="0.4" d="M272 136.52V130.655L270.943 130.058C270.644 131.89 268.522 133.097 266.747 133.348L254.66 140.525L249.385 142.46L232.548 133.636L232.937 133.408C231.497 132.725 230.723 131.164 229.945 129.739L228.811 130.426L228.138 130.618V136.583C228.138 137.344 228.631 138.104 229.619 138.683L246.487 148.574C248.462 149.732 251.676 149.732 253.651 148.574L270.518 138.684C271.489 138.114 271.983 137.37 271.999 136.621C271.999 136.588 271.998 136.555 271.997 136.521L272 136.52Z" fill="#42E8E0"/>
+<path d="M272 131.306V127.424L270.943 126.827C270.644 128.659 268.522 129.866 266.747 130.117L254.66 137.294L249.385 139.229L232.548 130.405L232.937 130.177C231.497 129.495 230.723 127.933 229.945 126.509L228.811 127.196L228.138 127.388V131.368C228.138 132.128 228.631 132.889 229.619 133.468L246.487 143.358C248.462 144.516 251.676 144.516 253.651 143.358L270.518 133.469C271.489 132.899 271.983 132.154 271.999 131.406C271.999 131.373 271.998 131.339 271.997 131.306H272Z" fill="url(#paint5_linear_1173_5301)"/>
+<path opacity="0.3" d="M266.746 130.118L254.66 137.295L250.068 138.979V144.227C251.365 144.227 252.663 143.937 253.651 143.358L270.518 133.468C271.489 132.898 271.983 132.154 271.998 131.405C271.999 131.373 271.997 131.339 271.997 131.305L271.999 131.306V127.424L271.033 126.879H270.932C270.603 128.682 268.505 129.869 266.746 130.118Z" fill="#0F054C"/>
+<path d="M246.488 139.415L229.619 129.526C227.644 128.368 227.644 126.483 229.619 125.325L246.487 115.436C248.462 114.278 251.675 114.278 253.651 115.436L270.519 125.326C272.494 126.484 272.494 128.369 270.519 129.526L253.651 139.416C251.676 140.573 248.462 140.573 246.488 139.415Z" fill="url(#paint6_linear_1173_5301)"/>
+<path d="M270.519 129.524L253.652 139.414C251.677 140.572 248.463 140.572 246.488 139.414L229.62 129.524C228.737 129.007 228.25 128.344 228.156 127.666C228.04 128.505 228.527 129.368 229.62 130.008L246.488 139.898C248.463 141.056 251.677 141.056 253.652 139.898L270.519 130.009C271.611 129.368 272.098 128.506 271.982 127.667C271.889 128.344 271.402 129.007 270.519 129.524Z" fill="white"/>
+<g opacity="0.3">
+<path d="M196.899 180.4V176.519L195.842 175.922C195.543 177.754 193.42 178.961 191.645 179.211L179.559 186.39L174.284 188.324L157.447 179.501L157.836 179.273C156.396 178.59 155.622 177.029 154.844 175.604L153.71 176.291L153.037 176.483V180.464C153.037 181.224 153.53 181.984 154.518 182.564L171.386 192.453C173.361 193.611 176.575 193.611 178.55 192.453L195.417 182.564C196.388 181.994 196.882 181.249 196.898 180.501C196.899 180.467 196.898 180.434 196.897 180.4H196.899Z" fill="url(#paint7_linear_1173_5301)"/>
+<path opacity="0.3" d="M191.646 179.212L179.559 186.39L174.968 188.073V193.321C176.265 193.321 177.563 193.032 178.551 192.453L195.418 182.563C196.389 181.993 196.883 181.248 196.899 180.5C196.9 180.466 196.898 180.434 196.897 180.4L196.9 180.401V176.519L195.934 175.974H195.833C195.502 177.777 193.404 178.963 191.646 179.212Z" fill="#0F054C"/>
+<path d="M171.387 188.508L154.519 178.618C152.544 177.46 152.544 175.576 154.519 174.418L171.386 164.529C173.361 163.371 176.575 163.371 178.55 164.529L195.418 174.418C197.393 175.576 197.393 177.46 195.418 178.618L178.551 188.508C176.576 189.667 173.362 189.667 171.387 188.508Z" fill="url(#paint8_linear_1173_5301)"/>
+<g opacity="0.3">
+<path d="M171.387 188.508L154.519 178.618C152.544 177.46 152.544 175.576 154.519 174.418L171.386 164.529C173.361 163.371 176.575 163.371 178.55 164.529L195.418 174.418C197.393 175.576 197.393 177.46 195.418 178.618L178.551 188.508C176.576 189.667 173.362 189.667 171.387 188.508Z" fill="#0F054C"/>
+</g>
+</g>
+<path opacity="0.4" d="M174.97 191.669C164.683 191.669 154.397 189.373 146.565 184.781C138.949 180.316 134.755 174.37 134.755 168.039C134.755 161.709 138.949 155.764 146.564 151.299C162.226 142.117 187.711 142.115 203.373 151.299C210.989 155.764 215.183 161.71 215.183 168.042C215.183 174.372 210.989 180.317 203.374 184.781C195.543 189.372 185.257 191.669 174.97 191.669ZM174.969 144.707C164.736 144.707 154.502 146.992 146.712 151.559C139.193 155.968 135.051 161.82 135.051 168.038C135.051 174.258 139.192 180.111 146.713 184.52C162.295 193.656 187.647 193.654 203.226 184.52C210.745 180.111 214.887 174.259 214.887 168.041C214.887 161.821 210.746 155.968 203.226 151.559C195.435 146.992 185.202 144.707 174.969 144.707Z" fill="#42E8E0"/>
+<path opacity="0.2" d="M174.97 198C161.915 198 148.863 195.088 138.924 189.26C129.267 183.598 123.949 176.062 123.949 168.038C123.949 160.015 129.266 152.478 138.922 146.817C158.798 135.163 191.138 135.164 211.013 146.818C220.67 152.48 225.988 160.016 225.988 168.039C225.988 176.063 220.67 183.599 211.015 189.26C201.078 195.087 188.022 198 174.97 198ZM174.967 138.374C161.967 138.374 148.967 141.275 139.07 147.079C129.509 152.684 124.245 160.127 124.245 168.039C124.245 175.951 129.51 183.394 139.071 189C158.866 200.606 191.073 200.607 210.867 189.001C220.427 183.395 225.692 175.952 225.692 168.04C225.692 160.128 220.426 152.684 210.866 147.079C200.969 141.275 187.968 138.374 174.967 138.374Z" fill="#42E8E0"/>
+<path d="M174.97 186.68C166.863 186.68 158.756 184.87 152.584 181.252C146.577 177.73 143.269 173.038 143.268 168.04C143.268 163.043 146.577 158.351 152.583 154.828C164.926 147.592 185.01 147.591 197.353 154.828C203.361 158.35 206.67 163.042 206.67 168.04C206.67 173.038 203.362 177.729 197.354 181.252C191.183 184.87 183.076 186.68 174.97 186.68ZM174.969 149.697C166.916 149.697 158.862 151.494 152.731 155.089C146.819 158.555 143.564 163.154 143.564 168.04C143.564 172.927 146.82 177.527 152.732 180.992C164.994 188.183 184.946 188.183 197.208 180.992C203.12 177.527 206.375 172.926 206.375 168.041C206.375 163.154 203.119 158.555 197.207 155.089C191.075 151.494 183.021 149.697 174.969 149.697Z" fill="#42E8E0"/>
+<path d="M174.969 174.121C173.817 174.121 172.666 173.864 171.791 173.351L154.922 163.46C154.047 162.946 153.564 162.254 153.564 161.509C153.564 160.764 154.046 160.071 154.922 159.558L171.79 149.668C173.543 148.642 176.394 148.642 178.148 149.668L195.016 159.558C195.892 160.072 196.374 160.764 196.374 161.51C196.374 162.254 195.892 162.946 195.016 163.46L178.149 173.35C177.272 173.864 176.12 174.121 174.969 174.121ZM171.937 173.091C173.609 174.071 176.329 174.07 178 173.09L194.868 163.2C195.649 162.743 196.078 162.143 196.078 161.511C196.078 160.878 195.649 160.277 194.867 159.819L178 149.93C176.328 148.948 173.609 148.948 171.937 149.93L155.07 159.819C154.29 160.277 153.86 160.878 153.86 161.51C153.86 162.142 154.29 162.743 155.07 163.2L171.937 173.091Z" fill="#42E8E0"/>
+<path opacity="0.4" d="M196.899 157.713V151.847L195.842 151.25C195.543 153.082 193.42 154.289 191.645 154.539L179.559 161.717L174.284 163.651L157.447 154.828L157.836 154.6C156.396 153.918 155.622 152.355 154.844 150.932L153.71 151.618L153.037 151.811V157.776C153.037 158.536 153.53 159.296 154.518 159.876L171.386 169.765C173.361 170.923 176.575 170.923 178.55 169.765L195.417 159.876C196.388 159.306 196.882 158.561 196.898 157.813C196.899 157.779 196.898 157.746 196.897 157.712L196.899 157.713Z" fill="#42E8E0"/>
+<path d="M196.899 152.5V148.618L195.842 148.022C195.543 149.853 193.42 151.061 191.645 151.311L179.559 158.488L174.284 160.423L157.447 151.599L157.836 151.371C156.396 150.689 155.622 149.128 154.844 147.703L153.71 148.39L153.037 148.582V152.562C153.037 153.323 153.53 154.083 154.518 154.662L171.386 164.552C173.361 165.71 176.575 165.71 178.55 164.552L195.417 154.662C196.388 154.092 196.882 153.348 196.898 152.599C196.899 152.566 196.898 152.533 196.897 152.499L196.899 152.5Z" fill="url(#paint9_linear_1173_5301)"/>
+<path opacity="0.3" d="M191.646 151.311L179.559 158.488L174.968 160.172V165.42C176.265 165.42 177.563 165.131 178.551 164.551L195.418 154.662C196.389 154.092 196.883 153.347 196.899 152.599C196.9 152.565 196.898 152.532 196.897 152.498L196.9 152.499V148.618L195.934 148.072H195.833C195.502 149.875 193.404 151.063 191.646 151.311Z" fill="#0F054C"/>
+<path d="M171.387 160.609L154.519 150.719C152.544 149.561 152.544 147.677 154.519 146.519L171.386 136.629C173.361 135.471 176.575 135.471 178.55 136.629L195.418 146.519C197.393 147.677 197.393 149.561 195.418 150.719L178.551 160.609C176.576 161.766 173.362 161.766 171.387 160.609Z" fill="url(#paint10_linear_1173_5301)"/>
+<path d="M174.968 158.813C173.928 158.813 172.888 158.581 172.096 158.116L158.918 150.389C158.124 149.923 157.687 149.295 157.687 148.618C157.687 147.942 158.124 147.313 158.918 146.847L172.096 139.12C173.68 138.193 176.256 138.193 177.84 139.121L191.019 146.847C191.813 147.313 192.25 147.943 192.25 148.619C192.25 149.295 191.813 149.924 191.019 150.389L177.84 158.116C177.049 158.581 176.009 158.813 174.968 158.813ZM172.244 157.857C173.746 158.738 176.191 158.738 177.693 157.857L190.871 150.129C191.569 149.72 191.954 149.184 191.954 148.62C191.954 148.055 191.569 147.518 190.87 147.109L177.692 139.382C176.189 138.502 173.745 138.501 172.243 139.382L159.065 147.109C158.366 147.518 157.981 148.055 157.981 148.619C157.981 149.183 158.366 149.72 159.065 150.129L172.244 157.857Z" fill="#5351AF"/>
+<path d="M195.418 150.718L178.551 160.607C176.576 161.765 173.362 161.765 171.387 160.607L154.519 150.718C153.636 150.2 153.149 149.537 153.055 148.859C152.939 149.699 153.426 150.561 154.519 151.201L171.387 161.091C173.362 162.249 176.576 162.249 178.551 161.091L195.418 151.201C196.51 150.56 196.997 149.699 196.881 148.859C196.787 149.537 196.301 150.2 195.418 150.718Z" fill="white"/>
+<g opacity="0.3">
+<path d="M52.6433 42.7195V38.8381L51.586 38.2414C51.2875 40.073 49.1642 41.2802 47.3896 41.5305L35.3028 48.7079L30.0277 50.6425L13.1912 41.8189L13.58 41.5902C12.1406 40.9078 11.3663 39.3464 10.5877 37.9219L9.45444 38.6086L8.78076 38.8009V42.781C8.78076 43.5413 9.2745 44.3017 10.262 44.881L27.1301 54.7707C29.1051 55.9285 32.3191 55.9285 34.294 54.7707L51.1613 44.881C52.1326 44.3112 52.6263 43.5664 52.6417 42.8182C52.6425 42.7844 52.6408 42.7515 52.6399 42.7178L52.6433 42.7195Z" fill="url(#paint11_linear_1173_5301)"/>
+<path opacity="0.3" d="M47.3894 41.5308L35.3026 48.7082L30.7114 50.3917V55.6396C32.0084 55.6396 33.3063 55.3504 34.2938 54.771L51.1611 44.8814C52.1324 44.3115 52.6261 43.5668 52.6415 42.8186C52.6423 42.7848 52.6406 42.7519 52.6397 42.7181L52.6423 42.719V38.8376L51.6762 38.292H51.5755C51.2464 40.0959 49.1478 41.2823 47.3894 41.5308Z" fill="#0F054C"/>
+<path d="M27.1306 50.8283L10.2625 40.9386C8.28751 39.7808 8.28751 37.8964 10.2625 36.7385L27.1297 26.8488C29.1047 25.691 32.3187 25.691 34.2937 26.8488L51.1618 36.7385C53.1367 37.8964 53.1367 39.7808 51.1618 40.9386L34.2945 50.8283C32.3187 51.987 29.1055 51.987 27.1306 50.8283Z" fill="url(#paint12_linear_1173_5301)"/>
+<g opacity="0.3">
+<path d="M27.1306 50.8283L10.2625 40.9386C8.28751 39.7808 8.28751 37.8964 10.2625 36.7385L27.1297 26.8488C29.1047 25.691 32.3187 25.691 34.2937 26.8488L51.1618 36.7385C53.1367 37.8964 53.1367 39.7808 51.1618 40.9386L34.2945 50.8283C32.3187 51.987 29.1055 51.987 27.1306 50.8283Z" fill="#0F054C"/>
+</g>
+</g>
+<path d="M30.7127 38.3613C29.5615 38.3613 28.4103 38.1041 27.5337 37.5905L10.6655 27.7008C9.78977 27.1873 9.30713 26.4937 9.30713 25.7498C9.30713 25.0059 9.78892 24.3122 10.6655 23.7987L27.5328 13.909C29.2861 12.8819 32.1376 12.8819 33.8909 13.909L50.759 23.7987C51.6348 24.3122 52.1175 25.0059 52.1175 25.7498C52.1175 26.4937 51.6356 27.1873 50.759 27.7008L33.8917 37.5905C33.016 38.1041 31.8648 38.3613 30.7127 38.3613ZM27.6812 37.3299C29.3526 38.3102 32.072 38.3119 33.7451 37.3299L50.6123 27.4402C51.3926 26.9829 51.8224 26.3819 51.8224 25.7498C51.8224 25.1167 51.3926 24.5166 50.6123 24.0593L33.7442 14.1696C32.072 13.1885 29.3534 13.1885 27.6812 14.1696L10.8139 24.0593C10.0337 24.5166 9.60388 25.1176 9.60388 25.7498C9.60388 26.3819 10.0337 26.9829 10.8139 27.4402L27.6812 37.3299Z" fill="#42E8E0"/>
+<path opacity="0.4" d="M52.6433 21.9537V16.0875L51.586 15.4908C51.2875 17.3224 49.1642 18.5296 47.3896 18.7807L35.3028 25.959L30.0277 27.8936L13.1912 19.0699L13.58 18.8422C12.1406 18.1598 11.3663 16.5984 10.5877 15.1738L9.45444 15.8606L8.78076 16.0528V22.0178C8.78076 22.7781 9.2745 23.5385 10.262 24.1178L27.1301 34.0075C29.1051 35.1654 32.3191 35.1654 34.294 34.0075L51.1613 24.1178C52.1326 23.548 52.6263 22.8033 52.6417 22.055C52.6425 22.0213 52.6408 21.9884 52.6399 21.9546L52.6433 21.9537Z" fill="#42E8E0"/>
+<path d="M52.6433 16.7401V12.8587L51.586 12.262C51.2875 14.0936 49.1642 15.3008 47.3896 15.552L35.3028 22.7293L30.0277 24.664L13.1912 15.8403L13.58 15.6117C12.1406 14.9293 11.3663 13.3679 10.5877 11.9434L9.45444 12.6301L8.78076 12.8223V16.8025C8.78076 17.5628 9.2745 18.3232 10.262 18.9025L27.1301 28.7922C29.1051 29.95 32.3191 29.95 34.294 28.7922L51.1613 18.9025C52.1326 18.3327 52.6263 17.5879 52.6417 16.8397C52.6425 16.8059 52.6408 16.773 52.6399 16.7392L52.6433 16.7401Z" fill="url(#paint13_linear_1173_5301)"/>
+<path opacity="0.3" d="M47.3894 15.5504L35.3026 22.7277L30.7114 24.4112V29.6592C32.0084 29.6592 33.3063 29.3699 34.2938 28.7906L51.1611 18.9009C52.1324 18.3311 52.6261 17.5863 52.6415 16.8381C52.6423 16.8043 52.6406 16.7714 52.6397 16.7376L52.6423 16.7385V12.8571L51.6762 12.3115H51.5755C51.2464 14.1154 49.1478 15.3018 47.3894 15.5504Z" fill="#0F054C"/>
+<path d="M27.1306 24.8478L10.2625 14.9582C8.28751 13.8003 8.28751 11.9159 10.2625 10.7581L27.1297 0.868379C29.1047 -0.28946 32.3187 -0.28946 34.2937 0.868379L51.1618 10.7581C53.1367 11.9159 53.1367 13.8003 51.1618 14.9582L34.2945 24.8478C32.3187 26.0065 29.1055 26.0065 27.1306 24.8478Z" fill="url(#paint14_linear_1173_5301)"/>
+<path d="M30.7124 23.0509C29.672 23.0509 28.6325 22.8188 27.8403 22.3547L14.662 14.6282C13.8673 14.1623 13.4307 13.5328 13.4307 12.8564C13.4307 12.1809 13.8681 11.5514 14.662 11.0863L27.8403 3.35903C29.423 2.43241 32 2.43241 33.5844 3.35903L46.7627 11.0863C47.5566 11.5522 47.9941 12.1809 47.9941 12.8573C47.9941 13.5336 47.5566 14.1623 46.7627 14.6282L33.5844 22.3547C32.7931 22.8188 31.7527 23.0509 30.7124 23.0509ZM30.7124 2.95894C29.7257 2.95894 28.7391 3.1789 27.9878 3.61969L14.8096 11.347C14.1112 11.7566 13.7265 12.2927 13.7257 12.8564C13.7257 13.421 14.1103 13.958 14.8096 14.3676L27.9878 22.094C29.4895 22.9756 31.9335 22.9756 33.4369 22.094L46.6152 14.3676C47.3136 13.958 47.699 13.421 47.699 12.8573C47.699 12.2935 47.3136 11.7566 46.6152 11.347L33.4369 3.61969C32.6856 3.17977 31.6981 2.95894 30.7124 2.95894Z" fill="#5351AF"/>
+<path d="M51.1621 14.959L34.2948 24.8487C32.3198 26.0065 29.1058 26.0065 27.1309 24.8487L10.2628 14.959C9.38017 14.4411 8.89325 13.7787 8.79944 13.1006C8.68347 13.9397 9.17039 14.8023 10.2628 15.4422L27.1309 25.3319C29.1058 26.4898 32.3198 26.4898 34.2948 25.3319L51.1621 15.4422C52.2544 14.8023 52.7413 13.9397 52.6254 13.1006C52.5316 13.7795 52.0446 14.442 51.1621 14.959Z" fill="white"/>
+<g opacity="0.4">
+<path d="M117.898 105.45L71.0659 77.9914C69.6844 77.1817 69.6844 75.157 71.0659 74.3464L140.343 33.7276C142.733 32.3265 145.677 32.3265 148.067 33.7276L194.899 61.1858C196.28 61.9955 196.28 64.0202 194.899 64.8308L125.622 105.45C123.232 106.851 120.287 106.851 117.898 105.45Z" fill="#24126A"/>
+</g>
+<path d="M148.135 38.2887L141.3 34.28L142.79 33.4062L149.626 37.415L148.135 38.2887Z" fill="#42E8E0"/>
+<path d="M153.969 41.7096L150.551 39.7048L152.042 38.8311L155.46 40.835L153.969 41.7096Z" fill="#42E8E0"/>
+<path d="M146.658 41.52L143.746 39.8123L145.236 38.9385L148.148 40.6462L146.658 41.52Z" fill="#42E8E0"/>
+<path d="M151.536 44.3806L148.118 42.3767L149.609 41.5029L153.027 43.5068L151.536 44.3806Z" fill="#42E8E0"/>
+<path d="M153.682 49.7383L140.25 41.8621L141.74 40.9883L155.173 48.8645L153.682 49.7383Z" fill="#42E8E0"/>
+<path d="M115.349 65.3243L101.917 57.4489L103.408 56.5742L116.84 64.4505L115.349 65.3243Z" fill="#42E8E0"/>
+<path d="M120.516 68.3523L117.099 66.3484L118.589 65.4746L122.007 67.4785L120.516 68.3523Z" fill="#42E8E0"/>
+<path d="M139.668 45.6195L136.755 43.9118L138.245 43.0371L141.158 44.7449L139.668 45.6195Z" fill="#42E8E0"/>
+<path d="M144.546 48.4792L141.128 46.4752L142.619 45.6006L146.037 47.6054L144.546 48.4792Z" fill="#42E8E0"/>
+<path d="M140.644 50.2897L133.26 45.9597L134.751 45.0859L142.135 49.4151L140.644 50.2897Z" fill="#42E8E0"/>
+<path d="M145.587 53.1873L142.169 51.1834L143.66 50.3096L147.078 52.3135L145.587 53.1873Z" fill="#42E8E0"/>
+<path d="M150.556 56.1004L147.138 54.0964L148.628 53.2227L152.046 55.2266L150.556 56.1004Z" fill="#42E8E0"/>
+<path d="M158.574 60.8037L152.106 57.0115L153.597 56.1377L160.064 59.9299L158.574 60.8037Z" fill="#42E8E0"/>
+<path d="M147.707 62.6277L144.289 60.6238L145.78 59.75L149.198 61.7539L147.707 62.6277Z" fill="#42E8E0"/>
+<path d="M155.726 67.3301L149.258 63.5379L150.749 62.6641L157.216 66.4563L155.726 67.3301Z" fill="#42E8E0"/>
+<path d="M129.688 52.0631L126.271 50.0592L127.761 49.1846L131.179 51.1894L129.688 52.0631Z" fill="#42E8E0"/>
+<path d="M134.657 54.9762L131.239 52.9723L132.729 52.0977L136.148 54.1024L134.657 54.9762Z" fill="#42E8E0"/>
+<path d="M142.675 59.6766L136.207 55.8844L137.698 55.0098L144.165 58.8028L142.675 59.6766Z" fill="#42E8E0"/>
+<path d="M156.055 63.4245L152.638 61.4197L154.128 60.5459L157.546 62.5498L156.055 63.4245Z" fill="#42E8E0"/>
+<path d="M161.025 66.3385L157.606 64.3338L159.097 63.46L162.516 65.4639L161.025 66.3385Z" fill="#42E8E0"/>
+<path d="M125.863 71.4871L122.445 69.4832L123.936 68.6094L127.354 70.6133L125.863 71.4871Z" fill="#42E8E0"/>
+<path d="M133.882 76.1904L127.414 72.3982L128.904 71.5244L135.372 75.3166L133.882 76.1904Z" fill="#42E8E0"/>
+<path d="M122.698 56.1609L119.279 54.157L120.77 53.2832L124.189 55.2871L122.698 56.1609Z" fill="#42E8E0"/>
+<path d="M130.716 60.8623L124.248 57.0701L125.739 56.1963L132.207 59.9885L130.716 60.8623Z" fill="#42E8E0"/>
+<path d="M126.713 76.0846L123.295 74.0798L124.786 73.2061L128.203 75.2108L126.713 76.0846Z" fill="#42E8E0"/>
+<path d="M134.731 80.7851L128.263 76.9929L129.753 76.1191L136.221 79.9113L134.731 80.7851Z" fill="#42E8E0"/>
+<path d="M163.9 55.7292L160.482 53.7253L161.973 52.8506L165.391 54.8545L163.9 55.7292Z" fill="#42E8E0"/>
+<path d="M158.732 52.698L155.314 50.6941L156.805 49.8203L160.223 51.8242L158.732 52.698Z" fill="#42E8E0"/>
+<path d="M171.918 60.4287L165.451 56.6365L166.942 55.7627L173.409 59.5549L171.918 60.4287Z" fill="#42E8E0"/>
+<path d="M132.849 49.8168L129.765 48.0086L131.255 47.1348L134.34 48.943L132.849 49.8168Z" fill="#42E8E0"/>
+<path d="M141.994 55.1799L134.498 50.7849L135.989 49.9111L143.484 54.3061L141.994 55.1799Z" fill="#42E8E0"/>
+<path d="M151.139 60.5402L143.643 56.1453L145.134 55.2715L152.629 59.6664L151.139 60.5402Z" fill="#42E8E0"/>
+<path d="M130.336 56.5422L122.841 52.1472L124.331 51.2734L131.827 55.6684L130.336 56.5422Z" fill="#42E8E0"/>
+<path d="M134.289 58.8577L131.986 57.5076L133.477 56.6338L135.779 57.9839L134.289 58.8577Z" fill="#42E8E0"/>
+<path d="M138.248 61.1799L135.946 59.8298L137.437 58.9561L139.738 60.3061L138.248 61.1799Z" fill="#42E8E0"/>
+<path d="M145.57 65.4722L139.906 62.152L141.396 61.2773L147.06 64.5984L145.57 65.4722Z" fill="#42E8E0"/>
+<path d="M147.108 66.3756L141.445 63.0545L142.935 62.1807L148.599 65.5018L147.108 66.3756Z" fill="#42E8E0"/>
+<path d="M162.397 63.0432L160.095 61.694L161.586 60.8193L163.887 62.1694L162.397 63.0432Z" fill="#42E8E0"/>
+<path d="M108.253 69.3591L100.869 65.0291L102.359 64.1553L109.743 68.4853L108.253 69.3591Z" fill="#42E8E0"/>
+<path d="M113.196 72.2585L109.778 70.2545L111.269 69.3799L114.687 71.3847L113.196 72.2585Z" fill="#42E8E0"/>
+<path d="M118.164 75.1706L114.746 73.1666L116.236 72.292L119.655 74.2968L118.164 75.1706Z" fill="#42E8E0"/>
+<path d="M126.183 79.8729L119.715 76.0807L121.205 75.2061L127.673 78.9983L126.183 79.8729Z" fill="#42E8E0"/>
+<path d="M115.15 81.6003L111.731 79.5955L113.222 78.7217L116.64 80.7256L115.15 81.6003Z" fill="#42E8E0"/>
+<path d="M123.168 86.2998L116.7 82.5076L118.19 81.6338L124.658 85.426L123.168 86.2998Z" fill="#42E8E0"/>
+<path d="M97.2962 71.1326L93.8784 69.1287L95.369 68.2549L98.7868 70.2588L97.2962 71.1326Z" fill="#42E8E0"/>
+<path d="M102.265 74.0447L98.8467 72.0408L100.337 71.167L103.756 73.1709L102.265 74.0447Z" fill="#42E8E0"/>
+<path d="M110.284 78.7461L103.816 74.9539L105.307 74.0801L111.775 77.8723L110.284 78.7461Z" fill="#42E8E0"/>
+<path d="M100.457 68.888L97.373 67.0798L98.8637 66.2061L101.948 68.0143L100.457 68.888Z" fill="#42E8E0"/>
+<path d="M109.603 74.2492L102.107 69.8543L103.598 68.9805L111.093 73.3754L109.603 74.2492Z" fill="#42E8E0"/>
+<path d="M118.748 79.6105L111.252 75.2156L112.743 74.3418L120.238 78.7367L118.748 79.6105Z" fill="#42E8E0"/>
+<path d="M91.8989 72.0656L84.4033 67.6707L85.8939 66.7969L93.3895 71.1918L91.8989 72.0656Z" fill="#42E8E0"/>
+<path d="M95.8507 74.3831L93.5483 73.0338L95.0389 72.1592L97.3413 73.5093L95.8507 74.3831Z" fill="#42E8E0"/>
+<path d="M99.8112 76.7053L97.5088 75.3561L98.9994 74.4814L101.302 75.8315L99.8112 76.7053Z" fill="#42E8E0"/>
+<path d="M79.7811 95.3645L77.4795 94.0144L78.9701 93.1406L81.2717 94.4907L79.7811 95.3645Z" fill="#42E8E0"/>
+<path d="M107.132 80.9968L101.468 77.6765L102.959 76.8027L108.623 80.123L107.132 80.9968Z" fill="#42E8E0"/>
+<path d="M108.671 81.899L103.007 78.5788L104.498 77.7041L110.161 81.0252L108.671 81.899Z" fill="#42E8E0"/>
+<path d="M106.77 64.3928L104.469 63.0427L105.959 62.1689L108.261 63.519L106.77 64.3928Z" fill="#42E8E0"/>
+<path d="M114.092 68.6851L108.428 65.364L109.919 64.4902L115.583 67.8113L114.092 68.6851Z" fill="#42E8E0"/>
+<path d="M121.571 73.0709L115.908 69.7498L117.399 68.876L123.062 72.1971L121.571 73.0709Z" fill="#42E8E0"/>
+<path d="M112.213 54.1125L109.91 52.7625L111.401 51.8887L113.703 53.2388L112.213 54.1125Z" fill="#42E8E0"/>
+<path d="M119.534 58.4039L113.871 55.0828L115.361 54.209L121.024 57.5301L119.534 58.4039Z" fill="#42E8E0"/>
+<path d="M127.014 62.7896L121.35 59.4694L122.84 58.5947L128.503 61.9158L127.014 62.7896Z" fill="#42E8E0"/>
+<path d="M121.76 99.9813C120.394 99.9813 119.03 99.6245 117.813 98.9109L70.9822 71.4527C70.2804 71.0405 69.8608 70.3044 69.8608 69.4817C69.8608 68.659 70.2795 67.9221 70.9822 67.5107L140.259 26.892C142.693 25.464 145.718 25.4648 148.152 26.892L194.984 54.3502C195.686 54.7624 196.104 55.4985 196.104 56.3212C196.104 57.1439 195.686 57.8808 194.984 58.2922L125.706 98.9109C124.488 99.6245 123.124 99.9813 121.76 99.9813ZM144.205 26.1628C142.898 26.1628 141.592 26.5049 140.427 27.1882L71.1502 67.8069C70.5541 68.1559 70.1985 68.782 70.1985 69.4809C70.1985 70.1797 70.5541 70.805 71.1502 71.1548L117.982 98.613C120.312 99.9796 123.207 99.9796 125.537 98.613L194.814 57.9943C195.41 57.6453 195.766 57.0192 195.766 56.3203C195.766 55.6214 195.41 54.9962 194.814 54.6463L147.982 27.1882C146.818 26.5049 145.511 26.1628 144.205 26.1628Z" fill="#42E8E0"/>
+<path opacity="0.4" d="M95.0911 118.606L48.2592 91.1483C46.8778 90.3386 46.8778 88.3139 48.2592 87.5033L55.4086 83.2755C57.798 81.8743 60.7426 81.8743 63.1328 83.2755L109.965 110.734C111.346 111.543 111.346 113.568 109.965 114.379L102.815 118.606C100.425 120.008 97.4805 120.008 95.0911 118.606Z" fill="#24126A"/>
+<path d="M71.646 90.5402L64.1504 86.1453L65.641 85.2715L73.1366 89.6664L71.646 90.5402Z" fill="#42E8E0"/>
+<path d="M92.7765 103.238L90.4741 101.887L91.9647 101.014L94.2671 102.364L92.7765 103.238Z" fill="#42E8E0"/>
+<path d="M75.9885 93.1536L73.686 91.8035L75.1766 90.9297L77.479 92.2798L75.9885 93.1536Z" fill="#42E8E0"/>
+<path d="M98.9527 113.136C97.5874 113.136 96.2231 112.779 95.0062 112.066L48.1752 84.6077C47.4734 84.1964 47.0547 83.4603 47.0547 82.6367C47.0547 81.814 47.4742 81.077 48.1752 80.6666L55.3246 76.4379C57.7583 75.0099 60.7839 75.0107 63.2176 76.4379L110.049 103.896C110.751 104.308 111.17 105.044 111.17 105.867C111.17 106.69 110.751 107.427 110.049 107.838L102.901 112.066C101.682 112.779 100.317 113.136 98.9527 113.136ZM59.2702 75.7096C57.9638 75.7096 56.6574 76.0517 55.4926 76.7349L48.3432 80.9636C47.7471 81.3126 47.3915 81.9378 47.3915 82.6367C47.3915 83.3364 47.7471 83.9608 48.3432 84.3107L95.1742 111.769C97.5039 113.135 100.399 113.135 102.73 111.769L109.878 107.541C110.474 107.192 110.83 106.566 110.83 105.867C110.83 105.168 110.474 104.543 109.878 104.193L63.047 76.7349C61.8831 76.0517 60.5766 75.7096 59.2702 75.7096Z" fill="#42E8E0"/>
+<defs>
+<linearGradient id="paint0_linear_1173_5301" x1="0.169666" y1="84.0781" x2="247.712" y2="84.0781" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.151" stop-color="#A3A7F5"/>
+<stop offset="0.3866" stop-color="#8289E8"/>
+<stop offset="0.6124" stop-color="#6A73DF"/>
+<stop offset="0.8221" stop-color="#5C66D9"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1173_5301" x1="158.419" y1="119.644" x2="87.9546" y2="27.5651" gradientUnits="userSpaceOnUse">
+<stop stop-color="#42E8E0"/>
+<stop offset="0.1055" stop-color="#37B6BF"/>
+<stop offset="0.2197" stop-color="#2C87A1"/>
+<stop offset="0.338" stop-color="#235F87"/>
+<stop offset="0.4587" stop-color="#1C3F72"/>
+<stop offset="0.5824" stop-color="#162561"/>
+<stop offset="0.7105" stop-color="#121355"/>
+<stop offset="0.8458" stop-color="#10084E"/>
+<stop offset="1" stop-color="#0F054C"/>
+</linearGradient>
+<radialGradient id="paint2_radial_1173_5301" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(87.6672 87.584) scale(193.753 196.764)">
+<stop stop-color="#42E8E0"/>
+<stop offset="0.1055" stop-color="#37B6BF"/>
+<stop offset="0.2197" stop-color="#2C87A1"/>
+<stop offset="0.338" stop-color="#235F87"/>
+<stop offset="0.4587" stop-color="#1C3F72"/>
+<stop offset="0.5824" stop-color="#162561"/>
+<stop offset="0.7105" stop-color="#121355"/>
+<stop offset="0.8458" stop-color="#10084E"/>
+<stop offset="1" stop-color="#0F054C"/>
+</radialGradient>
+<linearGradient id="paint3_linear_1173_5301" x1="232.502" y1="145.726" x2="267.569" y2="165.662" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint4_linear_1173_5301" x1="228.138" y1="153.438" x2="272" y2="153.438" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+<linearGradient id="paint5_linear_1173_5301" x1="232.502" y1="119.712" x2="267.569" y2="139.648" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint6_linear_1173_5301" x1="228.138" y1="127.425" x2="272" y2="127.425" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+<linearGradient id="paint7_linear_1173_5301" x1="157.401" y1="168.806" x2="192.468" y2="188.742" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint8_linear_1173_5301" x1="153.038" y1="176.518" x2="196.899" y2="176.518" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+<linearGradient id="paint9_linear_1173_5301" x1="157.401" y1="140.906" x2="192.468" y2="160.842" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint10_linear_1173_5301" x1="153.038" y1="148.619" x2="196.899" y2="148.619" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+<linearGradient id="paint11_linear_1173_5301" x1="13.1453" y1="31.1254" x2="48.2119" y2="51.0614" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint12_linear_1173_5301" x1="8.78134" y1="38.8387" x2="52.6427" y2="38.8387" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+<linearGradient id="paint13_linear_1173_5301" x1="13.1453" y1="5.14606" x2="48.2119" y2="25.082" gradientUnits="userSpaceOnUse">
+<stop stop-color="#BCBEFF"/>
+<stop offset="0.2271" stop-color="#AAADF8"/>
+<stop offset="0.6802" stop-color="#7C83E5"/>
+<stop offset="1" stop-color="#5761D7"/>
+</linearGradient>
+<linearGradient id="paint14_linear_1173_5301" x1="8.78134" y1="12.8582" x2="52.6427" y2="12.8582" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9E9FD"/>
+<stop offset="0.3601" stop-color="#D3D2F9"/>
+<stop offset="0.7062" stop-color="#C5C4F7"/>
+<stop offset="1" stop-color="#C0BFF6"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/assets/tech_works.png b/assets/tech_works.png
new file mode 100644
index 0000000..e207375
Binary files /dev/null and b/assets/tech_works.png differ
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 391a902..24bc670 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+  <key>MinimumOSVersion</key>
+  <string>13.0</string>
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
diff --git a/ios/Podfile b/ios/Podfile
index 06af686..a1c3b10 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -44,6 +44,7 @@ post_install do |installer|
       # ML Kit исключает arm64 для симулятора → сборка только x86_64.
       # На M1 это ещё могло работать через Rosetta; на M4 симулятор только arm64.
       config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'i386'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
     end
   end
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 89d5634..5e834b2 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -2,6 +2,8 @@ PODS:
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
+  - flutter_native_splash (2.4.3):
+    - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
   - geolocator_apple (1.2.0):
@@ -25,6 +27,7 @@ PODS:
 DEPENDENCIES:
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - 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`)
@@ -42,6 +45,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   geolocator_apple:
@@ -60,6 +65,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
@@ -69,6 +75,6 @@ SPEC CHECKSUMS:
   yandex_mapkit: b0468cf6fdc2e5ef315e08c081cb48763db1edee
   YandexMapsMobile: 27e6e45425bb61f0be2dbc2bf02d4e64926691a9
 
-PODFILE CHECKSUM: af32912eda0a14960d3c16b570702dbc954fc964
+PODFILE CHECKSUM: 5deaa97a3697e922b222a24011322ae172be432f
 
 COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 73f8f37..cbc2378 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -296,14 +296,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -376,14 +372,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -486,7 +478,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Profile;
@@ -500,7 +492,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = F42W9GA5WC;
+				DEVELOPMENT_TEAM = J463CU8H5F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -619,7 +611,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1";
 			};
 			name = Debug;
 		};
@@ -672,7 +664,7 @@
 				SUPPORTED_PLATFORMS = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = "1";
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -686,7 +678,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = F42W9GA5WC;
+				DEVELOPMENT_TEAM = J463CU8H5F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -712,7 +704,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = F42W9GA5WC;
+				DEVELOPMENT_TEAM = J463CU8H5F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index 1dd276b..24b6a18 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 34458af..52226d0 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 3711926..f6ec064 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index d625354..08dd661 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index fe907cf..d0a555f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index d31bb50..3be810b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 61706cb..ded807f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 3711926..f6ec064 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 4a0b2de..c77a230 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 6c2fb29..0fdd65d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
index 36d18eb..b10da85 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
index e1ac9e4..66bdaf4 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
index 3bbefb0..a04fffe 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
index f437fd4..7cdcf56 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 6c2fb29..0fdd65d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 54e93a6..5fe7841 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
index c647d81..fbede71 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
index 21bfa5e..9ca502d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 87b2bc7..6fb97a9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 4ef52a2..e85fa4f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git 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
index 7a28ee6..42cc2aa 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 0000000..9f447e1
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..00cabce 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9da19ea..c499530 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 9da19ea..3ca3458 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 9da19ea..9366118 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c..7fd9624 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="130" height="130"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 14b1fc2..c4c07f5 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,80 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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>
-	<string>Be Happy</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>be_happy</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIApplicationSceneManifest</key>
 	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Be Happy</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>be_happy</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UIApplicationSceneManifest</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>
+			<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>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>YandexMapKitApiKey</key>
+		<string>$(YANDEX_MAPKIT_API_KEY)</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Данные о местоположении необходимы для поиска ближайших самокатов и отображения их на карте.</string>
+		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+		<string>Данные о местоположении необходимы для отслеживания поездки на самокате в фоновом режиме.</string>
+		<key>NSCameraUsageDescription</key>
+		<string>Приложению нужен доступ к камере для сканирования QR-кодов самокатов</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>Приложению нужен доступ к галерее для выбора фото профиля и подтверждения поездки</string>
+		<key>UIStatusBarHidden</key>
+		<false/>
 	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>YandexMapKitApiKey</key>
-	<string>$(YANDEX_MAPKIT_API_KEY)</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-        <string>Данные о местоположении необходимы для поиска ближайших самокатов и отображения их на карте.</string>
-        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-        <string>Данные о местоположении необходимы для отслеживания поездки на самокате в фоновом режиме.</string>
-        <key>NSCameraUsageDescription</key>
-        <string>Приложению нужен доступ к камере для сканирования QR-кодов самокатов</string>
-        <key>NSPhotoLibraryUsageDescription</key>
-        <string>Приложению нужен доступ к галерее для выбора фото профиля и подтверждения поездки</string>
-</dict>
 </plist>
diff --git a/lib/core/app_colors.dart b/lib/core/app_colors.dart
index 6da88aa..3f2daa9 100644
--- a/lib/core/app_colors.dart
+++ b/lib/core/app_colors.dart
@@ -1,93 +1,93 @@
-import 'package:flutter/material.dart';
-
-class AppColors {
-  // --------------------------
-  // ФОНЫ ЭКРАНОВ
-  // --------------------------
-
-  /// Градиент PhoneScreen (ввод телефона)
-  static const LinearGradient phoneScreenBg = LinearGradient(
-    begin: Alignment.topCenter,
-    end: Alignment.bottomCenter,
-    colors: [
-      Color(0xFF293A69),
-      Color(0xFF202741),
-    ],
-  );
-
-  /// Градиент PhoneLoginScreen & PinLoginScreen
-  static const LinearGradient authScreenBg = LinearGradient(
-    begin: Alignment.topCenter,
-    end: Alignment.bottomCenter,
-    colors: [
-      Color(0xFF0D1A44),
-      Color(0xFF091233),
-    ],
-  );
-
-  // --------------------------
-  // КНОПКИ
-  // --------------------------
-
-  /// Активная кнопка — бирюзово-зелёный градиент
-  static const LinearGradient activeButtonGradient = LinearGradient(
-    begin: Alignment.centerLeft,
-    end: Alignment.centerRight,
-    colors: [
-      Color(0xFF75FBF0),
-      Color(0xFF8BFFAA),
-    ],
-  );
-
-  /// Неактивная кнопка — тёмно-синий
-  static const Color disabledButtonColor = Color(0xFF2A3A6A);
-
-  /// Активный текст кнопки
-  static const Color activeButtonText = Color(0xFF000032);
-
-  /// Неактивный текст кнопки
-  static const Color disabledButtonText = Color(0x99FFFFFF);
-
-  // --------------------------
-  // ЦВЕТА ДЛЯ TOGGLE / CHECKBOX
-  // --------------------------
-
-  /// Бордер неактивного чекбокса
-  static const Color checkboxBorder = Colors.white70;
-
-  /// Бордер чекбокса с ошибкой
-  static const Color checkboxErrorBorder = Color(0xFFBA1A1A);
-
-  /// Цвет заливки активного чекбокса
-  static const Color checkboxFill = Color(0xFF8BFFAA);
-
-  // --------------------------
-  // PIN / CODE INPUT
-  // --------------------------
-
-  /// Цвет цифры в SMS-коде (PhoneLoginScreen)
-  static const Color smsDigit = Color(0xFF75FBF0);
-
-  /// Цвет точки-плейсхолдера
-  static const Color digitPlaceholder = Color(0x66FFFFFF);
-
-  /// Цвет правильного PIN
-  static const Color pinSuccess = Color(0xFF66FF99);
-
-  /// Цвет неверного PIN
-  static const Color pinError = Color(0xFFFF4F4F);
-
-  // --------------------------
-  // ТЕКСТ
-  // --------------------------
-
-  static const Color whiteText = Colors.white;
-  static const Color white70 = Colors.white70;
-  static const Color hint = Colors.white54;
-
-  // --------------------------
-  // ПРОЧЕЕ
-  // --------------------------
-
-  static const Color darkBlue = Color(0xFF000032);
-}
+import 'package:flutter/material.dart';
+
+class AppColors {
+  // --------------------------
+  // ФОНЫ ЭКРАНОВ
+  // --------------------------
+
+  /// Градиент PhoneScreen (ввод телефона)
+  static const LinearGradient phoneScreenBg = LinearGradient(
+    begin: Alignment.topCenter,
+    end: Alignment.bottomCenter,
+    colors: [
+      Color(0xFF293A69),
+      Color(0xFF202741),
+    ],
+  );
+
+  /// Градиент PhoneLoginScreen & PinLoginScreen
+  static const LinearGradient authScreenBg = LinearGradient(
+    begin: Alignment.topCenter,
+    end: Alignment.bottomCenter,
+    colors: [
+      Color(0xFF0D1A44),
+      Color(0xFF091233),
+    ],
+  );
+
+  // --------------------------
+  // КНОПКИ
+  // --------------------------
+
+  /// Активная кнопка — бирюзово-зелёный градиент
+  static const LinearGradient activeButtonGradient = LinearGradient(
+    begin: Alignment.centerLeft,
+    end: Alignment.centerRight,
+    colors: [
+      Color(0xFF75FBF0),
+      Color(0xFF8BFFAA),
+    ],
+  );
+
+  /// Неактивная кнопка — тёмно-синий
+  static const Color disabledButtonColor = Color(0xFF2A3A6A);
+
+  /// Активный текст кнопки
+  static const Color activeButtonText = Color(0xFF000032);
+
+  /// Неактивный текст кнопки
+  static const Color disabledButtonText = Color(0x99FFFFFF);
+
+  // --------------------------
+  // ЦВЕТА ДЛЯ TOGGLE / CHECKBOX
+  // --------------------------
+
+  /// Бордер неактивного чекбокса
+  static const Color checkboxBorder = Colors.white70;
+
+  /// Бордер чекбокса с ошибкой
+  static const Color checkboxErrorBorder = Color(0xFFBA1A1A);
+
+  /// Цвет заливки активного чекбокса
+  static const Color checkboxFill = Color(0xFF8BFFAA);
+
+  // --------------------------
+  // PIN / CODE INPUT
+  // --------------------------
+
+  /// Цвет цифры в SMS-коде (PhoneLoginScreen)
+  static const Color smsDigit = Color(0xFF75FBF0);
+
+  /// Цвет точки-плейсхолдера
+  static const Color digitPlaceholder = Color(0x66FFFFFF);
+
+  /// Цвет правильного PIN
+  static const Color pinSuccess = Color(0xFF66FF99);
+
+  /// Цвет неверного PIN
+  static const Color pinError = Color(0xFFFF4F4F);
+
+  // --------------------------
+  // ТЕКСТ
+  // --------------------------
+
+  static const Color whiteText = Colors.white;
+  static const Color white70 = Colors.white70;
+  static const Color hint = Colors.white54;
+
+  // --------------------------
+  // ПРОЧЕЕ
+  // --------------------------
+
+  static const Color darkBlue = Color(0xFF000032);
+}
diff --git a/lib/core/failures.dart b/lib/core/failures.dart
index 4ea4b22..b2af654 100644
--- a/lib/core/failures.dart
+++ b/lib/core/failures.dart
@@ -1,29 +1,29 @@
-sealed class EntityFailure {
-  final String? message;
-  const EntityFailure(this.message);
-}
-
-class AuthFailure extends EntityFailure {
-  final int attemptsLeft;
-  const AuthFailure(this.attemptsLeft, {String? message}) : super(message);
-}
-
-class AuthBlockFailure extends EntityFailure {
-  const AuthBlockFailure(super.message);
-}
-
-class WrongZoneFailure extends EntityFailure {
-  const WrongZoneFailure(super.message);
-}
-
-class ScooterNotFoundFailure extends EntityFailure {
-  const ScooterNotFoundFailure(super.message);
-}
-
-class RouteHistoryNotFoundFailure extends EntityFailure {
-  const RouteHistoryNotFoundFailure(super.message);
-}
-
-class UnknownFailure extends EntityFailure {
-  const UnknownFailure(super.message);
+sealed class EntityFailure {
+  final String? message;
+  const EntityFailure(this.message);
+}
+
+class AuthFailure extends EntityFailure {
+  final int attemptsLeft;
+  const AuthFailure(this.attemptsLeft, {String? message}) : super(message);
+}
+
+class AuthBlockFailure extends EntityFailure {
+  const AuthBlockFailure(super.message);
+}
+
+class WrongZoneFailure extends EntityFailure {
+  const WrongZoneFailure(super.message);
+}
+
+class ScooterNotFoundFailure extends EntityFailure {
+  const ScooterNotFoundFailure(super.message);
+}
+
+class RouteHistoryNotFoundFailure extends EntityFailure {
+  const RouteHistoryNotFoundFailure(super.message);
+}
+
+class UnknownFailure extends EntityFailure {
+  const UnknownFailure(super.message);
 }
\ No newline at end of file
diff --git a/lib/core/result.dart b/lib/core/result.dart
index ea900ed..aab7c35 100644
--- a/lib/core/result.dart
+++ b/lib/core/result.dart
@@ -1,13 +1,13 @@
-import 'failures.dart';
-
-sealed class Result<T> {}
-
-class Success<T> extends Result<T> {
-  final T? data;
-  Success(this.data);
-}
-
-class Failure<T> extends Result<T> {
-  final EntityFailure failure;
-  Failure(this.failure);
+import 'failures.dart';
+
+sealed class Result<T> {}
+
+class Success<T> extends Result<T> {
+  final T? data;
+  Success(this.data);
+}
+
+class Failure<T> extends Result<T> {
+  final EntityFailure failure;
+  Failure(this.failure);
 }
\ No newline at end of file
diff --git a/lib/data/exceptions/auth_block_exception.dart b/lib/data/exceptions/auth_block_exception.dart
index d0fa2ea..176ca94 100644
--- a/lib/data/exceptions/auth_block_exception.dart
+++ b/lib/data/exceptions/auth_block_exception.dart
@@ -1,8 +1,8 @@
-class AuthBlockException implements Exception {
-  String description = "Неверный код. Вы временно заблокированы, попробуйте позже.";
-
-  AuthBlockException();
-
-  @override
-  String toString() => description;
-}
+class AuthBlockException implements Exception {
+  String description = "Неверный код. Вы временно заблокированы, попробуйте позже.";
+
+  AuthBlockException();
+
+  @override
+  String toString() => description;
+}
diff --git a/lib/data/exceptions/auth_exception.dart b/lib/data/exceptions/auth_exception.dart
index 1d29e14..2e2a888 100644
--- a/lib/data/exceptions/auth_exception.dart
+++ b/lib/data/exceptions/auth_exception.dart
@@ -1,9 +1,9 @@
-class AuthException implements Exception {
-  int attemptsLeft;
-  String? description;
-
-  AuthException(this.description, this.attemptsLeft);
-
-  @override
-  String toString() => description ?? "Ошибка авторизации";
-}
+class AuthException implements Exception {
+  int attemptsLeft;
+  String? description;
+
+  AuthException(this.description, this.attemptsLeft);
+
+  @override
+  String toString() => description ?? "Ошибка авторизации";
+}
diff --git a/lib/data/exceptions/route_history_not_found_exception.dart b/lib/data/exceptions/route_history_not_found_exception.dart
index ff94da5..591ce1d 100644
--- a/lib/data/exceptions/route_history_not_found_exception.dart
+++ b/lib/data/exceptions/route_history_not_found_exception.dart
@@ -1,8 +1,8 @@
-class RouteHistoryNotFoundException implements Exception {
-  final String message;
-
-  RouteHistoryNotFoundException({this.message = "История маршрута не найдена"});
-
-  @override
-  String toString() => message;
-}
+class RouteHistoryNotFoundException implements Exception {
+  final String message;
+
+  RouteHistoryNotFoundException({this.message = "История маршрута не найдена"});
+
+  @override
+  String toString() => message;
+}
diff --git a/lib/data/exceptions/scooter_not_found_exception.dart b/lib/data/exceptions/scooter_not_found_exception.dart
index a44ad82..cd77abd 100644
--- a/lib/data/exceptions/scooter_not_found_exception.dart
+++ b/lib/data/exceptions/scooter_not_found_exception.dart
@@ -1,8 +1,8 @@
-class ScooterNotFoundException implements Exception {
-  final String message;
-
-  ScooterNotFoundException({this.message = "Самокат не найден"});
-
-  @override
-  String toString() => message;
-}
+class ScooterNotFoundException implements Exception {
+  final String message;
+
+  ScooterNotFoundException({this.message = "Самокат не найден"});
+
+  @override
+  String toString() => message;
+}
diff --git a/lib/data/exceptions/unauthorized_exception.dart b/lib/data/exceptions/unauthorized_exception.dart
index 45aec02..f82416c 100644
--- a/lib/data/exceptions/unauthorized_exception.dart
+++ b/lib/data/exceptions/unauthorized_exception.dart
@@ -1,5 +1,5 @@
-class UnauthorizedException implements Exception {
-
-  @override
-  String toString() => "Ошибка авторизации. Пользователь не авторизован";
-}
+class UnauthorizedException implements Exception {
+
+  @override
+  String toString() => "Ошибка авторизации. Пользователь не авторизован";
+}
diff --git a/lib/data/exceptions/wrong_zone_exception.dart b/lib/data/exceptions/wrong_zone_exception.dart
index f5cec64..2b81ecc 100644
--- a/lib/data/exceptions/wrong_zone_exception.dart
+++ b/lib/data/exceptions/wrong_zone_exception.dart
@@ -1,6 +1,6 @@
-class WrongZoneException implements Exception {
-  final String message;
-
-  WrongZoneException({required this.message});
-
-}
+class WrongZoneException implements Exception {
+  final String message;
+
+  WrongZoneException({required this.message});
+
+}
diff --git a/lib/data/interceptor/auth_interceptor.dart b/lib/data/interceptor/auth_interceptor.dart
index ef9f69f..ef8922e 100644
--- a/lib/data/interceptor/auth_interceptor.dart
+++ b/lib/data/interceptor/auth_interceptor.dart
@@ -1,26 +1,26 @@
-import 'package:dio/dio.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:be_happy/presentation/event/spalsh_event.dart';
-
-import '../../di/service_locator.dart';
-
-class AuthInterceptor extends Interceptor {
-
-  AuthInterceptor();
-
-  @override
-  void onError(DioException err, ErrorInterceptorHandler handler) {
-    final String path = err.requestOptions.path;
-
-    if (err.response?.statusCode == 401) {
-      if (!path.contains('/auth/client/refresh') && !path.contains('/auth/client/login')) {
-        print('Interceptor: 401 на обычном запросе. Пытаемся обновить токен...');
-        getIt<SplashBloc>().add(AuthCheckRequested());
-      } else {
-        print('Interceptor: 401 на запросе авторизации. Пробрасываем ошибку дальше.');
-      }
-    }
-
-    return super.onError(err, handler);
-  }
+import 'package:dio/dio.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:be_happy/presentation/event/spalsh_event.dart';
+
+import '../../di/service_locator.dart';
+
+class AuthInterceptor extends Interceptor {
+
+  AuthInterceptor();
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) {
+    final String path = err.requestOptions.path;
+
+    if (err.response?.statusCode == 401) {
+      if (!path.contains('/auth/client/refresh') && !path.contains('/auth/client/login')) {
+        print('Interceptor: 401 на обычном запросе. Пытаемся обновить токен...');
+        getIt<SplashBloc>().add(AuthCheckRequested());
+      } else {
+        print('Interceptor: 401 на запросе авторизации. Пробрасываем ошибку дальше.');
+      }
+    }
+
+    return super.onError(err, handler);
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/auth_response_dto.dart b/lib/data/models/auth_response_dto.dart
index 9703de1..dc0d788 100644
--- a/lib/data/models/auth_response_dto.dart
+++ b/lib/data/models/auth_response_dto.dart
@@ -1,13 +1,13 @@
-class AuthResponseDto {
-  final String accessToken;
-  final String refreshToken;
-
-  AuthResponseDto({required this.accessToken, required this.refreshToken});
-
-  factory AuthResponseDto.fromJson(Map<String, dynamic> json) {
-    return AuthResponseDto(
-      accessToken: json["accessToken"] ?? "",
-      refreshToken: json["refreshToken"] ?? "",
-    );
-  }
+class AuthResponseDto {
+  final String accessToken;
+  final String refreshToken;
+
+  AuthResponseDto({required this.accessToken, required this.refreshToken});
+
+  factory AuthResponseDto.fromJson(Map<String, dynamic> json) {
+    return AuthResponseDto(
+      accessToken: json["accessToken"] ?? "",
+      refreshToken: json["refreshToken"] ?? "",
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/client_notification_dto.dart b/lib/data/models/client_notification_dto.dart
index dc5ba1e..1779cf1 100644
--- a/lib/data/models/client_notification_dto.dart
+++ b/lib/data/models/client_notification_dto.dart
@@ -1,89 +1,89 @@
-import 'dart:convert';
-import '../../domain/entities/client_notification.dart';
-
-class ClientNotificationDto {
-  final int id;
-  final String content;
-  final int clientId;
-  final String type;
-  final String category;
-  final String createdAt;
-  final String? canceledAt;
-  final String? readAt;
-
-  ClientNotificationDto({
-    required this.id,
-    required this.content,
-    required this.clientId,
-    required this.type,
-    required this.category,
-    required this.createdAt,
-    this.canceledAt,
-    this.readAt,
-  });
-
-  factory ClientNotificationDto.fromJson(Map<String, dynamic> json) {
-    return ClientNotificationDto(
-      id: json['id'] as int,
-      content: json['content'] as String,
-      clientId: json['clientId'] as int,
-      type: json['type'] as String,
-      category: json['category'] as String,
-      createdAt: json['createdAt'] as String,
-      canceledAt: json['canceledAt'] as String?,
-      readAt: json['readAt'] as String?,
-    );
-  }
-
-  ClientNotification toEntity() {
-    return ClientNotification(
-      id: id,
-      content: content,
-      clientId: clientId,
-      type: _parseType(type),
-      category: _parseCategory(category),
-      createdAt: _parseUtcDate(createdAt),
-      canceledAt: canceledAt != null ? _parseUtcDate(canceledAt!) : null,
-      readAt: readAt != null ? _parseUtcDate(readAt!) : null,
-    );
-  }
-
-  DateTime _parseUtcDate(String dateString) {
-    if (dateString.endsWith('Z') || dateString.contains('+') || dateString.contains('-')) {
-      return DateTime.parse(dateString).toLocal();
-    }
-    return DateTime.parse('${dateString}Z').toLocal();
-  }
-
-  NotificationType _parseType(String type) {
-    switch (type.toLowerCase()) {
-      case 'info':
-        return NotificationType.info;
-      case 'attention':
-        return NotificationType.attention;
-      case 'warning':
-        return NotificationType.warning;
-      default:
-        return NotificationType.info;
-    }
-  }
-
-  NotificationCategory _parseCategory(String category) {
-    switch (category.toLowerCase()) {
-      case 'auth':
-        return NotificationCategory.auth;
-      case 'zone':
-        return NotificationCategory.zone;
-      case 'payment':
-        return NotificationCategory.payment;
-      case 'companyinfo':
-        return NotificationCategory.companyInfo;
-      case 'admininfo':
-        return NotificationCategory.adminInfo;
-      case 'scooter':
-        return NotificationCategory.scooter;
-      default:
-        return NotificationCategory.companyInfo;
-    }
-  }
+import 'dart:convert';
+import '../../domain/entities/client_notification.dart';
+
+class ClientNotificationDto {
+  final int id;
+  final String content;
+  final int clientId;
+  final String type;
+  final String category;
+  final String createdAt;
+  final String? canceledAt;
+  final String? readAt;
+
+  ClientNotificationDto({
+    required this.id,
+    required this.content,
+    required this.clientId,
+    required this.type,
+    required this.category,
+    required this.createdAt,
+    this.canceledAt,
+    this.readAt,
+  });
+
+  factory ClientNotificationDto.fromJson(Map<String, dynamic> json) {
+    return ClientNotificationDto(
+      id: json['id'] as int,
+      content: json['content'] as String,
+      clientId: json['clientId'] as int,
+      type: json['type'] as String,
+      category: json['category'] as String,
+      createdAt: json['createdAt'] as String,
+      canceledAt: json['canceledAt'] as String?,
+      readAt: json['readAt'] as String?,
+    );
+  }
+
+  ClientNotification toEntity() {
+    return ClientNotification(
+      id: id,
+      content: content,
+      clientId: clientId,
+      type: _parseType(type),
+      category: _parseCategory(category),
+      createdAt: _parseUtcDate(createdAt),
+      canceledAt: canceledAt != null ? _parseUtcDate(canceledAt!) : null,
+      readAt: readAt != null ? _parseUtcDate(readAt!) : null,
+    );
+  }
+
+  DateTime _parseUtcDate(String dateString) {
+    if (dateString.endsWith('Z') || dateString.contains('+') || dateString.contains('-')) {
+      return DateTime.parse(dateString).toLocal();
+    }
+    return DateTime.parse('${dateString}Z').toLocal();
+  }
+
+  NotificationType _parseType(String type) {
+    switch (type.toLowerCase()) {
+      case 'info':
+        return NotificationType.info;
+      case 'attention':
+        return NotificationType.attention;
+      case 'warning':
+        return NotificationType.warning;
+      default:
+        return NotificationType.info;
+    }
+  }
+
+  NotificationCategory _parseCategory(String category) {
+    switch (category.toLowerCase()) {
+      case 'auth':
+        return NotificationCategory.auth;
+      case 'zone':
+        return NotificationCategory.zone;
+      case 'payment':
+        return NotificationCategory.payment;
+      case 'companyinfo':
+        return NotificationCategory.companyInfo;
+      case 'admininfo':
+        return NotificationCategory.adminInfo;
+      case 'scooter':
+        return NotificationCategory.scooter;
+      default:
+        return NotificationCategory.companyInfo;
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/login_request_dto.dart b/lib/data/models/login_request_dto.dart
index 057d37c..5828d4b 100644
--- a/lib/data/models/login_request_dto.dart
+++ b/lib/data/models/login_request_dto.dart
@@ -1,9 +1,9 @@
-class LoginRequestDto {
-  final String phone;
-
-  LoginRequestDto({required this.phone});
-
-  Map<String, dynamic> toJson() {
-    return {"phone": phone};
-  }
+class LoginRequestDto {
+  final String phone;
+
+  LoginRequestDto({required this.phone});
+
+  Map<String, dynamic> toJson() {
+    return {"phone": phone};
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/payment_card_request_dto.dart b/lib/data/models/payment_card_request_dto.dart
index 8c0b02e..e057d9b 100644
--- a/lib/data/models/payment_card_request_dto.dart
+++ b/lib/data/models/payment_card_request_dto.dart
@@ -1,25 +1,25 @@
-class PaymentCardRequestDto {
-  final String cardNumber;
-  final String cardHolder;
-  final int expirationMonth;
-  final int expirationYear;
-  final String cvv;
-
-  PaymentCardRequestDto({
-    required this.cardNumber,
-    required this.cardHolder,
-    required this.expirationMonth,
-    required this.expirationYear,
-    required this.cvv,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'cardNumber': cardNumber.replaceAll(' ', ''),
-      'cardHolder': cardHolder,
-      'expirationMonth': expirationMonth,
-      'expirationYear': expirationYear,
-      'cvv': cvv,
-    };
-  }
+class PaymentCardRequestDto {
+  final String cardNumber;
+  final String cardHolder;
+  final int expirationMonth;
+  final int expirationYear;
+  final String cvv;
+
+  PaymentCardRequestDto({
+    required this.cardNumber,
+    required this.cardHolder,
+    required this.expirationMonth,
+    required this.expirationYear,
+    required this.cvv,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'cardNumber': cardNumber.replaceAll(' ', ''),
+      'cardHolder': cardHolder,
+      'expirationMonth': expirationMonth,
+      'expirationYear': expirationYear,
+      'cvv': cvv,
+    };
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/payment_card_response_dto.dart b/lib/data/models/payment_card_response_dto.dart
index ccce5c8..157b6b1 100644
--- a/lib/data/models/payment_card_response_dto.dart
+++ b/lib/data/models/payment_card_response_dto.dart
@@ -1,45 +1,45 @@
-import '../../domain/entities/payment_card.dart';
-
-class PaymentCardResponseDto {
-  final int id;
-  final String bindingId;
-  final int expirationMonth;
-  final int expirationYear;
-  final String cardHolder;
-  final String cardLastNumber;
-  final String type;
-  final bool isMain;
-
-  PaymentCardResponseDto({
-    required this.id,
-    required this.bindingId,
-    required this.expirationMonth,
-    required this.expirationYear,
-    required this.cardHolder,
-    required this.cardLastNumber,
-    required this.type,
-    required this.isMain,
-  });
-
-  factory PaymentCardResponseDto.fromJson(Map<String, dynamic> json) {
-    return PaymentCardResponseDto(
-      id: json['id'] as int,
-      bindingId: json['bindingId'] as String,
-      expirationMonth: json['expirationMonth'] as int,
-      expirationYear: json['expirationYear'] as int,
-      cardHolder: json['cardHolder'] as String,
-      cardLastNumber: json['cardLastNumber'] as String,
-      isMain: json['isMain'] as bool,
-      type: json['type'] as String,
-    );
-  }
-
-  PaymentCard toEntity(String? fullCardNumber) {
-    return PaymentCard(
-      id: id,
-      bindingId: bindingId,
-      cardLastNumber: cardLastNumber,
-      isMain: isMain,
-    );
-  }
-}
+import '../../domain/entities/payment_card.dart';
+
+class PaymentCardResponseDto {
+  final int id;
+  final String bindingId;
+  final int expirationMonth;
+  final int expirationYear;
+  final String cardHolder;
+  final String cardLastNumber;
+  final String type;
+  final bool isMain;
+
+  PaymentCardResponseDto({
+    required this.id,
+    required this.bindingId,
+    required this.expirationMonth,
+    required this.expirationYear,
+    required this.cardHolder,
+    required this.cardLastNumber,
+    required this.type,
+    required this.isMain,
+  });
+
+  factory PaymentCardResponseDto.fromJson(Map<String, dynamic> json) {
+    return PaymentCardResponseDto(
+      id: json['id'] as int,
+      bindingId: json['bindingId'] as String,
+      expirationMonth: json['expirationMonth'] as int,
+      expirationYear: json['expirationYear'] as int,
+      cardHolder: json['cardHolder'] as String,
+      cardLastNumber: json['cardLastNumber'] as String,
+      isMain: json['isMain'] as bool,
+      type: json['type'] as String,
+    );
+  }
+
+  PaymentCard toEntity(String? fullCardNumber) {
+    return PaymentCard(
+      id: id,
+      bindingId: bindingId,
+      cardLastNumber: cardLastNumber,
+      isMain: isMain,
+    );
+  }
+}
diff --git a/lib/data/models/promo_code_response_dto.dart b/lib/data/models/promo_code_response_dto.dart
index 24ba6b1..88072e4 100644
--- a/lib/data/models/promo_code_response_dto.dart
+++ b/lib/data/models/promo_code_response_dto.dart
@@ -1,25 +1,25 @@
-import '../../domain/entities/promo_code_result.dart';
-
-class PromoCodeResponseDto {
-  final bool success;
-  final double balance;
-
-  PromoCodeResponseDto({
-    required this.success,
-    required this.balance,
-  });
-
-  factory PromoCodeResponseDto.fromJson(Map<String, dynamic> json) {
-    return PromoCodeResponseDto(
-      success: json['success'] as bool,
-      balance: (json['balance'] as num).toDouble(),
-    );
-  }
-
-  PromoCodeResult toEntity() {
-    return PromoCodeResult(
-      success: success,
-      balance: balance,
-    );
-  }
+import '../../domain/entities/promo_code_result.dart';
+
+class PromoCodeResponseDto {
+  final bool success;
+  final double balance;
+
+  PromoCodeResponseDto({
+    required this.success,
+    required this.balance,
+  });
+
+  factory PromoCodeResponseDto.fromJson(Map<String, dynamic> json) {
+    return PromoCodeResponseDto(
+      success: json['success'] as bool,
+      balance: (json['balance'] as num).toDouble(),
+    );
+  }
+
+  PromoCodeResult toEntity() {
+    return PromoCodeResult(
+      success: success,
+      balance: balance,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/scooter_order_history_response.dart b/lib/data/models/scooter_order_history_response.dart
index 1348d44..b73e53c 100644
--- a/lib/data/models/scooter_order_history_response.dart
+++ b/lib/data/models/scooter_order_history_response.dart
@@ -1,21 +1,21 @@
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/entities/pagination.dart';
-
-class ScooterOrderHistoryResponse {
-  final List<ScooterOrder> orders;
-  final Pagination pagination;
-
-  ScooterOrderHistoryResponse({
-    required this.orders,
-    required this.pagination,
-  });
-
-  factory ScooterOrderHistoryResponse.fromJson(Map<String, dynamic> json) {
-    return ScooterOrderHistoryResponse(
-      orders: (json['data'] as List<dynamic>)
-          .map((e) => ScooterOrder.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/entities/pagination.dart';
+
+class ScooterOrderHistoryResponse {
+  final List<ScooterOrder> orders;
+  final Pagination pagination;
+
+  ScooterOrderHistoryResponse({
+    required this.orders,
+    required this.pagination,
+  });
+
+  factory ScooterOrderHistoryResponse.fromJson(Map<String, dynamic> json) {
+    return ScooterOrderHistoryResponse(
+      orders: (json['data'] as List<dynamic>)
+          .map((e) => ScooterOrder.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/scooters_response.dart b/lib/data/models/scooters_response.dart
index 9c863b8..ada58c5 100644
--- a/lib/data/models/scooters_response.dart
+++ b/lib/data/models/scooters_response.dart
@@ -1,21 +1,21 @@
-import '../../domain/entities/pagination.dart';
-import '../../domain/entities/scooter.dart';
-
-class ScootersResponse {
-  final List<Scooter> scooters;
-  final Pagination pagination;
-
-  ScootersResponse({
-    required this.scooters,
-    required this.pagination,
-  });
-
-  factory ScootersResponse.fromJson(Map<String, dynamic> json) {
-    return ScootersResponse(
-      scooters: (json['data'] as List<dynamic>)
-          .map((e) => Scooter.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/pagination.dart';
+import '../../domain/entities/scooter.dart';
+
+class ScootersResponse {
+  final List<Scooter> scooters;
+  final Pagination pagination;
+
+  ScootersResponse({
+    required this.scooters,
+    required this.pagination,
+  });
+
+  factory ScootersResponse.fromJson(Map<String, dynamic> json) {
+    return ScootersResponse(
+      scooters: (json['data'] as List<dynamic>)
+          .map((e) => Scooter.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/subscriptions_response.dart b/lib/data/models/subscriptions_response.dart
index a9319eb..56667cc 100644
--- a/lib/data/models/subscriptions_response.dart
+++ b/lib/data/models/subscriptions_response.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/entities/subscription.dart';
-
-class SubscriptionsResponse {
-  final List<Subscription> subscriptions;
-
-  SubscriptionsResponse({required this.subscriptions});
-
-  factory SubscriptionsResponse.fromJson(Map<String, dynamic> json) {
-    return SubscriptionsResponse(
-      subscriptions: (json['data'] as List<dynamic>)
-          .map((e) => Subscription.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-  }
-}
+import 'package:be_happy/domain/entities/subscription.dart';
+
+class SubscriptionsResponse {
+  final List<Subscription> subscriptions;
+
+  SubscriptionsResponse({required this.subscriptions});
+
+  factory SubscriptionsResponse.fromJson(Map<String, dynamic> json) {
+    return SubscriptionsResponse(
+      subscriptions: (json['data'] as List<dynamic>)
+          .map((e) => Subscription.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+}
diff --git a/lib/data/models/tariffs_response.dart b/lib/data/models/tariffs_response.dart
index 0043cf9..fb94128 100644
--- a/lib/data/models/tariffs_response.dart
+++ b/lib/data/models/tariffs_response.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/entities/tariff.dart';
-
-class TariffsResponse {
-  final List<Tariff> tariffs;
-
-  TariffsResponse({required this.tariffs});
-
-  factory TariffsResponse.fromJson(Map<String, dynamic> json) {
-    return TariffsResponse(
-      tariffs: (json['data'] as List<dynamic>)
-          .map((e) => Tariff.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-  }
-}
+import 'package:be_happy/domain/entities/tariff.dart';
+
+class TariffsResponse {
+  final List<Tariff> tariffs;
+
+  TariffsResponse({required this.tariffs});
+
+  factory TariffsResponse.fromJson(Map<String, dynamic> json) {
+    return TariffsResponse(
+      tariffs: (json['data'] as List<dynamic>)
+          .map((e) => Tariff.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+}
diff --git a/lib/data/models/user_check_response_dto.dart b/lib/data/models/user_check_response_dto.dart
index 8ca073e..320f527 100644
--- a/lib/data/models/user_check_response_dto.dart
+++ b/lib/data/models/user_check_response_dto.dart
@@ -1,22 +1,22 @@
-class UserCheckResponseDto {
-  final bool success;
-  final bool hasFine;
-  final bool hasUnpaidOrder;
-  final bool hasCard;
-
-  UserCheckResponseDto({
-    required this.success,
-    required this.hasFine,
-    required this.hasUnpaidOrder,
-    required this.hasCard,
-  });
-
-  factory UserCheckResponseDto.fromJson(Map<String, dynamic> json) {
-    return UserCheckResponseDto(
-      success: json['success'] ?? false,
-      hasFine: json['hasFine'] ?? false,
-      hasUnpaidOrder: json['hasUnpaidOrder'] ?? false,
-      hasCard: json['hasCard'] ?? false,
-    );
-  }
-}
+class UserCheckResponseDto {
+  final bool success;
+  final bool hasFine;
+  final bool hasUnpaidOrder;
+  final bool hasCard;
+
+  UserCheckResponseDto({
+    required this.success,
+    required this.hasFine,
+    required this.hasUnpaidOrder,
+    required this.hasCard,
+  });
+
+  factory UserCheckResponseDto.fromJson(Map<String, dynamic> json) {
+    return UserCheckResponseDto(
+      success: json['success'] ?? false,
+      hasFine: json['hasFine'] ?? false,
+      hasUnpaidOrder: json['hasUnpaidOrder'] ?? false,
+      hasCard: json['hasCard'] ?? false,
+    );
+  }
+}
diff --git a/lib/data/models/verify_code_request_dto.dart b/lib/data/models/verify_code_request_dto.dart
index 54d0a7f..1ff7a47 100644
--- a/lib/data/models/verify_code_request_dto.dart
+++ b/lib/data/models/verify_code_request_dto.dart
@@ -1,10 +1,10 @@
-class VerifyCodeRequestDto {
-  final String code;
-  final String token;
-
-  VerifyCodeRequestDto({required this.code, required this.token});
-
-  Map<String, dynamic> toJson() {
-    return {"code": code, "token": token};
-  }
+class VerifyCodeRequestDto {
+  final String code;
+  final String token;
+
+  VerifyCodeRequestDto({required this.code, required this.token});
+
+  Map<String, dynamic> toJson() {
+    return {"code": code, "token": token};
+  }
 }
\ No newline at end of file
diff --git a/lib/data/models/zones_response.dart b/lib/data/models/zones_response.dart
index acce322..86f7245 100644
--- a/lib/data/models/zones_response.dart
+++ b/lib/data/models/zones_response.dart
@@ -1,22 +1,22 @@
-import '../../domain/entities/pagination.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/zone.dart';
-
-class ZonesResponse {
-  final List<Zone> zones;
-  final Pagination pagination;
-
-  ZonesResponse({
-    required this.zones,
-    required this.pagination,
-  });
-
-  factory ZonesResponse.fromJson(Map<String, dynamic> json) {
-    return ZonesResponse(
-      zones: (json['data'] as List<dynamic>)
-          .map((e) => Zone.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      pagination: Pagination.fromJson(json['pagination']),
-    );
-  }
+import '../../domain/entities/pagination.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/zone.dart';
+
+class ZonesResponse {
+  final List<Zone> zones;
+  final Pagination pagination;
+
+  ZonesResponse({
+    required this.zones,
+    required this.pagination,
+  });
+
+  factory ZonesResponse.fromJson(Map<String, dynamic> json) {
+    return ZonesResponse(
+      zones: (json['data'] as List<dynamic>)
+          .map((e) => Zone.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Pagination.fromJson(json['pagination']),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/data/network/api_service.dart b/lib/data/network/api_service.dart
index b2e4a07..50af4f8 100644
--- a/lib/data/network/api_service.dart
+++ b/lib/data/network/api_service.dart
@@ -1,1152 +1,1192 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'package:async/async.dart';
-import 'package:be_happy/data/exceptions/auth_block_exception.dart';
-import 'package:be_happy/data/exceptions/auth_exception.dart';
-import 'package:be_happy/data/exceptions/route_history_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/scooter_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/unauthorized_exception.dart';
-import 'package:be_happy/data/exceptions/wrong_zone_exception.dart';
-import 'package:be_happy/domain/entities/active_scooter_order.dart';
-import 'package:be_happy/domain/entities/scooter.dart';
-import 'package:be_happy/domain/service/security_service.dart';
-import 'package:dio/dio.dart';
-import 'package:http/http.dart' as http;
-import 'package:http_parser/http_parser.dart';
-import 'package:intl/intl.dart';
-import 'package:mime/mime.dart';
-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';
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/entities/subscription.dart';
-import '../../domain/entities/user_check_flags.dart';
-import '../../domain/entities/certificate.dart';
-import '../models/scooters_response.dart';
-import '../models/tariffs_response.dart';
-import '../models/zones_response.dart';
-import '../models/subscriptions_response.dart';
-import '../models/user_check_response_dto.dart';
-
-class ApiService {
-  static const String baseUrl = "https://sharing-api.sparkit.by/api/v1";
-  static const String fileBaseUrl = "https://sharing-api.sparkit.by";
-
-  final SecurityService _securityService;
-  final Dio _dio;
-
-  ApiService(this._securityService, this._dio);
-
-  Future<Options> _getAuthOptions() async {
-    final accessToken = await _securityService.getAccessToken();
-    return Options(headers: {"Authorization": "Bearer $accessToken"});
-  }
-
-  Future<String?> sendPhone(String phone, String model, String systemId) async {
-    try {
-      final response = await _dio.post(
-        "$baseUrl/auth/client/login",
-        data: {
-          "phone": phone,
-          "model": model,
-          "systemId": systemId
-        },
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return response.data["token"];
-      }
-      return null;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  Future<Map<String, String>?> verifyCode(String code, String token) async {
-    try {
-      final response = await _dio.post(
-        "$baseUrl/auth/client/verify",
-        data: {"code": code, "token": token},
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return {
-          "accessToken": response.data["accessToken"],
-          "refreshToken": response.data["refreshToken"],
-        };
-      }
-      return null;
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 400) {
-        final attempts =
-            int.tryParse(e.response?.data["message"]?.toString() ?? "0") ?? 0;
-        if (attempts == 0) throw AuthBlockException();
-        throw AuthException("Ошибка. Неверный код.", attempts);
-      } else if (e.response?.statusCode == 403) {
-        throw AuthBlockException();
-      }
-      rethrow;
-    }
-  }
-
-  Future<Map<String, String>?> refresh() async {
-    final refreshToken = await _securityService.getRefreshToken();
-    try {
-      final response = await _dio.get(
-        "$baseUrl/auth/client/refresh",
-        options: Options(headers: {"Authorization": "Bearer $refreshToken"}),
-      );
-
-      if (response.statusCode == 200) {
-        return {
-          "accessToken": response.data["accessToken"],
-          "refreshToken": response.data["refreshToken"],
-        };
-      }
-      return null;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  Future<UserProfile?> getProfile() async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/client/me",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200) {
-        final data = response.data;
-        final profileData = data["profile"];
-        if (profileData == null) return null;
-
-        String? parsedDate;
-        if (profileData["dob"] != null) {
-          try {
-            parsedDate = DateFormat(
-              'dd.MM.yyyy',
-            ).format(DateTime.parse(profileData["dob"]));
-          } catch (_) {}
-        }
-
-        final int? avatarId = profileData["avatarId"];
-        String? avatarUrl;
-
-        if (avatarId != null && profileData["avatar"] != null) {
-          final String? avatarPath = profileData["avatar"]["path"];
-          if (avatarPath != null && avatarPath.isNotEmpty) {
-            avatarUrl = Uri.parse(fileBaseUrl).resolve(avatarPath).toString();
-          }
-        }
-
-        dynamic balanceRaw = profileData["balance"];
-        double? balance;
-
-        if (balanceRaw is num) {
-          balance = balanceRaw.toDouble();
-        } else if (balanceRaw is String) {
-          balance = double.tryParse(balanceRaw);
-        }
-
-        return UserProfile(
-          name: profileData["name"] ?? "",
-          birthDate: parsedDate ?? "",
-          phone: data["phone"] ?? "",
-          balance: balance,
-          email: profileData["email"] ?? "",
-          avatarId: avatarId,
-          avatarUrl: avatarUrl,
-        );
-      }
-      return null;
-    } catch (e) {
-      return null;
-    }
-  }
-
-  Future<List<PaymentCard>> getPaymentCards() async {
-    final response = await _dio.get(
-      "$baseUrl/client/me",
-      options: await _getAuthOptions(),
-    );
-    if (response.statusCode == 200) {
-      final List<dynamic> cardsJson = response.data["clientCards"] ?? [];
-      return Future.wait(
-        cardsJson.map((cardJson) async {
-          return PaymentCard(
-            id: cardJson['id'],
-            bindingId: cardJson['bindingId'],
-            cardLastNumber: cardJson['cardLastNumber'],
-            isMain: cardJson['isMain'],
-          );
-        }),
-      );
-    }
-    return [];
-  }
-
-  Future<UserProfile?> updateProfile(UserProfile profile) async {
-    const url = "$baseUrl/client/me";
-    final accessToken = await _securityService.getAccessToken();
-
-    final Map<String, dynamic> body = {
-      if (profile.email != null && profile.email!.isNotEmpty)
-        "email": profile.email,
-      if (profile.name != null && profile.name!.isNotEmpty)
-        "name": profile.name,
-      if (profile.birthDate.isNotEmpty) "dob": profile.birthDate,
-      if (profile.avatarId != null) "avatarId": profile.avatarId,
-    };
-
-    if (body.isEmpty) return null;
-
-    try {
-      final response = await _dio.patch(
-        url,
-        data: body,
-        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
-      );
-
-      if (response.statusCode == 200) {
-        final data = response.data;
-        final profileData = data["profile"];
-        if (profileData == null) return null;
-
-        String? parsedDate;
-        if (profileData["dob"] != null) {
-          try {
-            parsedDate = DateFormat(
-              'dd.MM.yyyy',
-            ).format(DateTime.parse(profileData["dob"]));
-          } catch (_) {}
-        }
-
-        final int? avatarId = profileData["avatarId"];
-        String? avatarUrl;
-
-        if (avatarId != null && profileData["avatar"] != null) {
-          final String? avatarPath = profileData["avatar"]["path"];
-          if (avatarPath != null && avatarPath.isNotEmpty) {
-            avatarUrl = "$fileBaseUrl/${avatarPath.replaceFirst('/', '')}";
-          }
-        }
-
-        dynamic balanceRaw = data["balance"];
-        double? balance;
-        if (balanceRaw is double) {
-          balance = balanceRaw;
-        } else if (balanceRaw is String) {
-          balance = double.tryParse(balanceRaw);
-        }
-
-        return UserProfile(
-          name: profileData["name"] ?? "",
-          birthDate: parsedDate ?? "",
-          phone: data["phone"] ?? "",
-          balance: balance,
-          email: profileData["email"] ?? "",
-          avatarId: avatarId,
-          avatarUrl: avatarUrl,
-        );
-      }
-      return null;
-    } on DioException catch (e) {
-      print(
-        "ERROR: updateProfile failed: ${e.response?.statusCode} - ${e.message}",
-      );
-      rethrow;
-    }
-  }
-
-  Future<UserCheckFlags?> checkUser() async {
-    const url = "$baseUrl/scooterorder/check";
-    final accessToken = await _securityService.getAccessToken();
-
-    try {
-      final response = await _dio.post(
-        url,
-        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        final dto = UserCheckResponseDto.fromJson(response.data);
-        return UserCheckFlags(
-          hasFine: dto.hasFine,
-          hasUnpaidOrder: dto.hasUnpaidOrder,
-          hasCard: dto.hasCard,
-        );
-      }
-      return null;
-    } catch (e) {
-      print("ERROR: checkUser failed: $e");
-      return null;
-    }
-  }
-
-  Future<int?> uploadPhoto(File imageFile) async {
-    try {
-      final mimeType = lookupMimeType(imageFile.path) ?? 'image/jpeg';
-      final formData = FormData.fromMap({
-        'file': await MultipartFile.fromFile(
-          imageFile.path,
-          filename: basename(imageFile.path),
-          contentType: MediaType.parse(mimeType),
-        ),
-      });
-
-      final response = await _dio.post(
-        "$baseUrl/client/upload",
-        data: formData,
-        options: await _getAuthOptions(),
-      );
-
-      return response.data['id'];
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<List<int>> uploadScooterPhotos(List<File> images) async {
-    try {
-      final formData = FormData();
-      for (var file in images) {
-        final mimeType = lookupMimeType(file.path) ?? 'image/jpeg';
-        formData.files.add(
-          MapEntry(
-            'files',
-            await MultipartFile.fromFile(
-              file.path,
-              filename: basename(file.path),
-              contentType: MediaType.parse(mimeType),
-            ),
-          ),
-        );
-      }
-
-      final response = await _dio.post(
-        "$baseUrl/scooterorder/upload",
-        data: formData,
-        options: await _getAuthOptions(),
-      );
-
-      final List<dynamic> list = response.data['data'] ?? [];
-      return list.map((item) => item['id'] as int).toList();
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<ScootersResponse?> getScooters({
-    required List<double> area,
-    int page = 1,
-    int pageSize = 500,
-  }) async {
-    const path = "$baseUrl/scooter/available";
-
-    final queryParams = {
-      'readAll': 'true',
-      'area': area.map((coord) => coord.toString()).toList(),
-      'page': page,
-      'pageSize': pageSize,
-    };
-
-    final accessToken = await _securityService.getAccessToken();
-    if (accessToken == null) return null;
-
-    try {
-      final response = await _dio.get(
-        path,
-        queryParameters: queryParams,
-        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
-      );
-
-      if (response.statusCode == 200) {
-        return ScootersResponse.fromJson(response.data);
-      }
-      return null;
-    } catch (e) {
-      print("ERROR: getScooters failed: $e");
-      return null;
-    }
-  }
-
-  Future<Scooter?> getScooterById({required int id}) async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooter/$id/client",
-        options: await _getAuthOptions(),
-      );
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return Scooter.fromJson(response.data);
-      }
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 401) throw UnauthorizedException();
-      if (e.response?.statusCode == 403) throw AuthBlockException();
-    }
-    return null;
-  }
-
-  Future<Scooter?> getScooterByTitle({required String title}) async {
-    final url = "$baseUrl/scooter/$title/code";
-
-    try {
-      final response = await _dio.get(url, options: await _getAuthOptions());
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return Scooter.fromJson(response.data);
-      }
-
-      if (response.statusCode == 404) {
-        throw ScooterNotFoundException(message: "Самокат не найден");
-      }
-
-      return null;
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 401) throw UnauthorizedException();
-      if (e.response?.statusCode == 403) throw AuthBlockException();
-      if (e.response?.statusCode == 404) throw ScooterNotFoundException();
-      return null;
-    }
-  }
-
-  Future<ZonesResponse?> getZones({
-    required List<double> area,
-    int page = 1,
-    int pageSize = 500,
-  }) async {
-    const path = "$baseUrl/zone/available2";
-
-    final queryParams = {
-      'readAll': 'true',
-      'area': area.map((coord) => coord.toString()).toList(),
-      'page': page,
-      'pageSize': pageSize,
-    };
-
-    try {
-      final response = await _dio.get(
-        path,
-        queryParameters: queryParams,
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200) {
-        return ZonesResponse.fromJson(response.data);
-      }
-      return null;
-    } catch (e) {
-      print("ERROR: getZones failed: $e");
-      return null;
-    }
-  }
-
-  Future<TariffsResponse?> getAvailableTariffs({required int scooterId}) async {
-    final url = "$baseUrl/scooterplan/$scooterId/available";
-
-    try {
-      final response = await _dio.get(url, options: await _getAuthOptions());
-
-      if (response.statusCode == 200) {
-        return TariffsResponse.fromJson(response.data);
-      }
-      return null;
-    } catch (e) {
-      print("ERROR: getAvailableTariffs failed: $e");
-      return null;
-    }
-  }
-
-  Future<List<ClientSubscription>> getClientSubscriptions() async {
-    const url = "$baseUrl/scootersubscription/client";
-
-    try {
-      final response = await _dio.get(url, options: await _getAuthOptions());
-
-      if (response.statusCode == 200) {
-        final Map<String, dynamic> responseData = response.data;
-        final List<dynamic> items = responseData['data'] ?? [];
-
-        return items.map((item) {
-          return ClientSubscription.fromJson(item);
-        }).toList();
-      }
-      return [];
-    } catch (e) {
-      print("APISERVICE (getClientSubscriptions) Error: $e");
-      return [];
-    }
-  }
-
-  Future<SubscriptionsResponse?> getAvailableSubscriptions() async {
-    const url = "$baseUrl/scootersubscription/available";
-
-    try {
-      final response = await _dio.get(url, options: await _getAuthOptions());
-
-      if (response.statusCode == 200) {
-        return SubscriptionsResponse.fromJson(response.data);
-      }
-      return null;
-    } catch (e) {
-      print("APISERVICE (getAvailableSubscriptions) Error: $e");
-      return null;
-    }
-  }
-
-  Future<Subscription?> getSubscriptionById({required int id}) async {
-    final url = "$baseUrl/scootersubscription/$id/client";
-
-    try {
-      final response = await _dio.get(url, options: await _getAuthOptions());
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return Subscription.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 401) throw UnauthorizedException();
-      if (e.response?.statusCode == 403) throw AuthBlockException();
-      print("APISERVICE (getSubscriptionById) Error: $e");
-      return null;
-    }
-  }
-
-  Future<bool> activateSubscription({required int optionId, required int cardId}) async {
-    const url = "$baseUrl/scootersubscription/client";
-
-    try {
-      final response = await _dio.post(
-        url,
-        data: {"optionId": optionId, "cardId": cardId},
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 201) {
-        return response.data["success"] == true;
-      }
-      return false;
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 401) throw UnauthorizedException();
-      if (e.response?.statusCode == 403) throw AuthBlockException();
-      print("APISERVICE (activateSubscription) Error: $e");
-      return false;
-    }
-  }
-
-  Future<Map<String, dynamic>> addPaymentCard() async {
-    const url = "$baseUrl/client/card";
-    /*final cleanCardNumber = cardNumber.replaceAll(' ', '');*/
-
-    try {
-      final response = await _dio.post(
-        url,
-        /*data: {
-          "cardNumber": cleanCardNumber,
-          "cardHolder": cardHolder,
-          "expirationMonth": expirationMonth,
-          "expirationYear": expirationYear,
-          "cvv": cvv,
-        },*/
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return response.data;
-      }
-
-      throw AuthException('Непредвиденный статус: ${response.statusCode}', 0);
-    } on DioException catch (e) {
-      final data = e.response?.data;
-      final statusCode = e.response?.statusCode;
-
-      if (statusCode == 400) {
-        final message = _parseErrorMessage(data);
-        throw AuthException(message ?? 'Неверные данные карты', 0);
-      } else if (statusCode == 401) {
-        throw UnauthorizedException();
-      } else if (statusCode == 403) {
-        throw AuthBlockException();
-      } else if (statusCode == 404) {
-        throw AuthException('Пользователь не найден', 0);
-      }
-      throw AuthException('Ошибка сервера: $statusCode', 0);
-    }
-  }
-
-  Future<void> setMainPaymentCard(int cardId) async {
-    final url = "$baseUrl/client/card/$cardId";
-
-    try {
-      await _dio.put(
-        url,
-        data: {"isMain": true},
-        options: await _getAuthOptions(),
-      );
-    } on DioException catch (e) {
-      final statusCode = e.response?.statusCode;
-
-      if (statusCode == 400) {
-        final message = _parseErrorMessage(e.response?.data);
-        throw AuthException(
-          message ?? 'Ошибка при установке основной карты',
-          0,
-        );
-      } else if (statusCode == 401) {
-        throw UnauthorizedException();
-      } else if (statusCode == 403) {
-        throw AuthBlockException();
-      } else if (statusCode == 404) {
-        throw AuthException('Карта не найдена', 0);
-      }
-      throw AuthException('Ошибка сервера: $statusCode', 0);
-    }
-  }
-
-  Future<void> removePaymentCard(int cardId) async {
-    final url = "$baseUrl/client/card/$cardId";
-
-    try {
-      await _dio.delete(url, options: await _getAuthOptions());
-    } on DioException catch (e) {
-      final statusCode = e.response?.statusCode;
-
-      if (statusCode == 400) {
-        final message = _parseErrorMessage(e.response?.data);
-        throw AuthException(message ?? 'Ошибка при удалении карты', 0);
-      } else if (statusCode == 401) {
-        throw UnauthorizedException();
-      } else if (statusCode == 403) {
-        throw AuthBlockException();
-      } else if (statusCode == 404) {
-        throw AuthException('Карта не найдена', 0);
-      }
-      throw AuthException('Ошибка сервера: $statusCode', 0);
-    }
-  }
-
-  Future<ScooterOrder?> bookScooter({
-    required int scooterId,
-    required int planId,
-    int? subscriptionId,
-    int? cardId,
-    required bool isBalance,
-    required bool isInsurance,
-  }) async {
-    try {
-      final response = await _dio.post(
-        "$baseUrl/scooterorder/booking",
-        data: {
-          "scooterId": scooterId,
-          "planId": planId,
-          "subscriptionId": subscriptionId,
-          "cardId": cardId,
-          "isBalance": isBalance,
-          "isInsurance": isInsurance,
-        },
-        options: await _getAuthOptions(),
-      );
-
-      return ScooterOrder.fromJson(response.data);
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 400) {
-        final data = e.response?.data;
-
-        if (data is Map && data['message'] is List) {
-          final firstError = data['message'][0]['message'].toString();
-
-          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(
-              message: "Некорректная зона для начала поездки.",
-            );
-          }
-        }
-
-        if (data is Map && data['message'] is String) {}
-      } else {
-        _handleDioError(e);
-      }
-      rethrow;
-    }
-  }
-
-  Future<ScooterOrder?> startRide(int orderId) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/start",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 400) {
-        final data = e.response?.data;
-
-        if (data is Map && data['message'] is List) {
-          final firstError = data['message'][0]['message'].toString();
-
-          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(
-              message: "Некорректная зона для начала поездки.",
-            );
-          }
-        }
-
-        if (data is Map && data['message'] is String) {}
-      } else {
-        _handleDioError(e);
-      }
-      rethrow;
-    }
-  }
-
-  Future<void> cancelRide(int orderId) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/cancel",
-        options: await _getAuthOptions(),
-      );
-
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<ScooterOrder?> pauseRide(int orderId) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/pause",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<ScooterOrder?> resumeRide(int orderId) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/resume",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<void> finishRide({
-    required int orderId,
-    required List<int> filesId,
-  }) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/finish",
-        data: {"files": filesId},
-        options: await _getAuthOptions(),
-      );
-
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 400) {
-        final data = e.response?.data;
-
-        if (data is Map && data['message'] is List) {
-          final firstError = data['message'][0]['message'].toString();
-
-          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(
-              message: "Некорректная зона для завершения поездки.",
-            );
-          }
-        }
-
-        if (data is Map && data['message'] is String) {}
-      } else {
-        _handleDioError(e);
-      }
-      rethrow;
-    }
-  }
-
-  Future<void> payRide(int orderId) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/pay",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        // return ScooterOrder.fromJson(response.data);
-        return;
-      }
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return;
-    }
-  }
-
-  Future<List<ScooterOrder>> getClientOrders() async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooterorder/active",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200) {
-        final data = response.data;
-        if (data is Map<String, dynamic> && data['data'] is List) {
-          final List ordersList = data['data'];
-          return ordersList.map((json) => ScooterOrder.fromJson(json)).toList();
-        }
-      }
-      return [];
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return [];
-    }
-  }
-
-  Future<ActiveScooterOrder?> updateScooterOrderData({
-    required int orderId,
-    Map<String, dynamic>? data,
-  }) async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooterorder/$orderId/data",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ActiveScooterOrder.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<ScooterOrder?> getScooterOrderById({required int id}) async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooterorder/$id/client",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<void> payScooterOrderWithPhotos({
-    required int orderId,
-    required int? cardId,
-    required bool isBalance,
-  }) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/scooterorder/$orderId/pay",
-        data: {"cardId": cardId, "isBalance": isBalance},
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return;
-      }
-    } on DioException catch (e) {
-      _handleDioError(e);
-    }
-  }
-
-  Future<Map<String, dynamic>> getScooterOrderHistory({
-    int page = 1,
-    int pageSize = 20,
-  }) async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooterorder/history",
-        queryParameters: {"page": page, "pageSize": pageSize},
-        options: await _getAuthOptions(),
-      );
-
-      return response.data;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return {};
-    }
-  }
-
-  Future<List<Point>> getScooterOrderRouteHistory({required int id}) async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/scooterorder/$id/routehistory",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200) {
-        final String routeString = response.data['route'] ?? '[]';
-        final List<dynamic> routeList = json.decode(routeString);
-
-        return routeList
-            .map(
-              (item) => Point(
-                (item[1] as num).toDouble(),
-                (item[0] as num).toDouble(),
-              ),
-            )
-            .toList();
-      }
-
-      throw RouteHistoryNotFoundException(
-        message: "История маршрута не найдена",
-      );
-    } on DioException catch (e) {
-      if (e.response?.statusCode == 401) throw UnauthorizedException();
-      if (e.response?.statusCode == 403) throw AuthBlockException();
-      if (e.response?.statusCode == 404) throw RouteHistoryNotFoundException();
-      rethrow;
-    }
-  }
-
-  Future<Map<String, dynamic>> getNews() async {
-    try {
-      final response = await _dio.get(
-        "$baseUrl/news",
-        options: await _getAuthOptions(),
-      );
-      return response.data;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return {};
-    }
-  }
-
-  Future<Map<String, dynamic>?> getNewsById(int newsId) async {
-    try {
-      final response = await _dio.get(
-        '$baseUrl/news/$newsId',
-        options: await _getAuthOptions(),
-      );
-      return response.data;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Future<Map<String, dynamic>?> cancelNotification(int id) async {
-    try {
-      final response = await _dio.put(
-        "$baseUrl/notification/client/$id/cancel",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200 || response.statusCode == 201) {
-        return response.data;
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  Stream<Map<String, dynamic>> getNotificationsStream() {
-    final url = "$baseUrl/notification/client/stream";
-
-    final controller = StreamController<Map<String, dynamic>>();
-
-    _securityService.getAccessToken().then((accessToken) {
-      if (accessToken == null) {
-        controller.addError(UnauthorizedException());
-        return;
-      }
-
-      print("[SSE] Subscribing via flutter_client_sse...");
-
-      SSEClient.subscribeToSSE(
-        method: SSERequestType.GET,
-        url: url,
-        header: {
-          "Authorization": "Bearer $accessToken",
-          "Accept": "text/event-stream",
-          "Cache-Control": "no-cache",
-        },
-      ).listen(
-        (event) {
-          print("Received line [SSE]: id=${event.id}, event=${event.event}");
-          print("Data [SSE]: ${event.data}");
-
-          if (event.data != null && event.data!.isNotEmpty) {
-            try {
-              final Map<String, dynamic> jsonData = jsonDecode(event.data!);
-              print("[SSE] Parsed JSON: $jsonData");
-              controller.add(jsonData);
-            } catch (e) {
-              print("[SSE] JSON Parse Error: $e | Raw: ${event.data}");
-            }
-          }
-        },
-        onError: (error) {
-          print(" [SSE] Library Error: $error");
-          controller.addError(error);
-        },
-        onDone: () {
-          print(" [SSE] Library Stream Closed");
-          controller.close();
-        },
-      );
-    });
-
-    return controller.stream;
-  }
-
-  Future<Map<String, dynamic>> getNotifications({
-    int page = 1,
-    int pageSize = 10,
-  }) async {
-    final url = Uri.parse('$baseUrl/notification/client').replace(
-      queryParameters: {
-        'page': page.toString(),
-        'pageSize': pageSize.toString(),
-      },
-    );
-
-    final accessToken = await _securityService.getAccessToken();
-    if (accessToken == null) throw UnauthorizedException();
-
-    final response = await http.get(
-      url,
-      headers: {
-        "Content-Type": "application/json",
-        "Authorization": "Bearer $accessToken",
-      },
-    );
-
-    if (response.statusCode == 200) {
-      final data = jsonDecode(utf8.decode(response.bodyBytes));
-      if (data is Map<String, dynamic>) {
-        return data;
-      }
-      throw Exception('Expected Map with data and pagination');
-    } 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(
-        "$baseUrl/certificate",
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 200) {
-        final data = response.data;
-        final dataList = data['data'] as List<dynamic>;
-        return dataList.map((json) => Certificate.fromJson(json)).toList();
-      }
-      return [];
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return [];
-    }
-  }
-
-  Future<Map<String, dynamic>?> purchaseCertificate({
-    required int certificateId,
-    required int cardId,
-  }) async {
-    try {
-      final response = await _dio.post(
-        "$baseUrl/certificate/$certificateId",
-        data: {"cardId": cardId},
-        options: await _getAuthOptions(),
-      );
-
-      if (response.statusCode == 201) {
-        return response.data;
-      }
-      return null;
-    } on DioException catch (e) {
-      _handleDioError(e);
-      return null;
-    }
-  }
-
-  void _handleDioError(DioException e) {
-    if (e.response?.statusCode == 401) throw UnauthorizedException();
-    if (e.response?.statusCode == 403) throw AuthBlockException();
-
-    final message = _parseErrorMessage(e.response?.data);
-    throw AuthException(message ?? 'Ошибка сервера', 0);
-  }
-
-  String? _parseErrorMessage(dynamic data) {
-    if (data is Map<String, dynamic>) {
-      final messages = data['message'] as List?;
-      if (messages != null && messages.isNotEmpty) {
-        final firstError = messages.first as Map<String, dynamic>?;
-        return firstError?['message'] as String?;
-      }
-      return data['message'] as String?;
-    }
-    return null;
-  }
-
-  Future<Map<String, dynamic>> applyPromoCode(String code) async {
-    final token = await _securityService.getAccessToken();
-    if (token == null) throw Exception('No access token');
-
-    final response = await _dio.post(
-      '$baseUrl/promocode/apply',
-      data: {'code': code},
-      options: Options(
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': 'Bearer $token',
-        },
-      ),
-    );
-
-    if (response.statusCode == 201 || response.statusCode == 200) {
-      return response.data;
-    } else if (response.statusCode == 404) {
-      throw PromoCodeNotFoundException();
-    } else {
-      throw Exception('API Error: ${response.statusCode}');
-    }
-  }
-}
-
-// ✅ Добавь исключение (можно в отдельный файл)
-class PromoCodeNotFoundException implements Exception {}
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:async/async.dart';
+import 'package:be_happy/data/exceptions/auth_block_exception.dart';
+import 'package:be_happy/data/exceptions/auth_exception.dart';
+import 'package:be_happy/data/exceptions/route_history_not_found_exception.dart';
+import 'package:be_happy/data/exceptions/scooter_not_found_exception.dart';
+import 'package:be_happy/data/exceptions/unauthorized_exception.dart';
+import 'package:be_happy/data/exceptions/wrong_zone_exception.dart';
+import 'package:be_happy/domain/entities/active_scooter_order.dart';
+import 'package:be_happy/domain/entities/scooter.dart';
+import 'package:be_happy/domain/service/security_service.dart';
+import 'package:dio/dio.dart';
+import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart';
+import 'package:intl/intl.dart';
+import 'package:mime/mime.dart';
+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/fine.dart';
+import '../../domain/entities/point.dart';
+import '../../domain/entities/user_profile.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/entities/subscription.dart';
+import '../../domain/entities/user_check_flags.dart';
+import '../../domain/entities/certificate.dart';
+import '../models/scooters_response.dart';
+import '../models/tariffs_response.dart';
+import '../models/zones_response.dart';
+import '../models/subscriptions_response.dart';
+import '../models/user_check_response_dto.dart';
+
+class ApiService {
+  static const String baseUrl = "https://sharing-api.sparkit.by/api/v1";
+  static const String fileBaseUrl = "https://sharing-api.sparkit.by";
+
+  final SecurityService _securityService;
+  final Dio _dio;
+
+  ApiService(this._securityService, this._dio);
+
+  Future<Options> _getAuthOptions() async {
+    final accessToken = await _securityService.getAccessToken();
+    return Options(headers: {"Authorization": "Bearer $accessToken"});
+  }
+
+  Future<String?> sendPhone(String phone, String model, String systemId) async {
+    try {
+      final response = await _dio.post(
+        "$baseUrl/auth/client/login",
+        data: {
+          "phone": phone,
+          "model": model,
+          "systemId": systemId
+        },
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return response.data["token"];
+      }
+      return null;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  Future<Map<String, String>?> verifyCode(String code, String token) async {
+    try {
+      final response = await _dio.post(
+        "$baseUrl/auth/client/verify",
+        data: {"code": code, "token": token},
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return {
+          "accessToken": response.data["accessToken"],
+          "refreshToken": response.data["refreshToken"],
+        };
+      }
+      return null;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 400) {
+        final attempts =
+            int.tryParse(e.response?.data["message"]?.toString() ?? "0") ?? 0;
+        if (attempts == 0) throw AuthBlockException();
+        throw AuthException("Ошибка. Неверный код.", attempts);
+      } else if (e.response?.statusCode == 403) {
+        throw AuthBlockException();
+      }
+      rethrow;
+    }
+  }
+
+  Future<Map<String, String>?> refresh() async {
+    final refreshToken = await _securityService.getRefreshToken();
+    try {
+      final response = await _dio.get(
+        "$baseUrl/auth/client/refresh",
+        options: Options(headers: {"Authorization": "Bearer $refreshToken"}),
+      );
+
+      if (response.statusCode == 200) {
+        return {
+          "accessToken": response.data["accessToken"],
+          "refreshToken": response.data["refreshToken"],
+        };
+      }
+      return null;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  Future<UserProfile?> getProfile() async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/client/me",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200) {
+        final data = response.data;
+        final profileData = data["profile"];
+        if (profileData == null) return null;
+
+        String? parsedDate;
+        if (profileData["dob"] != null) {
+          try {
+            parsedDate = DateFormat(
+              'dd.MM.yyyy',
+            ).format(DateTime.parse(profileData["dob"]));
+          } catch (_) {}
+        }
+
+        final int? avatarId = profileData["avatarId"];
+        String? avatarUrl;
+
+        if (avatarId != null && profileData["avatar"] != null) {
+          final String? avatarPath = profileData["avatar"]["path"];
+          if (avatarPath != null && avatarPath.isNotEmpty) {
+            avatarUrl = Uri.parse(fileBaseUrl).resolve(avatarPath).toString();
+          }
+        }
+
+        dynamic balanceRaw = profileData["balance"];
+        double? balance;
+
+        if (balanceRaw is num) {
+          balance = balanceRaw.toDouble();
+        } else if (balanceRaw is String) {
+          balance = double.tryParse(balanceRaw);
+        }
+
+        return UserProfile(
+          name: profileData["name"] ?? "",
+          birthDate: parsedDate ?? "",
+          phone: data["phone"] ?? "",
+          balance: balance,
+          email: profileData["email"] ?? "",
+          avatarId: avatarId,
+          avatarUrl: avatarUrl,
+        );
+      }
+      return null;
+    } catch (e) {
+      return null;
+    }
+  }
+
+  Future<List<PaymentCard>> getPaymentCards() async {
+    final response = await _dio.get(
+      "$baseUrl/client/me",
+      options: await _getAuthOptions(),
+    );
+    if (response.statusCode == 200) {
+      final List<dynamic> cardsJson = response.data["clientCards"] ?? [];
+      return Future.wait(
+        cardsJson.map((cardJson) async {
+          return PaymentCard(
+            id: cardJson['id'],
+            bindingId: cardJson['bindingId'],
+            cardLastNumber: cardJson['cardLastNumber'],
+            isMain: cardJson['isMain'],
+          );
+        }),
+      );
+    }
+    return [];
+  }
+
+  Future<UserProfile?> updateProfile(UserProfile profile) async {
+    const url = "$baseUrl/client/me";
+    final accessToken = await _securityService.getAccessToken();
+
+    final Map<String, dynamic> body = {
+      if (profile.email != null && profile.email!.isNotEmpty)
+        "email": profile.email,
+      if (profile.name != null && profile.name!.isNotEmpty)
+        "name": profile.name,
+      if (profile.birthDate.isNotEmpty) "dob": profile.birthDate,
+      if (profile.avatarId != null) "avatarId": profile.avatarId,
+    };
+
+    if (body.isEmpty) return null;
+
+    try {
+      final response = await _dio.patch(
+        url,
+        data: body,
+        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
+      );
+
+      if (response.statusCode == 200) {
+        final data = response.data;
+        final profileData = data["profile"];
+        if (profileData == null) return null;
+
+        String? parsedDate;
+        if (profileData["dob"] != null) {
+          try {
+            parsedDate = DateFormat(
+              'dd.MM.yyyy',
+            ).format(DateTime.parse(profileData["dob"]));
+          } catch (_) {}
+        }
+
+        final int? avatarId = profileData["avatarId"];
+        String? avatarUrl;
+
+        if (avatarId != null && profileData["avatar"] != null) {
+          final String? avatarPath = profileData["avatar"]["path"];
+          if (avatarPath != null && avatarPath.isNotEmpty) {
+            avatarUrl = "$fileBaseUrl/${avatarPath.replaceFirst('/', '')}";
+          }
+        }
+
+        dynamic balanceRaw = data["balance"];
+        double? balance;
+        if (balanceRaw is double) {
+          balance = balanceRaw;
+        } else if (balanceRaw is String) {
+          balance = double.tryParse(balanceRaw);
+        }
+
+        return UserProfile(
+          name: profileData["name"] ?? "",
+          birthDate: parsedDate ?? "",
+          phone: data["phone"] ?? "",
+          balance: balance,
+          email: profileData["email"] ?? "",
+          avatarId: avatarId,
+          avatarUrl: avatarUrl,
+        );
+      }
+      return null;
+    } on DioException catch (e) {
+      print(
+        "ERROR: updateProfile failed: ${e.response?.statusCode} - ${e.message}",
+      );
+      rethrow;
+    }
+  }
+
+  Future<UserCheckFlags?> checkUser() async {
+    const url = "$baseUrl/scooterorder/check";
+    final accessToken = await _securityService.getAccessToken();
+
+    try {
+      final response = await _dio.post(
+        url,
+        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        final dto = UserCheckResponseDto.fromJson(response.data);
+        return UserCheckFlags(
+          hasFine: dto.hasFine,
+          hasUnpaidOrder: dto.hasUnpaidOrder,
+          hasCard: dto.hasCard,
+        );
+      }
+      return null;
+    } catch (e) {
+      print("ERROR: checkUser failed: $e");
+      return null;
+    }
+  }
+
+  Future<int?> uploadPhoto(File imageFile) async {
+    try {
+      final mimeType = lookupMimeType(imageFile.path) ?? 'image/jpeg';
+      final formData = FormData.fromMap({
+        'file': await MultipartFile.fromFile(
+          imageFile.path,
+          filename: basename(imageFile.path),
+          contentType: MediaType.parse(mimeType),
+        ),
+      });
+
+      final response = await _dio.post(
+        "$baseUrl/client/upload",
+        data: formData,
+        options: await _getAuthOptions(),
+      );
+
+      return response.data['id'];
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<List<int>> uploadScooterPhotos(List<File> images) async {
+    try {
+      final formData = FormData();
+      for (var file in images) {
+        final mimeType = lookupMimeType(file.path) ?? 'image/jpeg';
+        formData.files.add(
+          MapEntry(
+            'files',
+            await MultipartFile.fromFile(
+              file.path,
+              filename: basename(file.path),
+              contentType: MediaType.parse(mimeType),
+            ),
+          ),
+        );
+      }
+
+      final response = await _dio.post(
+        "$baseUrl/scooterorder/upload",
+        data: formData,
+        options: await _getAuthOptions(),
+      );
+
+      final List<dynamic> list = response.data['data'] ?? [];
+      return list.map((item) => item['id'] as int).toList();
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<ScootersResponse?> getScooters({
+    required List<double> area,
+    int page = 1,
+    int pageSize = 500,
+  }) async {
+    const path = "$baseUrl/scooter/available";
+
+    final queryParams = {
+      'readAll': 'true',
+      'area': area.map((coord) => coord.toString()).toList(),
+      'page': page,
+      'pageSize': pageSize,
+    };
+
+    final accessToken = await _securityService.getAccessToken();
+    if (accessToken == null) return null;
+
+    try {
+      final response = await _dio.get(
+        path,
+        queryParameters: queryParams,
+        options: Options(headers: {"Authorization": "Bearer $accessToken"}),
+      );
+
+      if (response.statusCode == 200) {
+        return ScootersResponse.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      print("ERROR: getScooters failed: $e");
+      return null;
+    }
+  }
+
+  Future<Scooter?> getScooterById({required int id}) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooter/$id/client",
+        options: await _getAuthOptions(),
+      );
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return Scooter.fromJson(response.data);
+      }
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) throw UnauthorizedException();
+      if (e.response?.statusCode == 403) throw AuthBlockException();
+    }
+    return null;
+  }
+
+  Future<Scooter?> getScooterByTitle({required String title}) async {
+    final url = "$baseUrl/scooter/$title/code";
+
+    try {
+      final response = await _dio.get(url, options: await _getAuthOptions());
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return Scooter.fromJson(response.data);
+      }
+
+      if (response.statusCode == 404) {
+        throw ScooterNotFoundException(message: "Самокат не найден");
+      }
+
+      return null;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) throw UnauthorizedException();
+      if (e.response?.statusCode == 403) throw AuthBlockException();
+      if (e.response?.statusCode == 404) throw ScooterNotFoundException();
+      return null;
+    }
+  }
+
+  Future<ZonesResponse?> getZones({
+    required List<double> area,
+    int page = 1,
+    int pageSize = 500,
+  }) async {
+    const path = "$baseUrl/zone/available2";
+
+    final queryParams = {
+      'readAll': 'true',
+      'area': area.map((coord) => coord.toString()).toList(),
+      'page': page,
+      'pageSize': pageSize,
+    };
+
+    try {
+      final response = await _dio.get(
+        path,
+        queryParameters: queryParams,
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200) {
+        return ZonesResponse.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      print("ERROR: getZones failed: $e");
+      return null;
+    }
+  }
+
+  Future<TariffsResponse?> getAvailableTariffs({required int scooterId}) async {
+    final url = "$baseUrl/scooterplan/$scooterId/available";
+
+    try {
+      final response = await _dio.get(url, options: await _getAuthOptions());
+
+      if (response.statusCode == 200) {
+        return TariffsResponse.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      print("ERROR: getAvailableTariffs failed: $e");
+      return null;
+    }
+  }
+
+  Future<List<ClientSubscription>> getClientSubscriptions() async {
+    const url = "$baseUrl/scootersubscription/client";
+
+    try {
+      final response = await _dio.get(url, options: await _getAuthOptions());
+
+      if (response.statusCode == 200) {
+        final Map<String, dynamic> responseData = response.data;
+        final List<dynamic> items = responseData['data'] ?? [];
+
+        return items.map((item) {
+          return ClientSubscription.fromJson(item);
+        }).toList();
+      }
+      return [];
+    } catch (e) {
+      print("APISERVICE (getClientSubscriptions) Error: $e");
+      return [];
+    }
+  }
+
+  Future<SubscriptionsResponse?> getAvailableSubscriptions() async {
+    const url = "$baseUrl/scootersubscription/available";
+
+    try {
+      final response = await _dio.get(url, options: await _getAuthOptions());
+
+      if (response.statusCode == 200) {
+        return SubscriptionsResponse.fromJson(response.data);
+      }
+      return null;
+    } catch (e) {
+      print("APISERVICE (getAvailableSubscriptions) Error: $e");
+      return null;
+    }
+  }
+
+  Future<Subscription?> getSubscriptionById({required int id}) async {
+    final url = "$baseUrl/scootersubscription/$id/client";
+
+    try {
+      final response = await _dio.get(url, options: await _getAuthOptions());
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return Subscription.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) throw UnauthorizedException();
+      if (e.response?.statusCode == 403) throw AuthBlockException();
+      print("APISERVICE (getSubscriptionById) Error: $e");
+      return null;
+    }
+  }
+
+  Future<bool> activateSubscription({required int optionId, required int cardId}) async {
+    const url = "$baseUrl/scootersubscription/client";
+
+    try {
+      final response = await _dio.post(
+        url,
+        data: {"optionId": optionId, "cardId": cardId},
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 201) {
+        return response.data["success"] == true;
+      }
+      return false;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) throw UnauthorizedException();
+      if (e.response?.statusCode == 403) throw AuthBlockException();
+      print("APISERVICE (activateSubscription) Error: $e");
+      return false;
+    }
+  }
+
+  Future<Map<String, dynamic>> addPaymentCard() async {
+    const url = "$baseUrl/client/card";
+    /*final cleanCardNumber = cardNumber.replaceAll(' ', '');*/
+
+    try {
+      final response = await _dio.post(
+        url,
+        /*data: {
+          "cardNumber": cleanCardNumber,
+          "cardHolder": cardHolder,
+          "expirationMonth": expirationMonth,
+          "expirationYear": expirationYear,
+          "cvv": cvv,
+        },*/
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return response.data;
+      }
+
+      throw AuthException('Непредвиденный статус: ${response.statusCode}', 0);
+    } on DioException catch (e) {
+      final data = e.response?.data;
+      final statusCode = e.response?.statusCode;
+
+      if (statusCode == 400) {
+        final message = _parseErrorMessage(data);
+        throw AuthException(message ?? 'Неверные данные карты', 0);
+      } else if (statusCode == 401) {
+        throw UnauthorizedException();
+      } else if (statusCode == 403) {
+        throw AuthBlockException();
+      } else if (statusCode == 404) {
+        throw AuthException('Пользователь не найден', 0);
+      }
+      throw AuthException('Ошибка сервера: $statusCode', 0);
+    }
+  }
+
+  Future<void> setMainPaymentCard(int cardId) async {
+    final url = "$baseUrl/client/card/$cardId";
+
+    try {
+      await _dio.put(
+        url,
+        data: {"isMain": true},
+        options: await _getAuthOptions(),
+      );
+    } on DioException catch (e) {
+      final statusCode = e.response?.statusCode;
+
+      if (statusCode == 400) {
+        final message = _parseErrorMessage(e.response?.data);
+        throw AuthException(
+          message ?? 'Ошибка при установке основной карты',
+          0,
+        );
+      } else if (statusCode == 401) {
+        throw UnauthorizedException();
+      } else if (statusCode == 403) {
+        throw AuthBlockException();
+      } else if (statusCode == 404) {
+        throw AuthException('Карта не найдена', 0);
+      }
+      throw AuthException('Ошибка сервера: $statusCode', 0);
+    }
+  }
+
+  Future<void> removePaymentCard(int cardId) async {
+    final url = "$baseUrl/client/card/$cardId";
+
+    try {
+      await _dio.delete(url, options: await _getAuthOptions());
+    } on DioException catch (e) {
+      final statusCode = e.response?.statusCode;
+
+      if (statusCode == 400) {
+        final message = _parseErrorMessage(e.response?.data);
+        throw AuthException(message ?? 'Ошибка при удалении карты', 0);
+      } else if (statusCode == 401) {
+        throw UnauthorizedException();
+      } else if (statusCode == 403) {
+        throw AuthBlockException();
+      } else if (statusCode == 404) {
+        throw AuthException('Карта не найдена', 0);
+      }
+      throw AuthException('Ошибка сервера: $statusCode', 0);
+    }
+  }
+
+  Future<ScooterOrder?> bookScooter({
+    required int scooterId,
+    required int planId,
+    int? subscriptionId,
+    int? cardId,
+    required bool isBalance,
+    required bool isInsurance,
+  }) async {
+    try {
+      final response = await _dio.post(
+        "$baseUrl/scooterorder/booking",
+        data: {
+          "scooterId": scooterId,
+          "planId": planId,
+          "subscriptionId": subscriptionId,
+          "cardId": cardId,
+          "isBalance": isBalance,
+          "isInsurance": isInsurance,
+        },
+        options: await _getAuthOptions(),
+      );
+
+      return ScooterOrder.fromJson(response.data);
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 400) {
+        final data = e.response?.data;
+
+        if (data is Map && data['message'] is List) {
+          final firstError = data['message'][0]['message'].toString();
+
+          if (firstError.contains("Wrong start zone")) {
+            throw WrongZoneException(
+              message: "Некорректная зона для начала поездки.",
+            );
+          }
+        }
+
+        if (data is Map && data['message'] is String) {}
+      } else {
+        _handleDioError(e);
+      }
+      rethrow;
+    }
+  }
+
+  Future<ScooterOrder?> startRide(int orderId) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/start",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return ScooterOrder.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 400) {
+        final data = e.response?.data;
+
+        if (data is Map && data['message'] is List) {
+          final firstError = data['message'][0]['message'].toString();
+
+          if (firstError.contains("Wrong start zone")) {
+            throw WrongZoneException(
+              message: "Некорректная зона для начала поездки.",
+            );
+          }
+        }
+
+        if (data is Map && data['message'] is String) {}
+      } else {
+        _handleDioError(e);
+      }
+      rethrow;
+    }
+  }
+
+  Future<void> cancelRide(int orderId) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/cancel",
+        options: await _getAuthOptions(),
+      );
+
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<ScooterOrder?> pauseRide(int orderId) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/pause",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return ScooterOrder.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<ScooterOrder?> resumeRide(int orderId) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/resume",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return ScooterOrder.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<void> finishRide({
+    required int orderId,
+    required List<int> filesId,
+  }) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/finish",
+        data: {"files": filesId},
+        options: await _getAuthOptions(),
+      );
+
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 400) {
+        final data = e.response?.data;
+
+        if (data is Map && data['message'] is List) {
+          final firstError = data['message'][0]['message'].toString();
+
+          if (firstError.contains("Wrong start zone")) {
+            throw WrongZoneException(
+              message: "Некорректная зона для завершения поездки.",
+            );
+          }
+        }
+
+        if (data is Map && data['message'] is String) {}
+      } else {
+        _handleDioError(e);
+      }
+      rethrow;
+    }
+  }
+
+  Future<void> payRide(int orderId) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/pay",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        // return ScooterOrder.fromJson(response.data);
+        return;
+      }
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return;
+    }
+  }
+
+  Future<List<ScooterOrder>> getClientOrders() async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/active",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200) {
+        final data = response.data;
+        if (data is Map<String, dynamic> && data['data'] is List) {
+          final List ordersList = data['data'];
+          return ordersList.map((json) => ScooterOrder.fromJson(json)).toList();
+        }
+      }
+      return [];
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return [];
+    }
+  }
+
+  Future<ActiveScooterOrder?> updateScooterOrderData({
+    required int orderId,
+    Map<String, dynamic>? data,
+  }) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/$orderId/data",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return ActiveScooterOrder.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<ScooterOrder?> getScooterOrderById({required int id}) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/$id/client",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return ScooterOrder.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<void> payScooterOrderWithPhotos({
+    required int orderId,
+    required int? cardId,
+    required bool isBalance,
+  }) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/scooterorder/$orderId/pay",
+        data: {"cardId": cardId, "isBalance": isBalance},
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return;
+      }
+    } on DioException catch (e) {
+      _handleDioError(e);
+    }
+  }
+
+  Future<Map<String, dynamic>> getScooterOrderHistory({
+    int page = 1,
+    int pageSize = 20,
+  }) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/history",
+        queryParameters: {"page": page, "pageSize": pageSize},
+        options: await _getAuthOptions(),
+      );
+
+      return response.data;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return {};
+    }
+  }
+
+  Future<List<Point>> getScooterOrderRouteHistory({required int id}) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/$id/routehistory",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200) {
+        final String routeString = response.data['route'] ?? '[]';
+        final List<dynamic> routeList = json.decode(routeString);
+
+        return routeList
+            .map(
+              (item) => Point(
+                (item[1] as num).toDouble(),
+                (item[0] as num).toDouble(),
+              ),
+            )
+            .toList();
+      }
+
+      throw RouteHistoryNotFoundException(
+        message: "История маршрута не найдена",
+      );
+    } on DioException catch (e) {
+      if (e.response?.statusCode == 401) throw UnauthorizedException();
+      if (e.response?.statusCode == 403) throw AuthBlockException();
+      if (e.response?.statusCode == 404) throw RouteHistoryNotFoundException();
+      rethrow;
+    }
+  }
+
+  /// GET /scooterorder/{id}/fine
+  Future<Fine?> getFineDetails(int orderId) async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/scooterorder/$orderId/fine",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 && response.data != null) {
+        return Fine.fromJson(response.data);
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  /// PUT /scooterorder/{id}/fine
+  Future<void> payFine({
+    required int orderId,
+    int? cardId,
+    required bool isBalance,
+  }) async {
+    try {
+      await _dio.put(
+        "$baseUrl/scooterorder/$orderId/fine",
+        data: {
+          if (cardId != null) 'cardId': cardId,
+          'isBalance': isBalance,
+        },
+        options: await _getAuthOptions(),
+      );
+    } on DioException catch (e) {
+      _handleDioError(e);
+    }
+  }
+
+  Future<Map<String, dynamic>> getNews() async {
+    try {
+      final response = await _dio.get(
+        "$baseUrl/news",
+        options: await _getAuthOptions(),
+      );
+      return response.data;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return {};
+    }
+  }
+
+  Future<Map<String, dynamic>?> getNewsById(int newsId) async {
+    try {
+      final response = await _dio.get(
+        '$baseUrl/news/$newsId',
+        options: await _getAuthOptions(),
+      );
+      return response.data;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> cancelNotification(int id) async {
+    try {
+      final response = await _dio.put(
+        "$baseUrl/notification/client/$id/cancel",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200 || response.statusCode == 201) {
+        return response.data;
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  Stream<Map<String, dynamic>> getNotificationsStream() {
+    final url = "$baseUrl/notification/client/stream";
+
+    final controller = StreamController<Map<String, dynamic>>();
+
+    _securityService.getAccessToken().then((accessToken) {
+      if (accessToken == null) {
+        controller.addError(UnauthorizedException());
+        return;
+      }
+
+      print("[SSE] Subscribing via flutter_client_sse...");
+
+      SSEClient.subscribeToSSE(
+        method: SSERequestType.GET,
+        url: url,
+        header: {
+          "Authorization": "Bearer $accessToken",
+          "Accept": "text/event-stream",
+          "Cache-Control": "no-cache",
+        },
+      ).listen(
+        (event) {
+          print("Received line [SSE]: id=${event.id}, event=${event.event}");
+          print("Data [SSE]: ${event.data}");
+
+          if (event.data != null && event.data!.isNotEmpty) {
+            try {
+              final Map<String, dynamic> jsonData = jsonDecode(event.data!);
+              print("[SSE] Parsed JSON: $jsonData");
+              controller.add(jsonData);
+            } catch (e) {
+              print("[SSE] JSON Parse Error: $e | Raw: ${event.data}");
+            }
+          }
+        },
+        onError: (error) {
+          print(" [SSE] Library Error: $error");
+          controller.addError(error);
+        },
+        onDone: () {
+          print(" [SSE] Library Stream Closed");
+          controller.close();
+        },
+      );
+    });
+
+    return controller.stream;
+  }
+
+  Future<Map<String, dynamic>> getNotifications({
+    int page = 1,
+    int pageSize = 10,
+  }) async {
+    final url = Uri.parse('$baseUrl/notification/client').replace(
+      queryParameters: {
+        'page': page.toString(),
+        'pageSize': pageSize.toString(),
+      },
+    );
+
+    final accessToken = await _securityService.getAccessToken();
+    if (accessToken == null) throw UnauthorizedException();
+
+    final response = await http.get(
+      url,
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": "Bearer $accessToken",
+      },
+    );
+
+    if (response.statusCode == 200) {
+      final data = jsonDecode(utf8.decode(response.bodyBytes));
+      if (data is Map<String, dynamic>) {
+        return data;
+      }
+      throw Exception('Expected Map with data and pagination');
+    } 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(
+        "$baseUrl/certificate",
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 200) {
+        final data = response.data;
+        final dataList = data['data'] as List<dynamic>;
+        return dataList.map((json) => Certificate.fromJson(json)).toList();
+      }
+      return [];
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return [];
+    }
+  }
+
+  Future<Map<String, dynamic>?> purchaseCertificate({
+    required int certificateId,
+    required int cardId,
+  }) async {
+    try {
+      final response = await _dio.post(
+        "$baseUrl/certificate/$certificateId",
+        data: {"cardId": cardId},
+        options: await _getAuthOptions(),
+      );
+
+      if (response.statusCode == 201) {
+        return response.data;
+      }
+      return null;
+    } on DioException catch (e) {
+      _handleDioError(e);
+      return null;
+    }
+  }
+
+  void _handleDioError(DioException e) {
+    if (e.response?.statusCode == 401) throw UnauthorizedException();
+    if (e.response?.statusCode == 403) throw AuthBlockException();
+
+    final message = _parseErrorMessage(e.response?.data);
+    throw AuthException(message ?? 'Ошибка сервера', 0);
+  }
+
+  String? _parseErrorMessage(dynamic data) {
+    if (data is Map<String, dynamic>) {
+      final messages = data['message'] as List?;
+      if (messages != null && messages.isNotEmpty) {
+        final firstError = messages.first as Map<String, dynamic>?;
+        return firstError?['message'] as String?;
+      }
+      return data['message'] as String?;
+    }
+    return null;
+  }
+
+  Future<Map<String, dynamic>> applyPromoCode(String code) async {
+    final token = await _securityService.getAccessToken();
+    if (token == null) throw Exception('No access token');
+
+    final response = await _dio.post(
+      '$baseUrl/promocode/apply',
+      data: {'code': code},
+      options: Options(
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $token',
+        },
+      ),
+    );
+
+    if (response.statusCode == 201 || response.statusCode == 200) {
+      return response.data;
+    } else if (response.statusCode == 404) {
+      throw PromoCodeNotFoundException();
+    } else {
+      throw Exception('API Error: ${response.statusCode}');
+    }
+  }
+}
+
+
+
+class PromoCodeNotFoundException implements Exception {}
diff --git a/lib/data/network/geocoding_remote_datasource.dart b/lib/data/network/geocoding_remote_datasource.dart
index 1b51a88..0a1f1b9 100644
--- a/lib/data/network/geocoding_remote_datasource.dart
+++ b/lib/data/network/geocoding_remote_datasource.dart
@@ -1,101 +1,101 @@
-import 'dart:async';
-
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-class GeocodingRemoteDataSource {
-
-  Future<String> getAddressFromPoint({
-    required double latitude,
-    required double longitude,
-  }) async {
-    final point = Point(
-      latitude: latitude,
-      longitude: longitude,
-    );
-
-    final (session, resultFuture) = await YandexSearch.searchByPoint(
-      point: point,
-      zoom: 16,
-      searchOptions: const SearchOptions(
-        searchType: SearchType.geo,
-        resultPageSize: 1,
-      ),
-    );
-
-    try {
-      final result = await resultFuture;
-
-      if (result.items == null || result.items!.isEmpty) {
-        throw Exception("Адрес не найден");
-      }
-
-      final item = result.items!.first;
-
-      print("ADDRESS FETCH RESULT ${item.name}");
-
-      final toponymAddress =
-          item.toponymMetadata?.address?.formattedAddress;
-
-      if (toponymAddress != null && toponymAddress.isNotEmpty) {
-        return toponymAddress;
-      }
-
-      final businessAddress =
-          item.businessMetadata?.address?.formattedAddress;
-
-      if (businessAddress != null && businessAddress.isNotEmpty) {
-        return businessAddress;
-      }
-
-      return item.name;
-    } catch (e) {
-      throw Exception("Ошибка получения адреса: $e");
-    } finally {
-      await session.close();
-    }
-  }
-
-  Future<List<MasstransitRoute>?> getPedestrianRoutes(
-      Point userPosition,
-      Point targetPosition,
-      ) async {
-    try {
-
-      print("From: ${userPosition.latitude}, ${userPosition.longitude}");
-      print("To: ${targetPosition.latitude}, ${targetPosition.longitude}");
-
-      final (session, resultFuture) = await YandexPedestrian.requestRoutes(
-          points: [
-            RequestPoint(point: userPosition, requestPointType: RequestPointType.wayPoint),
-            RequestPoint(point: targetPosition, requestPointType: RequestPointType.wayPoint)
-          ],
-          fitnessOptions: const FitnessOptions(avoidSteep: false, avoidStairs: false),
-          timeOptions: const TimeOptions()
-      );
-
-      final result = await resultFuture;
-
-      if (result.routes == null || result.routes!.isEmpty) {
-        print("Маршруты не найдены: список пуст или null");
-        return [];
-      }
-
-      final route = result.routes!.first;
-
-      final distance = route.metadata.weight.walkingDistance?.value;
-
-      if (distance != null) {
-        print("Дистанция до самоката: $distance м");
-      } else {
-        print("Дистанция не найдена в метаданных маршрута");
-      }
-
-      return result.routes;
-
-    } catch (e, stack) {
-      print('Pedestrian route error: $e');
-      print('Stack trace: $stack');
-      return null;
-    }
-  }
+import 'dart:async';
+
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+class GeocodingRemoteDataSource {
+
+  Future<String> getAddressFromPoint({
+    required double latitude,
+    required double longitude,
+  }) async {
+    final point = Point(
+      latitude: latitude,
+      longitude: longitude,
+    );
+
+    final (session, resultFuture) = await YandexSearch.searchByPoint(
+      point: point,
+      zoom: 16,
+      searchOptions: const SearchOptions(
+        searchType: SearchType.geo,
+        resultPageSize: 1,
+      ),
+    );
+
+    try {
+      final result = await resultFuture;
+
+      if (result.items == null || result.items!.isEmpty) {
+        throw Exception("Адрес не найден");
+      }
+
+      final item = result.items!.first;
+
+      print("ADDRESS FETCH RESULT ${item.name}");
+
+      final toponymAddress =
+          item.toponymMetadata?.address?.formattedAddress;
+
+      if (toponymAddress != null && toponymAddress.isNotEmpty) {
+        return toponymAddress;
+      }
+
+      final businessAddress =
+          item.businessMetadata?.address?.formattedAddress;
+
+      if (businessAddress != null && businessAddress.isNotEmpty) {
+        return businessAddress;
+      }
+
+      return item.name;
+    } catch (e) {
+      throw Exception("Ошибка получения адреса: $e");
+    } finally {
+      await session.close();
+    }
+  }
+
+  Future<List<MasstransitRoute>?> getPedestrianRoutes(
+      Point userPosition,
+      Point targetPosition,
+      ) async {
+    try {
+
+      print("From: ${userPosition.latitude}, ${userPosition.longitude}");
+      print("To: ${targetPosition.latitude}, ${targetPosition.longitude}");
+
+      final (session, resultFuture) = await YandexPedestrian.requestRoutes(
+          points: [
+            RequestPoint(point: userPosition, requestPointType: RequestPointType.wayPoint),
+            RequestPoint(point: targetPosition, requestPointType: RequestPointType.wayPoint)
+          ],
+          fitnessOptions: const FitnessOptions(avoidSteep: false, avoidStairs: false),
+          timeOptions: const TimeOptions()
+      );
+
+      final result = await resultFuture;
+
+      if (result.routes == null || result.routes!.isEmpty) {
+        print("Маршруты не найдены: список пуст или null");
+        return [];
+      }
+
+      final route = result.routes!.first;
+
+      final distance = route.metadata.weight.walkingDistance?.value;
+
+      if (distance != null) {
+        print("Дистанция до самоката: $distance м");
+      } else {
+        print("Дистанция не найдена в метаданных маршрута");
+      }
+
+      return result.routes;
+
+    } catch (e, stack) {
+      print('Pedestrian route error: $e');
+      print('Stack trace: $stack');
+      return null;
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/data/repositories/app_settings_repository_impl.dart b/lib/data/repositories/app_settings_repository_impl.dart
index 8aa3d52..f2127a9 100644
--- a/lib/data/repositories/app_settings_repository_impl.dart
+++ b/lib/data/repositories/app_settings_repository_impl.dart
@@ -1,42 +1,42 @@
-import 'package:be_happy/data/service/app_setting_service.dart';
-import 'package:be_happy/domain/entities/map_settings.dart';
-import 'package:be_happy/domain/repositories/app_settings_repository.dart';
-
-class AppSettingsRepositoryImpl extends AppSettingsRepository {
-  static const String SHOW_ALL_PLACEMARKS = "all_placemarks";
-  static const String SHOW_ALL_ZONES = "all_zones";
-  static const String SHOW_PARKING_ZONES = "parking_zones";
-  static const String SHOW_RESTRICTED_PARKING_ZONES = "restricted_parking_zones";
-  static const String SHOW_RESTRICTED_DRIVING_ZONES = "restricted_driving_zones";
-
-  final AppSettingsService appSettingsService;
-
-  AppSettingsRepositoryImpl(this.appSettingsService);
-
-  @override
-  Future<MapSettings> getMapSettings() async {
-    MapSettings settings = MapSettings(
-        all_placemarks: appSettingsService.getMapSettingsFlag(
-            SHOW_ALL_PLACEMARKS),
-        all_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_ALL_ZONES),
-        parking_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_PARKING_ZONES),
-        restricted_parking_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_RESTRICTED_PARKING_ZONES),
-        restricted_driving_zones: appSettingsService.getMapSettingsFlag(
-            SHOW_RESTRICTED_DRIVING_ZONES)
-    );
-
-    return settings;
-  }
-
-  @override
-  Future<void> saveMapSettings(MapSettings settings) async {
-    appSettingsService.saveMapSettingsFlag(SHOW_ALL_PLACEMARKS, settings.all_placemarks);
-    appSettingsService.saveMapSettingsFlag(SHOW_ALL_ZONES, settings.all_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_PARKING_ZONES, settings.parking_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_PARKING_ZONES, settings.restricted_parking_zones);
-    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_DRIVING_ZONES, settings.restricted_driving_zones);
-  }
-}
+import 'package:be_happy/data/service/app_setting_service.dart';
+import 'package:be_happy/domain/entities/map_settings.dart';
+import 'package:be_happy/domain/repositories/app_settings_repository.dart';
+
+class AppSettingsRepositoryImpl extends AppSettingsRepository {
+  static const String SHOW_ALL_PLACEMARKS = "all_placemarks";
+  static const String SHOW_ALL_ZONES = "all_zones";
+  static const String SHOW_PARKING_ZONES = "parking_zones";
+  static const String SHOW_RESTRICTED_PARKING_ZONES = "restricted_parking_zones";
+  static const String SHOW_RESTRICTED_DRIVING_ZONES = "restricted_driving_zones";
+
+  final AppSettingsService appSettingsService;
+
+  AppSettingsRepositoryImpl(this.appSettingsService);
+
+  @override
+  Future<MapSettings> getMapSettings() async {
+    MapSettings settings = MapSettings(
+        all_placemarks: appSettingsService.getMapSettingsFlag(
+            SHOW_ALL_PLACEMARKS),
+        all_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_ALL_ZONES),
+        parking_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_PARKING_ZONES),
+        restricted_parking_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_RESTRICTED_PARKING_ZONES),
+        restricted_driving_zones: appSettingsService.getMapSettingsFlag(
+            SHOW_RESTRICTED_DRIVING_ZONES)
+    );
+
+    return settings;
+  }
+
+  @override
+  Future<void> saveMapSettings(MapSettings settings) async {
+    appSettingsService.saveMapSettingsFlag(SHOW_ALL_PLACEMARKS, settings.all_placemarks);
+    appSettingsService.saveMapSettingsFlag(SHOW_ALL_ZONES, settings.all_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_PARKING_ZONES, settings.parking_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_PARKING_ZONES, settings.restricted_parking_zones);
+    appSettingsService.saveMapSettingsFlag(SHOW_RESTRICTED_DRIVING_ZONES, settings.restricted_driving_zones);
+  }
+}
diff --git a/lib/data/repositories/auth_repository_impl.dart b/lib/data/repositories/auth_repository_impl.dart
index a461d32..1c17e18 100644
--- a/lib/data/repositories/auth_repository_impl.dart
+++ b/lib/data/repositories/auth_repository_impl.dart
@@ -1,85 +1,85 @@
-import 'package:be_happy/core/failures.dart';
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/data/exceptions/auth_block_exception.dart';
-import 'package:be_happy/data/exceptions/auth_exception.dart';
-import 'package:be_happy/data/repositories/pin_repository_impl.dart';
-import 'package:be_happy/domain/service/device_info_service.dart';
-import 'package:be_happy/domain/service/security_service.dart';
-
-import '../../domain/repositories/auth_repository.dart';
-import '../../domain/entities/user_auth_data.dart';
-
-import '../network/api_service.dart';
-
-class AuthRepositoryImpl implements AuthRepository {
-  final ApiService _apiService;
-  final DeviceInfoService _deviceInfoService;
-  final SecurityService _securityService;
-
-  String tempToken = "";
-
-  AuthRepositoryImpl(
-    this._apiService,
-    this._deviceInfoService,
-    this._securityService,
-  );
-
-  @override
-  Future<String> login(String phone) async {
-    final systemId = await _deviceInfoService.getSystemId() ?? "UnknownId";
-    final deviceModel = await _deviceInfoService.getDeviceModel();
-
-    final response = await _apiService.sendPhone(phone, deviceModel, systemId);
-    if (response != null) {
-      tempToken = response;
-      print("TEMP TOKEN IS $tempToken");
-      return response;
-    } else {
-      throw Exception("Login failed");
-    }
-  }
-
-  @override
-  Future<Result<void>> verifyCode(String code, String token) async {
-    late final Result<UserAuthData> result;
-    try {
-      final response = await _apiService.verifyCode(code, tempToken);
-      if (response != null) {
-        final authData = UserAuthData(
-          accessToken: response["accessToken"]!,
-          refreshToken: response["refreshToken"]!,
-        );
-        await _securityService.saveTokens(authData);
-        result = Success(null);
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException {
-      result = Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<UserAuthData> refreshToken() async {
-    final response = await _apiService.refresh();
-    print("REFRESH: $response");
-    if (response != null) {
-      final authData = UserAuthData(
-        accessToken: response["accessToken"]!,
-        refreshToken: response["refreshToken"]!,
-      );
-      await _securityService.saveTokens(authData);
-      return authData;
-    } else {
-      throw Exception("Refresh token failed");
-    }
-  }
-
-  @override
-  Future<void> logout() async {
-    await _securityService.removeTokens();
-  }
-}
+import 'package:be_happy/core/failures.dart';
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/data/exceptions/auth_block_exception.dart';
+import 'package:be_happy/data/exceptions/auth_exception.dart';
+import 'package:be_happy/data/repositories/pin_repository_impl.dart';
+import 'package:be_happy/domain/service/device_info_service.dart';
+import 'package:be_happy/domain/service/security_service.dart';
+
+import '../../domain/repositories/auth_repository.dart';
+import '../../domain/entities/user_auth_data.dart';
+
+import '../network/api_service.dart';
+
+class AuthRepositoryImpl implements AuthRepository {
+  final ApiService _apiService;
+  final DeviceInfoService _deviceInfoService;
+  final SecurityService _securityService;
+
+  String tempToken = "";
+
+  AuthRepositoryImpl(
+    this._apiService,
+    this._deviceInfoService,
+    this._securityService,
+  );
+
+  @override
+  Future<String> login(String phone) async {
+    final systemId = await _deviceInfoService.getSystemId() ?? "UnknownId";
+    final deviceModel = await _deviceInfoService.getDeviceModel();
+
+    final response = await _apiService.sendPhone(phone, deviceModel, systemId);
+    if (response != null) {
+      tempToken = response;
+      print("TEMP TOKEN IS $tempToken");
+      return response;
+    } else {
+      throw Exception("Login failed");
+    }
+  }
+
+  @override
+  Future<Result<void>> verifyCode(String code, String token) async {
+    late final Result<UserAuthData> result;
+    try {
+      final response = await _apiService.verifyCode(code, tempToken);
+      if (response != null) {
+        final authData = UserAuthData(
+          accessToken: response["accessToken"]!,
+          refreshToken: response["refreshToken"]!,
+        );
+        await _securityService.saveTokens(authData);
+        result = Success(null);
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException {
+      result = Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<UserAuthData> refreshToken() async {
+    final response = await _apiService.refresh();
+    print("REFRESH: $response");
+    if (response != null) {
+      final authData = UserAuthData(
+        accessToken: response["accessToken"]!,
+        refreshToken: response["refreshToken"]!,
+      );
+      await _securityService.saveTokens(authData);
+      return authData;
+    } else {
+      throw Exception("Refresh token failed");
+    }
+  }
+
+  @override
+  Future<void> logout() async {
+    await _securityService.removeTokens();
+  }
+}
diff --git a/lib/data/repositories/certificate_repository_impl.dart b/lib/data/repositories/certificate_repository_impl.dart
index 23557fe..12aec58 100644
--- a/lib/data/repositories/certificate_repository_impl.dart
+++ b/lib/data/repositories/certificate_repository_impl.dart
@@ -1,59 +1,59 @@
-import '../../core/failures.dart';
-import '../../core/result.dart';
-import '../../domain/entities/certificate.dart';
-import '../../domain/repositories/certificate_repository.dart';
-import '../../domain/service/security_service.dart';
-import '../network/api_service.dart';
-import '../exceptions/auth_exception.dart';
-import '../exceptions/auth_block_exception.dart';
-import '../exceptions/unauthorized_exception.dart';
-
-class CertificateRepositoryImpl implements CertificateRepository {
-  final ApiService apiService;
-  final SecurityService securityService;
-
-  CertificateRepositoryImpl(this.apiService, this.securityService);
-
-  @override
-  Future<Result<List<Certificate>>> getCertificates() async {
-    try {
-      final certificates = await apiService.getCertificates();
-      return Success(certificates);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<Map<String, dynamic>>> purchaseCertificate({
-    required int certificateId,
-    required int cardId,
-  }) async {
-    try {
-      final result = await apiService.purchaseCertificate(
-        certificateId: certificateId,
-        cardId: cardId,
-      );
-
-      if (result != null) {
-        return Success(result);
-      } else {
-        return Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-}
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/certificate.dart';
+import '../../domain/repositories/certificate_repository.dart';
+import '../../domain/service/security_service.dart';
+import '../network/api_service.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+
+class CertificateRepositoryImpl implements CertificateRepository {
+  final ApiService apiService;
+  final SecurityService securityService;
+
+  CertificateRepositoryImpl(this.apiService, this.securityService);
+
+  @override
+  Future<Result<List<Certificate>>> getCertificates() async {
+    try {
+      final certificates = await apiService.getCertificates();
+      return Success(certificates);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<Map<String, dynamic>>> purchaseCertificate({
+    required int certificateId,
+    required int cardId,
+  }) async {
+    try {
+      final result = await apiService.purchaseCertificate(
+        certificateId: certificateId,
+        cardId: cardId,
+      );
+
+      if (result != null) {
+        return Success(result);
+      } else {
+        return Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+}
diff --git a/lib/data/repositories/news_repository_impl.dart b/lib/data/repositories/news_repository_impl.dart
index 62aeca2..733cd20 100644
--- a/lib/data/repositories/news_repository_impl.dart
+++ b/lib/data/repositories/news_repository_impl.dart
@@ -1,46 +1,46 @@
-import '../../domain/entities/news.dart';
-import '../../domain/repositories/news_repository.dart';
-import '../service/news_api_service.dart';
-import 'dart:developer' as dev;
-
-class NewsRepositoryImpl implements NewsRepository {
-  final NewsApiService _apiService;
-
-  NewsRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<NewsEntity>> getNews() async {
-    try {
-      dev.log('NewsRepository: Загрузка новостей...');
-
-      final response = await _apiService.getNews();
-      final List<dynamic> data = response['data'] ?? [];
-
-      final newsList = data.map((json) => NewsEntity.fromJson(json)).toList();
-
-      dev.log('NewsRepository: Загружено ${newsList.length} новостей');
-
-      return newsList;
-    } catch (e, stackTrace) {
-      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новости: $e');
-    }
-  }
-
-  @override
-  Future<NewsEntity> getNewsById(int id) async {
-    try {
-      dev.log('NewsRepository: Загрузка новости с ID: $id');
-
-      final response = await _apiService.getNewsById(id);
-
-      final news = NewsEntity.fromJson(response);
-
-      dev.log('NewsRepository: Успешно загружена новость с ID: $id');
-      return news;
-    } catch (e, stackTrace) {
-      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новость: $e');
-    }
-  }
+import '../../domain/entities/news.dart';
+import '../../domain/repositories/news_repository.dart';
+import '../service/news_api_service.dart';
+import 'dart:developer' as dev;
+
+class NewsRepositoryImpl implements NewsRepository {
+  final NewsApiService _apiService;
+
+  NewsRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<NewsEntity>> getNews() async {
+    try {
+      dev.log('NewsRepository: Загрузка новостей...');
+
+      final response = await _apiService.getNews();
+      final List<dynamic> data = response['data'] ?? [];
+
+      final newsList = data.map((json) => NewsEntity.fromJson(json)).toList();
+
+      dev.log('NewsRepository: Загружено ${newsList.length} новостей');
+
+      return newsList;
+    } catch (e, stackTrace) {
+      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новости: $e');
+    }
+  }
+
+  @override
+  Future<NewsEntity> getNewsById(int id) async {
+    try {
+      dev.log('NewsRepository: Загрузка новости с ID: $id');
+
+      final response = await _apiService.getNewsById(id);
+
+      final news = NewsEntity.fromJson(response);
+
+      dev.log('NewsRepository: Успешно загружена новость с ID: $id');
+      return news;
+    } catch (e, stackTrace) {
+      dev.log('NewsRepository: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новость: $e');
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/data/repositories/notification_repository_impl.dart b/lib/data/repositories/notification_repository_impl.dart
index 2e1b2d1..dec91ce 100644
--- a/lib/data/repositories/notification_repository_impl.dart
+++ b/lib/data/repositories/notification_repository_impl.dart
@@ -1,64 +1,64 @@
-import 'package:be_happy/domain/entities/client_notification.dart';
-
-import '../../data/network/api_service.dart';
-import '../../domain/entities/pagination_meta.dart';
-import '../../domain/repositories/notification_repository.dart';
-import '../../domain/usecase/get_notifications_usecase.dart';
-import '../models/client_notification_dto.dart';
-
-class NotificationRepositoryImpl implements NotificationRepository {
-  final ApiService _apiService;
-
-  NotificationRepositoryImpl(this._apiService);
-
-  @override
-  Stream<ClientNotification> getNotificationsStream() {
-    return _apiService.getNotificationsStream().map((data) {
-      // Создаем DTO из данных API
-      final dto = ClientNotificationDto.fromJson(data);
-      // Преобразуем в entity
-      return dto.toEntity();
-    });
-  }
-
-  @override
-  Future<ClientNotification> cancelNotification(int id) async {
-    final data = await _apiService.cancelNotification(id);
-    if (data == null) {
-      throw Exception("Failed to cancel notification");
-    }
-    final dto = ClientNotificationDto.fromJson(data);
-    return dto.toEntity();
-  }
-
-  @override
-  void closeStream() {
-    // соединение закрывается автоматически при отписке от stream
-  }
-
-  @override
-  Future<NotificationsResult> getNotifications({
-    int page = 1,
-    int pageSize = 10,
-  }) async {
-    try {
-      final response = await _apiService.getNotifications(
-        page: page,
-        pageSize: pageSize,
-      );
-
-      final notifications = (response['data'] as List)
-          .map((json) => ClientNotificationDto.fromJson(json).toEntity())
-          .toList();
-
-      final pagination = PaginationMeta.fromJson(response['pagination']);
-
-      return NotificationsResult(
-        notifications: notifications,
-        pagination: pagination,
-      );
-    } catch (e, stackTrace) {
-      throw Exception('Не удалось загрузить уведомления: $e');
-    }
-  }
-}
+import 'package:be_happy/domain/entities/client_notification.dart';
+
+import '../../data/network/api_service.dart';
+import '../../domain/entities/pagination_meta.dart';
+import '../../domain/repositories/notification_repository.dart';
+import '../../domain/usecase/get_notifications_usecase.dart';
+import '../models/client_notification_dto.dart';
+
+class NotificationRepositoryImpl implements NotificationRepository {
+  final ApiService _apiService;
+
+  NotificationRepositoryImpl(this._apiService);
+
+  @override
+  Stream<ClientNotification> getNotificationsStream() {
+    return _apiService.getNotificationsStream().map((data) {
+      // Создаем DTO из данных API
+      final dto = ClientNotificationDto.fromJson(data);
+      // Преобразуем в entity
+      return dto.toEntity();
+    });
+  }
+
+  @override
+  Future<ClientNotification> cancelNotification(int id) async {
+    final data = await _apiService.cancelNotification(id);
+    if (data == null) {
+      throw Exception("Failed to cancel notification");
+    }
+    final dto = ClientNotificationDto.fromJson(data);
+    return dto.toEntity();
+  }
+
+  @override
+  void closeStream() {
+    // соединение закрывается автоматически при отписке от stream
+  }
+
+  @override
+  Future<NotificationsResult> getNotifications({
+    int page = 1,
+    int pageSize = 10,
+  }) async {
+    try {
+      final response = await _apiService.getNotifications(
+        page: page,
+        pageSize: pageSize,
+      );
+
+      final notifications = (response['data'] as List)
+          .map((json) => ClientNotificationDto.fromJson(json).toEntity())
+          .toList();
+
+      final pagination = PaginationMeta.fromJson(response['pagination']);
+
+      return NotificationsResult(
+        notifications: notifications,
+        pagination: pagination,
+      );
+    } catch (e, stackTrace) {
+      throw Exception('Не удалось загрузить уведомления: $e');
+    }
+  }
+}
diff --git a/lib/data/repositories/payment_repository_impl.dart b/lib/data/repositories/payment_repository_impl.dart
index 7fcd325..3811c60 100644
--- a/lib/data/repositories/payment_repository_impl.dart
+++ b/lib/data/repositories/payment_repository_impl.dart
@@ -1,115 +1,115 @@
-import '../../core/failures.dart';
-import '../../core/result.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/repositories/payment_repository.dart';
-import '../../domain/service/security_service.dart';
-import '../network/api_service.dart';
-import '../exceptions/auth_exception.dart';
-import '../exceptions/auth_block_exception.dart';
-import '../exceptions/unauthorized_exception.dart';
-import '../service/security_service_impl.dart';
-
-class PaymentRepositoryImpl implements PaymentRepository {
-  final ApiService apiService;
-  final SecurityService securityService;
-
-  PaymentRepositoryImpl(this.apiService, this.securityService);
-
-  @override
-  Future<Result<List<PaymentCard>>> getPaymentCards() async {
-    try {
-      final cards = await apiService.getPaymentCards();
-      return Success(cards);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<Map<String, dynamic>>> addPaymentCard(
-    /*required String cardNumber,
-    required String cardHolder,
-    required String expiryMonth,
-    required String expiryYear,
-    required String cvv,*/
-  ) async {
-    try {
-      final result = await apiService.addPaymentCard(
-        /*cardNumber: cardNumber,
-        cardHolder: cardHolder,
-        expirationMonth: int.parse(expiryMonth),
-        expirationYear: int.parse(expiryYear),
-        cvv: cvv,*/
-      );
-
-      // await securityService.saveCardFullNumber(cardId, cardNumber);
-
-      return Success(result);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } on FormatException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<void>> setMainPaymentCard(int cardId) async {
-    try {
-      await apiService.setMainPaymentCard(cardId);
-      return Success(null);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<void>> removePaymentCard(int cardId) async {
-    try {
-      await apiService.removePaymentCard(cardId);
-      await securityService.removeCardFullNumber(cardId);
-      return Success(null);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-
-  @override
-  Future<Result<bool>> activateSubscription(int optionId, int cardId) async {
-    try {
-      final success = await apiService.activateSubscription(optionId: optionId, cardId: cardId);
-      return Success(success);
-    } on AuthException catch (e) {
-      return Failure(AuthFailure(e.attemptsLeft));
-    } on AuthBlockException catch (_) {
-      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
-    } on UnauthorizedException catch (_) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    } catch (e) {
-      return Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-  }
-}
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/repositories/payment_repository.dart';
+import '../../domain/service/security_service.dart';
+import '../network/api_service.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+import '../service/security_service_impl.dart';
+
+class PaymentRepositoryImpl implements PaymentRepository {
+  final ApiService apiService;
+  final SecurityService securityService;
+
+  PaymentRepositoryImpl(this.apiService, this.securityService);
+
+  @override
+  Future<Result<List<PaymentCard>>> getPaymentCards() async {
+    try {
+      final cards = await apiService.getPaymentCards();
+      return Success(cards);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<Map<String, dynamic>>> addPaymentCard(
+    /*required String cardNumber,
+    required String cardHolder,
+    required String expiryMonth,
+    required String expiryYear,
+    required String cvv,*/
+  ) async {
+    try {
+      final result = await apiService.addPaymentCard(
+        /*cardNumber: cardNumber,
+        cardHolder: cardHolder,
+        expirationMonth: int.parse(expiryMonth),
+        expirationYear: int.parse(expiryYear),
+        cvv: cvv,*/
+      );
+
+      // await securityService.saveCardFullNumber(cardId, cardNumber);
+
+      return Success(result);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } on FormatException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<void>> setMainPaymentCard(int cardId) async {
+    try {
+      await apiService.setMainPaymentCard(cardId);
+      return Success(null);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<void>> removePaymentCard(int cardId) async {
+    try {
+      await apiService.removePaymentCard(cardId);
+      await securityService.removeCardFullNumber(cardId);
+      return Success(null);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+
+  @override
+  Future<Result<bool>> activateSubscription(int optionId, int cardId) async {
+    try {
+      final success = await apiService.activateSubscription(optionId: optionId, cardId: cardId);
+      return Success(success);
+    } on AuthException catch (e) {
+      return Failure(AuthFailure(e.attemptsLeft));
+    } on AuthBlockException catch (_) {
+      return Failure(AuthBlockFailure("Ошибка. Вы заблокированы."));
+    } on UnauthorizedException catch (_) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    } catch (e) {
+      return Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+  }
+}
diff --git a/lib/data/repositories/pin_repository_impl.dart b/lib/data/repositories/pin_repository_impl.dart
index 60e27e5..96b6c9c 100644
--- a/lib/data/repositories/pin_repository_impl.dart
+++ b/lib/data/repositories/pin_repository_impl.dart
@@ -1,24 +1,24 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-class PinRepositoryImpl implements PinRepository {
-  final FlutterSecureStorage _storage;
-
-  PinRepositoryImpl(this._storage);
-
-  @override
-  Future<String?> getSavedPin() {
-    return _storage.read(key: "user_pin");
-  }
-
-  @override
-  Future<void> savePin(String? pin) async {
-    await _storage.write(key: "user_pin", value: pin);
-  }
-
-  @override
-  Future<void> removePin() async {
-    await _storage.delete(key: "user_pin");
-  }
-}
-
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class PinRepositoryImpl implements PinRepository {
+  final FlutterSecureStorage _storage;
+
+  PinRepositoryImpl(this._storage);
+
+  @override
+  Future<String?> getSavedPin() {
+    return _storage.read(key: "user_pin");
+  }
+
+  @override
+  Future<void> savePin(String? pin) async {
+    await _storage.write(key: "user_pin", value: pin);
+  }
+
+  @override
+  Future<void> removePin() async {
+    await _storage.delete(key: "user_pin");
+  }
+}
+
diff --git a/lib/data/repositories/profile_repository_impl.dart b/lib/data/repositories/profile_repository_impl.dart
index 185263a..0ec3d70 100644
--- a/lib/data/repositories/profile_repository_impl.dart
+++ b/lib/data/repositories/profile_repository_impl.dart
@@ -1,48 +1,48 @@
-import 'dart:io';
-
-import 'package:be_happy/data/network/api_service.dart';
-
-import '../../domain/entities/user_profile.dart';
-import '../../domain/entities/user_check_flags.dart';
-import '../../domain/repositories/profile_repository.dart';
-
-class UserProfileRepositoryImpl implements UserProfileRepository {
-  final ApiService _apiService;
-
-  static const String kAccessToken = "access_token";
-  static const String kRefreshToken = "refresh_token";
-
-  final UserProfile _cachedProfile = UserProfile(
-    name: 'Иванов Антон',
-    birthDate: '12-03-2005',
-    phone: '+375 00 000-00-00',
-    balance: null,
-    email: 'почта@gmail.com',
-  );
-
-  UserProfileRepositoryImpl(this._apiService);
-
-  @override
-  Future<UserProfile> getProfile() async {
-    return await _apiService.getProfile() ?? _cachedProfile;
-  }
-
-  @override
-  Future<UserProfile?> updateProfile(UserProfile profile) async {
-    //await Future.delayed(const Duration(milliseconds: 300));
-    print("UPDATE PROFILE DATA: $profile");
-    return await _apiService.updateProfile(profile);
-  }
-
-  @override
-  Future<int?> uploadProfilePhoto(File imageFile) async {
-    return await _apiService.uploadPhoto(imageFile);
-  }
-
-  @override
-  Future<UserCheckFlags?> checkUser() async {
-    return await _apiService.checkUser();
-  }
-
-
-}
+import 'dart:io';
+
+import 'package:be_happy/data/network/api_service.dart';
+
+import '../../domain/entities/user_profile.dart';
+import '../../domain/entities/user_check_flags.dart';
+import '../../domain/repositories/profile_repository.dart';
+
+class UserProfileRepositoryImpl implements UserProfileRepository {
+  final ApiService _apiService;
+
+  static const String kAccessToken = "access_token";
+  static const String kRefreshToken = "refresh_token";
+
+  final UserProfile _cachedProfile = UserProfile(
+    name: 'Иванов Антон',
+    birthDate: '12-03-2005',
+    phone: '+375 00 000-00-00',
+    balance: null,
+    email: 'почта@gmail.com',
+  );
+
+  UserProfileRepositoryImpl(this._apiService);
+
+  @override
+  Future<UserProfile> getProfile() async {
+    return await _apiService.getProfile() ?? _cachedProfile;
+  }
+
+  @override
+  Future<UserProfile?> updateProfile(UserProfile profile) async {
+    //await Future.delayed(const Duration(milliseconds: 300));
+    print("UPDATE PROFILE DATA: $profile");
+    return await _apiService.updateProfile(profile);
+  }
+
+  @override
+  Future<int?> uploadProfilePhoto(File imageFile) async {
+    return await _apiService.uploadPhoto(imageFile);
+  }
+
+  @override
+  Future<UserCheckFlags?> checkUser() async {
+    return await _apiService.checkUser();
+  }
+
+
+}
diff --git a/lib/data/repositories/promo_code_repository_impl.dart b/lib/data/repositories/promo_code_repository_impl.dart
index 8f6a0c5..87b0796 100644
--- a/lib/data/repositories/promo_code_repository_impl.dart
+++ b/lib/data/repositories/promo_code_repository_impl.dart
@@ -1,23 +1,23 @@
-import '../../domain/entities/promo_code_result.dart';
-import '../../domain/repositories/promo_code_repository.dart';
-import '../models/promo_code_response_dto.dart';
-import '../network/api_service.dart';
-
-class PromoCodeRepositoryImpl implements PromoCodeRepository {
-  final ApiService apiService;
-
-  PromoCodeRepositoryImpl(this.apiService);
-
-  @override
-  Future<PromoCodeResult> applyPromoCode(String code) async {
-    try {
-      final data = await apiService.applyPromoCode(code);
-      final dto = PromoCodeResponseDto.fromJson(data);
-      return dto.toEntity();
-    } on PromoCodeNotFoundException {
-      throw Exception('Промокод не найден');
-    } catch (e) {
-      throw Exception('Ошибка активации промокода: $e');
-    }
-  }
+import '../../domain/entities/promo_code_result.dart';
+import '../../domain/repositories/promo_code_repository.dart';
+import '../models/promo_code_response_dto.dart';
+import '../network/api_service.dart';
+
+class PromoCodeRepositoryImpl implements PromoCodeRepository {
+  final ApiService apiService;
+
+  PromoCodeRepositoryImpl(this.apiService);
+
+  @override
+  Future<PromoCodeResult> applyPromoCode(String code) async {
+    try {
+      final data = await apiService.applyPromoCode(code);
+      final dto = PromoCodeResponseDto.fromJson(data);
+      return dto.toEntity();
+    } on PromoCodeNotFoundException {
+      throw Exception('Промокод не найден');
+    } catch (e) {
+      throw Exception('Ошибка активации промокода: $e');
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/data/repositories/scooter_repository_impl.dart b/lib/data/repositories/scooter_repository_impl.dart
index 110373e..0655491 100644
--- a/lib/data/repositories/scooter_repository_impl.dart
+++ b/lib/data/repositories/scooter_repository_impl.dart
@@ -1,428 +1,477 @@
-import 'dart:io';
-import 'package:be_happy/data/exceptions/auth_block_exception.dart';
-import 'package:be_happy/data/exceptions/route_history_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/scooter_not_found_exception.dart';
-import 'package:be_happy/data/exceptions/unauthorized_exception.dart';
-import 'package:be_happy/data/exceptions/wrong_zone_exception.dart';
-import 'package:be_happy/domain/entities/point.dart';
-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';
-import '../../domain/entities/scooter_order.dart';
-import '../exceptions/auth_exception.dart';
-import '../network/api_service.dart';
-
-class ScooterRepositoryImpl extends ScooterRepository {
-  final ApiService _apiService;
-
-  final scooter = Scooter(
-    id: 123,
-    title: "Unnamed",
-    status: "Available",
-    latitude: 55.178960,
-    longitude: 30.222316,
-    batteryLevel: 89,
-    isOnline: true,
-    maxSpeed: 25,
-    number: "Unnamed",
-  );
-
-  ScooterRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<Scooter>> getScooters(
-    List<double> area,
-    int page,
-    int pageSize,
-  ) async {
-    final responce = await _apiService.getScooters(
-      area: area,
-      page: page,
-      pageSize: pageSize,
-    );
-
-    final List<Scooter>? list = responce?.scooters;
-    // list?.add(scooter);
-
-    // print("Scooters: ${list?.first.status}");
-
-    if (responce != null) {
-      return list ?? List.empty();
-    }
-
-    return List.empty();
-  }
-
-  @override
-  Future<Result<Scooter?>> getScooter(int id) async {
-    late final Result<Scooter> result;
-    try {
-      final scooter = await _apiService.getScooterById(id: id);
-      if (scooter != null) {
-        result = Success(scooter);
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId) async {
-    late final Result<List<Tariff>> result;
-    try {
-      final response = await _apiService.getAvailableTariffs(
-        scooterId: scooterId,
-      );
-      if (response != null) {
-        result = Success(response.tariffs);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Subscription>>> getAvailableSubscriptions() async {
-    late final Result<List<Subscription>> result;
-    try {
-      final response = await _apiService.getAvailableSubscriptions();
-      if (response != null) {
-        result = Success(response.subscriptions);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<Subscription>> getSubscriptionById(int id) async {
-    late final Result<Subscription> result;
-    try {
-      final subscription = await _apiService.getSubscriptionById(id: id);
-      if (subscription != null) {
-        result = Success(subscription);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
-    late final Result<List<ClientSubscription>> result;
-    try {
-      final subscriptions = await _apiService.getClientSubscriptions();
-      result = Success(subscriptions);
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> bookScooter({
-    required int scooterId,
-    required int planId,
-    int? subscriptionId,
-    int? cardId,
-    required bool isBalance,
-    required bool isInsurance,
-  }) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.bookScooter(
-        scooterId: scooterId,
-        planId: planId,
-        subscriptionId: subscriptionId,
-        cardId: cardId,
-        isBalance: isBalance,
-        isInsurance: isInsurance,
-      );
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on WrongZoneException catch (e) {
-      result = Failure(WrongZoneFailure(e.message));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> startRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.startRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> cancelRide(int orderId) async {
-    late final Result<void> result;
-    try {
-      await _apiService.cancelRide(orderId);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> pauseRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.pauseRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> resumeRide(int orderId) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.resumeRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> finishRide(int orderId, List<int> files) async {
-    late final Result<ScooterOrder> result;
-    try {
-      await _apiService.finishRide(orderId: orderId, filesId: files);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } on WrongZoneException catch (e) {
-      result = Failure(WrongZoneFailure(e.message));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> payRide(int orderId) async {
-    late final Result<void> result;
-    try {
-      await _apiService.payRide(orderId);
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ScooterOrder>>> getClientOrders() async {
-    late final Result<List<ScooterOrder>> result;
-    try {
-      final orders = await _apiService.getClientOrders();
-      result = Success(orders);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<int>>> uploadScooterPhotos(List<File> images) async {
-    late final Result<List<int>> result;
-    try {
-      final filesId = await _apiService.uploadScooterPhotos(images);
-      result = Success(filesId);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ActiveScooterOrder>> updateScooterOrderData({
-    required int orderId,
-  }) async {
-    late final Result<ActiveScooterOrder> result;
-    try {
-      final order = await _apiService.updateScooterOrderData(orderId: orderId);
-      if (order != null) {
-        print("ORDER DATA FROM REPOSITORY: $order");
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<void>> payScooterOrderWithPhotos({
-    required int orderId,
-    required int? cardId,
-    required bool isBalance,
-  }) async {
-    late final Result<void> result;
-    try {
-      final order = await _apiService.payScooterOrderWithPhotos(
-        orderId: orderId,
-        cardId: cardId,
-        isBalance: isBalance,
-      );
-      result = Success(null);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<ScooterOrder>> getScooterOrderById(int id) async {
-    late final Result<ScooterOrder> result;
-    try {
-      final order = await _apiService.getScooterOrderById(id: id);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
-    int page = 1,
-    int pageSize = 20,
-  }) async {
-    late final Result<List<ScooterOrder>> result;
-    try {
-      final response = await _apiService.getScooterOrderHistory(
-        page: page,
-        pageSize: pageSize,
-      );
-      final List<dynamic> data = response['data'] ?? [];
-      final orders = data.map((json) => ScooterOrder.fromJson(json)).toList();
-      result = Success(orders);
-    } on AuthException catch (e) {
-      result = Failure(AuthFailure(e.attemptsLeft));
-    } catch (e) {
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<Scooter?>> getScooterByTitle(String title) async {
-    late final Result<Scooter?> result;
-    try {
-      final scooter = await _apiService.getScooterByTitle(title: title);
-      if (scooter != null) {
-        result = Success(scooter);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
-    } on ScooterNotFoundException catch (e) {
-      result = Failure(ScooterNotFoundFailure(e.message));
-    } on UnauthorizedException catch (e) {
-      result = Failure(AuthFailure(0, message: e.toString()));
-    } on AuthBlockException catch (e) {
-      result = Failure(AuthBlockFailure(e.toString()));
-    } catch (e, stacktrace) {
-      print("REPOSITORY ERROR: $e");
-      print("STACKTRACE: $stacktrace");
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-
-  @override
-  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id) async {
-    late final Result<List<Point>> result;
-    try {
-      final route = await _apiService.getScooterOrderRouteHistory(id: id);
-      result = Success(route);
-    } on RouteHistoryNotFoundException catch (e) {
-      result = Failure(RouteHistoryNotFoundFailure(e.message));
-    } on UnauthorizedException catch (e) {
-      result = Failure(AuthFailure(0, message: e.toString()));
-    } on AuthBlockException catch (e) {
-      result = Failure(AuthBlockFailure(e.toString()));
-    } catch (e, stacktrace) {
-      print("REPOSITORY ERROR: $e");
-      print("STACKTRACE: $stacktrace");
-      result = Failure(UnknownFailure("Неизвестная ошибка"));
-    }
-    return result;
-  }
-}
+import 'dart:io';
+
+import '../../core/failures.dart';
+import '../../core/result.dart';
+import '../../domain/entities/active_scooter_order.dart';
+import '../../domain/entities/client_subscription.dart';
+import '../../domain/entities/fine.dart';
+import '../../domain/entities/point.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/tariff.dart';
+import '../../domain/entities/subscription.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/repositories/scooter_repository.dart';
+import '../exceptions/auth_block_exception.dart';
+import '../exceptions/auth_exception.dart';
+import '../exceptions/route_history_not_found_exception.dart';
+import '../exceptions/scooter_not_found_exception.dart';
+import '../exceptions/unauthorized_exception.dart';
+import '../exceptions/wrong_zone_exception.dart';
+import '../network/api_service.dart';
+
+class ScooterRepositoryImpl extends ScooterRepository {
+  final ApiService _apiService;
+
+  final scooter = Scooter(
+    id: 123,
+    title: "Unnamed",
+    status: "Available",
+    latitude: 55.178960,
+    longitude: 30.222316,
+    batteryLevel: 89,
+    isOnline: true,
+    maxSpeed: 25,
+    number: "Unnamed",
+  );
+
+  ScooterRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<Scooter>> getScooters(
+    List<double> area,
+    int page,
+    int pageSize,
+  ) async {
+    final responce = await _apiService.getScooters(
+      area: area,
+      page: page,
+      pageSize: pageSize,
+    );
+
+    final List<Scooter>? list = responce?.scooters;
+    // list?.add(scooter);
+
+    // print("Scooters: ${list?.first.status}");
+
+    if (responce != null) {
+      return list ?? List.empty();
+    }
+
+    return List.empty();
+  }
+
+  @override
+  Future<Result<Scooter?>> getScooter(int id) async {
+    late final Result<Scooter> result;
+    try {
+      final scooter = await _apiService.getScooterById(id: id);
+      if (scooter != null) {
+        result = Success(scooter);
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId) async {
+    late final Result<List<Tariff>> result;
+    try {
+      final response = await _apiService.getAvailableTariffs(
+        scooterId: scooterId,
+      );
+      if (response != null) {
+        result = Success(response.tariffs);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Subscription>>> getAvailableSubscriptions() async {
+    late final Result<List<Subscription>> result;
+    try {
+      final response = await _apiService.getAvailableSubscriptions();
+      if (response != null) {
+        result = Success(response.subscriptions);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Subscription>> getSubscriptionById(int id) async {
+    late final Result<Subscription> result;
+    try {
+      final subscription = await _apiService.getSubscriptionById(id: id);
+      if (subscription != null) {
+        result = Success(subscription);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
+    late final Result<List<ClientSubscription>> result;
+    try {
+      final subscriptions = await _apiService.getClientSubscriptions();
+      result = Success(subscriptions);
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> bookScooter({
+    required int scooterId,
+    required int planId,
+    int? subscriptionId,
+    int? cardId,
+    required bool isBalance,
+    required bool isInsurance,
+  }) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.bookScooter(
+        scooterId: scooterId,
+        planId: planId,
+        subscriptionId: subscriptionId,
+        cardId: cardId,
+        isBalance: isBalance,
+        isInsurance: isInsurance,
+      );
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on WrongZoneException catch (e) {
+      result = Failure(WrongZoneFailure(e.message));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> startRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.startRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> cancelRide(int orderId) async {
+    late final Result<void> result;
+    try {
+      await _apiService.cancelRide(orderId);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> pauseRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.pauseRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> resumeRide(int orderId) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.resumeRide(orderId);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> finishRide(int orderId, List<int> files) async {
+    late final Result<ScooterOrder> result;
+    try {
+      await _apiService.finishRide(orderId: orderId, filesId: files);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on WrongZoneException catch (e) {
+      result = Failure(WrongZoneFailure(e.message));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payRide(int orderId) async {
+    late final Result<void> result;
+    try {
+      await _apiService.payRide(orderId);
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ScooterOrder>>> getClientOrders() async {
+    late final Result<List<ScooterOrder>> result;
+    try {
+      final orders = await _apiService.getClientOrders();
+      result = Success(orders);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<int>>> uploadScooterPhotos(List<File> images) async {
+    late final Result<List<int>> result;
+    try {
+      final filesId = await _apiService.uploadScooterPhotos(images);
+      result = Success(filesId);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ActiveScooterOrder>> updateScooterOrderData({
+    required int orderId,
+  }) async {
+    late final Result<ActiveScooterOrder> result;
+    try {
+      final order = await _apiService.updateScooterOrderData(orderId: orderId);
+      if (order != null) {
+        print("ORDER DATA FROM REPOSITORY: $order");
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payScooterOrderWithPhotos({
+    required int orderId,
+    required int? cardId,
+    required bool isBalance,
+  }) async {
+    late final Result<void> result;
+    try {
+      final order = await _apiService.payScooterOrderWithPhotos(
+        orderId: orderId,
+        cardId: cardId,
+        isBalance: isBalance,
+      );
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<ScooterOrder>> getScooterOrderById(int id) async {
+    late final Result<ScooterOrder> result;
+    try {
+      final order = await _apiService.getScooterOrderById(id: id);
+      if (order != null) {
+        result = Success(order);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
+    int page = 1,
+    int pageSize = 20,
+  }) async {
+    late final Result<List<ScooterOrder>> result;
+    try {
+      final response = await _apiService.getScooterOrderHistory(
+        page: page,
+        pageSize: pageSize,
+      );
+      final List<dynamic> data = response['data'] ?? [];
+      final orders = data.map((json) => ScooterOrder.fromJson(json)).toList();
+      result = Success(orders);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Scooter?>> getScooterByTitle(String title) async {
+    late final Result<Scooter?> result;
+    try {
+      final scooter = await _apiService.getScooterByTitle(title: title);
+      if (scooter != null) {
+        result = Success(scooter);
+      } else {
+        result = Failure(UnknownFailure("Неизвестная ошибка"));
+      }
+    } on ScooterNotFoundException catch (e) {
+      result = Failure(ScooterNotFoundFailure(e.message));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e, stacktrace) {
+      print("REPOSITORY ERROR: $e");
+      print("STACKTRACE: $stacktrace");
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id) async {
+    late final Result<List<Point>> result;
+    try {
+      final route = await _apiService.getScooterOrderRouteHistory(id: id);
+      result = Success(route);
+    } on RouteHistoryNotFoundException catch (e) {
+      result = Failure(RouteHistoryNotFoundFailure(e.message));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e, stacktrace) {
+      print("REPOSITORY ERROR: $e");
+      print("STACKTRACE: $stacktrace");
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<Fine>> getFineDetails(int orderId) async {
+    late final Result<Fine> result;
+    try {
+      final fine = await _apiService.getFineDetails(orderId);
+      if (fine != null) {
+        result = Success(fine);
+      } else {
+        result = Failure(UnknownFailure("Не удалось получить данные о штрафе"));
+      }
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+
+  @override
+  Future<Result<void>> payFine({
+    required int orderId,
+    int? cardId,
+    required bool isBalance,
+  }) async {
+    late final Result<void> result;
+    try {
+      await _apiService.payFine(
+        orderId: orderId,
+        cardId: cardId,
+        isBalance: isBalance,
+      );
+      result = Success(null);
+    } on AuthException catch (e) {
+      result = Failure(AuthFailure(e.attemptsLeft));
+    } on UnauthorizedException catch (e) {
+      result = Failure(AuthFailure(0, message: e.toString()));
+    } on AuthBlockException catch (e) {
+      result = Failure(AuthBlockFailure(e.toString()));
+    } catch (e) {
+      result = Failure(UnknownFailure("Неизвестная ошибка"));
+    }
+    return result;
+  }
+}
diff --git a/lib/data/repositories/zone_repository_impl.dart b/lib/data/repositories/zone_repository_impl.dart
index a6e860f..009714a 100644
--- a/lib/data/repositories/zone_repository_impl.dart
+++ b/lib/data/repositories/zone_repository_impl.dart
@@ -1,69 +1,69 @@
-import 'package:be_happy/domain/entities/zone.dart';
-import 'package:be_happy/domain/repositories/zone_repository.dart';
-
-import '../../domain/entities/point.dart';
-import '../network/api_service.dart';
-
-class ZoneRepositoryImpl extends ZoneRepository {
-  final ApiService _apiService;
-
-  ZoneRepositoryImpl(this._apiService);
-
-  @override
-  Future<List<Zone>> getZones(List<double> area,
-      int page,
-      int pageSize,) async {
-
-    final List<Point> list = [];
-    final List<Point> list2 = [];
-
-    /*list.add(Point(55.182372,30.203347));
-    list.add(Point(55.173746,30.200257));
-    list.add(Point(55.172153,30.212531));
-    list.add(Point(55.179946,30.215964));
-
-    list2.add(Point(55.178304,30.227380));
-    list2.add(Point(55.178059,30.229654));
-    list2.add(Point(55.191339,30.234718));
-    list2.add(Point(55.194352,30.234890));
-    list2.add(Point(55.194377,30.231972));
-    list2.add(Point(55.192123,30.232744));
-
-    final zone = Zone(id: 123,
-        title: "Zone 01",
-        description: "description",
-        type: "Finish",
-        isActive: true,
-        shapeType: "polygon",
-        points: list,
-        speedLimit: "speedLimit");
-
-    final zone2 = Zone(id: 124,
-        title: "Zone 02",
-        description: "description",
-        type: "NotDrive",
-        isActive: true,
-        shapeType: "polygon",
-        points: list2,
-        speedLimit: "speedLimit");
-*/
-
-    final responce = await _apiService.getZones(
-      area: area,
-      page: page,
-      pageSize: pageSize,
-    );
-
-    final List<Zone>? zones = responce?.zones;
-    // zones?.add(zone);
-    // zones?.add(zone2);
-
-    print("Scooters: ${zones?.first.title}");
-
-    if (responce != null) {
-      return zones ?? List.empty();
-    }
-
-    return List.empty();
-  }
-}
+import 'package:be_happy/domain/entities/zone.dart';
+import 'package:be_happy/domain/repositories/zone_repository.dart';
+
+import '../../domain/entities/point.dart';
+import '../network/api_service.dart';
+
+class ZoneRepositoryImpl extends ZoneRepository {
+  final ApiService _apiService;
+
+  ZoneRepositoryImpl(this._apiService);
+
+  @override
+  Future<List<Zone>> getZones(List<double> area,
+      int page,
+      int pageSize,) async {
+
+    final List<Point> list = [];
+    final List<Point> list2 = [];
+
+    /*list.add(Point(55.182372,30.203347));
+    list.add(Point(55.173746,30.200257));
+    list.add(Point(55.172153,30.212531));
+    list.add(Point(55.179946,30.215964));
+
+    list2.add(Point(55.178304,30.227380));
+    list2.add(Point(55.178059,30.229654));
+    list2.add(Point(55.191339,30.234718));
+    list2.add(Point(55.194352,30.234890));
+    list2.add(Point(55.194377,30.231972));
+    list2.add(Point(55.192123,30.232744));
+
+    final zone = Zone(id: 123,
+        title: "Zone 01",
+        description: "description",
+        type: "Finish",
+        isActive: true,
+        shapeType: "polygon",
+        points: list,
+        speedLimit: "speedLimit");
+
+    final zone2 = Zone(id: 124,
+        title: "Zone 02",
+        description: "description",
+        type: "NotDrive",
+        isActive: true,
+        shapeType: "polygon",
+        points: list2,
+        speedLimit: "speedLimit");
+*/
+
+    final responce = await _apiService.getZones(
+      area: area,
+      page: page,
+      pageSize: pageSize,
+    );
+
+    final List<Zone>? zones = responce?.zones;
+    // zones?.add(zone);
+    // zones?.add(zone2);
+
+    print("Scooters: ${zones?.first.title}");
+
+    if (responce != null) {
+      return zones ?? List.empty();
+    }
+
+    return List.empty();
+  }
+}
diff --git a/lib/data/service/app_setting_service.dart b/lib/data/service/app_setting_service.dart
index 023729b..372b6df 100644
--- a/lib/data/service/app_setting_service.dart
+++ b/lib/data/service/app_setting_service.dart
@@ -1,15 +1,15 @@
-import 'package:shared_preferences/shared_preferences.dart';
-
-class AppSettingsService {
-  final SharedPreferences sharedPreferences;
-
-  AppSettingsService(this.sharedPreferences);
-
-  Future<void> saveMapSettingsFlag(String key, bool value) async {
-    sharedPreferences.setBool(key, value);
-  }
-
-  bool getMapSettingsFlag(String key) {
-    return sharedPreferences.getBool(key) ?? false;
-  }
-}
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AppSettingsService {
+  final SharedPreferences sharedPreferences;
+
+  AppSettingsService(this.sharedPreferences);
+
+  Future<void> saveMapSettingsFlag(String key, bool value) async {
+    sharedPreferences.setBool(key, value);
+  }
+
+  bool getMapSettingsFlag(String key) {
+    return sharedPreferences.getBool(key) ?? false;
+  }
+}
diff --git a/lib/data/service/device_info_service_impl.dart b/lib/data/service/device_info_service_impl.dart
index 643dff8..712ef17 100644
--- a/lib/data/service/device_info_service_impl.dart
+++ b/lib/data/service/device_info_service_impl.dart
@@ -1,43 +1,43 @@
-import 'dart:io';
-
-import 'package:android_id/android_id.dart';
-import 'package:device_info_plus/device_info_plus.dart';
-
-import '../../domain/service/device_info_service.dart';
-
-class DeviceInfoServiceImpl extends DeviceInfoService {
-  final DeviceInfoPlugin _deviceInfo = DeviceInfoPlugin();
-  final AndroidId _androidId = const AndroidId();
-
-  @override
-  Future<String> getDeviceModel() async {
-    try {
-      if (Platform.isAndroid) {
-        final androidInfo = await _deviceInfo.androidInfo;
-        return '${androidInfo.manufacturer} ${androidInfo.model}';
-      } else if (Platform.isIOS) {
-        final iosInfo = await _deviceInfo.iosInfo;
-        return iosInfo.utsname.machine;
-      }
-    } catch (e) {
-      print("ERROR: $e");
-    }
-    return 'Unknown';
-  }
-
-  @override
-  Future<String?> getSystemId() async {
-    try {
-      if (Platform.isAndroid) {
-        return await _androidId.getId();
-      } else if (Platform.isIOS) {
-        final iosInfo = await _deviceInfo.iosInfo;
-        return iosInfo.identifierForVendor;
-      }
-    } catch (e) {
-      print("ERROR: $e");
-      return null;
-    }
-    return null;
-  }
-}
+import 'dart:io';
+
+import 'package:android_id/android_id.dart';
+import 'package:device_info_plus/device_info_plus.dart';
+
+import '../../domain/service/device_info_service.dart';
+
+class DeviceInfoServiceImpl extends DeviceInfoService {
+  final DeviceInfoPlugin _deviceInfo = DeviceInfoPlugin();
+  final AndroidId _androidId = const AndroidId();
+
+  @override
+  Future<String> getDeviceModel() async {
+    try {
+      if (Platform.isAndroid) {
+        final androidInfo = await _deviceInfo.androidInfo;
+        return '${androidInfo.manufacturer} ${androidInfo.model}';
+      } else if (Platform.isIOS) {
+        final iosInfo = await _deviceInfo.iosInfo;
+        return iosInfo.utsname.machine;
+      }
+    } catch (e) {
+      print("ERROR: $e");
+    }
+    return 'Unknown';
+  }
+
+  @override
+  Future<String?> getSystemId() async {
+    try {
+      if (Platform.isAndroid) {
+        return await _androidId.getId();
+      } else if (Platform.isIOS) {
+        final iosInfo = await _deviceInfo.iosInfo;
+        return iosInfo.identifierForVendor;
+      }
+    } catch (e) {
+      print("ERROR: $e");
+      return null;
+    }
+    return null;
+  }
+}
diff --git a/lib/data/service/news_api_service.dart b/lib/data/service/news_api_service.dart
index 8e5d887..2b697f7 100644
--- a/lib/data/service/news_api_service.dart
+++ b/lib/data/service/news_api_service.dart
@@ -1,36 +1,36 @@
-import 'dart:developer' as dev;
-import '../network/api_service.dart';
-
-class NewsApiService {
-  final ApiService _apiService;
-
-  NewsApiService(this._apiService);
-
-  Future<Map<String, dynamic>> getNews() async {
-    try {
-      dev.log('NewsApiService: Запрос GET /news');
-
-      final response = await _apiService.getNews();
-
-      dev.log('NewsApiService: Успешно получено ${response['data']?.length ?? 0} новостей');
-      return response;
-    } catch (e, stackTrace) {
-      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новости: $e');
-    }
-  }
-
-  Future<Map<String, dynamic>> getNewsById(int newsId) async {
-    try {
-      dev.log('NewsApiService: Запрос GET /news/$newsId');
-
-      final response = await _apiService.getNewsById(newsId);
-
-      dev.log('NewsApiService: Успешно получена новость с ID: $newsId');
-      return response!;
-    } catch (e, stackTrace) {
-      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
-      throw Exception('Не удалось загрузить новость: $e');
-    }
-  }
+import 'dart:developer' as dev;
+import '../network/api_service.dart';
+
+class NewsApiService {
+  final ApiService _apiService;
+
+  NewsApiService(this._apiService);
+
+  Future<Map<String, dynamic>> getNews() async {
+    try {
+      dev.log('NewsApiService: Запрос GET /news');
+
+      final response = await _apiService.getNews();
+
+      dev.log('NewsApiService: Успешно получено ${response['data']?.length ?? 0} новостей');
+      return response;
+    } catch (e, stackTrace) {
+      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новости: $e');
+    }
+  }
+
+  Future<Map<String, dynamic>> getNewsById(int newsId) async {
+    try {
+      dev.log('NewsApiService: Запрос GET /news/$newsId');
+
+      final response = await _apiService.getNewsById(newsId);
+
+      dev.log('NewsApiService: Успешно получена новость с ID: $newsId');
+      return response!;
+    } catch (e, stackTrace) {
+      dev.log('NewsApiService: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить новость: $e');
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/data/service/security_service_impl.dart b/lib/data/service/security_service_impl.dart
index 462f797..ccd5ea3 100644
--- a/lib/data/service/security_service_impl.dart
+++ b/lib/data/service/security_service_impl.dart
@@ -1,80 +1,80 @@
-import 'package:be_happy/domain/entities/user_auth_data.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-import '../../domain/service/security_service.dart';
-
-class SecurityServiceImpl extends SecurityService {
-  static const String kAccessToken = "access_token";
-  static const String kRefreshToken = "refresh_token";
-  static const String kCardNumberPrefix = "card_number_";
-
-  final FlutterSecureStorage _secureStorage;
-
-  SecurityServiceImpl(this._secureStorage);
-
-  @override
-  Future<void> saveTokens(UserAuthData data) async {
-    await _secureStorage.write(key: kAccessToken, value: data.accessToken);
-    await _secureStorage.write(key: kRefreshToken, value: data.refreshToken);
-  }
-
-  @override
-  Future<void> removeTokens() async {
-    await _secureStorage.delete(key: kRefreshToken);
-    await _secureStorage.delete(key: kAccessToken);
-  }
-
-  @override
-  Future<String?> getAccessToken() async {
-    return await _secureStorage.read(key: kAccessToken);
-  }
-
-  @override
-  Future<String?> getRefreshToken() async {
-    return await _secureStorage.read(key: kRefreshToken);
-  }
-
-  @override
-  Future<void> saveCardFullNumber(int cardId, String fullCardNumber) async {
-    await _secureStorage.write(
-      key: '${kCardNumberPrefix}_$cardId',
-      value: fullCardNumber,
-    );
-  }
-
-  @override
-  Future<String?> getCardFullNumber(int cardId) async {
-    return await _secureStorage.read(key: '${kCardNumberPrefix}_$cardId');
-  }
-
-  @override
-  Future<void> removeCardFullNumber(int cardId) async {
-    await _secureStorage.delete(key: '${kCardNumberPrefix}_$cardId');
-  }
-
-  @override
-  Future<void> clearAllCardsNumbers() async {
-    // Получаем все ключи и удаляем те, что начинаются с префикса карты
-    final allKeys = await _secureStorage.readAll();
-    for (final key in allKeys.keys) {
-      if (key.startsWith(kCardNumberPrefix)) {
-        await _secureStorage.delete(key: key);
-      }
-    }
-  }
-
-  // @override
-  // Future<UserAuthData?> getTokens() async {
-  //   final accessToken = await _secureStorage.read(key: kAccessToken);
-  //   final refreshToken = await _secureStorage.read(key: kRefreshToken);
-  //
-  //   if(accessToken != null && refreshToken != null) {
-  //       return UserAuthData(
-  //       accessToken: accessToken,
-  //       refreshToken: refreshToken,
-  //     );
-  //   }
-  //
-  //   return null;
-  // }
-}
+import 'package:be_happy/domain/entities/user_auth_data.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+import '../../domain/service/security_service.dart';
+
+class SecurityServiceImpl extends SecurityService {
+  static const String kAccessToken = "access_token";
+  static const String kRefreshToken = "refresh_token";
+  static const String kCardNumberPrefix = "card_number_";
+
+  final FlutterSecureStorage _secureStorage;
+
+  SecurityServiceImpl(this._secureStorage);
+
+  @override
+  Future<void> saveTokens(UserAuthData data) async {
+    await _secureStorage.write(key: kAccessToken, value: data.accessToken);
+    await _secureStorage.write(key: kRefreshToken, value: data.refreshToken);
+  }
+
+  @override
+  Future<void> removeTokens() async {
+    await _secureStorage.delete(key: kRefreshToken);
+    await _secureStorage.delete(key: kAccessToken);
+  }
+
+  @override
+  Future<String?> getAccessToken() async {
+    return await _secureStorage.read(key: kAccessToken);
+  }
+
+  @override
+  Future<String?> getRefreshToken() async {
+    return await _secureStorage.read(key: kRefreshToken);
+  }
+
+  @override
+  Future<void> saveCardFullNumber(int cardId, String fullCardNumber) async {
+    await _secureStorage.write(
+      key: '${kCardNumberPrefix}_$cardId',
+      value: fullCardNumber,
+    );
+  }
+
+  @override
+  Future<String?> getCardFullNumber(int cardId) async {
+    return await _secureStorage.read(key: '${kCardNumberPrefix}_$cardId');
+  }
+
+  @override
+  Future<void> removeCardFullNumber(int cardId) async {
+    await _secureStorage.delete(key: '${kCardNumberPrefix}_$cardId');
+  }
+
+  @override
+  Future<void> clearAllCardsNumbers() async {
+    // Получаем все ключи и удаляем те, что начинаются с префикса карты
+    final allKeys = await _secureStorage.readAll();
+    for (final key in allKeys.keys) {
+      if (key.startsWith(kCardNumberPrefix)) {
+        await _secureStorage.delete(key: key);
+      }
+    }
+  }
+
+  // @override
+  // Future<UserAuthData?> getTokens() async {
+  //   final accessToken = await _secureStorage.read(key: kAccessToken);
+  //   final refreshToken = await _secureStorage.read(key: kRefreshToken);
+  //
+  //   if(accessToken != null && refreshToken != null) {
+  //       return UserAuthData(
+  //       accessToken: accessToken,
+  //       refreshToken: refreshToken,
+  //     );
+  //   }
+  //
+  //   return null;
+  // }
+}
diff --git a/lib/di/service_locator.dart b/lib/di/service_locator.dart
index 162a7e7..85b15d4 100644
--- a/lib/di/service_locator.dart
+++ b/lib/di/service_locator.dart
@@ -1,406 +1,416 @@
-import 'package:be_happy/data/repositories/app_settings_repository_impl.dart';
-import 'package:be_happy/data/repositories/certificate_repository_impl.dart';
-import 'package:be_happy/data/repositories/notification_repository_impl.dart';
-import 'package:be_happy/data/repositories/payment_repository_impl.dart'; // ← новый
-import 'package:be_happy/data/repositories/scooter_repository_impl.dart';
-import 'package:be_happy/data/repositories/zone_repository_impl.dart';
-import 'package:be_happy/data/service/app_setting_service.dart';
-import 'package:be_happy/data/service/device_info_service_impl.dart';
-import 'package:be_happy/data/service/security_service_impl.dart';
-import 'package:be_happy/domain/repositories/app_settings_repository.dart';
-import 'package:be_happy/domain/repositories/certificate_repository.dart';
-import 'package:be_happy/domain/repositories/notification_repository.dart';
-import 'package:be_happy/domain/repositories/payment_repository.dart'; // ← новый
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-import 'package:be_happy/domain/repositories/profile_repository.dart';
-import 'package:be_happy/domain/repositories/scooter_repository.dart';
-import 'package:be_happy/domain/repositories/zone_repository.dart';
-import 'package:be_happy/domain/service/security_service.dart';
-import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart'; // ← новый
-import 'package:be_happy/domain/usecase/get_certificates_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
-import 'package:be_happy/domain/usecase/is_pin_set_usecase.dart';
-import 'package:be_happy/domain/usecase/purchase_certificate_usecase.dart';
-import 'package:be_happy/domain/usecase/book_scooter_usecase.dart';
-import 'package:be_happy/domain/usecase/cancel_notification_usecase.dart';
-import 'package:be_happy/domain/usecase/create_pin_usecase.dart';
-import 'package:be_happy/domain/usecase/get_address_by_point_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_scooters_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_subscriptions_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_tariffs_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_zones_usecase.dart';
-import 'package:be_happy/domain/usecase/get_client_orders_usecase.dart';
-import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
-import 'package:be_happy/domain/usecase/get_notifications_stream_usecase.dart';
-import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
-import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
-import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
-import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
-import 'package:be_happy/domain/usecase/login_usecase.dart';
-import 'package:be_happy/domain/usecase/logout_usecase.dart';
-import 'package:be_happy/domain/usecase/pay_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/refresh_token_usecase.dart';
-import 'package:be_happy/domain/usecase/save_map_settings_usecase.dart';
-import 'package:be_happy/domain/usecase/update_profile_usecase.dart';
-import 'package:be_happy/domain/usecase/upload_profile_photo_usecase.dart';
-import 'package:be_happy/domain/usecase/verify_code_usecase.dart';
-import 'package:be_happy/domain/usecase/upload_scooter_photos_usecase.dart';
-import 'package:be_happy/domain/usecase/update_scooter_order_data_usecase.dart';
-import 'package:be_happy/domain/usecase/pay_scooter_order_with_photos_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_order_by_id_usecase.dart';
-import 'package:be_happy/domain/usecase/finish_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/pause_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/resume_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/verify_pin_usecase.dart';
-import 'package:be_happy/presentation/viewmodel/active_ride_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/add_card_bloc.dart'; // ← новый
-import 'package:be_happy/presentation/viewmodel/current_rides_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/map_settings_modal_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/payment_confirm_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/payment_method_sheet_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/pin_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/profile_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/scooter_detail_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/scooter_code_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/send_photo_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/tariff_sheet_bloc.dart';
-import 'package:be_happy/domain/usecase/cancel_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/start_ride_usecase.dart';
-import 'package:be_happy/domain/usecase/check_user_usecase.dart';
-import 'package:be_happy/presentation/viewmodel/reserved_ride_bloc.dart';
-import 'package:dio/dio.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:get_it/get_it.dart';
-import 'package:http/http.dart' as http;
-import 'package:shared_preferences/shared_preferences.dart';
-
-import '../data/interceptor/auth_interceptor.dart';
-import '../data/network/api_service.dart';
-import '../data/network/geocoding_remote_datasource.dart';
-import '../data/repositories/auth_repository_impl.dart';
-import '../data/repositories/news_repository_impl.dart';
-import '../data/repositories/pin_repository_impl.dart';
-import '../data/repositories/profile_repository_impl.dart';
-import '../data/repositories/promo_code_repository_impl.dart';
-import '../data/service/news_api_service.dart';
-import '../domain/repositories/auth_repository.dart';
-import '../domain/repositories/news_repository.dart';
-import '../domain/repositories/promo_code_repository.dart';
-import '../domain/service/device_info_service.dart';
-import '../domain/usecase/activate_subscription_usecase.dart';
-import '../domain/usecase/apply_promo_code_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';
-import '../domain/usecase/set_main_payment_card_usecase.dart';
-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/promo_code_bloc.dart';
-import '../presentation/viewmodel/scooter_detail_modal_bloc.dart';
-import '../presentation/viewmodel/subscription_list_bloc.dart';
-import '../presentation/viewmodel/verify_code_bloc.dart';
-
-final getIt = GetIt.instance;
-
-Future<void> setupDependencies() async {
-  final sharedPreferences = await SharedPreferences.getInstance();
-  final dio = Dio();
-  dio.interceptors.add(LogInterceptor(/*requestHeader: false, responseHeader:false, */responseBody: true, requestBody: true));
-  dio.interceptors.add(AuthInterceptor());
-  // HTTP
-  getIt.registerSingleton<http.Client>(http.Client());
-  //SecureStorage
-  getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
-
-  //SharedPrefs
-  getIt.registerSingleton<SharedPreferences>(sharedPreferences);
-
-  // Service
-  getIt.registerSingleton<SecurityService>(SecurityServiceImpl(getIt()));
-
-  getIt.registerLazySingleton(() => ApiService(getIt<SecurityService>(), dio));
-
-  getIt.registerSingleton<GeocodingRemoteDataSource>(
-    GeocodingRemoteDataSource(),
-  );
-
-  getIt.registerSingleton<DeviceInfoService>(DeviceInfoServiceImpl());
-
-  getIt.registerSingleton<AppSettingsService>(AppSettingsService(getIt()));
-
-  getIt.registerLazySingleton<NewsApiService>(
-        () => NewsApiService(getIt<ApiService>()),
-  );
-
-  // Repository
-  getIt.registerSingleton<AuthRepository>(
-    AuthRepositoryImpl(getIt(), getIt(), getIt()),
-  );
-
-  getIt.registerSingleton<PinRepository>(PinRepositoryImpl(getIt()));
-
-  getIt.registerSingleton<UserProfileRepository>(
-    UserProfileRepositoryImpl(getIt()),
-  );
-
-  getIt.registerSingleton<ScooterRepository>(ScooterRepositoryImpl(getIt()));
-
-  getIt.registerSingleton<ZoneRepository>(ZoneRepositoryImpl(getIt()));
-
-  getIt.registerSingleton<AppSettingsRepository>(
-    AppSettingsRepositoryImpl(getIt()),
-  );
-
-  getIt.registerSingleton<PaymentRepository>(
-    PaymentRepositoryImpl(getIt(), getIt()),
-  );
-
-  getIt.registerSingleton<CertificateRepository>(
-    CertificateRepositoryImpl(getIt(), getIt()),
-  );
-
-  getIt.registerLazySingleton<NewsRepository>(
-        () => NewsRepositoryImpl(getIt<NewsApiService>()),
-  );
-
-  getIt.registerSingleton<NotificationRepository>(
-    NotificationRepositoryImpl(getIt()),
-  );
-
-  // Use Cases
-  getIt.registerSingleton<LoginUseCase>(LoginUseCase(getIt()));
-
-  getIt.registerSingleton<LogoutUseCase>(LogoutUseCase(getIt(), getIt()));
-
-  getIt.registerSingleton<VerifyCodeUseCase>(VerifyCodeUseCase(getIt()));
-
-  getIt.registerSingleton<RefreshTokenUseCase>(RefreshTokenUseCase(getIt()));
-
-  getIt.registerSingleton<CreatePinUseCase>(CreatePinUseCase(getIt()));
-
-  getIt.registerSingleton<VerifyPinUseCase>(VerifyPinUseCase(getIt()));
-
-  getIt.registerSingleton<IsPinSetUsecase>(IsPinSetUsecase(getIt()));
-
-  getIt.registerSingleton<GetProfileUseCase>(GetProfileUseCase(getIt()));
-
-  getIt.registerSingleton<UpdateProfileUseCase>(UpdateProfileUseCase(getIt()));
-
-  getIt.registerSingleton<UploadProfilePhotoUsecase>(
-    UploadProfilePhotoUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<GetAvailableScootersUsecase>(
-    GetAvailableScootersUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<GetNewsByIdUsecase>(
-    GetNewsByIdUsecase(getIt<NewsRepository>()),
-  );
-
-  getIt.registerSingleton<GetScooterUsecase>(GetScooterUsecase(getIt()));
-  getIt.registerSingleton<GetAvailableTariffsUsecase>(
-    GetAvailableTariffsUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetAddressByPointUsecase>(
-    GetAddressByPointUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetPedestrianRoutesUsecase>(
-    GetPedestrianRoutesUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetScooterOrderRouteHistoryUsecase>(
-    GetScooterOrderRouteHistoryUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetAvailableZonesUsecase>(
-    GetAvailableZonesUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetMapSettingsUsecase>(
-    GetMapSettingsUsecase(getIt()),
-  );
-  getIt.registerSingleton<SaveMapSettingsUsecase>(
-    SaveMapSettingsUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<AddPaymentCardUsecase>(
-    AddPaymentCardUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetPaymentCardsUsecase>(
-    GetPaymentCardsUsecase(getIt(), getIt()),
-  );
-  getIt.registerSingleton<SetMainPaymentCardUsecase>(
-    SetMainPaymentCardUsecase(getIt()),
-  );
-  getIt.registerSingleton<RemovePaymentCardUsecase>(
-    RemovePaymentCardUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<GetCertificatesUsecase>(
-    GetCertificatesUsecase(getIt()),
-  );
-  getIt.registerSingleton<PurchaseCertificateUsecase>(
-    PurchaseCertificateUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<GetClientOrdersUsecase>(
-    GetClientOrdersUsecase(getIt()),
-  );
-  getIt.registerSingleton<BookScooterUsecase>(BookScooterUsecase(getIt()));
-
-  getIt.registerSingleton<StartRideUsecase>(StartRideUsecase(getIt()));
-  getIt.registerSingleton<CancelRideUsecase>(CancelRideUsecase(getIt()));
-
-  getIt.registerSingleton<UploadScooterPhotosUsecase>(
-    UploadScooterPhotosUsecase(getIt()),
-  );
-  getIt.registerSingleton<UpdateScooterOrderDataUsecase>(
-    UpdateScooterOrderDataUsecase(getIt()),
-  );
-  getIt.registerSingleton<PayScooterOrderWithPhotosUsecase>(
-    PayScooterOrderWithPhotosUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetScooterOrderByIdUsecase>(
-    GetScooterOrderByIdUsecase(getIt()),
-  );
-
-  getIt.registerSingleton<FinishRideUsecase>(FinishRideUsecase(getIt()));
-  getIt.registerSingleton<PauseRideUsecase>(PauseRideUsecase(getIt()));
-  getIt.registerSingleton<ResumeRideUsecase>(ResumeRideUsecase(getIt()));
-  getIt.registerSingleton<PayRideUsecase>(PayRideUsecase(getIt()));
-  getIt.registerSingleton<GetAvailableSubscriptionsUsecase>(
-    GetAvailableSubscriptionsUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetSubscriptionByIdUsecase>(
-    GetSubscriptionByIdUsecase(getIt()),
-  );
-  getIt.registerSingleton<ActivateSubscriptionUsecase>(
-    ActivateSubscriptionUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetClientSubscriptionsUsecase>(
-    GetClientSubscriptionsUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetScooterByTitleUsecase>(
-    GetScooterByTitleUsecase(getIt()),
-  );
-  getIt.registerSingleton<GetNotificationsUsecase>(
-    GetNotificationsUsecase(getIt<NotificationRepository>()),
-  );
-  getIt.registerFactory<NotificationsBloc>(
-        () => NotificationsBloc(getIt<GetNotificationsUsecase>()),
-  );
-
-
-  // Blocs
-  getIt.registerLazySingleton<SplashBloc>(() => SplashBloc(getIt()));
-
-  getIt.registerFactory<PhoneAuthBloc>(() => PhoneAuthBloc(getIt()));
-
-  getIt.registerFactory<VerifyCodeBloc>(() => VerifyCodeBloc(getIt(), getIt(), getIt()));
-
-  getIt.registerLazySingleton<ProfileBloc>(() => ProfileBloc(getIt(), getIt(), getIt()));
-
-  getIt.registerFactory<EditProfileBloc>(
-        () => EditProfileBloc(getIt(), getIt()),
-  );
-
-  getIt.registerFactory<MapBloc>(
-        () => MapBloc(
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-      getIt(),
-    ),
-  );
-
-  getIt.registerFactory<ScooterDetailBloc>(() => ScooterDetailBloc(getIt()));
-
-  getIt.registerFactory<MapSettingsModalBloc>(
-        () => MapSettingsModalBloc(getIt(), getIt()),
-  );
-
-  getIt.registerFactory<AddCardBloc>(() => AddCardBloc(getIt()));
-
-
-  getIt.registerFactory<PaymentMethodSheetBloc>(
-        () => PaymentMethodSheetBloc(getIt(), getIt(), getIt(), getIt()),
-  );
-
-  getIt.registerFactory<CurrentRidesBloc>(() => CurrentRidesBloc(getIt()));
-
-  getIt.registerFactory<ActiveRideBloc>(
-        () => ActiveRideBloc(getIt(), getIt(), getIt(), getIt(), getIt()),
-  );
-
-  getIt.registerFactory<ReservedRideBloc>(
-        () => ReservedRideBloc(getIt(), getIt()),
-  );
-
-  getIt.registerFactory<NewsBloc>(() => NewsBloc(getIt<NewsRepository>()));
-
-
-  getIt.registerFactory<SendPhotoBloc>(() => SendPhotoBloc(getIt(), getIt()));
-
-  getIt.registerFactory<SubscriptionListBloc>(
-        () => SubscriptionListBloc(
-      getAvailableSubscriptionsUsecase: getIt(),
-      getClientSubscriptionsUsecase: getIt(),
-    ),
-  );
-
-  // UseCase
-  getIt.registerSingleton<GetScooterOrderHistoryUsecase>(
-    GetScooterOrderHistoryUsecase(getIt<ScooterRepository>()),
-  );
-
-  getIt.registerSingleton<CheckUserUseCase>(
-    CheckUserUseCase(getIt<UserProfileRepository>()),
-  );
-
-  getIt.registerSingleton<GetNotificationsStreamUseCase>(
-    GetNotificationsStreamUseCase(getIt<NotificationRepository>()),
-  );
-
-  getIt.registerSingleton<CancelNotificationUseCase>(
-    CancelNotificationUseCase(getIt<NotificationRepository>()),
-  );
-
-  // Bloc
-  getIt.registerFactory<OrderHistoryBloc>(
-        () => OrderHistoryBloc(getIt<GetScooterOrderHistoryUsecase>()),
-  );
-
-  getIt.registerFactory<ScooterCodeBloc>(
-        () => ScooterCodeBloc(getScooterByTitleUsecase: getIt<GetScooterByTitleUsecase>()),
-  );
-
-
-  // Repository
-  getIt.registerSingleton<PromoCodeRepository>(
-    PromoCodeRepositoryImpl(getIt<ApiService>()),
-  );
-
-// UseCase
-  getIt.registerSingleton<ApplyPromoCodeUsecase>(
-    ApplyPromoCodeUsecase(getIt<PromoCodeRepository>()),
-  );
-
-// Bloc (factory, т.к. экран создаёт новый экземпляр)
-  getIt.registerFactory<PromoCodeBloc>(
-        () => PromoCodeBloc(getIt<ApplyPromoCodeUsecase>()),
-  );
-}
+import 'package:be_happy/data/repositories/app_settings_repository_impl.dart';
+import 'package:be_happy/data/repositories/certificate_repository_impl.dart';
+import 'package:be_happy/data/repositories/notification_repository_impl.dart';
+import 'package:be_happy/data/repositories/payment_repository_impl.dart'; // ← новый
+import 'package:be_happy/data/repositories/scooter_repository_impl.dart';
+import 'package:be_happy/data/repositories/zone_repository_impl.dart';
+import 'package:be_happy/data/service/app_setting_service.dart';
+import 'package:be_happy/data/service/device_info_service_impl.dart';
+import 'package:be_happy/data/service/security_service_impl.dart';
+import 'package:be_happy/domain/repositories/app_settings_repository.dart';
+import 'package:be_happy/domain/repositories/certificate_repository.dart';
+import 'package:be_happy/domain/repositories/notification_repository.dart';
+import 'package:be_happy/domain/repositories/payment_repository.dart'; // ← новый
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+import 'package:be_happy/domain/repositories/profile_repository.dart';
+import 'package:be_happy/domain/repositories/scooter_repository.dart';
+import 'package:be_happy/domain/repositories/zone_repository.dart';
+import 'package:be_happy/domain/service/security_service.dart';
+import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart'; // ← новый
+import 'package:be_happy/domain/usecase/get_certificates_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
+import 'package:be_happy/domain/usecase/is_pin_set_usecase.dart';
+import 'package:be_happy/domain/usecase/purchase_certificate_usecase.dart';
+import 'package:be_happy/domain/usecase/book_scooter_usecase.dart';
+import 'package:be_happy/domain/usecase/cancel_notification_usecase.dart';
+import 'package:be_happy/domain/usecase/create_pin_usecase.dart';
+import 'package:be_happy/domain/usecase/get_address_by_point_usecase.dart';
+import 'package:be_happy/domain/usecase/get_available_scooters_usecase.dart';
+import 'package:be_happy/domain/usecase/get_available_subscriptions_usecase.dart';
+import 'package:be_happy/domain/usecase/get_available_tariffs_usecase.dart';
+import 'package:be_happy/domain/usecase/get_available_zones_usecase.dart';
+import 'package:be_happy/domain/usecase/get_client_orders_usecase.dart';
+import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
+import 'package:be_happy/domain/usecase/get_notifications_stream_usecase.dart';
+import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
+import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
+import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
+import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
+import 'package:be_happy/domain/usecase/login_usecase.dart';
+import 'package:be_happy/domain/usecase/logout_usecase.dart';
+import 'package:be_happy/domain/usecase/pay_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/refresh_token_usecase.dart';
+import 'package:be_happy/domain/usecase/save_map_settings_usecase.dart';
+import 'package:be_happy/domain/usecase/update_profile_usecase.dart';
+import 'package:be_happy/domain/usecase/upload_profile_photo_usecase.dart';
+import 'package:be_happy/domain/usecase/verify_code_usecase.dart';
+import 'package:be_happy/domain/usecase/upload_scooter_photos_usecase.dart';
+import 'package:be_happy/domain/usecase/update_scooter_order_data_usecase.dart';
+import 'package:be_happy/domain/usecase/pay_scooter_order_with_photos_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_order_by_id_usecase.dart';
+import 'package:be_happy/domain/usecase/finish_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/pause_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/resume_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/verify_pin_usecase.dart';
+import 'package:be_happy/presentation/viewmodel/active_ride_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/add_card_bloc.dart'; // ← новый
+import 'package:be_happy/presentation/viewmodel/current_rides_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/map_settings_modal_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/payment_confirm_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/payment_method_sheet_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/pin_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/profile_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/scooter_detail_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/scooter_code_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/send_photo_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/tariff_sheet_bloc.dart';
+import 'package:be_happy/domain/usecase/cancel_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/start_ride_usecase.dart';
+import 'package:be_happy/domain/usecase/check_user_usecase.dart';
+import 'package:be_happy/presentation/viewmodel/reserved_ride_bloc.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:get_it/get_it.dart';
+import 'package:http/http.dart' as http;
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../data/interceptor/auth_interceptor.dart';
+import '../data/network/api_service.dart';
+import '../data/network/geocoding_remote_datasource.dart';
+import '../data/repositories/auth_repository_impl.dart';
+import '../data/repositories/news_repository_impl.dart';
+import '../data/repositories/pin_repository_impl.dart';
+import '../data/repositories/profile_repository_impl.dart';
+import '../data/repositories/promo_code_repository_impl.dart';
+import '../data/service/news_api_service.dart';
+import '../domain/repositories/auth_repository.dart';
+import '../domain/repositories/news_repository.dart';
+import '../domain/repositories/promo_code_repository.dart';
+import '../domain/service/device_info_service.dart';
+import '../domain/usecase/activate_subscription_usecase.dart';
+import '../domain/usecase/apply_promo_code_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';
+import '../domain/usecase/set_main_payment_card_usecase.dart';
+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/promo_code_bloc.dart';
+import '../presentation/viewmodel/scooter_detail_modal_bloc.dart';
+import '../presentation/viewmodel/subscription_list_bloc.dart';
+import '../presentation/viewmodel/verify_code_bloc.dart';
+
+final getIt = GetIt.instance;
+
+Future<void> setupDependencies() async {
+  final sharedPreferences = await SharedPreferences.getInstance();
+  final dio = Dio();
+  dio.interceptors.add(
+    LogInterceptor(
+      /*requestHeader: false, responseHeader:false, */
+      responseBody: true,
+      requestBody: true,
+    ),
+  );
+  dio.interceptors.add(AuthInterceptor());
+  // HTTP
+  getIt.registerSingleton<http.Client>(http.Client());
+  //SecureStorage
+  getIt.registerSingleton<FlutterSecureStorage>(FlutterSecureStorage());
+
+  //SharedPrefs
+  getIt.registerSingleton<SharedPreferences>(sharedPreferences);
+
+  // Service
+  getIt.registerSingleton<SecurityService>(SecurityServiceImpl(getIt()));
+
+  getIt.registerLazySingleton(() => ApiService(getIt<SecurityService>(), dio));
+
+  getIt.registerSingleton<GeocodingRemoteDataSource>(
+    GeocodingRemoteDataSource(),
+  );
+
+  getIt.registerSingleton<DeviceInfoService>(DeviceInfoServiceImpl());
+
+  getIt.registerSingleton<AppSettingsService>(AppSettingsService(getIt()));
+
+  getIt.registerLazySingleton<NewsApiService>(
+    () => NewsApiService(getIt<ApiService>()),
+  );
+
+  // Repository
+  getIt.registerSingleton<AuthRepository>(
+    AuthRepositoryImpl(getIt(), getIt(), getIt()),
+  );
+
+  getIt.registerSingleton<PinRepository>(PinRepositoryImpl(getIt()));
+
+  getIt.registerSingleton<UserProfileRepository>(
+    UserProfileRepositoryImpl(getIt()),
+  );
+
+  getIt.registerSingleton<ScooterRepository>(ScooterRepositoryImpl(getIt()));
+
+  getIt.registerSingleton<ZoneRepository>(ZoneRepositoryImpl(getIt()));
+
+  getIt.registerSingleton<AppSettingsRepository>(
+    AppSettingsRepositoryImpl(getIt()),
+  );
+
+  getIt.registerSingleton<PaymentRepository>(
+    PaymentRepositoryImpl(getIt(), getIt()),
+  );
+
+  getIt.registerSingleton<CertificateRepository>(
+    CertificateRepositoryImpl(getIt(), getIt()),
+  );
+
+  getIt.registerLazySingleton<NewsRepository>(
+    () => NewsRepositoryImpl(getIt<NewsApiService>()),
+  );
+
+  getIt.registerSingleton<NotificationRepository>(
+    NotificationRepositoryImpl(getIt()),
+  );
+
+  // Use Cases
+  getIt.registerSingleton<LoginUseCase>(LoginUseCase(getIt()));
+
+  getIt.registerSingleton<LogoutUseCase>(LogoutUseCase(getIt(), getIt()));
+
+  getIt.registerSingleton<VerifyCodeUseCase>(VerifyCodeUseCase(getIt()));
+
+  getIt.registerSingleton<RefreshTokenUseCase>(RefreshTokenUseCase(getIt()));
+
+  getIt.registerSingleton<CreatePinUseCase>(CreatePinUseCase(getIt()));
+
+  getIt.registerSingleton<VerifyPinUseCase>(VerifyPinUseCase(getIt()));
+
+  getIt.registerSingleton<IsPinSetUsecase>(IsPinSetUsecase(getIt()));
+
+  getIt.registerSingleton<GetProfileUseCase>(GetProfileUseCase(getIt()));
+
+  getIt.registerSingleton<UpdateProfileUseCase>(UpdateProfileUseCase(getIt()));
+
+  getIt.registerSingleton<UploadProfilePhotoUsecase>(
+    UploadProfilePhotoUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<GetAvailableScootersUsecase>(
+    GetAvailableScootersUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<GetNewsByIdUsecase>(
+    GetNewsByIdUsecase(getIt<NewsRepository>()),
+  );
+
+  getIt.registerSingleton<GetScooterUsecase>(GetScooterUsecase(getIt()));
+  getIt.registerSingleton<GetAvailableTariffsUsecase>(
+    GetAvailableTariffsUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetAddressByPointUsecase>(
+    GetAddressByPointUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetPedestrianRoutesUsecase>(
+    GetPedestrianRoutesUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetScooterOrderRouteHistoryUsecase>(
+    GetScooterOrderRouteHistoryUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetAvailableZonesUsecase>(
+    GetAvailableZonesUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetMapSettingsUsecase>(
+    GetMapSettingsUsecase(getIt()),
+  );
+  getIt.registerSingleton<SaveMapSettingsUsecase>(
+    SaveMapSettingsUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<AddPaymentCardUsecase>(
+    AddPaymentCardUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetPaymentCardsUsecase>(
+    GetPaymentCardsUsecase(getIt(), getIt()),
+  );
+  getIt.registerSingleton<SetMainPaymentCardUsecase>(
+    SetMainPaymentCardUsecase(getIt()),
+  );
+  getIt.registerSingleton<RemovePaymentCardUsecase>(
+    RemovePaymentCardUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<GetCertificatesUsecase>(
+    GetCertificatesUsecase(getIt()),
+  );
+  getIt.registerSingleton<PurchaseCertificateUsecase>(
+    PurchaseCertificateUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<GetClientOrdersUsecase>(
+    GetClientOrdersUsecase(getIt()),
+  );
+  getIt.registerSingleton<BookScooterUsecase>(BookScooterUsecase(getIt()));
+
+  getIt.registerSingleton<StartRideUsecase>(StartRideUsecase(getIt()));
+  getIt.registerSingleton<CancelRideUsecase>(CancelRideUsecase(getIt()));
+
+  getIt.registerSingleton<UploadScooterPhotosUsecase>(
+    UploadScooterPhotosUsecase(getIt()),
+  );
+  getIt.registerSingleton<UpdateScooterOrderDataUsecase>(
+    UpdateScooterOrderDataUsecase(getIt()),
+  );
+  getIt.registerSingleton<PayScooterOrderWithPhotosUsecase>(
+    PayScooterOrderWithPhotosUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetScooterOrderByIdUsecase>(
+    GetScooterOrderByIdUsecase(getIt()),
+  );
+
+  getIt.registerSingleton<FinishRideUsecase>(FinishRideUsecase(getIt()));
+  getIt.registerSingleton<PauseRideUsecase>(PauseRideUsecase(getIt()));
+  getIt.registerSingleton<ResumeRideUsecase>(ResumeRideUsecase(getIt()));
+  getIt.registerSingleton<PayRideUsecase>(PayRideUsecase(getIt()));
+  getIt.registerSingleton<GetAvailableSubscriptionsUsecase>(
+    GetAvailableSubscriptionsUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetSubscriptionByIdUsecase>(
+    GetSubscriptionByIdUsecase(getIt()),
+  );
+  getIt.registerSingleton<ActivateSubscriptionUsecase>(
+    ActivateSubscriptionUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetClientSubscriptionsUsecase>(
+    GetClientSubscriptionsUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetScooterByTitleUsecase>(
+    GetScooterByTitleUsecase(getIt()),
+  );
+  getIt.registerSingleton<GetNotificationsUsecase>(
+    GetNotificationsUsecase(getIt<NotificationRepository>()),
+  );
+  getIt.registerFactory<NotificationsBloc>(
+    () => NotificationsBloc(getIt<GetNotificationsUsecase>()),
+  );
+
+  // Blocs
+  getIt.registerLazySingleton<SplashBloc>(() => SplashBloc(getIt()));
+
+  getIt.registerFactory<PhoneAuthBloc>(() => PhoneAuthBloc(getIt()));
+
+  getIt.registerFactory<VerifyCodeBloc>(
+    () => VerifyCodeBloc(getIt(), getIt(), getIt()),
+  );
+
+  getIt.registerLazySingleton<ProfileBloc>(
+    () => ProfileBloc(getIt(), getIt(), getIt()),
+  );
+
+  getIt.registerFactory<EditProfileBloc>(
+    () => EditProfileBloc(getIt(), getIt()),
+  );
+
+  getIt.registerFactory<MapBloc>(
+    () => MapBloc(
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+      getIt(),
+    ),
+  );
+
+  getIt.registerFactory<ScooterDetailBloc>(() => ScooterDetailBloc(getIt()));
+
+  getIt.registerFactory<MapSettingsModalBloc>(
+    () => MapSettingsModalBloc(getIt(), getIt()),
+  );
+
+  getIt.registerFactory<AddCardBloc>(() => AddCardBloc(getIt()));
+
+  getIt.registerFactory<PaymentMethodSheetBloc>(
+    () => PaymentMethodSheetBloc(getIt(), getIt(), getIt(), getIt()),
+  );
+
+  getIt.registerFactory<CurrentRidesBloc>(() => CurrentRidesBloc(getIt()));
+
+  getIt.registerFactory<ActiveRideBloc>(
+    () => ActiveRideBloc(getIt(), getIt(), getIt(), getIt(), getIt()),
+  );
+
+  getIt.registerFactory<ReservedRideBloc>(
+    () => ReservedRideBloc(getIt(), getIt()),
+  );
+
+  getIt.registerFactory<NewsBloc>(() => NewsBloc(getIt<NewsRepository>()));
+
+  getIt.registerFactory<SendPhotoBloc>(() => SendPhotoBloc(getIt(), getIt()));
+
+  getIt.registerFactory<SubscriptionListBloc>(
+    () => SubscriptionListBloc(
+      getAvailableSubscriptionsUsecase: getIt(),
+      getClientSubscriptionsUsecase: getIt(),
+    ),
+  );
+
+  // UseCase
+  getIt.registerSingleton<GetScooterOrderHistoryUsecase>(
+    GetScooterOrderHistoryUsecase(getIt<ScooterRepository>()),
+  );
+
+  getIt.registerSingleton<CheckUserUseCase>(
+    CheckUserUseCase(getIt<UserProfileRepository>()),
+  );
+
+  getIt.registerSingleton<GetNotificationsStreamUseCase>(
+    GetNotificationsStreamUseCase(getIt<NotificationRepository>()),
+  );
+
+  getIt.registerSingleton<CancelNotificationUseCase>(
+    CancelNotificationUseCase(getIt<NotificationRepository>()),
+  );
+
+  // Bloc
+  getIt.registerFactory<OrderHistoryBloc>(
+    () => OrderHistoryBloc(getIt<GetScooterOrderHistoryUsecase>()),
+  );
+
+  getIt.registerFactory<ScooterCodeBloc>(
+    () => ScooterCodeBloc(
+      getScooterByTitleUsecase: getIt<GetScooterByTitleUsecase>(),
+      getAddressUsecase: getIt<GetAddressByPointUsecase>(),
+      getPedestrianRoutesUsecase: getIt<GetPedestrianRoutesUsecase>()
+    ),
+  );
+
+  // Repository
+  getIt.registerSingleton<PromoCodeRepository>(
+    PromoCodeRepositoryImpl(getIt<ApiService>()),
+  );
+
+  // UseCase
+  getIt.registerSingleton<ApplyPromoCodeUsecase>(
+    ApplyPromoCodeUsecase(getIt<PromoCodeRepository>()),
+  );
+
+  // Bloc (factory, т.к. экран создаёт новый экземпляр)
+  getIt.registerFactory<PromoCodeBloc>(
+    () => PromoCodeBloc(getIt<ApplyPromoCodeUsecase>()),
+  );
+}
diff --git a/lib/domain/entities/active_scooter_order.dart b/lib/domain/entities/active_scooter_order.dart
index b896bcc..190be5b 100644
--- a/lib/domain/entities/active_scooter_order.dart
+++ b/lib/domain/entities/active_scooter_order.dart
@@ -1,50 +1,50 @@
-import 'scooter.dart';
-
-class ActiveScooterOrder {
-  final int orderId;
-  final int scooterId;
-  final double latitude;
-  final double longitude;
-  final double mileage;
-  final double speed;
-  final double price;
-  final double time;
-  final bool zone;
-
-  ActiveScooterOrder({
-    required this.orderId,
-    required this.scooterId,
-    required this.latitude,
-    required this.longitude,
-    required this.mileage,
-    required this.speed,
-    required this.price,
-    required this.time,
-    required this.zone,
-  });
-
-  factory ActiveScooterOrder.fromJson(Map<String, dynamic> json) {
-    return ActiveScooterOrder(
-      orderId: json['orderId'] ?? 0,
-      scooterId: json['scooterId'] ?? 0,
-      latitude: (json['latitude'] ?? 0).toDouble(),
-      longitude: (json['longitude'] ?? 0).toDouble(),
-      mileage: (json['mileage'] ?? 0).toDouble(),
-      speed: (json['speed'] ?? 0).toDouble(),
-      price: (json['price'] ?? 0).toDouble(),
-      time: (json['time'] ?? 0.0).toDouble(),
-      zone: json['zone'],
-    );
-  }
-  Map<String, dynamic> toJson() {
-    return {
-      'orderId': orderId,
-      'scooterId': scooterId,
-      'latitude': latitude,
-      'longitude': longitude,
-      'mileage': mileage,
-      'speed': speed,
-      'price': price,
-    };
-  }
-}
+import 'scooter.dart';
+
+class ActiveScooterOrder {
+  final int orderId;
+  final int scooterId;
+  final double latitude;
+  final double longitude;
+  final double mileage;
+  final double speed;
+  final double price;
+  final double time;
+  final bool zone;
+
+  ActiveScooterOrder({
+    required this.orderId,
+    required this.scooterId,
+    required this.latitude,
+    required this.longitude,
+    required this.mileage,
+    required this.speed,
+    required this.price,
+    required this.time,
+    required this.zone,
+  });
+
+  factory ActiveScooterOrder.fromJson(Map<String, dynamic> json) {
+    return ActiveScooterOrder(
+      orderId: json['orderId'] ?? 0,
+      scooterId: json['scooterId'] ?? 0,
+      latitude: (json['latitude'] ?? 0).toDouble(),
+      longitude: (json['longitude'] ?? 0).toDouble(),
+      mileage: (json['mileage'] ?? 0).toDouble(),
+      speed: (json['speed'] ?? 0).toDouble(),
+      price: (json['price'] ?? 0).toDouble(),
+      time: (json['time'] ?? 0.0).toDouble(),
+      zone: json['zone'],
+    );
+  }
+  Map<String, dynamic> toJson() {
+    return {
+      'orderId': orderId,
+      'scooterId': scooterId,
+      'latitude': latitude,
+      'longitude': longitude,
+      'mileage': mileage,
+      'speed': speed,
+      'price': price,
+    };
+  }
+}
diff --git a/lib/domain/entities/certificate.dart b/lib/domain/entities/certificate.dart
index 1d540df..b3ce7b5 100644
--- a/lib/domain/entities/certificate.dart
+++ b/lib/domain/entities/certificate.dart
@@ -1,94 +1,94 @@
-class Currency {
-  final int id;
-  final String title;
-  final String currency;
-  final String code;
-  final bool isBase;
-  final int denomination;
-  final double exchangeRate;
-  final String formatString;
-  final String floatSeparator;
-  final int decimals;
-  final bool isHideZero;
-
-  Currency({
-    required this.id,
-    required this.title,
-    required this.currency,
-    required this.code,
-    required this.isBase,
-    required this.denomination,
-    required this.exchangeRate,
-    required this.formatString,
-    required this.floatSeparator,
-    required this.decimals,
-    required this.isHideZero,
-  });
-
-  factory Currency.fromJson(Map<String, dynamic> json) {
-    return Currency(
-      id: json['id'] as int,
-      title: json['title'] as String,
-      currency: json['currency'] as String,
-      code: json['code'] as String,
-      isBase: json['isBase'] as bool,
-      denomination: json['denomination'] as int,
-      exchangeRate: (json['exchangeRate'] as num).toDouble(),
-      formatString: json['formatString'] as String,
-      floatSeparator: json['floatSeparator'] as String,
-      decimals: json['decimals'] as int,
-      isHideZero: json['isHideZero'] as bool,
-    );
-  }
-}
-
-class Certificate {
-  final int id;
-  final String title;
-  final String? description;
-  final double price;
-  final int currencyId;
-  final int value;
-  final double discount;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final int sort;
-  final bool isActive;
-  final Currency? currency;
-  final String? pricePrint;
-
-  Certificate({
-    required this.id,
-    required this.title,
-    this.description,
-    required this.price,
-    required this.currencyId,
-    required this.value,
-    required this.discount,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.sort,
-    required this.isActive,
-    this.currency,
-    this.pricePrint,
-  });
-
-  factory Certificate.fromJson(Map<String, dynamic> json) {
-    return Certificate(
-      id: json['id'] as int,
-      title: json['title'] as String,
-      description: json['description'] as String?,
-      price: (json['price'] as num).toDouble(),
-      currencyId: json['currencyId'] as int,
-      value: json['value'] as int,
-      discount: (json['discount'] as num).toDouble(),
-      createdAt: DateTime.parse(json['createdAt'] as String),
-      updatedAt: DateTime.parse(json['updatedAt'] as String),
-      sort: json['sort'] as int,
-      isActive: json['isActive'] as bool,
-      currency: json['currency'] != null ? Currency.fromJson(json['currency']) : null,
-      pricePrint: json['pricePrint'] as String?,
-    );
-  }
-
-}
+class Currency {
+  final int id;
+  final String title;
+  final String currency;
+  final String code;
+  final bool isBase;
+  final int denomination;
+  final double exchangeRate;
+  final String formatString;
+  final String floatSeparator;
+  final int decimals;
+  final bool isHideZero;
+
+  Currency({
+    required this.id,
+    required this.title,
+    required this.currency,
+    required this.code,
+    required this.isBase,
+    required this.denomination,
+    required this.exchangeRate,
+    required this.formatString,
+    required this.floatSeparator,
+    required this.decimals,
+    required this.isHideZero,
+  });
+
+  factory Currency.fromJson(Map<String, dynamic> json) {
+    return Currency(
+      id: json['id'] as int,
+      title: json['title'] as String,
+      currency: json['currency'] as String,
+      code: json['code'] as String,
+      isBase: json['isBase'] as bool,
+      denomination: json['denomination'] as int,
+      exchangeRate: (json['exchangeRate'] as num).toDouble(),
+      formatString: json['formatString'] as String,
+      floatSeparator: json['floatSeparator'] as String,
+      decimals: json['decimals'] as int,
+      isHideZero: json['isHideZero'] as bool,
+    );
+  }
+}
+
+class Certificate {
+  final int id;
+  final String title;
+  final String? description;
+  final double price;
+  final int currencyId;
+  final int value;
+  final double discount;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final int sort;
+  final bool isActive;
+  final Currency? currency;
+  final String? pricePrint;
+
+  Certificate({
+    required this.id,
+    required this.title,
+    this.description,
+    required this.price,
+    required this.currencyId,
+    required this.value,
+    required this.discount,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.sort,
+    required this.isActive,
+    this.currency,
+    this.pricePrint,
+  });
+
+  factory Certificate.fromJson(Map<String, dynamic> json) {
+    return Certificate(
+      id: json['id'] as int,
+      title: json['title'] as String,
+      description: json['description'] as String?,
+      price: (json['price'] as num).toDouble(),
+      currencyId: json['currencyId'] as int,
+      value: json['value'] as int,
+      discount: (json['discount'] as num).toDouble(),
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      updatedAt: DateTime.parse(json['updatedAt'] as String),
+      sort: json['sort'] as int,
+      isActive: json['isActive'] as bool,
+      currency: json['currency'] != null ? Currency.fromJson(json['currency']) : null,
+      pricePrint: json['pricePrint'] as String?,
+    );
+  }
+
+}
diff --git a/lib/domain/entities/client_notification.dart b/lib/domain/entities/client_notification.dart
index 4f9d6d6..8139c61 100644
--- a/lib/domain/entities/client_notification.dart
+++ b/lib/domain/entities/client_notification.dart
@@ -1,58 +1,58 @@
-enum NotificationType {
-  info,
-  attention,
-  warning,
-}
-
-enum NotificationCategory {
-  auth,
-  zone,
-  payment,
-  companyInfo,
-  adminInfo,
-  scooter,
-}
-
-class ClientNotification {
-  final int id;
-  final String content;
-  final int clientId;
-  final NotificationType type;
-  final NotificationCategory category;
-  final DateTime createdAt;
-  final DateTime? canceledAt;
-  final DateTime? readAt;
-
-  ClientNotification({
-    required this.id,
-    required this.content,
-    required this.clientId,
-    required this.type,
-    required this.category,
-    required this.createdAt,
-    this.canceledAt,
-    this.readAt,
-  }) ;
-
-  ClientNotification copyWith({
-    int? id,
-    String? content,
-    int? clientId,
-    NotificationType? type,
-    NotificationCategory? category,
-    DateTime? createdAt,
-    DateTime? canceledAt,
-    DateTime? readAt,
-  }) {
-    return ClientNotification(
-      id: id ?? this.id,
-      content: content ?? this.content,
-      clientId: clientId ?? this.clientId,
-      type: type ?? this.type,
-      category: category ?? this.category,
-      createdAt: createdAt ?? this.createdAt,
-      canceledAt: canceledAt ?? this.canceledAt,
-      readAt: readAt ?? this.readAt,
-    );
-  }
-}
+enum NotificationType {
+  info,
+  attention,
+  warning,
+}
+
+enum NotificationCategory {
+  auth,
+  zone,
+  payment,
+  companyInfo,
+  adminInfo,
+  scooter,
+}
+
+class ClientNotification {
+  final int id;
+  final String content;
+  final int clientId;
+  final NotificationType type;
+  final NotificationCategory category;
+  final DateTime createdAt;
+  final DateTime? canceledAt;
+  final DateTime? readAt;
+
+  ClientNotification({
+    required this.id,
+    required this.content,
+    required this.clientId,
+    required this.type,
+    required this.category,
+    required this.createdAt,
+    this.canceledAt,
+    this.readAt,
+  }) ;
+
+  ClientNotification copyWith({
+    int? id,
+    String? content,
+    int? clientId,
+    NotificationType? type,
+    NotificationCategory? category,
+    DateTime? createdAt,
+    DateTime? canceledAt,
+    DateTime? readAt,
+  }) {
+    return ClientNotification(
+      id: id ?? this.id,
+      content: content ?? this.content,
+      clientId: clientId ?? this.clientId,
+      type: type ?? this.type,
+      category: category ?? this.category,
+      createdAt: createdAt ?? this.createdAt,
+      canceledAt: canceledAt ?? this.canceledAt,
+      readAt: readAt ?? this.readAt,
+    );
+  }
+}
diff --git a/lib/domain/entities/client_subscription.dart b/lib/domain/entities/client_subscription.dart
index f68a51c..4e89e14 100644
--- a/lib/domain/entities/client_subscription.dart
+++ b/lib/domain/entities/client_subscription.dart
@@ -1,24 +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,
-    );
-  }
+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,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/fine.dart b/lib/domain/entities/fine.dart
new file mode 100644
index 0000000..929590e
--- /dev/null
+++ b/lib/domain/entities/fine.dart
@@ -0,0 +1,76 @@
+import 'package:equatable/equatable.dart';
+
+class Fine extends Equatable {
+  final int id;
+  final String scooterNumber;
+  final String date;
+  final String description;
+  final double amount;
+  final String amountPrint;
+  final List<String> photoUrls;
+  final bool isPaid;
+
+  const Fine({
+    required this.id,
+    required this.scooterNumber,
+    required this.date,
+    required this.description,
+    required this.amount,
+    required this.amountPrint,
+    required this.photoUrls,
+    required this.isPaid,
+  });
+
+  factory Fine.fromJson(Map<String, dynamic> json, {String? scooterNumber}) {
+    final List<dynamic> filesJson = json['files'] ?? [];
+    final List<String> photos = filesJson
+        .map((file) => file['path'] as String? ?? file['filename'] as String? ?? '')
+        .where((path) => path.isNotEmpty)
+        .toList();
+
+    // Форматирование даты из createdAt (2026-08-07T09:15:26.565Z -> 07-08-2026)
+    String formattedDate = '';
+    if (json['createdAt'] != null) {
+      final parsedDate = DateTime.tryParse(json['createdAt'].toString());
+      if (parsedDate != null) {
+        final day = parsedDate.day.toString().padLeft(2, '0');
+        final month = parsedDate.month.toString().padLeft(2, '0');
+        final year = parsedDate.year;
+        formattedDate = '$day-$month-$year';
+      }
+    }
+
+    return Fine(
+      id: json['id'] as int? ?? 0,
+      scooterNumber: scooterNumber ?? '',
+      date: formattedDate,
+      description: json['description'] as String? ?? '',
+      amount: (json['value'] as num?)?.toDouble() ?? 0.0,
+      amountPrint: json['valuePrint'] as String? ?? '0,00 BYN',
+      photoUrls: photos,
+      isPaid: json['isPaid'] as bool? ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'description': description,
+      'value': amount,
+      'valuePrint': amountPrint,
+      'isPaid': isPaid,
+    };
+  }
+
+  @override
+  List<Object?> get props => [
+    id,
+    scooterNumber,
+    date,
+    description,
+    amount,
+    amountPrint,
+    photoUrls,
+    isPaid,
+  ];
+}
\ No newline at end of file
diff --git a/lib/domain/entities/map_settings.dart b/lib/domain/entities/map_settings.dart
index 6afbb28..0dcc908 100644
--- a/lib/domain/entities/map_settings.dart
+++ b/lib/domain/entities/map_settings.dart
@@ -1,15 +1,15 @@
-class MapSettings {
-  final bool all_placemarks;
-  final bool all_zones;
-  final bool parking_zones;
-  final bool restricted_parking_zones;
-  final bool restricted_driving_zones;
-
-  MapSettings({
-    required this.all_placemarks,
-    required this.all_zones,
-    required this.parking_zones,
-    required this.restricted_parking_zones,
-    required this.restricted_driving_zones,
-  });
-}
+class MapSettings {
+  final bool all_placemarks;
+  final bool all_zones;
+  final bool parking_zones;
+  final bool restricted_parking_zones;
+  final bool restricted_driving_zones;
+
+  MapSettings({
+    required this.all_placemarks,
+    required this.all_zones,
+    required this.parking_zones,
+    required this.restricted_parking_zones,
+    required this.restricted_driving_zones,
+  });
+}
diff --git a/lib/domain/entities/news.dart b/lib/domain/entities/news.dart
index 30c742b..ebb58a8 100644
--- a/lib/domain/entities/news.dart
+++ b/lib/domain/entities/news.dart
@@ -1,62 +1,62 @@
-class NewsEntity {
-  final int id;
-  final String title;
-  final String previewText;
-  final String text;
-  final DateTime createdAt;
-  final DateTime publishedAt;
-  final bool isActive;
-  final String? imageUrl;
-
-  final String? textJson;
-  final int? userId;
-  final int? pictureId;
-  final dynamic user;
-  final dynamic picture;
-
-  NewsEntity({
-    required this.id,
-    required this.title,
-    required this.previewText,
-    required this.text,
-    required this.createdAt,
-    required this.publishedAt,
-    required this.isActive,
-    this.imageUrl,
-
-    this.textJson,
-    this.userId,
-    this.pictureId,
-    this.user,
-    this.picture,
-  });
-
-  factory NewsEntity.fromJson(Map<String, dynamic> json) {
-    DateTime _parseDate(String? dateStr) {
-      try {
-        return dateStr != null ? DateTime.parse(dateStr) : DateTime.now();
-      } catch (_) {
-        return DateTime.now();
-      }
-    }
-
-    return NewsEntity(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? '',
-      previewText: json['previewText'] ?? '',
-      text: json['text'] ?? '',
-      createdAt: _parseDate(json['createdAt']),
-      publishedAt: _parseDate(json['publishedAt']),
-      isActive: json['isActive'] ?? false,
-      imageUrl: json['picture'] != null
-          ? 'https://sharing-api.sparkit.by/${json['picture']['path']}'
-          : null,
-
-      textJson: json['textJson'],
-      userId: json['userId'],
-      pictureId: json['pictureId'],
-      user: json['user'],
-      picture: json['picture'],
-    );
-  }
+class NewsEntity {
+  final int id;
+  final String title;
+  final String previewText;
+  final String text;
+  final DateTime createdAt;
+  final DateTime publishedAt;
+  final bool isActive;
+  final String? imageUrl;
+
+  final String? textJson;
+  final int? userId;
+  final int? pictureId;
+  final dynamic user;
+  final dynamic picture;
+
+  NewsEntity({
+    required this.id,
+    required this.title,
+    required this.previewText,
+    required this.text,
+    required this.createdAt,
+    required this.publishedAt,
+    required this.isActive,
+    this.imageUrl,
+
+    this.textJson,
+    this.userId,
+    this.pictureId,
+    this.user,
+    this.picture,
+  });
+
+  factory NewsEntity.fromJson(Map<String, dynamic> json) {
+    DateTime _parseDate(String? dateStr) {
+      try {
+        return dateStr != null ? DateTime.parse(dateStr) : DateTime.now();
+      } catch (_) {
+        return DateTime.now();
+      }
+    }
+
+    return NewsEntity(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? '',
+      previewText: json['previewText'] ?? '',
+      text: json['text'] ?? '',
+      createdAt: _parseDate(json['createdAt']),
+      publishedAt: _parseDate(json['publishedAt']),
+      isActive: json['isActive'] ?? false,
+      imageUrl: json['picture'] != null
+          ? 'https://sharing-api.sparkit.by/${json['picture']['path']}'
+          : null,
+
+      textJson: json['textJson'],
+      userId: json['userId'],
+      pictureId: json['pictureId'],
+      user: json['user'],
+      picture: json['picture'],
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/pagination.dart b/lib/domain/entities/pagination.dart
index 80c10e2..689f984 100644
--- a/lib/domain/entities/pagination.dart
+++ b/lib/domain/entities/pagination.dart
@@ -1,19 +1,19 @@
-class Pagination {
-  final int total;
-  final int currentPage;
-  final int lastPage;
-
-  Pagination({
-    required this.total,
-    required this.currentPage,
-    required this.lastPage,
-  });
-
-  factory Pagination.fromJson(Map<String, dynamic> json) {
-    return Pagination(
-      total: json['total'] ?? 0,
-      currentPage: json['currentPage'] ?? 0,
-      lastPage: json['lastPage'] ?? 0,
-    );
-  }
+class Pagination {
+  final int total;
+  final int currentPage;
+  final int lastPage;
+
+  Pagination({
+    required this.total,
+    required this.currentPage,
+    required this.lastPage,
+  });
+
+  factory Pagination.fromJson(Map<String, dynamic> json) {
+    return Pagination(
+      total: json['total'] ?? 0,
+      currentPage: json['currentPage'] ?? 0,
+      lastPage: json['lastPage'] ?? 0,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/pagination_meta.dart b/lib/domain/entities/pagination_meta.dart
index 0ca97c9..48d9a6e 100644
--- a/lib/domain/entities/pagination_meta.dart
+++ b/lib/domain/entities/pagination_meta.dart
@@ -1,28 +1,28 @@
-class PaginationMeta {
-  final int total;
-  final int lastPage;
-  final int currentPage;
-  final int totalPerPage;
-  final int? prevPage;
-  final int? nextPage;
-
-  PaginationMeta({
-    required this.total,
-    required this.lastPage,
-    required this.currentPage,
-    required this.totalPerPage,
-    this.prevPage,
-    this.nextPage,
-  });
-
-  factory PaginationMeta.fromJson(Map<String, dynamic> json) {
-    return PaginationMeta(
-      total: json['total'] as int,
-      lastPage: json['lastPage'] as int,
-      currentPage: json['currentPage'] as int,
-      totalPerPage: json['totalPerPage'] as int,
-      prevPage: json['prevPage'] as int?,
-      nextPage: json['nextPage'] as int?,
-    );
-  }
+class PaginationMeta {
+  final int total;
+  final int lastPage;
+  final int currentPage;
+  final int totalPerPage;
+  final int? prevPage;
+  final int? nextPage;
+
+  PaginationMeta({
+    required this.total,
+    required this.lastPage,
+    required this.currentPage,
+    required this.totalPerPage,
+    this.prevPage,
+    this.nextPage,
+  });
+
+  factory PaginationMeta.fromJson(Map<String, dynamic> json) {
+    return PaginationMeta(
+      total: json['total'] as int,
+      lastPage: json['lastPage'] as int,
+      currentPage: json['currentPage'] as int,
+      totalPerPage: json['totalPerPage'] as int,
+      prevPage: json['prevPage'] as int?,
+      nextPage: json['nextPage'] as int?,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/payment_card.dart b/lib/domain/entities/payment_card.dart
index fd5dca1..9df6f19 100644
--- a/lib/domain/entities/payment_card.dart
+++ b/lib/domain/entities/payment_card.dart
@@ -1,27 +1,27 @@
-class PaymentCard {
-  final int id;
-  final String? bindingId;
-  final String cardLastNumber;
-  final bool isMain;
-
-  PaymentCard({
-    required this.id,
-    required this.bindingId,
-    required this.cardLastNumber,
-    required this.isMain,
-  });
-
-  PaymentCard copyWith({
-    int? id,
-    String? bindingId,
-    String? cardLastNumber,
-    bool? isMain,
-  }) {
-    return PaymentCard(
-      id: id ?? this.id,
-      bindingId: bindingId ?? this.bindingId,
-      cardLastNumber: cardLastNumber ?? this.cardLastNumber,
-      isMain: isMain ?? this.isMain,
-    );
-  }
+class PaymentCard {
+  final int id;
+  final String? bindingId;
+  final String cardLastNumber;
+  final bool isMain;
+
+  PaymentCard({
+    required this.id,
+    required this.bindingId,
+    required this.cardLastNumber,
+    required this.isMain,
+  });
+
+  PaymentCard copyWith({
+    int? id,
+    String? bindingId,
+    String? cardLastNumber,
+    bool? isMain,
+  }) {
+    return PaymentCard(
+      id: id ?? this.id,
+      bindingId: bindingId ?? this.bindingId,
+      cardLastNumber: cardLastNumber ?? this.cardLastNumber,
+      isMain: isMain ?? this.isMain,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/point.dart b/lib/domain/entities/point.dart
index c76a021..ebfd216 100644
--- a/lib/domain/entities/point.dart
+++ b/lib/domain/entities/point.dart
@@ -1,12 +1,12 @@
-
-class Point {
-  final double latitude;
-  final double longitude;
-
-  Point(this.latitude, this.longitude);
-
-  @override
-  String toString() {
-    return 'Point{latitude: $latitude, longitude: $longitude}';
-  }
-}
+
+class Point {
+  final double latitude;
+  final double longitude;
+
+  Point(this.latitude, this.longitude);
+
+  @override
+  String toString() {
+    return 'Point{latitude: $latitude, longitude: $longitude}';
+  }
+}
diff --git a/lib/domain/entities/promo_code_result.dart b/lib/domain/entities/promo_code_result.dart
index 7256168..e58a0a5 100644
--- a/lib/domain/entities/promo_code_result.dart
+++ b/lib/domain/entities/promo_code_result.dart
@@ -1,9 +1,9 @@
-class PromoCodeResult {
-  final bool success;
-  final double balance;
-
-  PromoCodeResult({
-    required this.success,
-    required this.balance,
-  });
+class PromoCodeResult {
+  final bool success;
+  final double balance;
+
+  PromoCodeResult({
+    required this.success,
+    required this.balance,
+  });
 }
\ No newline at end of file
diff --git a/lib/domain/entities/scooter.dart b/lib/domain/entities/scooter.dart
index 4168e57..b451e30 100644
--- a/lib/domain/entities/scooter.dart
+++ b/lib/domain/entities/scooter.dart
@@ -1,51 +1,51 @@
-
-class Scooter {
-  final int id;
-  final String title;
-  final String status;
-  final double latitude;
-  final double longitude;
-  final int batteryLevel;
-  final bool isOnline;
-  final int maxSpeed;
-  final String number;
-  double? distance;
-  double? timeToTravel;
-
-  Scooter({
-    required this.id,
-    required this.title,
-    required this.status,
-    required this.latitude,
-    required this.longitude,
-    required this.batteryLevel,
-    required this.isOnline,
-    required this.maxSpeed,
-    required this.number,
-    this.distance,
-    this.timeToTravel,
-  });
-
-  factory Scooter.fromJson(Map<String, dynamic> json) {
-    final scooterDetail = json['scooterDetail'] as Map<String, dynamic>? ?? {};
-    final model = json['model'] as Map<String, dynamic>? ?? {};
-
-    return Scooter(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? 'Unknown',
-      status: json['status'] ?? 'Unavailable',
-      latitude: (scooterDetail['latitude'] as num?)?.toDouble() ?? 0.0,
-      longitude: (scooterDetail['longitude'] as num?)?.toDouble() ?? 0.0,
-      batteryLevel: (scooterDetail['batteryLevel'] as num?)?.toInt() ?? 0,
-      isOnline: scooterDetail['isOnline'] ?? false,
-      maxSpeed: (json['maxSpeed'] as num?)?.toInt() ?? 25,
-      number: json['title'] ?? 'Unknown',
-    );
-  }
-
-
-  @override
-  String toString() {
-    return 'Scooter{id: $id, title: $title, status: $status, latitude: $latitude, longitude: $longitude, batteryLevel: $batteryLevel, isOnline: $isOnline}';
-  }
-}
+
+class Scooter {
+  final int id;
+  final String title;
+  final String status;
+  final double latitude;
+  final double longitude;
+  final int batteryLevel;
+  final bool isOnline;
+  final int maxSpeed;
+  final String number;
+  double? distance;
+  double? timeToTravel;
+
+  Scooter({
+    required this.id,
+    required this.title,
+    required this.status,
+    required this.latitude,
+    required this.longitude,
+    required this.batteryLevel,
+    required this.isOnline,
+    required this.maxSpeed,
+    required this.number,
+    this.distance,
+    this.timeToTravel,
+  });
+
+  factory Scooter.fromJson(Map<String, dynamic> json) {
+    final scooterDetail = json['scooterDetail'] as Map<String, dynamic>? ?? {};
+    final model = json['model'] as Map<String, dynamic>? ?? {};
+
+    return Scooter(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? 'Unknown',
+      status: json['status'] ?? 'Unavailable',
+      latitude: (scooterDetail['latitude'] as num?)?.toDouble() ?? 0.0,
+      longitude: (scooterDetail['longitude'] as num?)?.toDouble() ?? 0.0,
+      batteryLevel: (scooterDetail['batteryLevel'] as num?)?.toInt() ?? 0,
+      isOnline: scooterDetail['isOnline'] ?? false,
+      maxSpeed: (json['maxSpeed'] as num?)?.toInt() ?? 25,
+      number: json['title'] ?? 'Unknown',
+    );
+  }
+
+
+  @override
+  String toString() {
+    return 'Scooter{id: $id, title: $title, status: $status, latitude: $latitude, longitude: $longitude, batteryLevel: $batteryLevel, isOnline: $isOnline}';
+  }
+}
diff --git a/lib/domain/entities/scooter_order.dart b/lib/domain/entities/scooter_order.dart
index 8058c74..9bdd544 100644
--- a/lib/domain/entities/scooter_order.dart
+++ b/lib/domain/entities/scooter_order.dart
@@ -1,154 +1,157 @@
-import 'scooter.dart';
-
-class ScooterOrder {
-  final int id;
-  final int scooterId;
-  final Scooter scooter;
-  final int? planId;
-  final ScooterPlan? plan;
-  final int clientId;
-  final int? subscriptionId;
-  final int? cardId;
-  final bool isBalance;
-  final int decimals;
-  final bool isInsurance;
-  final double? insurancePrice;
-  final String? insurancePricePrint;
-  final double? holdPrice;
-  final String? holdPricePrint;
-  final double? totalPrice;
-  final String? totalPricePrint;
-  final int? currencyId;
-  final String status;
-  final DateTime createdAt;
-  final DateTime? updatedAt;
-  final DateTime? startAt;
-  final DateTime? finishAt;
-  final DateTime? expiresAt;
-  final DateTime? cancelAt;
-  final String? cancelDescription;
-  final double mileage; //эту
-  final double avgSpeed; //эту и снизу еще 4 есть
-  final String payTotalPricePrint;
-  final String unpayTotalPricePrint;
-  final String totalOrderPricePrint;
-
-  ScooterOrder({
-    required this.id,
-    required this.scooterId,
-    required this.scooter,
-    this.planId,
-    this.plan,
-    required this.clientId,
-    this.subscriptionId,
-    this.cardId,
-    required this.isBalance,
-    required this.decimals,
-    required this.isInsurance,
-    this.insurancePrice,
-    this.insurancePricePrint,
-    this.holdPrice,
-    this.holdPricePrint,
-    this.totalPrice,
-    this.totalPricePrint,
-    this.currencyId,
-    required this.status,
-    required this.createdAt,
-    this.updatedAt,
-    this.startAt,
-    this.finishAt,
-    this.expiresAt,
-    this.cancelAt,
-    this.cancelDescription,
-    required this.mileage,
-    required this.avgSpeed,
-    required this.payTotalPricePrint, // оплачено
-    required this.unpayTotalPricePrint, //неоплачено
-    required this.totalOrderPricePrint, //общая
-  });
-
-  factory ScooterOrder.fromJson(Map<String, dynamic> json) {
-    final paymentInfo = json['paymentInfo'] as Map<String, dynamic>?;
-
-    return ScooterOrder(
-      id: json['id'] ?? 0,
-      scooterId: json['scooterId'] ?? 0,
-      scooter: Scooter.fromJson(json['scooter']),
-      planId: json['planId'],
-      plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
-      clientId: json['clientId'] ?? 0,
-      subscriptionId: json['subscriptionId'],
-      cardId: json['cardId'],
-      isBalance: json['isBalance'] ?? false,
-      decimals: json['decimals'] ?? 0,
-      isInsurance: json['isInsurance'] ?? false,
-      insurancePrice: (json['insurancePrice'] as num?)?.toDouble(),
-      insurancePricePrint: json['insurancePricePrint'],
-      holdPrice: (json['holdPrice'] as num?)?.toDouble(),
-      holdPricePrint: json['holdPricePrint'],
-      totalPrice: (json['totalPrice'] as num?)?.toDouble(),
-      totalPricePrint: json['totalPricePrint'],
-      currencyId: json['currencyId'],
-      status: json['status'] ?? '',
-      createdAt: json['createdAt'] != null 
-          ? DateTime.parse(json['createdAt']) 
-          : DateTime.now(),
-      updatedAt: json['updatedAt'] != null 
-          ? DateTime.parse(json['updatedAt']) 
-          : null,
-      startAt: json['startAt'] != null 
-          ? DateTime.parse(json['startAt']) 
-          : null,
-      finishAt: json['finishAt'] != null 
-          ? DateTime.parse(json['finishAt'])
-          : null,
-      expiresAt: json['expiresAt'] != null 
-          ? DateTime.parse(json['expiresAt']) 
-          : null,
-      cancelAt: json['cancelAt'] != null 
-          ? DateTime.parse(json['cancelAt']) 
-          : null,
-      cancelDescription: json['cancelDescription'],
-      mileage: (json['mileage'] as num?)?.toDouble() ?? 0.0,
-      avgSpeed: (json['avgSpeed'] as num?)?.toDouble() ?? 0.0,
-      payTotalPricePrint: paymentInfo?['payTotalPricePrint'] ?? '',
-      unpayTotalPricePrint: paymentInfo?['unpayTotalPricePrint'] ?? '',
-      totalOrderPricePrint: paymentInfo?['totalOrderPricePrint'] ?? '',
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'id': id,
-      'scooterId': scooterId,
-      'planId': planId,
-      'subscriptionId': subscriptionId,
-      'cardId': cardId,
-      'isBalance': isBalance,
-      'isInsurance': isInsurance,
-    };
-  }
-}
-
-class ScooterPlan {
-  final int id;
-  final String title;
-  final double price;
-  final String? description;
-
-  ScooterPlan({
-    required this.id,
-    required this.title,
-    required this.price,
-    this.description,
-  });
-
-  factory ScooterPlan.fromJson(Map<String, dynamic> json) {
-    return ScooterPlan(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? '',
-      price: (json['price'] as num?)?.toDouble() ?? 0.0,
-      description: json['description'],
-    );
-  }
-}
+import 'scooter.dart';
+
+class ScooterOrder {
+  final int id;
+  final int scooterId;
+  final Scooter scooter;
+  final int? planId;
+  final ScooterPlan? plan;
+  final int clientId;
+  final int? subscriptionId;
+  final int? cardId;
+  final bool isBalance;
+  final int decimals;
+  final bool isInsurance;
+  final double? insurancePrice;
+  final String? insurancePricePrint;
+  final double? holdPrice;
+  final String? holdPricePrint;
+  final double? totalPrice;
+  final String? totalPricePrint;
+  final int? currencyId;
+  final String status;
+  final DateTime createdAt;
+  final DateTime? updatedAt;
+  final DateTime? startAt;
+  final DateTime? finishAt;
+  final DateTime? expiresAt;
+  final DateTime? cancelAt;
+  final String? cancelDescription;
+  final double mileage;
+  final double avgSpeed;
+  final String payTotalPricePrint;
+  final String unpayTotalPricePrint;
+  final String totalOrderPricePrint;
+  final bool hasFine;
+
+  ScooterOrder({
+    required this.id,
+    required this.scooterId,
+    required this.scooter,
+    this.planId,
+    this.plan,
+    required this.clientId,
+    this.subscriptionId,
+    this.cardId,
+    required this.isBalance,
+    required this.decimals,
+    required this.isInsurance,
+    this.insurancePrice,
+    this.insurancePricePrint,
+    this.holdPrice,
+    this.holdPricePrint,
+    this.totalPrice,
+    this.totalPricePrint,
+    this.currencyId,
+    required this.status,
+    required this.createdAt,
+    this.updatedAt,
+    this.startAt,
+    this.finishAt,
+    this.expiresAt,
+    this.cancelAt,
+    this.cancelDescription,
+    required this.mileage,
+    required this.avgSpeed,
+    required this.payTotalPricePrint, // оплачено
+    required this.unpayTotalPricePrint, //неоплачено
+    required this.totalOrderPricePrint, //общая
+    required this.hasFine,
+  });
+
+  factory ScooterOrder.fromJson(Map<String, dynamic> json) {
+    final paymentInfo = json['paymentInfo'] as Map<String, dynamic>?;
+
+    return ScooterOrder(
+      id: json['id'] ?? 0,
+      scooterId: json['scooterId'] ?? 0,
+      scooter: Scooter.fromJson(json['scooter']),
+      planId: json['planId'],
+      plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
+      clientId: json['clientId'] ?? 0,
+      subscriptionId: json['subscriptionId'],
+      cardId: json['cardId'],
+      isBalance: json['isBalance'] ?? false,
+      decimals: json['decimals'] ?? 0,
+      isInsurance: json['isInsurance'] ?? false,
+      insurancePrice: (json['insurancePrice'] as num?)?.toDouble(),
+      insurancePricePrint: json['insurancePricePrint'],
+      holdPrice: (json['holdPrice'] as num?)?.toDouble(),
+      holdPricePrint: json['holdPricePrint'],
+      totalPrice: (json['totalPrice'] as num?)?.toDouble(),
+      totalPricePrint: json['totalPricePrint'],
+      currencyId: json['currencyId'],
+      status: json['status'] ?? '',
+      createdAt: json['createdAt'] != null 
+          ? DateTime.parse(json['createdAt']) 
+          : DateTime.now(),
+      updatedAt: json['updatedAt'] != null 
+          ? DateTime.parse(json['updatedAt']) 
+          : null,
+      startAt: json['startAt'] != null 
+          ? DateTime.parse(json['startAt']) 
+          : null,
+      finishAt: json['finishAt'] != null 
+          ? DateTime.parse(json['finishAt'])
+          : null,
+      expiresAt: json['expiresAt'] != null 
+          ? DateTime.parse(json['expiresAt']) 
+          : null,
+      cancelAt: json['cancelAt'] != null 
+          ? DateTime.parse(json['cancelAt']) 
+          : null,
+      cancelDescription: json['cancelDescription'],
+      mileage: (json['mileage'] as num?)?.toDouble() ?? 0.0,
+      avgSpeed: (json['avgSpeed'] as num?)?.toDouble() ?? 0.0,
+      payTotalPricePrint: paymentInfo?['payTotalPricePrint'] ?? '',
+      unpayTotalPricePrint: paymentInfo?['unpayTotalPricePrint'] ?? '',
+      totalOrderPricePrint: paymentInfo?['totalOrderPricePrint'] ?? '',
+      hasFine: paymentInfo?['hasFine'] ?? false,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'scooterId': scooterId,
+      'planId': planId,
+      'subscriptionId': subscriptionId,
+      'cardId': cardId,
+      'isBalance': isBalance,
+      'isInsurance': isInsurance,
+    };
+  }
+}
+
+class ScooterPlan {
+  final int id;
+  final String title;
+  final double price;
+  final String? description;
+
+  ScooterPlan({
+    required this.id,
+    required this.title,
+    required this.price,
+    this.description,
+  });
+
+  factory ScooterPlan.fromJson(Map<String, dynamic> json) {
+    return ScooterPlan(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? '',
+      price: (json['price'] as num?)?.toDouble() ?? 0.0,
+      description: json['description'],
+    );
+  }
+}
diff --git a/lib/domain/entities/subscription.dart b/lib/domain/entities/subscription.dart
index 9f7ec7f..4d9b92f 100644
--- a/lib/domain/entities/subscription.dart
+++ b/lib/domain/entities/subscription.dart
@@ -1,65 +1,65 @@
-
-import 'package:be_happy/domain/entities/subscription_period.dart';
-
-class Subscription {
-  final int id;
-  final String title;
-  final String shortDescription;
-  final String fullDescription;
-  final String fullDescriptionJson;
-  final int planId;
-  final bool isActive;
-  final bool isCurrent;
-  final String currency;
-  final DateTime? activeFrom;
-  final DateTime? activeTo;
-  final DateTime createdAt;
-  final DateTime updatedAt;
-  final List<SubscriptionPeriod> options;
-
-
-  Subscription({
-    required this.id,
-    required this.title,
-    required this.shortDescription,
-    required this.fullDescription,
-    required this.fullDescriptionJson,
-    required this.planId,
-    required this.isActive,
-    required this.currency,
-    this.activeFrom,
-    this.activeTo,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.isCurrent,
-    required this.options,
-  });
-
-  factory Subscription.fromJson(Map<String, dynamic> json) {
-    final currencyData = json['currency'] as Map<String, dynamic>? ?? {};
-    final optionsData = json['options'] as List<dynamic>? ?? [];
-
-
-    return Subscription(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? '',
-      shortDescription: json['shortDescription'] ?? '',
-      fullDescription: json['fullDescription'] ?? '',
-      fullDescriptionJson: json['fullDescriptionJson'] ?? '',
-      planId: json['planId'] ?? 0,
-      isActive: json['isActive'] ?? false,
-      currency: currencyData['currency'] ?? 'BYN',
-      activeFrom: json['activeFrom'] != null ? DateTime.parse(json['activeFrom']) : null,
-      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(),
-    );
-  }
-
-  @override
-  String toString() {
-    return 'Subscription{id: $id, title: $title, isActive: $isActive}';
-  }
+
+import 'package:be_happy/domain/entities/subscription_period.dart';
+
+class Subscription {
+  final int id;
+  final String title;
+  final String shortDescription;
+  final String fullDescription;
+  final String fullDescriptionJson;
+  final int planId;
+  final bool isActive;
+  final bool isCurrent;
+  final String currency;
+  final DateTime? activeFrom;
+  final DateTime? activeTo;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final List<SubscriptionPeriod> options;
+
+
+  Subscription({
+    required this.id,
+    required this.title,
+    required this.shortDescription,
+    required this.fullDescription,
+    required this.fullDescriptionJson,
+    required this.planId,
+    required this.isActive,
+    required this.currency,
+    this.activeFrom,
+    this.activeTo,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.isCurrent,
+    required this.options,
+  });
+
+  factory Subscription.fromJson(Map<String, dynamic> json) {
+    final currencyData = json['currency'] as Map<String, dynamic>? ?? {};
+    final optionsData = json['options'] as List<dynamic>? ?? [];
+
+
+    return Subscription(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? '',
+      shortDescription: json['shortDescription'] ?? '',
+      fullDescription: json['fullDescription'] ?? '',
+      fullDescriptionJson: json['fullDescriptionJson'] ?? '',
+      planId: json['planId'] ?? 0,
+      isActive: json['isActive'] ?? false,
+      currency: currencyData['currency'] ?? 'BYN',
+      activeFrom: json['activeFrom'] != null ? DateTime.parse(json['activeFrom']) : null,
+      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(),
+    );
+  }
+
+  @override
+  String toString() {
+    return 'Subscription{id: $id, title: $title, isActive: $isActive}';
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/subscription_period.dart b/lib/domain/entities/subscription_period.dart
index aa03fc6..75e61a7 100644
--- a/lib/domain/entities/subscription_period.dart
+++ b/lib/domain/entities/subscription_period.dart
@@ -1,33 +1,33 @@
-class SubscriptionPeriod {
-  final int id;
-  final int subscriptionId;
-  final int days;
-  final String title;
-  final double price;
-  final String pricePrint;
-
-  SubscriptionPeriod({
-    required this.id,
-    required this.subscriptionId,
-    required this.days,
-    required this.title,
-    required this.price,
-    required this.pricePrint,
-  });
-
-  factory SubscriptionPeriod.fromJson(Map<String, dynamic> json) {
-    return SubscriptionPeriod(
-      id: json['id'] ?? 0,
-      subscriptionId: json['subscriptionId'] ?? 0,
-      days: json['days'] ?? 0,
-      title: json['title'] ?? '',
-      price: (json['price'] ?? 0).toDouble(),
-      pricePrint: json['pricePrint'] ?? '',
-    );
-  }
-
-  @override
-  String toString() {
-    return 'SubscriptionPeriod{id: $id, title: $title, days: $days, price: $price}';
-  }
+class SubscriptionPeriod {
+  final int id;
+  final int subscriptionId;
+  final int days;
+  final String title;
+  final double price;
+  final String pricePrint;
+
+  SubscriptionPeriod({
+    required this.id,
+    required this.subscriptionId,
+    required this.days,
+    required this.title,
+    required this.price,
+    required this.pricePrint,
+  });
+
+  factory SubscriptionPeriod.fromJson(Map<String, dynamic> json) {
+    return SubscriptionPeriod(
+      id: json['id'] ?? 0,
+      subscriptionId: json['subscriptionId'] ?? 0,
+      days: json['days'] ?? 0,
+      title: json['title'] ?? '',
+      price: (json['price'] ?? 0).toDouble(),
+      pricePrint: json['pricePrint'] ?? '',
+    );
+  }
+
+  @override
+  String toString() {
+    return 'SubscriptionPeriod{id: $id, title: $title, days: $days, price: $price}';
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/entities/tariff.dart b/lib/domain/entities/tariff.dart
index 9180b23..a999e32 100644
--- a/lib/domain/entities/tariff.dart
+++ b/lib/domain/entities/tariff.dart
@@ -1,51 +1,51 @@
-class Tariff {
-  final int id;
-  final String title;
-  final String description;
-  final bool isActive;
-  final String currency;
-  final double holdPrice;      // Старт / бронь
-  final double drivePrice;     // Цена минуты
-  final double pausePrice;     // Пауза
-  final double startPrice;     // Старт цена
-  final double cashback;       // Процент кэшбэка
-  final double insurance;      // Страховка
-
-  Tariff({
-    required this.id,
-    required this.title,
-    required this.description,
-    required this.isActive,
-    required this.currency,
-    required this.holdPrice,
-    required this.drivePrice,
-    required this.pausePrice,
-    required this.startPrice,
-    required this.cashback,
-    required this.insurance,
-  });
-
-  factory Tariff.fromJson(Map<String, dynamic> json) {
-    final planPrice = json['planPrice'] as Map<String, dynamic>? ?? {};
-    final currency = json['currency'] as Map<String, dynamic>? ?? {};
-
-    return Tariff(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? 'Unknown',
-      description: json['description'] ?? '',
-      isActive: json['isActive'] ?? false,
-      currency: currency['currency'] ?? 'BYN',
-      holdPrice: (planPrice['hold'] as num?)?.toDouble() ?? 0.0,
-      drivePrice: (planPrice['drive'] as num?)?.toDouble() ?? 0.0,
-      pausePrice: (planPrice['pause'] as num?)?.toDouble() ?? 0.0,
-      startPrice: (planPrice['start'] as num?)?.toDouble() ?? 0.0,
-      cashback: (planPrice['cashback'] as num?)?.toDouble() ?? 0.0,
-      insurance: (planPrice['insurance'] as num?)?.toDouble() ?? 0.0,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'Tariff{id: $id, title: $title, isActive: $isActive}';
-  }
-}
+class Tariff {
+  final int id;
+  final String title;
+  final String description;
+  final bool isActive;
+  final String currency;
+  final double holdPrice;      // Старт / бронь
+  final double drivePrice;     // Цена минуты
+  final double pausePrice;     // Пауза
+  final double startPrice;     // Старт цена
+  final double cashback;       // Процент кэшбэка
+  final double insurance;      // Страховка
+
+  Tariff({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.isActive,
+    required this.currency,
+    required this.holdPrice,
+    required this.drivePrice,
+    required this.pausePrice,
+    required this.startPrice,
+    required this.cashback,
+    required this.insurance,
+  });
+
+  factory Tariff.fromJson(Map<String, dynamic> json) {
+    final planPrice = json['planPrice'] as Map<String, dynamic>? ?? {};
+    final currency = json['currency'] as Map<String, dynamic>? ?? {};
+
+    return Tariff(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? 'Unknown',
+      description: json['description'] ?? '',
+      isActive: json['isActive'] ?? false,
+      currency: currency['currency'] ?? 'BYN',
+      holdPrice: (planPrice['hold'] as num?)?.toDouble() ?? 0.0,
+      drivePrice: (planPrice['drive'] as num?)?.toDouble() ?? 0.0,
+      pausePrice: (planPrice['pause'] as num?)?.toDouble() ?? 0.0,
+      startPrice: (planPrice['start'] as num?)?.toDouble() ?? 0.0,
+      cashback: (planPrice['cashback'] as num?)?.toDouble() ?? 0.0,
+      insurance: (planPrice['insurance'] as num?)?.toDouble() ?? 0.0,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'Tariff{id: $id, title: $title, isActive: $isActive}';
+  }
+}
diff --git a/lib/domain/entities/top_up_tariff.dart b/lib/domain/entities/top_up_tariff.dart
index 8218fc2..47bcb06 100644
--- a/lib/domain/entities/top_up_tariff.dart
+++ b/lib/domain/entities/top_up_tariff.dart
@@ -1,17 +1,17 @@
-class TopUpTariff {
-  final int id;
-  final int points;
-  final double price;
-  final double? discountPercent;
-
-  TopUpTariff({
-    required this.id,
-    required this.points,
-    required this.price,
-    this.discountPercent,
-  });
-
-  double get finalPrice => discountPercent != null
-      ? price * (1 - discountPercent! / 100)
-      : price;
-}
+class TopUpTariff {
+  final int id;
+  final int points;
+  final double price;
+  final double? discountPercent;
+
+  TopUpTariff({
+    required this.id,
+    required this.points,
+    required this.price,
+    this.discountPercent,
+  });
+
+  double get finalPrice => discountPercent != null
+      ? price * (1 - discountPercent! / 100)
+      : price;
+}
diff --git a/lib/domain/entities/user_auth_data.dart b/lib/domain/entities/user_auth_data.dart
index 2df8ca3..91da6e9 100644
--- a/lib/domain/entities/user_auth_data.dart
+++ b/lib/domain/entities/user_auth_data.dart
@@ -1,9 +1,9 @@
-class UserAuthData {
-  final String accessToken;
-  final String refreshToken;
-
-  UserAuthData({
-    required this.accessToken,
-    required this.refreshToken,
-  });
+class UserAuthData {
+  final String accessToken;
+  final String refreshToken;
+
+  UserAuthData({
+    required this.accessToken,
+    required this.refreshToken,
+  });
 }
\ No newline at end of file
diff --git a/lib/domain/entities/user_check_flags.dart b/lib/domain/entities/user_check_flags.dart
index 027e3f0..112eba4 100644
--- a/lib/domain/entities/user_check_flags.dart
+++ b/lib/domain/entities/user_check_flags.dart
@@ -1,23 +1,23 @@
-class UserCheckFlags {
-  final bool hasFine;
-  final bool hasUnpaidOrder;
-  final bool hasCard;
-
-  const UserCheckFlags({
-    required this.hasFine,
-    required this.hasUnpaidOrder,
-    required this.hasCard,
-  });
-
-  UserCheckFlags copyWith({
-    bool? hasFine,
-    bool? hasUnpaidOrder,
-    bool? hasCard,
-  }) {
-    return UserCheckFlags(
-      hasFine: hasFine ?? this.hasFine,
-      hasUnpaidOrder: hasUnpaidOrder ?? this.hasUnpaidOrder,
-      hasCard: hasCard ?? this.hasCard,
-    );
-  }
-}
+class UserCheckFlags {
+  final bool hasFine;
+  final bool hasUnpaidOrder;
+  final bool hasCard;
+
+  const UserCheckFlags({
+    required this.hasFine,
+    required this.hasUnpaidOrder,
+    required this.hasCard,
+  });
+
+  UserCheckFlags copyWith({
+    bool? hasFine,
+    bool? hasUnpaidOrder,
+    bool? hasCard,
+  }) {
+    return UserCheckFlags(
+      hasFine: hasFine ?? this.hasFine,
+      hasUnpaidOrder: hasUnpaidOrder ?? this.hasUnpaidOrder,
+      hasCard: hasCard ?? this.hasCard,
+    );
+  }
+}
diff --git a/lib/domain/entities/user_profile.dart b/lib/domain/entities/user_profile.dart
index 3f13a18..93f3416 100644
--- a/lib/domain/entities/user_profile.dart
+++ b/lib/domain/entities/user_profile.dart
@@ -1,38 +1,38 @@
-class UserProfile {
-  String name;
-  String birthDate;
-  String phone;
-  String email;
-  double? balance;
-  int? avatarId;
-  String? avatarUrl;
-
-  UserProfile({
-    required this.name,
-    required this.birthDate,
-    required this.phone,
-    required this.email,
-    this.balance,
-    this.avatarId,
-    this.avatarUrl,
-  });
-
-  UserProfile copyWith({
-    String? name,
-    String? birthDate,
-    String? email,
-    double? balance,
-    int? avatarId,
-    String? avatarUrl,
-  }) {
-    return UserProfile(
-      name: name ?? this.name,
-      birthDate: birthDate ?? this.birthDate,
-      phone: phone, // телефон не меняется
-      email: email ?? this.email,
-      balance: balance ?? this.balance,
-      avatarId: avatarId ?? this.avatarId,
-      avatarUrl: avatarUrl ?? this.avatarUrl,
-    );
-  }
-}
+class UserProfile {
+  String name;
+  String birthDate;
+  String phone;
+  String email;
+  double? balance;
+  int? avatarId;
+  String? avatarUrl;
+
+  UserProfile({
+    required this.name,
+    required this.birthDate,
+    required this.phone,
+    required this.email,
+    this.balance,
+    this.avatarId,
+    this.avatarUrl,
+  });
+
+  UserProfile copyWith({
+    String? name,
+    String? birthDate,
+    String? email,
+    double? balance,
+    int? avatarId,
+    String? avatarUrl,
+  }) {
+    return UserProfile(
+      name: name ?? this.name,
+      birthDate: birthDate ?? this.birthDate,
+      phone: phone, // телефон не меняется
+      email: email ?? this.email,
+      balance: balance ?? this.balance,
+      avatarId: avatarId ?? this.avatarId,
+      avatarUrl: avatarUrl ?? this.avatarUrl,
+    );
+  }
+}
diff --git a/lib/domain/entities/zone.dart b/lib/domain/entities/zone.dart
index be5d52f..5e693b4 100644
--- a/lib/domain/entities/zone.dart
+++ b/lib/domain/entities/zone.dart
@@ -1,123 +1,123 @@
-import 'dart:convert';
-import 'package:be_happy/domain/entities/point.dart';
-
-class Zone {
-  final int id;
-  final String title;
-  final String description;
-  final String type;
-  final bool isActive;
-  final String shapeType;
-  // Трехмерная структура для поддержки MultiPolygon и дыр (holes):
-  // geometry[индекс_полигона][индекс_кольца][индекс_точки]
-  // индекс_кольца == 0 — внешняя граница, > 0 — внутренние вырезы (дыры)
-  final List<List<List<Point>>> geometry;
-  final String speedLimit;
-
-  Zone({
-    required this.id,
-    required this.title,
-    required this.description,
-    required this.type,
-    required this.isActive,
-    required this.shapeType,
-    required this.geometry,
-    required this.speedLimit,
-  });
-
-  // Геттер для обратной совместимости (возвращает внешнее кольцо первого полигона)
-  List<Point> get points {
-    if (geometry.isNotEmpty && geometry[0].isNotEmpty) {
-      return geometry[0][0];
-    }
-    return [];
-  }
-
-  factory Zone.fromJson(Map<String, dynamic> json) {
-    final zoneCoordinates = json['coordinates'] as Map<String, dynamic>? ?? {};
-    final String coordsString = zoneCoordinates['coordinates'] ?? '[]';
-    final String shapeType = zoneCoordinates['type'] ?? 'Polygon';
-
-    List<List<List<Point>>> parsedGeometry = [];
-
-    try {
-      final dynamic decoded = jsonDecode(coordsString);
-
-      if (decoded is List && decoded.isNotEmpty) {
-        if (shapeType == 'Polygon') {
-          // Структура: [[[lon, lat], [lon, lat], ...], [hole1], ...]
-          List<List<Point>> polygonRings = [];
-          for (var ring in decoded) {
-            if (ring is List) {
-              List<Point> ringPoints = [];
-              for (var coord in ring) {
-                if (coord is List && coord.length >= 2) {
-                  // В GeoJSON сначала идет Longitude, затем Latitude
-                  ringPoints.add(Point(
-                    (coord[1] as num).toDouble(),
-                    (coord[0] as num).toDouble(),
-                  ));
-                }
-              }
-              if (ringPoints.isNotEmpty) polygonRings.add(ringPoints);
-            }
-          }
-          if (polygonRings.isNotEmpty) parsedGeometry.add(polygonRings);
-
-        } else if (shapeType == 'MultiPolygon') {
-          // Структура: [[[[lon, lat], ...]], [[[lon, lat], ...]]]
-          for (var poly in decoded) {
-            if (poly is List) {
-              List<List<Point>> polygonRings = [];
-              for (var ring in poly) {
-                if (ring is List) {
-                  List<Point> ringPoints = [];
-                  for (var coord in ring) {
-                    if (coord is List && coord.length >= 2) {
-                      ringPoints.add(Point(
-                        (coord[1] as num).toDouble(),
-                        (coord[0] as num).toDouble(),
-                      ));
-                    }
-                  }
-                  if (ringPoints.isNotEmpty) polygonRings.add(ringPoints);
-                }
-              }
-              if (polygonRings.isNotEmpty) parsedGeometry.add(polygonRings);
-            }
-          }
-        } else {
-          // Fallback для LineString или плоских списков
-          List<Point> ringPoints = [];
-          for (var coord in decoded) {
-            if (coord is List && coord.length >= 2) {
-              ringPoints.add(Point(
-                (coord[1] as num).toDouble(),
-                (coord[0] as num).toDouble(),
-              ));
-            }
-          }
-          if (ringPoints.isNotEmpty) parsedGeometry.add([ringPoints]);
-        }
-      }
-    } catch (e) {
-      print("PARSE ERROR for Zone ID ${json['id']}: $e");
-    }
-
-    return Zone(
-      id: json['id'] ?? 0,
-      title: json['title'] ?? 'Unknown',
-      description: json['description'] ?? '',
-      type: json['type'] ?? '',
-      isActive: json['isActive'] ?? false,
-      speedLimit: json['speedLimit'] ?? '',
-      shapeType: shapeType,
-      geometry: parsedGeometry,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'Zone{id: $id, title: $title, type: $type, polygonsCount: ${geometry.length}}';
-  }
+import 'dart:convert';
+import 'package:be_happy/domain/entities/point.dart';
+
+class Zone {
+  final int id;
+  final String title;
+  final String description;
+  final String type;
+  final bool isActive;
+  final String shapeType;
+  // Трехмерная структура для поддержки MultiPolygon и дыр (holes):
+  // geometry[индекс_полигона][индекс_кольца][индекс_точки]
+  // индекс_кольца == 0 — внешняя граница, > 0 — внутренние вырезы (дыры)
+  final List<List<List<Point>>> geometry;
+  final String speedLimit;
+
+  Zone({
+    required this.id,
+    required this.title,
+    required this.description,
+    required this.type,
+    required this.isActive,
+    required this.shapeType,
+    required this.geometry,
+    required this.speedLimit,
+  });
+
+  // Геттер для обратной совместимости (возвращает внешнее кольцо первого полигона)
+  List<Point> get points {
+    if (geometry.isNotEmpty && geometry[0].isNotEmpty) {
+      return geometry[0][0];
+    }
+    return [];
+  }
+
+  factory Zone.fromJson(Map<String, dynamic> json) {
+    final zoneCoordinates = json['coordinates'] as Map<String, dynamic>? ?? {};
+    final String coordsString = zoneCoordinates['coordinates'] ?? '[]';
+    final String shapeType = zoneCoordinates['type'] ?? 'Polygon';
+
+    List<List<List<Point>>> parsedGeometry = [];
+
+    try {
+      final dynamic decoded = jsonDecode(coordsString);
+
+      if (decoded is List && decoded.isNotEmpty) {
+        if (shapeType == 'Polygon') {
+          // Структура: [[[lon, lat], [lon, lat], ...], [hole1], ...]
+          List<List<Point>> polygonRings = [];
+          for (var ring in decoded) {
+            if (ring is List) {
+              List<Point> ringPoints = [];
+              for (var coord in ring) {
+                if (coord is List && coord.length >= 2) {
+                  // В GeoJSON сначала идет Longitude, затем Latitude
+                  ringPoints.add(Point(
+                    (coord[1] as num).toDouble(),
+                    (coord[0] as num).toDouble(),
+                  ));
+                }
+              }
+              if (ringPoints.isNotEmpty) polygonRings.add(ringPoints);
+            }
+          }
+          if (polygonRings.isNotEmpty) parsedGeometry.add(polygonRings);
+
+        } else if (shapeType == 'MultiPolygon') {
+          // Структура: [[[[lon, lat], ...]], [[[lon, lat], ...]]]
+          for (var poly in decoded) {
+            if (poly is List) {
+              List<List<Point>> polygonRings = [];
+              for (var ring in poly) {
+                if (ring is List) {
+                  List<Point> ringPoints = [];
+                  for (var coord in ring) {
+                    if (coord is List && coord.length >= 2) {
+                      ringPoints.add(Point(
+                        (coord[1] as num).toDouble(),
+                        (coord[0] as num).toDouble(),
+                      ));
+                    }
+                  }
+                  if (ringPoints.isNotEmpty) polygonRings.add(ringPoints);
+                }
+              }
+              if (polygonRings.isNotEmpty) parsedGeometry.add(polygonRings);
+            }
+          }
+        } else {
+          // Fallback для LineString или плоских списков
+          List<Point> ringPoints = [];
+          for (var coord in decoded) {
+            if (coord is List && coord.length >= 2) {
+              ringPoints.add(Point(
+                (coord[1] as num).toDouble(),
+                (coord[0] as num).toDouble(),
+              ));
+            }
+          }
+          if (ringPoints.isNotEmpty) parsedGeometry.add([ringPoints]);
+        }
+      }
+    } catch (e) {
+      print("PARSE ERROR for Zone ID ${json['id']}: $e");
+    }
+
+    return Zone(
+      id: json['id'] ?? 0,
+      title: json['title'] ?? 'Unknown',
+      description: json['description'] ?? '',
+      type: json['type'] ?? '',
+      isActive: json['isActive'] ?? false,
+      speedLimit: json['speedLimit'] ?? '',
+      shapeType: shapeType,
+      geometry: parsedGeometry,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'Zone{id: $id, title: $title, type: $type, polygonsCount: ${geometry.length}}';
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/app_settings_repository.dart b/lib/domain/repositories/app_settings_repository.dart
index 029c231..4cac6c7 100644
--- a/lib/domain/repositories/app_settings_repository.dart
+++ b/lib/domain/repositories/app_settings_repository.dart
@@ -1,7 +1,7 @@
-import 'package:be_happy/domain/entities/map_settings.dart';
-
-abstract class AppSettingsRepository {
-
-  Future<MapSettings> getMapSettings();
-  Future<void> saveMapSettings(MapSettings settings);
+import 'package:be_happy/domain/entities/map_settings.dart';
+
+abstract class AppSettingsRepository {
+
+  Future<MapSettings> getMapSettings();
+  Future<void> saveMapSettings(MapSettings settings);
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/auth_repository.dart b/lib/domain/repositories/auth_repository.dart
index 18cc89f..c077c1e 100644
--- a/lib/domain/repositories/auth_repository.dart
+++ b/lib/domain/repositories/auth_repository.dart
@@ -1,14 +1,14 @@
-import 'dart:ffi';
-
-import '../../core/result.dart';
-import '../entities/user_auth_data.dart';
-
-abstract class AuthRepository {
-  Future<String> login(String phone);
-
-  Future<Result<void>> verifyCode(String code, String token);
-
-  Future<UserAuthData> refreshToken();
-
-  Future<void> logout();
-}
+import 'dart:ffi';
+
+import '../../core/result.dart';
+import '../entities/user_auth_data.dart';
+
+abstract class AuthRepository {
+  Future<String> login(String phone);
+
+  Future<Result<void>> verifyCode(String code, String token);
+
+  Future<UserAuthData> refreshToken();
+
+  Future<void> logout();
+}
diff --git a/lib/domain/repositories/certificate_repository.dart b/lib/domain/repositories/certificate_repository.dart
index 1a1a68e..c80cb31 100644
--- a/lib/domain/repositories/certificate_repository.dart
+++ b/lib/domain/repositories/certificate_repository.dart
@@ -1,11 +1,11 @@
-import '../../core/result.dart';
-import '../entities/certificate.dart';
-
-abstract class CertificateRepository {
-  Future<Result<List<Certificate>>> getCertificates();
-  
-  Future<Result<Map<String, dynamic>>> purchaseCertificate({
-    required int certificateId,
-    required int cardId,
-  });
-}
+import '../../core/result.dart';
+import '../entities/certificate.dart';
+
+abstract class CertificateRepository {
+  Future<Result<List<Certificate>>> getCertificates();
+  
+  Future<Result<Map<String, dynamic>>> purchaseCertificate({
+    required int certificateId,
+    required int cardId,
+  });
+}
diff --git a/lib/domain/repositories/launch_repository.dart b/lib/domain/repositories/launch_repository.dart
index 863cd46..2b73757 100644
--- a/lib/domain/repositories/launch_repository.dart
+++ b/lib/domain/repositories/launch_repository.dart
@@ -1,3 +1,3 @@
-abstract class LaunchRepository {
-  Future<bool> isFirstLaunch();
-}
+abstract class LaunchRepository {
+  Future<bool> isFirstLaunch();
+}
diff --git a/lib/domain/repositories/news_repository.dart b/lib/domain/repositories/news_repository.dart
index a9fadf1..a288531 100644
--- a/lib/domain/repositories/news_repository.dart
+++ b/lib/domain/repositories/news_repository.dart
@@ -1,6 +1,6 @@
-import '../entities/news.dart';
-
-abstract class NewsRepository {
-  Future<List<NewsEntity>> getNews();
-  Future<NewsEntity> getNewsById(int id);
+import '../entities/news.dart';
+
+abstract class NewsRepository {
+  Future<List<NewsEntity>> getNews();
+  Future<NewsEntity> getNewsById(int id);
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/notification_repository.dart b/lib/domain/repositories/notification_repository.dart
index 8025fae..bbe5b98 100644
--- a/lib/domain/repositories/notification_repository.dart
+++ b/lib/domain/repositories/notification_repository.dart
@@ -1,19 +1,19 @@
-import 'package:be_happy/domain/entities/client_notification.dart';
-
-import '../usecase/get_notifications_usecase.dart';
-
-abstract class NotificationRepository {
-  /// Устанавливает постоянное SSE-соединение и возвращает поток уведомлений
-  Stream<ClientNotification> getNotificationsStream();
-
-  /// Отменяет уведомление по ID
-  Future<ClientNotification> cancelNotification(int id);
-
-  /// Закрывает SSE-соединение
-  void closeStream();
-
-  /// получить список уведомлений
-  Future<NotificationsResult> getNotifications({
-    int page = 1,
-    int pageSize = 10,
-  });}
+import 'package:be_happy/domain/entities/client_notification.dart';
+
+import '../usecase/get_notifications_usecase.dart';
+
+abstract class NotificationRepository {
+  /// Устанавливает постоянное SSE-соединение и возвращает поток уведомлений
+  Stream<ClientNotification> getNotificationsStream();
+
+  /// Отменяет уведомление по ID
+  Future<ClientNotification> cancelNotification(int id);
+
+  /// Закрывает SSE-соединение
+  void closeStream();
+
+  /// получить список уведомлений
+  Future<NotificationsResult> getNotifications({
+    int page = 1,
+    int pageSize = 10,
+  });}
diff --git a/lib/domain/repositories/payment_repository.dart b/lib/domain/repositories/payment_repository.dart
index d1db710..fcc626f 100644
--- a/lib/domain/repositories/payment_repository.dart
+++ b/lib/domain/repositories/payment_repository.dart
@@ -1,20 +1,20 @@
-import '../../core/result.dart';
-import '../entities/payment_card.dart';
-
-abstract class PaymentRepository {
-  Future<Result<List<PaymentCard>>> getPaymentCards();
-  
-  Future<Result<Map<String, dynamic>>> addPaymentCard(
-    /*required String cardNumber,
-    required String cardHolder,
-    required String expiryMonth,
-    required String expiryYear,
-    required String cvv,*/
-  );
-  
-  Future<Result<void>> setMainPaymentCard(int cardId);
-  
-  Future<Result<void>> removePaymentCard(int cardId);
-  
-  Future<Result<bool>> activateSubscription(int optionId, int cardId);
+import '../../core/result.dart';
+import '../entities/payment_card.dart';
+
+abstract class PaymentRepository {
+  Future<Result<List<PaymentCard>>> getPaymentCards();
+  
+  Future<Result<Map<String, dynamic>>> addPaymentCard(
+    /*required String cardNumber,
+    required String cardHolder,
+    required String expiryMonth,
+    required String expiryYear,
+    required String cvv,*/
+  );
+  
+  Future<Result<void>> setMainPaymentCard(int cardId);
+  
+  Future<Result<void>> removePaymentCard(int cardId);
+  
+  Future<Result<bool>> activateSubscription(int optionId, int cardId);
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/pin_repository.dart b/lib/domain/repositories/pin_repository.dart
index 71ac5ce..3dde1dc 100644
--- a/lib/domain/repositories/pin_repository.dart
+++ b/lib/domain/repositories/pin_repository.dart
@@ -1,9 +1,9 @@
-import '../entities/user_auth_data.dart';
-
-abstract class PinRepository {
-  Future<String?> getSavedPin();
-
-  Future<void> savePin(String? pin);
-
-  Future<void> removePin();
+import '../entities/user_auth_data.dart';
+
+abstract class PinRepository {
+  Future<String?> getSavedPin();
+
+  Future<void> savePin(String? pin);
+
+  Future<void> removePin();
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/profile_repository.dart b/lib/domain/repositories/profile_repository.dart
index 410c311..6f831a4 100644
--- a/lib/domain/repositories/profile_repository.dart
+++ b/lib/domain/repositories/profile_repository.dart
@@ -1,12 +1,12 @@
-import 'dart:io';
-
-import '../entities/user_check_flags.dart';
-import '../entities/user_profile.dart';
-
-abstract class UserProfileRepository {
-  Future<UserProfile> getProfile();
-  Future<UserProfile?> updateProfile(UserProfile profile);
-  Future<int?> uploadProfilePhoto(File imageFile);
-  Future<UserCheckFlags?> checkUser();
-}
-
+import 'dart:io';
+
+import '../entities/user_check_flags.dart';
+import '../entities/user_profile.dart';
+
+abstract class UserProfileRepository {
+  Future<UserProfile> getProfile();
+  Future<UserProfile?> updateProfile(UserProfile profile);
+  Future<int?> uploadProfilePhoto(File imageFile);
+  Future<UserCheckFlags?> checkUser();
+}
+
diff --git a/lib/domain/repositories/promo_code_repository.dart b/lib/domain/repositories/promo_code_repository.dart
index 467ed16..d694b0c 100644
--- a/lib/domain/repositories/promo_code_repository.dart
+++ b/lib/domain/repositories/promo_code_repository.dart
@@ -1,5 +1,5 @@
-import '../entities/promo_code_result.dart';
-
-abstract class PromoCodeRepository {
-  Future<PromoCodeResult> applyPromoCode(String code);
+import '../entities/promo_code_result.dart';
+
+abstract class PromoCodeRepository {
+  Future<PromoCodeResult> applyPromoCode(String code);
 }
\ No newline at end of file
diff --git a/lib/domain/repositories/scooter_repository.dart b/lib/domain/repositories/scooter_repository.dart
index 3d5f9ce..b2b123a 100644
--- a/lib/domain/repositories/scooter_repository.dart
+++ b/lib/domain/repositories/scooter_repository.dart
@@ -1,56 +1,65 @@
-
-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';
-import '../entities/tariff.dart';
-import '../entities/scooter_order.dart';
-
-abstract class ScooterRepository {
-  Future<List<Scooter>> getScooters(List<double> area, int page, int pageSize);
-  Future<Result<Scooter?>> getScooter(int id);
-  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId);
-  Future<Result<List<Subscription>>> getAvailableSubscriptions();
-  Future<Result<Subscription>> getSubscriptionById(int id);
-  Future<Result<List<ClientSubscription>>> getClientSubscriptions();
-  Future<Result<ScooterOrder>> bookScooter({
-    required int scooterId,
-    required int planId,
-    int? subscriptionId,
-    int? cardId,
-    required bool isBalance,
-    required bool isInsurance,
-  });
-  Future<Result<ScooterOrder>> startRide(int orderId);
-  Future<Result<void>> cancelRide(int orderId);
-  Future<Result<ScooterOrder>> pauseRide(int orderId);
-  Future<Result<ScooterOrder>> resumeRide(int orderId);
-  Future<Result<void>> finishRide(int orderId, List<int> files);
-  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<void>> payScooterOrderWithPhotos({
-    required int orderId,
-    required int? cardId,
-    required bool isBalance,
-  });
-  Future<Result<ScooterOrder>> getScooterOrderById(int id);
-
-  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
-    int page = 1,
-    int pageSize = 20,
-  });
-
-  Future<Result<Scooter?>> getScooterByTitle(String title);
-
-  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id);
-
-}
+
+import 'dart:io';
+
+import 'package:be_happy/domain/entities/active_scooter_order.dart';
+
+import '../../core/result.dart';
+import '../entities/client_subscription.dart';
+import '../entities/fine.dart';
+import '../entities/point.dart';
+import '../entities/scooter.dart';
+import '../entities/subscription.dart';
+import '../entities/tariff.dart';
+import '../entities/scooter_order.dart';
+
+abstract class ScooterRepository {
+  Future<List<Scooter>> getScooters(List<double> area, int page, int pageSize);
+  Future<Result<Scooter?>> getScooter(int id);
+  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId);
+  Future<Result<List<Subscription>>> getAvailableSubscriptions();
+  Future<Result<Subscription>> getSubscriptionById(int id);
+  Future<Result<List<ClientSubscription>>> getClientSubscriptions();
+  Future<Result<ScooterOrder>> bookScooter({
+    required int scooterId,
+    required int planId,
+    int? subscriptionId,
+    int? cardId,
+    required bool isBalance,
+    required bool isInsurance,
+  });
+  Future<Result<ScooterOrder>> startRide(int orderId);
+  Future<Result<void>> cancelRide(int orderId);
+  Future<Result<ScooterOrder>> pauseRide(int orderId);
+  Future<Result<ScooterOrder>> resumeRide(int orderId);
+  Future<Result<void>> finishRide(int orderId, List<int> files);
+  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<void>> payScooterOrderWithPhotos({
+    required int orderId,
+    required int? cardId,
+    required bool isBalance,
+  });
+  Future<Result<ScooterOrder>> getScooterOrderById(int id);
+
+  Future<Result<List<ScooterOrder>>> getScooterOrderHistory({
+    int page = 1,
+    int pageSize = 20,
+  });
+
+  Future<Result<Scooter?>> getScooterByTitle(String title);
+
+  Future<Result<List<Point>>> getScooterOrderRouteHistory(int id);
+
+  Future<Result<Fine>> getFineDetails(int orderId);
+
+  Future<Result<void>> payFine({
+    required int orderId,
+    int? cardId,
+    required bool isBalance,
+  });
+
+}
diff --git a/lib/domain/repositories/zone_repository.dart b/lib/domain/repositories/zone_repository.dart
index 3acab73..96e3b68 100644
--- a/lib/domain/repositories/zone_repository.dart
+++ b/lib/domain/repositories/zone_repository.dart
@@ -1,6 +1,6 @@
-import '../entities/zone.dart';
-
-abstract class ZoneRepository {
-  Future<List<Zone>> getZones(List<double> area, int page, int pageSize);
-}
-
+import '../entities/zone.dart';
+
+abstract class ZoneRepository {
+  Future<List<Zone>> getZones(List<double> area, int page, int pageSize);
+}
+
diff --git a/lib/domain/service/device_info_service.dart b/lib/domain/service/device_info_service.dart
index 01eff6a..dbd9b52 100644
--- a/lib/domain/service/device_info_service.dart
+++ b/lib/domain/service/device_info_service.dart
@@ -1,4 +1,4 @@
-abstract class DeviceInfoService {
-  Future<String?> getSystemId();      //SSAID - Android, IDFV - iOS (Vendor ID - один идентификатор для всех приложений одного разработчика, уникальный для одного устройства)
-  Future<String> getDeviceModel();
+abstract class DeviceInfoService {
+  Future<String?> getSystemId();      //SSAID - Android, IDFV - iOS (Vendor ID - один идентификатор для всех приложений одного разработчика, уникальный для одного устройства)
+  Future<String> getDeviceModel();
 }
\ No newline at end of file
diff --git a/lib/domain/service/security_service.dart b/lib/domain/service/security_service.dart
index 66bd06b..360e099 100644
--- a/lib/domain/service/security_service.dart
+++ b/lib/domain/service/security_service.dart
@@ -1,16 +1,16 @@
-import 'package:be_happy/domain/entities/user_auth_data.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-abstract class SecurityService {
-  Future<void> saveTokens(UserAuthData data);
-  Future<void> removeTokens();
-  Future<String?> getRefreshToken();
-  Future<String?> getAccessToken();
-  
-  // Методы для работы с полными номерами карт
-  Future<void> saveCardFullNumber(int cardId, String fullCardNumber);
-  Future<String?> getCardFullNumber(int cardId);
-  Future<void> removeCardFullNumber(int cardId);
-  Future<void> clearAllCardsNumbers();
-  // Future<UserAuthData?> getTokens();
+import 'package:be_happy/domain/entities/user_auth_data.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+abstract class SecurityService {
+  Future<void> saveTokens(UserAuthData data);
+  Future<void> removeTokens();
+  Future<String?> getRefreshToken();
+  Future<String?> getAccessToken();
+  
+  // Методы для работы с полными номерами карт
+  Future<void> saveCardFullNumber(int cardId, String fullCardNumber);
+  Future<String?> getCardFullNumber(int cardId);
+  Future<void> removeCardFullNumber(int cardId);
+  Future<void> clearAllCardsNumbers();
+  // Future<UserAuthData?> getTokens();
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/activate_subscription_usecase.dart b/lib/domain/usecase/activate_subscription_usecase.dart
index 7683106..cf358df 100644
--- a/lib/domain/usecase/activate_subscription_usecase.dart
+++ b/lib/domain/usecase/activate_subscription_usecase.dart
@@ -1,12 +1,12 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/repositories/payment_repository.dart';
-
-class ActivateSubscriptionUsecase {
-  final PaymentRepository repository;
-
-  ActivateSubscriptionUsecase(this.repository);
-
-  Future<Result<bool>> call(int optionId, int cardId) {
-    return repository.activateSubscription(optionId, cardId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/repositories/payment_repository.dart';
+
+class ActivateSubscriptionUsecase {
+  final PaymentRepository repository;
+
+  ActivateSubscriptionUsecase(this.repository);
+
+  Future<Result<bool>> call(int optionId, int cardId) {
+    return repository.activateSubscription(optionId, cardId);
+  }
+}
diff --git a/lib/domain/usecase/add_payment_card_usecase.dart b/lib/domain/usecase/add_payment_card_usecase.dart
index 5430c38..38b18c0 100644
--- a/lib/domain/usecase/add_payment_card_usecase.dart
+++ b/lib/domain/usecase/add_payment_card_usecase.dart
@@ -1,24 +1,24 @@
-import '../repositories/payment_repository.dart';
-import '../../core/result.dart';
-
-class AddPaymentCardUsecase {
-  final PaymentRepository repository;
-
-  AddPaymentCardUsecase(this.repository);
-
-  Future<Result<Map<String, dynamic>>> call(
-    /*required String cardNumber,
-    required String cardHolder,
-    required String expiryMonth,
-    required String expiryYear,
-    required String cvv,*/
-  ) {
-    return repository.addPaymentCard(
-      /*cardNumber: cardNumber,
-      cardHolder: cardHolder,
-      expiryMonth: expiryMonth,
-      expiryYear: expiryYear,
-      cvv: cvv,*/
-    );
-  }
+import '../repositories/payment_repository.dart';
+import '../../core/result.dart';
+
+class AddPaymentCardUsecase {
+  final PaymentRepository repository;
+
+  AddPaymentCardUsecase(this.repository);
+
+  Future<Result<Map<String, dynamic>>> call(
+    /*required String cardNumber,
+    required String cardHolder,
+    required String expiryMonth,
+    required String expiryYear,
+    required String cvv,*/
+  ) {
+    return repository.addPaymentCard(
+      /*cardNumber: cardNumber,
+      cardHolder: cardHolder,
+      expiryMonth: expiryMonth,
+      expiryYear: expiryYear,
+      cvv: cvv,*/
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/apply_promo_code_usecase.dart b/lib/domain/usecase/apply_promo_code_usecase.dart
index 683f075..ac0101e 100644
--- a/lib/domain/usecase/apply_promo_code_usecase.dart
+++ b/lib/domain/usecase/apply_promo_code_usecase.dart
@@ -1,12 +1,12 @@
-import '../entities/promo_code_result.dart';
-import '../repositories/promo_code_repository.dart';
-
-class ApplyPromoCodeUsecase {
-  final PromoCodeRepository repository;
-
-  ApplyPromoCodeUsecase(this.repository);
-
-  Future<PromoCodeResult> call(String code) {
-    return repository.applyPromoCode(code);
-  }
+import '../entities/promo_code_result.dart';
+import '../repositories/promo_code_repository.dart';
+
+class ApplyPromoCodeUsecase {
+  final PromoCodeRepository repository;
+
+  ApplyPromoCodeUsecase(this.repository);
+
+  Future<PromoCodeResult> call(String code) {
+    return repository.applyPromoCode(code);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/book_scooter_usecase.dart b/lib/domain/usecase/book_scooter_usecase.dart
index cd4d5bc..04d3115 100644
--- a/lib/domain/usecase/book_scooter_usecase.dart
+++ b/lib/domain/usecase/book_scooter_usecase.dart
@@ -1,27 +1,27 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class BookScooterUsecase {
-  final ScooterRepository repository;
-
-  BookScooterUsecase(this.repository);
-
-  Future<Result<ScooterOrder>> call({
-    required int scooterId,
-    required int planId,
-    int? subscriptionId,
-    int? cardId,
-    required bool isBalance,
-    required bool isInsurance,
-  }) {
-    return repository.bookScooter(
-      scooterId: scooterId,
-      planId: planId,
-      subscriptionId: subscriptionId,
-      cardId: cardId,
-      isBalance: isBalance,
-      isInsurance: isInsurance,
-    );
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class BookScooterUsecase {
+  final ScooterRepository repository;
+
+  BookScooterUsecase(this.repository);
+
+  Future<Result<ScooterOrder>> call({
+    required int scooterId,
+    required int planId,
+    int? subscriptionId,
+    int? cardId,
+    required bool isBalance,
+    required bool isInsurance,
+  }) {
+    return repository.bookScooter(
+      scooterId: scooterId,
+      planId: planId,
+      subscriptionId: subscriptionId,
+      cardId: cardId,
+      isBalance: isBalance,
+      isInsurance: isInsurance,
+    );
+  }
+}
diff --git a/lib/domain/usecase/cancel_notification_usecase.dart b/lib/domain/usecase/cancel_notification_usecase.dart
index 87cc8bc..255a385 100644
--- a/lib/domain/usecase/cancel_notification_usecase.dart
+++ b/lib/domain/usecase/cancel_notification_usecase.dart
@@ -1,12 +1,12 @@
-import 'package:be_happy/domain/entities/client_notification.dart';
-import 'package:be_happy/domain/repositories/notification_repository.dart';
-
-class CancelNotificationUseCase {
-  final NotificationRepository repository;
-
-  CancelNotificationUseCase(this.repository);
-
-  Future<ClientNotification> call(int id) async {
-    return await repository.cancelNotification(id);
-  }
-}
+import 'package:be_happy/domain/entities/client_notification.dart';
+import 'package:be_happy/domain/repositories/notification_repository.dart';
+
+class CancelNotificationUseCase {
+  final NotificationRepository repository;
+
+  CancelNotificationUseCase(this.repository);
+
+  Future<ClientNotification> call(int id) async {
+    return await repository.cancelNotification(id);
+  }
+}
diff --git a/lib/domain/usecase/cancel_ride_usecase.dart b/lib/domain/usecase/cancel_ride_usecase.dart
index a689474..3ddddde 100644
--- a/lib/domain/usecase/cancel_ride_usecase.dart
+++ b/lib/domain/usecase/cancel_ride_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class CancelRideUsecase {
-  final ScooterRepository repository;
-
-  CancelRideUsecase(this.repository);
-
-  Future<Result<void>> call(int orderId) {
-    return repository.cancelRide(orderId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class CancelRideUsecase {
+  final ScooterRepository repository;
+
+  CancelRideUsecase(this.repository);
+
+  Future<Result<void>> call(int orderId) {
+    return repository.cancelRide(orderId);
+  }
+}
diff --git a/lib/domain/usecase/change_pin_usecase.dart b/lib/domain/usecase/change_pin_usecase.dart
index 6619e4f..6578adc 100644
--- a/lib/domain/usecase/change_pin_usecase.dart
+++ b/lib/domain/usecase/change_pin_usecase.dart
@@ -1,27 +1,27 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-
-import '../repositories/auth_repository.dart';
-
-class ChangePinUseCase {
-  final PinRepository repository;
-
-  ChangePinUseCase(this.repository);
-
-  Future<void> call({
-    required String oldPin,
-    required String newPin,
-  }) async {
-    final savedPin = await repository.getSavedPin();
-
-    if (savedPin != oldPin) {
-      throw Exception('Wrong old PIN');
-    }
-
-    if (newPin.length != 6) {
-      throw Exception('Invalid new PIN');
-    }
-
-    await repository.savePin(newPin);
-  }
-}
-
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+
+import '../repositories/auth_repository.dart';
+
+class ChangePinUseCase {
+  final PinRepository repository;
+
+  ChangePinUseCase(this.repository);
+
+  Future<void> call({
+    required String oldPin,
+    required String newPin,
+  }) async {
+    final savedPin = await repository.getSavedPin();
+
+    if (savedPin != oldPin) {
+      throw Exception('Wrong old PIN');
+    }
+
+    if (newPin.length != 6) {
+      throw Exception('Invalid new PIN');
+    }
+
+    await repository.savePin(newPin);
+  }
+}
+
diff --git a/lib/domain/usecase/check_user_usecase.dart b/lib/domain/usecase/check_user_usecase.dart
index 0321ff8..60a69fe 100644
--- a/lib/domain/usecase/check_user_usecase.dart
+++ b/lib/domain/usecase/check_user_usecase.dart
@@ -1,12 +1,12 @@
-import '../entities/user_check_flags.dart';
-import '../repositories/profile_repository.dart';
-
-class CheckUserUseCase {
-  final UserProfileRepository repository;
-
-  CheckUserUseCase(this.repository);
-
-  Future<UserCheckFlags?> call() {
-    return repository.checkUser();
-  }
-}
+import '../entities/user_check_flags.dart';
+import '../repositories/profile_repository.dart';
+
+class CheckUserUseCase {
+  final UserProfileRepository repository;
+
+  CheckUserUseCase(this.repository);
+
+  Future<UserCheckFlags?> call() {
+    return repository.checkUser();
+  }
+}
diff --git a/lib/domain/usecase/create_pin_usecase.dart b/lib/domain/usecase/create_pin_usecase.dart
index 119468f..c7ed847 100644
--- a/lib/domain/usecase/create_pin_usecase.dart
+++ b/lib/domain/usecase/create_pin_usecase.dart
@@ -1,27 +1,27 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-
-import '../repositories/auth_repository.dart';
-
-class CreatePinUseCase {
-  final PinRepository repository;
-
-  CreatePinUseCase(this.repository);
-
-  Future<void> call(String pin) async {
-    _validate(pin);
-
-    final hashed = _hash(pin);
-    await repository.savePin(hashed);
-  }
-
-  void _validate(String pin) {
-    if (pin.length != 6) {
-      throw Exception('PIN must be 6 digits');
-    }
-  }
-
-  String _hash(String pin) {
-    // временно просто pin
-    return pin;
-  }
-}
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+
+import '../repositories/auth_repository.dart';
+
+class CreatePinUseCase {
+  final PinRepository repository;
+
+  CreatePinUseCase(this.repository);
+
+  Future<void> call(String pin) async {
+    _validate(pin);
+
+    final hashed = _hash(pin);
+    await repository.savePin(hashed);
+  }
+
+  void _validate(String pin) {
+    if (pin.length != 6) {
+      throw Exception('PIN must be 6 digits');
+    }
+  }
+
+  String _hash(String pin) {
+    // временно просто pin
+    return pin;
+  }
+}
diff --git a/lib/domain/usecase/finish_ride_usecase.dart b/lib/domain/usecase/finish_ride_usecase.dart
index 6a418c8..99fd77c 100644
--- a/lib/domain/usecase/finish_ride_usecase.dart
+++ b/lib/domain/usecase/finish_ride_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class FinishRideUsecase {
-  final ScooterRepository repository;
-
-  FinishRideUsecase(this.repository);
-
-  Future<Result<void>> call(int orderId, List<int> files) {
-    return repository.finishRide(orderId, files);
-  }
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class FinishRideUsecase {
+  final ScooterRepository repository;
+
+  FinishRideUsecase(this.repository);
+
+  Future<Result<void>> call(int orderId, List<int> files) {
+    return repository.finishRide(orderId, files);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_address_by_point_usecase.dart b/lib/domain/usecase/get_address_by_point_usecase.dart
index 25db8f9..6c6baab 100644
--- a/lib/domain/usecase/get_address_by_point_usecase.dart
+++ b/lib/domain/usecase/get_address_by_point_usecase.dart
@@ -1,11 +1,11 @@
-import 'package:be_happy/data/network/geocoding_remote_datasource.dart';
-
-class GetAddressByPointUsecase {
-  final GeocodingRemoteDataSource dataSource;
-
-  GetAddressByPointUsecase(this.dataSource);
-
-  Future<String> call(double latitude, double longitude) {
-    return dataSource.getAddressFromPoint(latitude: latitude, longitude: longitude);
-  }
+import 'package:be_happy/data/network/geocoding_remote_datasource.dart';
+
+class GetAddressByPointUsecase {
+  final GeocodingRemoteDataSource dataSource;
+
+  GetAddressByPointUsecase(this.dataSource);
+
+  Future<String> call(double latitude, double longitude) {
+    return dataSource.getAddressFromPoint(latitude: latitude, longitude: longitude);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_available_scooters_usecase.dart b/lib/domain/usecase/get_available_scooters_usecase.dart
index 9bc26ac..2b65a52 100644
--- a/lib/domain/usecase/get_available_scooters_usecase.dart
+++ b/lib/domain/usecase/get_available_scooters_usecase.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/entities/scooter.dart';
-
-import '../repositories/scooter_repository.dart';
-
-
-class GetAvailableScootersUsecase {
-  final ScooterRepository repository;
-
-  GetAvailableScootersUsecase(this.repository);
-
-  Future<List<Scooter>> call(List<double> area, int page, int pageSize) {
-    return repository.getScooters(area, page, pageSize);
-  }
-}
-
+import 'package:be_happy/domain/entities/scooter.dart';
+
+import '../repositories/scooter_repository.dart';
+
+
+class GetAvailableScootersUsecase {
+  final ScooterRepository repository;
+
+  GetAvailableScootersUsecase(this.repository);
+
+  Future<List<Scooter>> call(List<double> area, int page, int pageSize) {
+    return repository.getScooters(area, page, pageSize);
+  }
+}
+
diff --git a/lib/domain/usecase/get_available_subscriptions_usecase.dart b/lib/domain/usecase/get_available_subscriptions_usecase.dart
index 5bbc3e8..2cfa60e 100644
--- a/lib/domain/usecase/get_available_subscriptions_usecase.dart
+++ b/lib/domain/usecase/get_available_subscriptions_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-
-import '../repositories/scooter_repository.dart';
-
-class GetAvailableSubscriptionsUsecase {
-  final ScooterRepository repository;
-
-  GetAvailableSubscriptionsUsecase(this.repository);
-
-  Future<Result<List<Subscription>>> call() {
-    return repository.getAvailableSubscriptions();
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+
+import '../repositories/scooter_repository.dart';
+
+class GetAvailableSubscriptionsUsecase {
+  final ScooterRepository repository;
+
+  GetAvailableSubscriptionsUsecase(this.repository);
+
+  Future<Result<List<Subscription>>> call() {
+    return repository.getAvailableSubscriptions();
+  }
+}
diff --git a/lib/domain/usecase/get_available_tariffs_usecase.dart b/lib/domain/usecase/get_available_tariffs_usecase.dart
index 3ed7083..4305fdb 100644
--- a/lib/domain/usecase/get_available_tariffs_usecase.dart
+++ b/lib/domain/usecase/get_available_tariffs_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/tariff.dart';
-
-import '../repositories/scooter_repository.dart';
-
-class GetAvailableTariffsUsecase {
-  final ScooterRepository repository;
-
-  GetAvailableTariffsUsecase(this.repository);
-
-  Future<Result<List<Tariff>>> call(int scooterId) {
-    return repository.getAvailableTariffs(scooterId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/tariff.dart';
+
+import '../repositories/scooter_repository.dart';
+
+class GetAvailableTariffsUsecase {
+  final ScooterRepository repository;
+
+  GetAvailableTariffsUsecase(this.repository);
+
+  Future<Result<List<Tariff>>> call(int scooterId) {
+    return repository.getAvailableTariffs(scooterId);
+  }
+}
diff --git a/lib/domain/usecase/get_available_zones_usecase.dart b/lib/domain/usecase/get_available_zones_usecase.dart
index 4cc642d..e2a26c7 100644
--- a/lib/domain/usecase/get_available_zones_usecase.dart
+++ b/lib/domain/usecase/get_available_zones_usecase.dart
@@ -1,15 +1,15 @@
-
-import '../entities/zone.dart';
-import '../repositories/zone_repository.dart';
-
-
-class GetAvailableZonesUsecase {
-  final ZoneRepository repository;
-
-  GetAvailableZonesUsecase(this.repository);
-
-  Future<List<Zone>?> call(List<double> area, int page, int pageSize) {
-    return repository.getZones(area, page, pageSize);
-  }
-}
-
+
+import '../entities/zone.dart';
+import '../repositories/zone_repository.dart';
+
+
+class GetAvailableZonesUsecase {
+  final ZoneRepository repository;
+
+  GetAvailableZonesUsecase(this.repository);
+
+  Future<List<Zone>?> call(List<double> area, int page, int pageSize) {
+    return repository.getZones(area, page, pageSize);
+  }
+}
+
diff --git a/lib/domain/usecase/get_certificates_usecase.dart b/lib/domain/usecase/get_certificates_usecase.dart
index bf3a481..083083b 100644
--- a/lib/domain/usecase/get_certificates_usecase.dart
+++ b/lib/domain/usecase/get_certificates_usecase.dart
@@ -1,13 +1,13 @@
-import '../entities/certificate.dart';
-import '../repositories/certificate_repository.dart';
-import '../../core/result.dart';
-
-class GetCertificatesUsecase {
-  final CertificateRepository repository;
-
-  GetCertificatesUsecase(this.repository);
-
-  Future<Result<List<Certificate>>> call() async {
-    return await repository.getCertificates();
-  }
-}
+import '../entities/certificate.dart';
+import '../repositories/certificate_repository.dart';
+import '../../core/result.dart';
+
+class GetCertificatesUsecase {
+  final CertificateRepository repository;
+
+  GetCertificatesUsecase(this.repository);
+
+  Future<Result<List<Certificate>>> call() async {
+    return await repository.getCertificates();
+  }
+}
diff --git a/lib/domain/usecase/get_client_orders_usecase.dart b/lib/domain/usecase/get_client_orders_usecase.dart
index 1559afd..be3ec82 100644
--- a/lib/domain/usecase/get_client_orders_usecase.dart
+++ b/lib/domain/usecase/get_client_orders_usecase.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-
-import '../repositories/scooter_repository.dart';
-
-
-class GetClientOrdersUsecase {
-  final ScooterRepository repository;
-
-  GetClientOrdersUsecase(this.repository);
-
-  Future<Result<List<ScooterOrder>>> call() {
-    return repository.getClientOrders();
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+
+import '../repositories/scooter_repository.dart';
+
+
+class GetClientOrdersUsecase {
+  final ScooterRepository repository;
+
+  GetClientOrdersUsecase(this.repository);
+
+  Future<Result<List<ScooterOrder>>> call() {
+    return repository.getClientOrders();
+  }
+}
diff --git a/lib/domain/usecase/get_client_subscriptions_usecase.dart b/lib/domain/usecase/get_client_subscriptions_usecase.dart
index d1b0be3..b024778 100644
--- a/lib/domain/usecase/get_client_subscriptions_usecase.dart
+++ b/lib/domain/usecase/get_client_subscriptions_usecase.dart
@@ -1,21 +1,21 @@
-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';
-
-
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-
-import '../repositories/scooter_repository.dart';
-
-class GetClientSubscriptionsUsecase {
-  final ScooterRepository repository;
-
-  GetClientSubscriptionsUsecase(this.repository);
-
-  Future<Result<List<ClientSubscription>>> call() {
-    return repository.getClientSubscriptions();
-  }
-}
+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';
+
+
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+
+import '../repositories/scooter_repository.dart';
+
+class GetClientSubscriptionsUsecase {
+  final ScooterRepository repository;
+
+  GetClientSubscriptionsUsecase(this.repository);
+
+  Future<Result<List<ClientSubscription>>> call() {
+    return repository.getClientSubscriptions();
+  }
+}
diff --git a/lib/domain/usecase/get_fine_details_usecase.dart b/lib/domain/usecase/get_fine_details_usecase.dart
new file mode 100644
index 0000000..a9001a1
--- /dev/null
+++ b/lib/domain/usecase/get_fine_details_usecase.dart
@@ -0,0 +1,14 @@
+import 'package:be_happy/core/result.dart';
+import '../entities/fine.dart';
+import '../repositories/scooter_repository.dart';
+
+
+class GetFineDetailsUsecase {
+  final ScooterRepository repository;
+
+  GetFineDetailsUsecase(this.repository);
+
+  Future<Result<Fine>> call(int orderId) {
+    return repository.getFineDetails(orderId);
+  }
+}
\ No newline at end of file
diff --git a/lib/domain/usecase/get_map_settings_usecase.dart b/lib/domain/usecase/get_map_settings_usecase.dart
index 5d89e41..4c9a3e3 100644
--- a/lib/domain/usecase/get_map_settings_usecase.dart
+++ b/lib/domain/usecase/get_map_settings_usecase.dart
@@ -1,12 +1,12 @@
-import 'package:be_happy/domain/entities/map_settings.dart';
-import 'package:be_happy/domain/repositories/app_settings_repository.dart';
-
-class GetMapSettingsUsecase {
-  AppSettingsRepository repository;
-
-  GetMapSettingsUsecase(this.repository);
-
-  Future<MapSettings> call() {
-    return repository.getMapSettings();
-  }
+import 'package:be_happy/domain/entities/map_settings.dart';
+import 'package:be_happy/domain/repositories/app_settings_repository.dart';
+
+class GetMapSettingsUsecase {
+  AppSettingsRepository repository;
+
+  GetMapSettingsUsecase(this.repository);
+
+  Future<MapSettings> call() {
+    return repository.getMapSettings();
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_news_by_id_usecase.dart b/lib/domain/usecase/get_news_by_id_usecase.dart
index c2855b1..1188675 100644
--- a/lib/domain/usecase/get_news_by_id_usecase.dart
+++ b/lib/domain/usecase/get_news_by_id_usecase.dart
@@ -1,12 +1,12 @@
-import '../entities/news.dart';
-import '../repositories/news_repository.dart';
-
-class GetNewsByIdUsecase {
-  final NewsRepository repository;
-
-  GetNewsByIdUsecase(this.repository);
-
-  Future<NewsEntity> call(int id) {
-    return repository.getNewsById(id);
-  }
+import '../entities/news.dart';
+import '../repositories/news_repository.dart';
+
+class GetNewsByIdUsecase {
+  final NewsRepository repository;
+
+  GetNewsByIdUsecase(this.repository);
+
+  Future<NewsEntity> call(int id) {
+    return repository.getNewsById(id);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_notifications_stream_usecase.dart b/lib/domain/usecase/get_notifications_stream_usecase.dart
index 20dccc8..1a32e06 100644
--- a/lib/domain/usecase/get_notifications_stream_usecase.dart
+++ b/lib/domain/usecase/get_notifications_stream_usecase.dart
@@ -1,12 +1,12 @@
-import 'package:be_happy/domain/entities/client_notification.dart';
-import 'package:be_happy/domain/repositories/notification_repository.dart';
-
-class GetNotificationsStreamUseCase {
-  final NotificationRepository repository;
-
-  GetNotificationsStreamUseCase(this.repository);
-
-  Stream<ClientNotification> call() {
-    return repository.getNotificationsStream();
-  }
-}
+import 'package:be_happy/domain/entities/client_notification.dart';
+import 'package:be_happy/domain/repositories/notification_repository.dart';
+
+class GetNotificationsStreamUseCase {
+  final NotificationRepository repository;
+
+  GetNotificationsStreamUseCase(this.repository);
+
+  Stream<ClientNotification> call() {
+    return repository.getNotificationsStream();
+  }
+}
diff --git a/lib/domain/usecase/get_notifications_usecase.dart b/lib/domain/usecase/get_notifications_usecase.dart
index 818a461..ee63e78 100644
--- a/lib/domain/usecase/get_notifications_usecase.dart
+++ b/lib/domain/usecase/get_notifications_usecase.dart
@@ -1,23 +1,23 @@
-import '../entities/client_notification.dart';
-import '../entities/pagination_meta.dart';
-import '../repositories/notification_repository.dart';
-
-class GetNotificationsUsecase {
-  final NotificationRepository repository;
-
-  GetNotificationsUsecase(this.repository);
-
-  Future<NotificationsResult> call({int page = 1, int pageSize = 10}) {
-    return repository.getNotifications(page: page, pageSize: pageSize);
-  }
-}
-
-class NotificationsResult {
-  final List<ClientNotification> notifications;
-  final PaginationMeta pagination;
-
-  NotificationsResult({
-    required this.notifications,
-    required this.pagination,
-  });
+import '../entities/client_notification.dart';
+import '../entities/pagination_meta.dart';
+import '../repositories/notification_repository.dart';
+
+class GetNotificationsUsecase {
+  final NotificationRepository repository;
+
+  GetNotificationsUsecase(this.repository);
+
+  Future<NotificationsResult> call({int page = 1, int pageSize = 10}) {
+    return repository.getNotifications(page: page, pageSize: pageSize);
+  }
+}
+
+class NotificationsResult {
+  final List<ClientNotification> notifications;
+  final PaginationMeta pagination;
+
+  NotificationsResult({
+    required this.notifications,
+    required this.pagination,
+  });
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_payment_cards_usecase.dart b/lib/domain/usecase/get_payment_cards_usecase.dart
index fd7fd33..0917fea 100644
--- a/lib/domain/usecase/get_payment_cards_usecase.dart
+++ b/lib/domain/usecase/get_payment_cards_usecase.dart
@@ -1,31 +1,31 @@
-import 'package:be_happy/domain/service/security_service.dart';
-
-import '../entities/payment_card.dart';
-import '../repositories/payment_repository.dart';
-import '../../core/result.dart';
-
-class GetPaymentCardsUsecase {
-  final PaymentRepository repository;
-  final SecurityService securityService;
-
-  GetPaymentCardsUsecase(this.repository, this.securityService);
-
-  Future<Result<List<PaymentCard>>> call() async {
-    final result = await repository.getPaymentCards();
-    
-    if (result is Failure) {
-      return result;
-    }
-    
-    final cards = (result as Success).data as List<PaymentCard>;
-    
-    // Для каждой карты получаем полный номер из локального хранилища
-    /*final cardsWithFullNumbers = <PaymentCard>[];
-    for (final card in cards) {
-      final fullNumber = await securityService.getCardFullNumber(card.id);
-      cardsWithFullNumbers.add(card.copyWith(fullCardNumber: fullNumber));
-    }*/
-    
-    return Success(cards);
-  }
-}
+import 'package:be_happy/domain/service/security_service.dart';
+
+import '../entities/payment_card.dart';
+import '../repositories/payment_repository.dart';
+import '../../core/result.dart';
+
+class GetPaymentCardsUsecase {
+  final PaymentRepository repository;
+  final SecurityService securityService;
+
+  GetPaymentCardsUsecase(this.repository, this.securityService);
+
+  Future<Result<List<PaymentCard>>> call() async {
+    final result = await repository.getPaymentCards();
+    
+    if (result is Failure) {
+      return result;
+    }
+    
+    final cards = (result as Success).data as List<PaymentCard>;
+    
+    // Для каждой карты получаем полный номер из локального хранилища
+    /*final cardsWithFullNumbers = <PaymentCard>[];
+    for (final card in cards) {
+      final fullNumber = await securityService.getCardFullNumber(card.id);
+      cardsWithFullNumbers.add(card.copyWith(fullCardNumber: fullNumber));
+    }*/
+    
+    return Success(cards);
+  }
+}
diff --git a/lib/domain/usecase/get_pedestrian_routes_usecase.dart b/lib/domain/usecase/get_pedestrian_routes_usecase.dart
index 0e65031..528a1d3 100644
--- a/lib/domain/usecase/get_pedestrian_routes_usecase.dart
+++ b/lib/domain/usecase/get_pedestrian_routes_usecase.dart
@@ -1,12 +1,12 @@
-import 'package:be_happy/data/network/geocoding_remote_datasource.dart';
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-class GetPedestrianRoutesUsecase {
-  final GeocodingRemoteDataSource dataSource;
-
-  GetPedestrianRoutesUsecase(this.dataSource);
-
-  Future<List<MasstransitRoute>?> call(Point userPosition, Point targetPosition) {
-    return dataSource.getPedestrianRoutes(userPosition, targetPosition);
-  }
+import 'package:be_happy/data/network/geocoding_remote_datasource.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+class GetPedestrianRoutesUsecase {
+  final GeocodingRemoteDataSource dataSource;
+
+  GetPedestrianRoutesUsecase(this.dataSource);
+
+  Future<List<MasstransitRoute>?> call(Point userPosition, Point targetPosition) {
+    return dataSource.getPedestrianRoutes(userPosition, targetPosition);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_profile_usecase.dart b/lib/domain/usecase/get_profile_usecase.dart
index fd14f19..222df63 100644
--- a/lib/domain/usecase/get_profile_usecase.dart
+++ b/lib/domain/usecase/get_profile_usecase.dart
@@ -1,13 +1,13 @@
-import '../entities/user_profile.dart';
-import '../repositories/profile_repository.dart';
-
-class GetProfileUseCase {
-  final UserProfileRepository repository;
-
-  GetProfileUseCase(this.repository);
-
-  Future<UserProfile> call() {
-    return repository.getProfile();
-  }
-}
-
+import '../entities/user_profile.dart';
+import '../repositories/profile_repository.dart';
+
+class GetProfileUseCase {
+  final UserProfileRepository repository;
+
+  GetProfileUseCase(this.repository);
+
+  Future<UserProfile> call() {
+    return repository.getProfile();
+  }
+}
+
diff --git a/lib/domain/usecase/get_scooter_by_title_usecase.dart b/lib/domain/usecase/get_scooter_by_title_usecase.dart
index 03b5225..e07128e 100644
--- a/lib/domain/usecase/get_scooter_by_title_usecase.dart
+++ b/lib/domain/usecase/get_scooter_by_title_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter.dart';
-
-import '../repositories/scooter_repository.dart';
-
-class GetScooterByTitleUsecase {
-  final ScooterRepository repository;
-
-  GetScooterByTitleUsecase(this.repository);
-
-  Future<Result<Scooter?>> call(String title) {
-    return repository.getScooterByTitle(title);
-  }
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter.dart';
+
+import '../repositories/scooter_repository.dart';
+
+class GetScooterByTitleUsecase {
+  final ScooterRepository repository;
+
+  GetScooterByTitleUsecase(this.repository);
+
+  Future<Result<Scooter?>> call(String title) {
+    return repository.getScooterByTitle(title);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_scooter_order_by_id_usecase.dart b/lib/domain/usecase/get_scooter_order_by_id_usecase.dart
index 0b834d0..ec513c0 100644
--- a/lib/domain/usecase/get_scooter_order_by_id_usecase.dart
+++ b/lib/domain/usecase/get_scooter_order_by_id_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import '../entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class GetScooterOrderByIdUsecase {
-  final ScooterRepository repository;
-
-  GetScooterOrderByIdUsecase(this.repository);
-
-  Future<Result<ScooterOrder>> call(int id) {
-    return repository.getScooterOrderById(id);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import '../entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class GetScooterOrderByIdUsecase {
+  final ScooterRepository repository;
+
+  GetScooterOrderByIdUsecase(this.repository);
+
+  Future<Result<ScooterOrder>> call(int id) {
+    return repository.getScooterOrderById(id);
+  }
+}
diff --git a/lib/domain/usecase/get_scooter_order_history_usecase.dart b/lib/domain/usecase/get_scooter_order_history_usecase.dart
index e49dbcd..f101bf8 100644
--- a/lib/domain/usecase/get_scooter_order_history_usecase.dart
+++ b/lib/domain/usecase/get_scooter_order_history_usecase.dart
@@ -1,19 +1,19 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import 'package:be_happy/domain/repositories/scooter_repository.dart';
-
-class GetScooterOrderHistoryUsecase {
-  final ScooterRepository _repository;
-
-  GetScooterOrderHistoryUsecase(this._repository);
-
-  Future<Result<List<ScooterOrder>>> call({
-    int page = 1,
-    int pageSize = 20,
-  }) async {
-    return await _repository.getScooterOrderHistory(
-      page: page,
-      pageSize: pageSize,
-    );
-  }
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import 'package:be_happy/domain/repositories/scooter_repository.dart';
+
+class GetScooterOrderHistoryUsecase {
+  final ScooterRepository _repository;
+
+  GetScooterOrderHistoryUsecase(this._repository);
+
+  Future<Result<List<ScooterOrder>>> call({
+    int page = 1,
+    int pageSize = 20,
+  }) async {
+    return await _repository.getScooterOrderHistory(
+      page: page,
+      pageSize: pageSize,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/get_scooter_order_route_history_usecase.dart b/lib/domain/usecase/get_scooter_order_route_history_usecase.dart
index 2b17a61..115a062 100644
--- a/lib/domain/usecase/get_scooter_order_route_history_usecase.dart
+++ b/lib/domain/usecase/get_scooter_order_route_history_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/point.dart';
-import 'package:be_happy/domain/repositories/scooter_repository.dart';
-
-class GetScooterOrderRouteHistoryUsecase {
-  final ScooterRepository _repository;
-
-  GetScooterOrderRouteHistoryUsecase(this._repository);
-
-  Future<Result<List<Point>>> call(int id) async {
-    return await _repository.getScooterOrderRouteHistory(id);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/point.dart';
+import 'package:be_happy/domain/repositories/scooter_repository.dart';
+
+class GetScooterOrderRouteHistoryUsecase {
+  final ScooterRepository _repository;
+
+  GetScooterOrderRouteHistoryUsecase(this._repository);
+
+  Future<Result<List<Point>>> call(int id) async {
+    return await _repository.getScooterOrderRouteHistory(id);
+  }
+}
diff --git a/lib/domain/usecase/get_scooter_usecase.dart b/lib/domain/usecase/get_scooter_usecase.dart
index cc5ed73..2f634da 100644
--- a/lib/domain/usecase/get_scooter_usecase.dart
+++ b/lib/domain/usecase/get_scooter_usecase.dart
@@ -1,16 +1,16 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter.dart';
-
-import '../repositories/scooter_repository.dart';
-
-
-class GetScooterUsecase {
-  final ScooterRepository repository;
-
-  GetScooterUsecase(this.repository);
-
-  Future<Result<Scooter?>> call(int id) {
-    return repository.getScooter(id);
-  }
-}
-
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter.dart';
+
+import '../repositories/scooter_repository.dart';
+
+
+class GetScooterUsecase {
+  final ScooterRepository repository;
+
+  GetScooterUsecase(this.repository);
+
+  Future<Result<Scooter?>> call(int id) {
+    return repository.getScooter(id);
+  }
+}
+
diff --git a/lib/domain/usecase/get_subscription_by_id_usecase.dart b/lib/domain/usecase/get_subscription_by_id_usecase.dart
index c5ca63b..a5fc184 100644
--- a/lib/domain/usecase/get_subscription_by_id_usecase.dart
+++ b/lib/domain/usecase/get_subscription_by_id_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-
-import '../repositories/scooter_repository.dart';
-
-class GetSubscriptionByIdUsecase {
-  final ScooterRepository repository;
-
-  GetSubscriptionByIdUsecase(this.repository);
-
-  Future<Result<Subscription>> call(int id) {
-    return repository.getSubscriptionById(id);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+
+import '../repositories/scooter_repository.dart';
+
+class GetSubscriptionByIdUsecase {
+  final ScooterRepository repository;
+
+  GetSubscriptionByIdUsecase(this.repository);
+
+  Future<Result<Subscription>> call(int id) {
+    return repository.getSubscriptionById(id);
+  }
+}
diff --git a/lib/domain/usecase/is_pin_set_usecase.dart b/lib/domain/usecase/is_pin_set_usecase.dart
index 126cffd..4dcecf4 100644
--- a/lib/domain/usecase/is_pin_set_usecase.dart
+++ b/lib/domain/usecase/is_pin_set_usecase.dart
@@ -1,17 +1,17 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-
-import '../repositories/auth_repository.dart';
-
-class IsPinSetUsecase {
-  final PinRepository repository;
-
-  IsPinSetUsecase(this.repository);
-
-  Future<bool> call() async {
-    if (await repository.getSavedPin() == null) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-}
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+
+import '../repositories/auth_repository.dart';
+
+class IsPinSetUsecase {
+  final PinRepository repository;
+
+  IsPinSetUsecase(this.repository);
+
+  Future<bool> call() async {
+    if (await repository.getSavedPin() == null) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+}
diff --git a/lib/domain/usecase/login_usecase.dart b/lib/domain/usecase/login_usecase.dart
index 1cbe726..56d1bde 100644
--- a/lib/domain/usecase/login_usecase.dart
+++ b/lib/domain/usecase/login_usecase.dart
@@ -1,11 +1,11 @@
-import '../repositories/auth_repository.dart';
-
-class LoginUseCase {
-  final AuthRepository _repository;
-
-  LoginUseCase(this._repository);
-
-  Future<String> execute(String phone) async {
-    return await _repository.login(phone);
-  }
+import '../repositories/auth_repository.dart';
+
+class LoginUseCase {
+  final AuthRepository _repository;
+
+  LoginUseCase(this._repository);
+
+  Future<String> execute(String phone) async {
+    return await _repository.login(phone);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/logout_usecase.dart b/lib/domain/usecase/logout_usecase.dart
index 959c1a4..45b3416 100644
--- a/lib/domain/usecase/logout_usecase.dart
+++ b/lib/domain/usecase/logout_usecase.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-
-import '../repositories/auth_repository.dart';
-
-class LogoutUseCase {
-  final AuthRepository _authRepository;
-  final PinRepository _pinRepository;
-
-  LogoutUseCase(this._authRepository, this._pinRepository);
-
-  Future<void> call() async {
-    await _authRepository.logout();
-    await _pinRepository.removePin();
-  }
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+
+import '../repositories/auth_repository.dart';
+
+class LogoutUseCase {
+  final AuthRepository _authRepository;
+  final PinRepository _pinRepository;
+
+  LogoutUseCase(this._authRepository, this._pinRepository);
+
+  Future<void> call() async {
+    await _authRepository.logout();
+    await _pinRepository.removePin();
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/pause_ride_usecase.dart b/lib/domain/usecase/pause_ride_usecase.dart
index 619712e..b333846 100644
--- a/lib/domain/usecase/pause_ride_usecase.dart
+++ b/lib/domain/usecase/pause_ride_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class PauseRideUsecase {
-  final ScooterRepository repository;
-
-  PauseRideUsecase(this.repository);
-
-  Future<Result<ScooterOrder>> call(int orderId) {
-    return repository.pauseRide(orderId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class PauseRideUsecase {
+  final ScooterRepository repository;
+
+  PauseRideUsecase(this.repository);
+
+  Future<Result<ScooterOrder>> call(int orderId) {
+    return repository.pauseRide(orderId);
+  }
+}
diff --git a/lib/domain/usecase/pay_fine_usecase.dart b/lib/domain/usecase/pay_fine_usecase.dart
new file mode 100644
index 0000000..affdd0d
--- /dev/null
+++ b/lib/domain/usecase/pay_fine_usecase.dart
@@ -0,0 +1,21 @@
+import '../../core/result.dart';
+import '../entities/fine.dart';
+import '../repositories/scooter_repository.dart';
+
+class PayFineUsecase {
+  final ScooterRepository repository;
+
+  PayFineUsecase(this.repository);
+
+  Future<Result<void>> call({
+    required int orderId,
+    int? cardId,
+    required bool isBalance,
+  }) {
+    return repository.payFine(
+      orderId: orderId,
+      cardId: cardId,
+      isBalance: isBalance,
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/domain/usecase/pay_ride_usecase.dart b/lib/domain/usecase/pay_ride_usecase.dart
index 034cefe..c7928a7 100644
--- a/lib/domain/usecase/pay_ride_usecase.dart
+++ b/lib/domain/usecase/pay_ride_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class PayRideUsecase {
-  final ScooterRepository repository;
-
-  PayRideUsecase(this.repository);
-
-  Future<Result<void>> call(int orderId,  int? cardId,
-       bool isBalance) {
-    return repository.payScooterOrderWithPhotos(orderId: orderId, cardId: cardId, isBalance: isBalance);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class PayRideUsecase {
+  final ScooterRepository repository;
+
+  PayRideUsecase(this.repository);
+
+  Future<Result<void>> call(int orderId,  int? cardId,
+       bool isBalance) {
+    return repository.payScooterOrderWithPhotos(orderId: orderId, cardId: cardId, isBalance: isBalance);
+  }
+}
diff --git a/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart b/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart
index a35c40b..641d472 100644
--- a/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart
+++ b/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart
@@ -1,21 +1,21 @@
-import 'package:be_happy/core/result.dart';
-import '../entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class PayScooterOrderWithPhotosUsecase {
-  final ScooterRepository repository;
-
-  PayScooterOrderWithPhotosUsecase(this.repository);
-
-  Future<Result<void>> call({
-    required int orderId,
-    required int cardId,
-    required bool isBalance,
-  }) {
-    return repository.payScooterOrderWithPhotos(
-      orderId: orderId,
-      cardId: cardId,
-      isBalance: isBalance,
-    );
-  }
-}
+import 'package:be_happy/core/result.dart';
+import '../entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class PayScooterOrderWithPhotosUsecase {
+  final ScooterRepository repository;
+
+  PayScooterOrderWithPhotosUsecase(this.repository);
+
+  Future<Result<void>> call({
+    required int orderId,
+    required int cardId,
+    required bool isBalance,
+  }) {
+    return repository.payScooterOrderWithPhotos(
+      orderId: orderId,
+      cardId: cardId,
+      isBalance: isBalance,
+    );
+  }
+}
diff --git a/lib/domain/usecase/purchase_certificate_usecase.dart b/lib/domain/usecase/purchase_certificate_usecase.dart
index 4a71cdc..72e3560 100644
--- a/lib/domain/usecase/purchase_certificate_usecase.dart
+++ b/lib/domain/usecase/purchase_certificate_usecase.dart
@@ -1,19 +1,19 @@
-import '../entities/certificate.dart';
-import '../repositories/certificate_repository.dart';
-import '../../core/result.dart';
-
-class PurchaseCertificateUsecase {
-  final CertificateRepository repository;
-
-  PurchaseCertificateUsecase(this.repository);
-
-  Future<Result<Map<String, dynamic>>> call({
-    required int certificateId,
-    required int cardId,
-  }) async {
-    return await repository.purchaseCertificate(
-      certificateId: certificateId,
-      cardId: cardId,
-    );
-  }
-}
+import '../entities/certificate.dart';
+import '../repositories/certificate_repository.dart';
+import '../../core/result.dart';
+
+class PurchaseCertificateUsecase {
+  final CertificateRepository repository;
+
+  PurchaseCertificateUsecase(this.repository);
+
+  Future<Result<Map<String, dynamic>>> call({
+    required int certificateId,
+    required int cardId,
+  }) async {
+    return await repository.purchaseCertificate(
+      certificateId: certificateId,
+      cardId: cardId,
+    );
+  }
+}
diff --git a/lib/domain/usecase/refresh_token_usecase.dart b/lib/domain/usecase/refresh_token_usecase.dart
index ce9549b..2681337 100644
--- a/lib/domain/usecase/refresh_token_usecase.dart
+++ b/lib/domain/usecase/refresh_token_usecase.dart
@@ -1,12 +1,12 @@
-import '../entities/user_auth_data.dart';
-import '../repositories/auth_repository.dart';
-
-class RefreshTokenUseCase {
-  final AuthRepository _repository;
-
-  RefreshTokenUseCase(this._repository);
-
-  Future<UserAuthData> execute() async {
-    return await _repository.refreshToken();
-  }
+import '../entities/user_auth_data.dart';
+import '../repositories/auth_repository.dart';
+
+class RefreshTokenUseCase {
+  final AuthRepository _repository;
+
+  RefreshTokenUseCase(this._repository);
+
+  Future<UserAuthData> execute() async {
+    return await _repository.refreshToken();
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/remove_payment_card_usecase.dart b/lib/domain/usecase/remove_payment_card_usecase.dart
index b7bf654..36d454a 100644
--- a/lib/domain/usecase/remove_payment_card_usecase.dart
+++ b/lib/domain/usecase/remove_payment_card_usecase.dart
@@ -1,12 +1,12 @@
-import '../repositories/payment_repository.dart';
-import '../../core/result.dart';
-
-class RemovePaymentCardUsecase {
-  final PaymentRepository repository;
-
-  RemovePaymentCardUsecase(this.repository);
-
-  Future<Result<void>> call(int cardId) {
-    return repository.removePaymentCard(cardId);
-  }
-}
+import '../repositories/payment_repository.dart';
+import '../../core/result.dart';
+
+class RemovePaymentCardUsecase {
+  final PaymentRepository repository;
+
+  RemovePaymentCardUsecase(this.repository);
+
+  Future<Result<void>> call(int cardId) {
+    return repository.removePaymentCard(cardId);
+  }
+}
diff --git a/lib/domain/usecase/resume_ride_usecase.dart b/lib/domain/usecase/resume_ride_usecase.dart
index 6cb349c..b63fb9d 100644
--- a/lib/domain/usecase/resume_ride_usecase.dart
+++ b/lib/domain/usecase/resume_ride_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class ResumeRideUsecase {
-  final ScooterRepository repository;
-
-  ResumeRideUsecase(this.repository);
-
-  Future<Result<ScooterOrder>> call(int orderId) {
-    return repository.resumeRide(orderId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class ResumeRideUsecase {
+  final ScooterRepository repository;
+
+  ResumeRideUsecase(this.repository);
+
+  Future<Result<ScooterOrder>> call(int orderId) {
+    return repository.resumeRide(orderId);
+  }
+}
diff --git a/lib/domain/usecase/save_map_settings_usecase.dart b/lib/domain/usecase/save_map_settings_usecase.dart
index 494ade3..90b170d 100644
--- a/lib/domain/usecase/save_map_settings_usecase.dart
+++ b/lib/domain/usecase/save_map_settings_usecase.dart
@@ -1,13 +1,14 @@
-import 'package:be_happy/domain/entities/map_settings.dart';
-
-import '../repositories/app_settings_repository.dart';
-
-class SaveMapSettingsUsecase {
-  AppSettingsRepository repository;
-
-  SaveMapSettingsUsecase(this.repository);
-
-  Future<void> call(MapSettings settings) {
-    return repository.saveMapSettings(settings);
-  }
+
+import 'package:be_happy/domain/entities/map_settings.dart';
+
+import '../repositories/app_settings_repository.dart';
+
+class SaveMapSettingsUsecase {
+  AppSettingsRepository repository;
+
+  SaveMapSettingsUsecase(this.repository);
+
+  Future<void> call(MapSettings settings) {
+    return repository.saveMapSettings(settings);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/set_main_payment_card_usecase.dart b/lib/domain/usecase/set_main_payment_card_usecase.dart
index ffa6c8f..00216dc 100644
--- a/lib/domain/usecase/set_main_payment_card_usecase.dart
+++ b/lib/domain/usecase/set_main_payment_card_usecase.dart
@@ -1,12 +1,12 @@
-import '../repositories/payment_repository.dart';
-import '../../core/result.dart';
-
-class SetMainPaymentCardUsecase {
-  final PaymentRepository repository;
-
-  SetMainPaymentCardUsecase(this.repository);
-
-  Future<Result<void>> call(int cardId) {
-    return repository.setMainPaymentCard(cardId);
-  }
-}
+import '../repositories/payment_repository.dart';
+import '../../core/result.dart';
+
+class SetMainPaymentCardUsecase {
+  final PaymentRepository repository;
+
+  SetMainPaymentCardUsecase(this.repository);
+
+  Future<Result<void>> call(int cardId) {
+    return repository.setMainPaymentCard(cardId);
+  }
+}
diff --git a/lib/domain/usecase/start_ride_usecase.dart b/lib/domain/usecase/start_ride_usecase.dart
index 5e47160..38e1c5a 100644
--- a/lib/domain/usecase/start_ride_usecase.dart
+++ b/lib/domain/usecase/start_ride_usecase.dart
@@ -1,13 +1,13 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class StartRideUsecase {
-  final ScooterRepository repository;
-
-  StartRideUsecase(this.repository);
-
-  Future<Result<ScooterOrder>> call(int orderId) {
-    return repository.startRide(orderId);
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class StartRideUsecase {
+  final ScooterRepository repository;
+
+  StartRideUsecase(this.repository);
+
+  Future<Result<ScooterOrder>> call(int orderId) {
+    return repository.startRide(orderId);
+  }
+}
diff --git a/lib/domain/usecase/update_profile_usecase.dart b/lib/domain/usecase/update_profile_usecase.dart
index 6bd7a65..5b20442 100644
--- a/lib/domain/usecase/update_profile_usecase.dart
+++ b/lib/domain/usecase/update_profile_usecase.dart
@@ -1,12 +1,12 @@
-import '../entities/user_profile.dart';
-import '../repositories/profile_repository.dart';
-
-class UpdateProfileUseCase {
-  final UserProfileRepository repository;
-
-  UpdateProfileUseCase(this.repository);
-
-  Future<UserProfile?> call(UserProfile profile) {
-    return repository.updateProfile(profile);
-  }
-}
+import '../entities/user_profile.dart';
+import '../repositories/profile_repository.dart';
+
+class UpdateProfileUseCase {
+  final UserProfileRepository repository;
+
+  UpdateProfileUseCase(this.repository);
+
+  Future<UserProfile?> call(UserProfile profile) {
+    return repository.updateProfile(profile);
+  }
+}
diff --git a/lib/domain/usecase/update_scooter_order_data_usecase.dart b/lib/domain/usecase/update_scooter_order_data_usecase.dart
index 1a26047..d45b14c 100644
--- a/lib/domain/usecase/update_scooter_order_data_usecase.dart
+++ b/lib/domain/usecase/update_scooter_order_data_usecase.dart
@@ -1,18 +1,18 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/active_scooter_order.dart';
-import '../entities/scooter_order.dart';
-import '../repositories/scooter_repository.dart';
-
-class UpdateScooterOrderDataUsecase {
-  final ScooterRepository repository;
-
-  UpdateScooterOrderDataUsecase(this.repository);
-
-  Future<Result<ActiveScooterOrder>> call({
-    required int orderId,
-  }) {
-    return repository.updateScooterOrderData(
-      orderId: orderId,
-    );
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/active_scooter_order.dart';
+import '../entities/scooter_order.dart';
+import '../repositories/scooter_repository.dart';
+
+class UpdateScooterOrderDataUsecase {
+  final ScooterRepository repository;
+
+  UpdateScooterOrderDataUsecase(this.repository);
+
+  Future<Result<ActiveScooterOrder>> call({
+    required int orderId,
+  }) {
+    return repository.updateScooterOrderData(
+      orderId: orderId,
+    );
+  }
+}
diff --git a/lib/domain/usecase/upload_profile_photo_usecase.dart b/lib/domain/usecase/upload_profile_photo_usecase.dart
index 3e1176a..a47b07c 100644
--- a/lib/domain/usecase/upload_profile_photo_usecase.dart
+++ b/lib/domain/usecase/upload_profile_photo_usecase.dart
@@ -1,12 +1,12 @@
-import 'dart:io';
-import '../repositories/profile_repository.dart';
-
-class UploadProfilePhotoUsecase {
-  final UserProfileRepository repository;
-
-  UploadProfilePhotoUsecase(this.repository);
-
-  Future<int?> call(File imageFile) {
-    return repository.uploadProfilePhoto(imageFile);
-  }
+import 'dart:io';
+import '../repositories/profile_repository.dart';
+
+class UploadProfilePhotoUsecase {
+  final UserProfileRepository repository;
+
+  UploadProfilePhotoUsecase(this.repository);
+
+  Future<int?> call(File imageFile) {
+    return repository.uploadProfilePhoto(imageFile);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/upload_scooter_photos_usecase.dart b/lib/domain/usecase/upload_scooter_photos_usecase.dart
index aefba1b..5690d30 100644
--- a/lib/domain/usecase/upload_scooter_photos_usecase.dart
+++ b/lib/domain/usecase/upload_scooter_photos_usecase.dart
@@ -1,13 +1,13 @@
-import 'dart:io';
-import 'package:be_happy/core/result.dart';
-import '../repositories/scooter_repository.dart';
-
-class UploadScooterPhotosUsecase {
-  final ScooterRepository repository;
-
-  UploadScooterPhotosUsecase(this.repository);
-
-  Future<Result<List<int>>> call(List<File> images) {
-    return repository.uploadScooterPhotos(images);
-  }
-}
+import 'dart:io';
+import 'package:be_happy/core/result.dart';
+import '../repositories/scooter_repository.dart';
+
+class UploadScooterPhotosUsecase {
+  final ScooterRepository repository;
+
+  UploadScooterPhotosUsecase(this.repository);
+
+  Future<Result<List<int>>> call(List<File> images) {
+    return repository.uploadScooterPhotos(images);
+  }
+}
diff --git a/lib/domain/usecase/verify_code_usecase.dart b/lib/domain/usecase/verify_code_usecase.dart
index 56ff553..293cf7a 100644
--- a/lib/domain/usecase/verify_code_usecase.dart
+++ b/lib/domain/usecase/verify_code_usecase.dart
@@ -1,14 +1,14 @@
-import 'package:be_happy/core/result.dart';
-
-import '../entities/user_auth_data.dart';
-import '../repositories/auth_repository.dart';
-
-class VerifyCodeUseCase {
-  final AuthRepository _repository;
-
-  VerifyCodeUseCase(this._repository);
-
-  Future<Result<void>> execute(String code, String token) {
-    return _repository.verifyCode(code, token);
-  }
+import 'package:be_happy/core/result.dart';
+
+import '../entities/user_auth_data.dart';
+import '../repositories/auth_repository.dart';
+
+class VerifyCodeUseCase {
+  final AuthRepository _repository;
+
+  VerifyCodeUseCase(this._repository);
+
+  Future<Result<void>> execute(String code, String token) {
+    return _repository.verifyCode(code, token);
+  }
 }
\ No newline at end of file
diff --git a/lib/domain/usecase/verify_pin_usecase.dart b/lib/domain/usecase/verify_pin_usecase.dart
index d157f09..b3380c2 100644
--- a/lib/domain/usecase/verify_pin_usecase.dart
+++ b/lib/domain/usecase/verify_pin_usecase.dart
@@ -1,15 +1,15 @@
-import 'package:be_happy/domain/repositories/pin_repository.dart';
-
-import '../repositories/auth_repository.dart';
-
-class VerifyPinUseCase {
-  final PinRepository repository;
-
-  VerifyPinUseCase(this.repository);
-
-  Future<bool> call(String enteredPin) async {
-    final savedPin = await repository.getSavedPin();
-    return enteredPin == savedPin;
-  }
-}
-
+import 'package:be_happy/domain/repositories/pin_repository.dart';
+
+import '../repositories/auth_repository.dart';
+
+class VerifyPinUseCase {
+  final PinRepository repository;
+
+  VerifyPinUseCase(this.repository);
+
+  Future<bool> call(String enteredPin) async {
+    final savedPin = await repository.getSavedPin();
+    return enteredPin == savedPin;
+  }
+}
+
diff --git a/lib/main.dart b/lib/main.dart
index 553710f..be2e620 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,78 +1,78 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart'; // 🔹 1. Добавлен импорт
-import 'package:bot_toast/bot_toast.dart';
-import 'package:be_happy/presentation/event/edit_profile_event.dart';
-import 'package:be_happy/presentation/event/profile_event.dart';
-import 'package:be_happy/presentation/event/scooter_detail_event.dart';
-import 'package:be_happy/presentation/navigation/app_router.dart';
-import 'package:be_happy/presentation/screens/payment_confirm_screen.dart';
-import 'package:be_happy/presentation/screens/splash_screen.dart';
-import 'package:be_happy/presentation/state/splash_state.dart';
-import 'package:be_happy/presentation/viewmodel/auth_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/edit_profile_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/map_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/payment_confirm_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/pin_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/profile_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/scooter_detail_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:be_happy/presentation/viewmodel/verify_code_bloc.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'di/service_locator.dart';
-
-void main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-
-  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());
-}
-
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final appRouter = AppRouter(getIt<SplashBloc>());
-
-    return MultiBlocProvider(
-      providers: [
-        BlocProvider.value(value: getIt<SplashBloc>()),
-
-        BlocProvider(create: (context) => getIt<PhoneAuthBloc>()),
-        BlocProvider(create: (context) => getIt<VerifyCodeBloc>()),
-        BlocProvider(create: (context) => getIt<PinBloc>()),
-        BlocProvider(create: (context) => getIt<MapBloc>()),
-        BlocProvider(create: (context) => getIt<ProfileBloc>()),
-      ],
-      child: BlocListener<SplashBloc, SplashState>(
-        listener: (context, state) {
-          print(
-            '!!! Состояние AuthBloc изменилось на: ${state.runtimeType} !!!',
-          );
-        },
-        child: MaterialApp.router(
-          title: 'BeHappy',
-          debugShowCheckedModeBanner: false,
-          theme: ThemeData.dark(),
-          builder: BotToastInit(),
-          routerConfig: appRouter.router,
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart'; // 🔹 1. Добавлен импорт
+import 'package:bot_toast/bot_toast.dart';
+import 'package:be_happy/presentation/event/edit_profile_event.dart';
+import 'package:be_happy/presentation/event/profile_event.dart';
+import 'package:be_happy/presentation/event/scooter_detail_event.dart';
+import 'package:be_happy/presentation/navigation/app_router.dart';
+import 'package:be_happy/presentation/screens/payment_confirm_screen.dart';
+import 'package:be_happy/presentation/screens/splash_screen.dart';
+import 'package:be_happy/presentation/state/splash_state.dart';
+import 'package:be_happy/presentation/viewmodel/auth_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/edit_profile_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/map_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/payment_confirm_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/pin_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/profile_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/scooter_detail_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:be_happy/presentation/viewmodel/verify_code_bloc.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'di/service_locator.dart';
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  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());
+}
+
+
+class MyApp extends StatelessWidget {
+  const MyApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final appRouter = AppRouter(getIt<SplashBloc>());
+
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider.value(value: getIt<SplashBloc>()),
+
+        BlocProvider(create: (context) => getIt<PhoneAuthBloc>()),
+        BlocProvider(create: (context) => getIt<VerifyCodeBloc>()),
+        BlocProvider(create: (context) => getIt<PinBloc>()),
+        BlocProvider(create: (context) => getIt<MapBloc>()),
+        BlocProvider(create: (context) => getIt<ProfileBloc>()),
+      ],
+      child: BlocListener<SplashBloc, SplashState>(
+        listener: (context, state) {
+          print(
+            '!!! Состояние AuthBloc изменилось на: ${state.runtimeType} !!!',
+          );
+        },
+        child: MaterialApp.router(
+          title: 'BeHappy',
+          debugShowCheckedModeBanner: false,
+          theme: ThemeData.dark(),
+          builder: BotToastInit(),
+          routerConfig: appRouter.router,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/app_checkbox.dart b/lib/presentation/components/app_checkbox.dart
index cb474c3..4f5588a 100644
--- a/lib/presentation/components/app_checkbox.dart
+++ b/lib/presentation/components/app_checkbox.dart
@@ -1,44 +1,44 @@
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-
-
-class AppCheckbox extends StatelessWidget {
-  final bool value;
-  final Function(bool?) onChanged;
-  final bool isError;
-
-
-  const AppCheckbox({
-    super.key,
-    required this.value,
-    required this.onChanged,
-    this.isError = false,
-  });
-
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => onChanged(!value),
-      child: Container(
-        width: 22,
-        height: 22,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(6),
-          border: Border.all(
-            color: isError ? AppColors.checkboxErrorBorder : AppColors.checkboxBorder,
-            width: 2,
-          ),
-          color: value ? AppColors.checkboxFill : Colors.transparent,
-        ),
-        child: value
-            ? const Icon(
-          Icons.check,
-          size: 16,
-          color: Color(0xFF000032),
-        )
-            : null,
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+
+
+class AppCheckbox extends StatelessWidget {
+  final bool value;
+  final Function(bool?) onChanged;
+  final bool isError;
+
+
+  const AppCheckbox({
+    super.key,
+    required this.value,
+    required this.onChanged,
+    this.isError = false,
+  });
+
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => onChanged(!value),
+      child: Container(
+        width: 22,
+        height: 22,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(6),
+          border: Border.all(
+            color: isError ? AppColors.checkboxErrorBorder : AppColors.checkboxBorder,
+            width: 2,
+          ),
+          color: value ? AppColors.checkboxFill : Colors.transparent,
+        ),
+        child: value
+            ? const Icon(
+          Icons.check,
+          size: 16,
+          color: Color(0xFF000032),
+        )
+            : null,
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/arrow_button.dart b/lib/presentation/components/arrow_button.dart
index c15e5ab..e9c3af4 100644
--- a/lib/presentation/components/arrow_button.dart
+++ b/lib/presentation/components/arrow_button.dart
@@ -1,46 +1,46 @@
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-
-
-class GradientButton extends StatelessWidget {
-  final String text;
-  final VoidCallback? onTap;
-  final bool enabled;
-
-
-  const GradientButton({
-    super.key,
-    required this.text,
-    required this.onTap,
-    this.enabled = true,
-  });
-
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: enabled ? onTap : null,
-      child: Container(
-        constraints: const BoxConstraints(
-          maxWidth: 350, // Максимальная ширина кнопки
-        ),
-        height: 66,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(24),
-          gradient: enabled ? AppColors.activeButtonGradient : null,
-          color: enabled ? null : AppColors.disabledButtonColor,
-        ),
-        alignment: Alignment.center,
-        child: Text(
-          text,
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
-            fontSize: 20,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+
+
+class GradientButton extends StatelessWidget {
+  final String text;
+  final VoidCallback? onTap;
+  final bool enabled;
+
+
+  const GradientButton({
+    super.key,
+    required this.text,
+    required this.onTap,
+    this.enabled = true,
+  });
+
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: enabled ? onTap : null,
+      child: Container(
+        constraints: const BoxConstraints(
+          maxWidth: 350, // Максимальная ширина кнопки
+        ),
+        height: 66,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(24),
+          gradient: enabled ? AppColors.activeButtonGradient : null,
+          color: enabled ? null : AppColors.disabledButtonColor,
+        ),
+        alignment: Alignment.center,
+        child: Text(
+          text,
+          textAlign: TextAlign.center,
+          style: TextStyle(
+            color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
+            fontSize: 20,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/card_input_field.dart b/lib/presentation/components/card_input_field.dart
index c9d71cb..fef60cc 100644
--- a/lib/presentation/components/card_input_field.dart
+++ b/lib/presentation/components/card_input_field.dart
@@ -1,80 +1,80 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-class CardInputField extends StatelessWidget {
-  final String hintText;
-  final IconData? icon;
-  final TextEditingController? controller;
-  final ValueChanged<String>? onChanged;
-  final TextInputType keyboardType;
-  final List<TextInputFormatter>? inputFormatters;
-  final bool obscureText;
-  final int? maxLength;
-  final double letterSpacing;
-  final TextCapitalization textCapitalization; // ← новый параметр
-
-  const CardInputField({
-    super.key,
-    required this.hintText,
-    this.icon,
-    this.controller,
-    this.onChanged,
-    this.keyboardType = TextInputType.text,
-    this.inputFormatters,
-    this.obscureText = false,
-    this.maxLength,
-    this.letterSpacing = 0,
-    this.textCapitalization = TextCapitalization.none, // ← по умолчанию none
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 46,
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      decoration: BoxDecoration(
-        color: Colors.white.withOpacity(0.15),
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Row(
-        children: [
-          Expanded(
-            child: TextField(
-              controller: controller,
-              onChanged: onChanged,
-              keyboardType: keyboardType,
-              inputFormatters: inputFormatters,
-              obscureText: obscureText,
-              maxLength: maxLength,
-              textCapitalization: textCapitalization, // ← передаём в TextField
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 16,
-                letterSpacing: letterSpacing,
-              ),
-              decoration: InputDecoration(
-                hintText: hintText,
-                hintStyle: TextStyle(
-                  color: Colors.white.withOpacity(0.4),
-                  fontSize: 16,
-                  letterSpacing: letterSpacing,
-                ),
-                counterText: '',
-                border: InputBorder.none,
-                contentPadding: EdgeInsets.zero,
-              ),
-            ),
-          ),
-          if (icon != null) ...[
-            const SizedBox(width: 12),
-            Icon(
-              icon,
-              color: Colors.white.withOpacity(0.6),
-              size: 22,
-            ),
-          ],
-        ],
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class CardInputField extends StatelessWidget {
+  final String hintText;
+  final IconData? icon;
+  final TextEditingController? controller;
+  final ValueChanged<String>? onChanged;
+  final TextInputType keyboardType;
+  final List<TextInputFormatter>? inputFormatters;
+  final bool obscureText;
+  final int? maxLength;
+  final double letterSpacing;
+  final TextCapitalization textCapitalization; // ← новый параметр
+
+  const CardInputField({
+    super.key,
+    required this.hintText,
+    this.icon,
+    this.controller,
+    this.onChanged,
+    this.keyboardType = TextInputType.text,
+    this.inputFormatters,
+    this.obscureText = false,
+    this.maxLength,
+    this.letterSpacing = 0,
+    this.textCapitalization = TextCapitalization.none, // ← по умолчанию none
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 46,
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      decoration: BoxDecoration(
+        color: Colors.white.withOpacity(0.15),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: TextField(
+              controller: controller,
+              onChanged: onChanged,
+              keyboardType: keyboardType,
+              inputFormatters: inputFormatters,
+              obscureText: obscureText,
+              maxLength: maxLength,
+              textCapitalization: textCapitalization, // ← передаём в TextField
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 16,
+                letterSpacing: letterSpacing,
+              ),
+              decoration: InputDecoration(
+                hintText: hintText,
+                hintStyle: TextStyle(
+                  color: Colors.white.withOpacity(0.4),
+                  fontSize: 16,
+                  letterSpacing: letterSpacing,
+                ),
+                counterText: '',
+                border: InputBorder.none,
+                contentPadding: EdgeInsets.zero,
+              ),
+            ),
+          ),
+          if (icon != null) ...[
+            const SizedBox(width: 12),
+            Icon(
+              icon,
+              color: Colors.white.withOpacity(0.6),
+              size: 22,
+            ),
+          ],
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/code_dots.dart b/lib/presentation/components/code_dots.dart
index e097267..31dedaa 100644
--- a/lib/presentation/components/code_dots.dart
+++ b/lib/presentation/components/code_dots.dart
@@ -1,43 +1,43 @@
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-
-
-class CodeDots extends StatelessWidget {
-  final String code;
-  final int length;
-  final bool isError;
-
-
-  const CodeDots({
-    super.key,
-    required this.code,
-    required this.length,
-    this.isError = false,
-  });
-
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: List.generate(length, (i) {
-        bool filled = i < code.length;
-        return Container(
-          margin: const EdgeInsets.symmetric(horizontal: 8),
-          child: Text(
-            filled ? code[i] : '●',
-            style: TextStyle(
-              fontSize: 20,
-              fontWeight: FontWeight.w600,
-              color: isError
-                  ? AppColors.pinError
-                  : filled
-                  ? AppColors.smsDigit
-                  : AppColors.digitPlaceholder,
-            ),
-          ),
-        );
-      }),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+
+
+class CodeDots extends StatelessWidget {
+  final String code;
+  final int length;
+  final bool isError;
+
+
+  const CodeDots({
+    super.key,
+    required this.code,
+    required this.length,
+    this.isError = false,
+  });
+
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: List.generate(length, (i) {
+        bool filled = i < code.length;
+        return Container(
+          margin: const EdgeInsets.symmetric(horizontal: 8),
+          child: Text(
+            filled ? code[i] : '●',
+            style: TextStyle(
+              fontSize: 20,
+              fontWeight: FontWeight.w600,
+              color: isError
+                  ? AppColors.pinError
+                  : filled
+                  ? AppColors.smsDigit
+                  : AppColors.digitPlaceholder,
+            ),
+          ),
+        );
+      }),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/content_parser.dart b/lib/presentation/components/content_parser.dart
index 71e4e21..5fc55f0 100644
--- a/lib/presentation/components/content_parser.dart
+++ b/lib/presentation/components/content_parser.dart
@@ -1,244 +1,244 @@
-import 'package:flutter/material.dart';
-import 'package:html/parser.dart' as html_parser;
-import 'package:html/dom.dart' as dom;
-import 'dart:convert';
-
-/// Парсер контента новостей (поддерживает HTML и JSON-формат)
-class ContentParser {
-
-  /// Парсит текст новости: сначала проверяет textJson, потом text
-  static List<Widget> parseContent({String? textJson, String? text}) {
-    if (textJson != null && textJson.isNotEmpty) {
-      return _parseJsonText(textJson);
-    } else if (text != null && text.isNotEmpty) {
-      return _parseHtmlText(text);
-    }
-    return const [];
-  }
-
-  // 🔹 HTML-парсинг
-  static List<Widget> _parseHtmlText(String htmlText) {
-    final parsedHtml = html_parser.parse(htmlText);
-    final List<dom.Node> elements = parsedHtml.body?.nodes ?? [];
-    return _parseHtmlElements(elements);
-  }
-
-  static List<Widget> _parseHtmlElements(List<dom.Node> nodes) {
-    List<Widget> widgets = [];
-
-    for (final node in nodes) {
-      if (node is dom.Element) {
-        final text = node.text.trim();
-        if (text.isEmpty) continue;
-
-        switch (node.localName) {
-          case 'h1':
-          case 'h2':
-          case 'h3':
-            widgets.add(_buildHeader(text));
-            break;
-          case 'p':
-            widgets.add(_buildParagraph(text));
-            break;
-          case 'ul':
-            widgets.add(_buildUnorderedList(node.nodes));
-            break;
-          default:
-            widgets.add(_buildDefaultText(text));
-        }
-      } else if (node is dom.Text) {
-        final text = node.text.trim();
-        if (text.isNotEmpty) {
-          widgets.add(_buildDefaultText(text));
-        }
-      }
-    }
-
-    return widgets;
-  }
-
-  // 🔹 JSON-парсинг
-  static List<Widget> _parseJsonText(String jsonString) {
-    try {
-      final dynamic data = jsonDecode(jsonString);
-      return _parseJsonNode(data);
-    } catch (e) {
-      return [
-        const Text(
-          'Ошибка отображения текста новости',
-          style: TextStyle(color: Colors.red, fontSize: 14),
-        ),
-      ];
-    }
-  }
-
-  static List<Widget> _parseJsonNode(dynamic node) {
-    List<Widget> widgets = [];
-
-    if (node is List) {
-      for (final item in node) {
-        widgets.addAll(_parseJsonNode(item));
-      }
-    } else if (node is Map<String, dynamic>) {
-      final type = node['type'] as String?;
-      final content = node['content'];
-
-      switch (type) {
-        case 'div':
-          if (content is List) {
-            widgets.addAll(_parseJsonNode(content));
-          }
-          break;
-        case 'h1':
-        case 'h2':
-        case 'h3':
-          final text = _extractJsonText(content);
-          if (text != null && text.isNotEmpty) {
-            widgets.add(_buildHeader(text));
-          }
-          break;
-        case 'p':
-          final text = _extractJsonText(content);
-          if (text != null && text.isNotEmpty) {
-            widgets.add(_buildParagraph(text));
-          }
-          break;
-        case 'ul':
-          if (content is List) {
-            widgets.add(_buildJsonUnorderedList(content));
-          }
-          break;
-        case 'li':
-          final text = _extractJsonText(content);
-          if (text != null && text.isNotEmpty) {
-            widgets.add(_buildListItem(text));
-          }
-          break;
-        default:
-          final text = _extractJsonText(content);
-          if (text != null && text.isNotEmpty) {
-            widgets.add(_buildDefaultText(text));
-          }
-      }
-    }
-
-    return widgets;
-  }
-
-  // 🔹 Вспомогательные методы извлечения текста из JSON
-  static String? _extractJsonText(dynamic content) {
-    if (content == null) return null;
-    if (content is List) {
-      return content.map((e) => e?.toString() ?? '').where((s) => s.isNotEmpty).join(' ');
-    }
-    return content.toString();
-  }
-
-  // 🔹 Виджеты для отображения (принимают НЕ nullable String)
-  static Widget _buildHeader(String text) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Text(
-        text, // ✅ text — не nullable
-        style: const TextStyle(
-          color: Colors.white,
-          fontSize: 18,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-    );
-  }
-
-  static Widget _buildParagraph(String text) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Text(
-        text,
-        style: const TextStyle(
-          color: Colors.white70,
-          fontSize: 14,
-          height: 1.5,
-        ),
-      ),
-    );
-  }
-
-  static Widget _buildDefaultText(String text) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Text(
-        text,
-        style: const TextStyle(
-          color: Colors.white70,
-          fontSize: 14,
-        ),
-      ),
-    );
-  }
-
-  static Widget _buildUnorderedList(List<dom.Node> children) {
-    final items = <Widget>[];
-    for (final child in children) {
-      if (child is dom.Element && child.localName == 'li') {
-        final text = child.text.trim();
-        if (text.isNotEmpty) {
-          items.add(_buildListItem(text));
-        }
-      }
-    }
-
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: items,
-      ),
-    );
-  }
-
-  static Widget _buildJsonUnorderedList(List<dynamic> content) {
-    final items = <Widget>[];
-    for (final item in content) {
-      if (item is Map<String, dynamic> && item['type'] == 'li') {
-        final text = _extractJsonText(item['content']);
-        if (text != null && text.isNotEmpty) {
-          items.add(_buildListItem(text));
-        }
-      }
-    }
-
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: items,
-      ),
-    );
-  }
-
-  static Widget _buildListItem(String text) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 16, top: 4, bottom: 4),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Text('• ',
-              style: TextStyle(
-                color: Colors.white70,
-                fontSize: 14,
-              )),
-          Expanded(
-            child: Text(
-              text,
-              style: const TextStyle(
-                color: Colors.white70,
-                fontSize: 14,
-                height: 1.5,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import 'package:html/parser.dart' as html_parser;
+import 'package:html/dom.dart' as dom;
+import 'dart:convert';
+
+/// Парсер контента новостей (поддерживает HTML и JSON-формат)
+class ContentParser {
+
+  /// Парсит текст новости: сначала проверяет textJson, потом text
+  static List<Widget> parseContent({String? textJson, String? text}) {
+    if (textJson != null && textJson.isNotEmpty) {
+      return _parseJsonText(textJson);
+    } else if (text != null && text.isNotEmpty) {
+      return _parseHtmlText(text);
+    }
+    return const [];
+  }
+
+  // 🔹 HTML-парсинг
+  static List<Widget> _parseHtmlText(String htmlText) {
+    final parsedHtml = html_parser.parse(htmlText);
+    final List<dom.Node> elements = parsedHtml.body?.nodes ?? [];
+    return _parseHtmlElements(elements);
+  }
+
+  static List<Widget> _parseHtmlElements(List<dom.Node> nodes) {
+    List<Widget> widgets = [];
+
+    for (final node in nodes) {
+      if (node is dom.Element) {
+        final text = node.text.trim();
+        if (text.isEmpty) continue;
+
+        switch (node.localName) {
+          case 'h1':
+          case 'h2':
+          case 'h3':
+            widgets.add(_buildHeader(text));
+            break;
+          case 'p':
+            widgets.add(_buildParagraph(text));
+            break;
+          case 'ul':
+            widgets.add(_buildUnorderedList(node.nodes));
+            break;
+          default:
+            widgets.add(_buildDefaultText(text));
+        }
+      } else if (node is dom.Text) {
+        final text = node.text.trim();
+        if (text.isNotEmpty) {
+          widgets.add(_buildDefaultText(text));
+        }
+      }
+    }
+
+    return widgets;
+  }
+
+  // 🔹 JSON-парсинг
+  static List<Widget> _parseJsonText(String jsonString) {
+    try {
+      final dynamic data = jsonDecode(jsonString);
+      return _parseJsonNode(data);
+    } catch (e) {
+      return [
+        const Text(
+          'Ошибка отображения текста новости',
+          style: TextStyle(color: Colors.red, fontSize: 14),
+        ),
+      ];
+    }
+  }
+
+  static List<Widget> _parseJsonNode(dynamic node) {
+    List<Widget> widgets = [];
+
+    if (node is List) {
+      for (final item in node) {
+        widgets.addAll(_parseJsonNode(item));
+      }
+    } else if (node is Map<String, dynamic>) {
+      final type = node['type'] as String?;
+      final content = node['content'];
+
+      switch (type) {
+        case 'div':
+          if (content is List) {
+            widgets.addAll(_parseJsonNode(content));
+          }
+          break;
+        case 'h1':
+        case 'h2':
+        case 'h3':
+          final text = _extractJsonText(content);
+          if (text != null && text.isNotEmpty) {
+            widgets.add(_buildHeader(text));
+          }
+          break;
+        case 'p':
+          final text = _extractJsonText(content);
+          if (text != null && text.isNotEmpty) {
+            widgets.add(_buildParagraph(text));
+          }
+          break;
+        case 'ul':
+          if (content is List) {
+            widgets.add(_buildJsonUnorderedList(content));
+          }
+          break;
+        case 'li':
+          final text = _extractJsonText(content);
+          if (text != null && text.isNotEmpty) {
+            widgets.add(_buildListItem(text));
+          }
+          break;
+        default:
+          final text = _extractJsonText(content);
+          if (text != null && text.isNotEmpty) {
+            widgets.add(_buildDefaultText(text));
+          }
+      }
+    }
+
+    return widgets;
+  }
+
+  // 🔹 Вспомогательные методы извлечения текста из JSON
+  static String? _extractJsonText(dynamic content) {
+    if (content == null) return null;
+    if (content is List) {
+      return content.map((e) => e?.toString() ?? '').where((s) => s.isNotEmpty).join(' ');
+    }
+    return content.toString();
+  }
+
+  // 🔹 Виджеты для отображения (принимают НЕ nullable String)
+  static Widget _buildHeader(String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Text(
+        text, // ✅ text — не nullable
+        style: const TextStyle(
+          color: Colors.white,
+          fontSize: 18,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    );
+  }
+
+  static Widget _buildParagraph(String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Text(
+        text,
+        style: const TextStyle(
+          color: Colors.white70,
+          fontSize: 14,
+          height: 1.5,
+        ),
+      ),
+    );
+  }
+
+  static Widget _buildDefaultText(String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Text(
+        text,
+        style: const TextStyle(
+          color: Colors.white70,
+          fontSize: 14,
+        ),
+      ),
+    );
+  }
+
+  static Widget _buildUnorderedList(List<dom.Node> children) {
+    final items = <Widget>[];
+    for (final child in children) {
+      if (child is dom.Element && child.localName == 'li') {
+        final text = child.text.trim();
+        if (text.isNotEmpty) {
+          items.add(_buildListItem(text));
+        }
+      }
+    }
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: items,
+      ),
+    );
+  }
+
+  static Widget _buildJsonUnorderedList(List<dynamic> content) {
+    final items = <Widget>[];
+    for (final item in content) {
+      if (item is Map<String, dynamic> && item['type'] == 'li') {
+        final text = _extractJsonText(item['content']);
+        if (text != null && text.isNotEmpty) {
+          items.add(_buildListItem(text));
+        }
+      }
+    }
+
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: items,
+      ),
+    );
+  }
+
+  static Widget _buildListItem(String text) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16, top: 4, bottom: 4),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text('• ',
+              style: TextStyle(
+                color: Colors.white70,
+                fontSize: 14,
+              )),
+          Expanded(
+            child: Text(
+              text,
+              style: const TextStyle(
+                color: Colors.white70,
+                fontSize: 14,
+                height: 1.5,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/custom_app_bar.dart b/lib/presentation/components/custom_app_bar.dart
index 99054ff..814d0b7 100644
--- a/lib/presentation/components/custom_app_bar.dart
+++ b/lib/presentation/components/custom_app_bar.dart
@@ -1,34 +1,34 @@
-import 'package:flutter/material.dart';
-
-class CustomAppBar extends StatelessWidget {
-  final String title;
-
-  const CustomAppBar({super.key, required this.title});
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        InkWell(
-          onTap: () => Navigator.pop(context),
-          child: Row(
-            children: [
-              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x99FFFFFF), size: 20),
-              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x66FFFFFF), size: 20),
-              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x22FFFFFF), size: 20),
-            ],
-          ),
-        ),
-        const SizedBox(width: 20),
-        Text(
-          title,
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 20,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-      ],
-    );
-  }
+import 'package:flutter/material.dart';
+
+class CustomAppBar extends StatelessWidget {
+  final String title;
+
+  const CustomAppBar({super.key, required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        InkWell(
+          onTap: () => Navigator.pop(context),
+          child: Row(
+            children: [
+              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x99FFFFFF), size: 20),
+              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x66FFFFFF), size: 20),
+              Icon(Icons.arrow_back_ios_sharp, color: const Color(0x22FFFFFF), size: 20),
+            ],
+          ),
+        ),
+        const SizedBox(width: 20),
+        Text(
+          title,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 20,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ],
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/dialog/cancel_booking_dialog.dart b/lib/presentation/components/dialog/cancel_booking_dialog.dart
index c7a7047..7bc350e 100644
--- a/lib/presentation/components/dialog/cancel_booking_dialog.dart
+++ b/lib/presentation/components/dialog/cancel_booking_dialog.dart
@@ -1,96 +1,96 @@
-import 'package:flutter/material.dart';
-
-class CancelBookingDialog extends StatelessWidget {
-  const CancelBookingDialog({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(
-              "Отменить\nбронирование?",
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 22,
-                fontWeight: FontWeight.w600,
-                height: 1.2,
-              ),
-            ),
-            const SizedBox(height: 16),
-            const Text(
-              "Вы действительно хотите отменить\nбронирование",
-              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),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+
+class CancelBookingDialog extends StatelessWidget {
+  const CancelBookingDialog({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(
+              "Отменить\nбронирование?",
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 22,
+                fontWeight: FontWeight.w600,
+                height: 1.2,
+              ),
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              "Вы действительно хотите отменить\nбронирование",
+              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),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/dialog/cannot_finish_ride_dialog.dart b/lib/presentation/components/dialog/cannot_finish_ride_dialog.dart
index 42e1475..6172a69 100644
--- a/lib/presentation/components/dialog/cannot_finish_ride_dialog.dart
+++ b/lib/presentation/components/dialog/cannot_finish_ride_dialog.dart
@@ -1,79 +1,79 @@
-import 'package:flutter/material.dart';
-
-class CannotFinishRideDialog extends StatelessWidget {
-  const CannotFinishRideDialog({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),
-
-            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)
-                },
-                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,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+
+class CannotFinishRideDialog extends StatelessWidget {
+  const CannotFinishRideDialog({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),
+
+            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)
+                },
+                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,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart b/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart
index 8850254..707f254 100644
--- a/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart
+++ b/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart
@@ -1,96 +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),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
+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),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/fine_notification_card.dart b/lib/presentation/components/fine_notification_card.dart
index 06415c2..365d0ea 100644
--- a/lib/presentation/components/fine_notification_card.dart
+++ b/lib/presentation/components/fine_notification_card.dart
@@ -1,90 +1,90 @@
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-
-class FineNotificationCard extends StatelessWidget {
-  final VoidCallback onClose;
-
-  const FineNotificationCard({
-    super.key,
-    required this.onClose,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Container(
-            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
-            decoration: BoxDecoration(
-              color: const Color(0xFF2D2B4D),
-              borderRadius: BorderRadius.circular(32),
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(height: 8),
-                const Padding(
-                  padding: EdgeInsets.only(left: 64),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        'У вас имеются неоплаченные штрафы',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      SizedBox(height: 12),
-                      Text(
-                        'Оплатите штраф, чтобы начать поездку',
-                        style: TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                          height: 1.2,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-
-          Positioned(
-            top: -20,
-            left: -30,
-            child: Image.asset(
-              'assets/icons/card-screen.png',
-              width: 120,
-              height: 120,
-              fit: BoxFit.contain,
-            ),
-          ),
-
-          Positioned(
-            top: 15,
-            right: 15,
-            child: GestureDetector(
-              onTap: onClose,
-              child: Container(
-                padding: const EdgeInsets.all(6),
-                decoration: BoxDecoration(
-                  color: Colors.white.withOpacity(0.2),
-                  shape: BoxShape.circle,
-                ),
-                child: const Icon(Icons.close, color: Colors.white70, size: 20),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class FineNotificationCard extends StatelessWidget {
+  final VoidCallback onClose;
+
+  const FineNotificationCard({
+    super.key,
+    required this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Container(
+            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
+            decoration: BoxDecoration(
+              color: const Color(0xFF2D2B4D),
+              borderRadius: BorderRadius.circular(32),
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 8),
+                const Padding(
+                  padding: EdgeInsets.only(left: 64),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'У вас имеются неоплаченные штрафы',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      SizedBox(height: 12),
+                      Text(
+                        'Оплатите штраф, чтобы начать поездку',
+                        style: TextStyle(
+                          color: Colors.white70,
+                          fontSize: 14,
+                          height: 1.2,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          Positioned(
+            top: -20,
+            left: -30,
+            child: Image.asset(
+              'assets/icons/card-screen.png',
+              width: 120,
+              height: 120,
+              fit: BoxFit.contain,
+            ),
+          ),
+
+          Positioned(
+            top: 15,
+            right: 15,
+            child: GestureDetector(
+              onTap: onClose,
+              child: Container(
+                padding: const EdgeInsets.all(6),
+                decoration: BoxDecoration(
+                  color: Colors.white.withOpacity(0.2),
+                  shape: BoxShape.circle,
+                ),
+                child: const Icon(Icons.close, color: Colors.white70, size: 20),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/full_screen_image_viewer.dart b/lib/presentation/components/full_screen_image_viewer.dart
new file mode 100644
index 0000000..5b00b7d
--- /dev/null
+++ b/lib/presentation/components/full_screen_image_viewer.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+
+class FullScreenImageViewer extends StatefulWidget {
+  final List<String> photoUrls;
+  final int initialIndex;
+
+  const FullScreenImageViewer({
+    super.key,
+    required this.photoUrls,
+    required this.initialIndex,
+  });
+
+  @override
+  State<FullScreenImageViewer> createState() => _FullScreenImageViewerState();
+}
+
+class _FullScreenImageViewerState extends State<FullScreenImageViewer> {
+  late PageController _pageController;
+
+  @override
+  void initState() {
+    super.initState();
+    _pageController = PageController(initialPage: widget.initialIndex);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      appBar: AppBar(
+        backgroundColor: Colors.transparent,
+        iconTheme: const IconThemeData(color: Colors.white),
+      ),
+      body: PageView.builder(
+        controller: _pageController,
+        itemCount: widget.photoUrls.length,
+        itemBuilder: (context, index) {
+          final isNetwork = widget.photoUrls[index].startsWith('http');
+          return InteractiveViewer(
+            child: Center(
+              child: isNetwork
+                  ? Image.network(widget.photoUrls[index])
+                  : Image.asset(widget.photoUrls[index]),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/presentation/components/gradient_button.dart b/lib/presentation/components/gradient_button.dart
index 60abd19..34be126 100644
--- a/lib/presentation/components/gradient_button.dart
+++ b/lib/presentation/components/gradient_button.dart
@@ -1,119 +1,119 @@
-// import 'package:flutter/material.dart';
-// import '../core/app_colors.dart';
-//
-//
-// class GradientButton extends StatelessWidget {
-//   final String text;
-//   final VoidCallback? onTap;
-//   final bool enabled;
-//
-//
-//   const GradientButton({
-//     super.key,
-//     required this.text,
-//     required this.onTap,
-//     this.enabled = true,
-//   });
-//
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return GestureDetector(
-//       onTap: enabled ? onTap : null,
-//       child: Container(
-//         constraints: const BoxConstraints(
-//           maxWidth: 350, // Максимальная ширина кнопки
-//         ),
-//         height: 66,
-//         decoration: BoxDecoration(
-//           borderRadius: BorderRadius.circular(24),
-//           gradient: enabled ? AppColors.activeButtonGradient : null,
-//           color: enabled ? null : AppColors.disabledButtonColor,
-//         ),
-//         alignment: Alignment.center,
-//         child: Text(
-//           text,
-//           textAlign: TextAlign.center,
-//           style: TextStyle(
-//             color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
-//             fontSize: 20,
-//             fontWeight: FontWeight.w600,
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }
-
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-
-class GradientButton extends StatelessWidget {
-  final String text;
-  final VoidCallback? onTap;
-  final bool enabled;
-  final bool showArrows; // Новый параметр для стрелок
-  final double height;    // Параметр высоты
-  final double width;
-  final double fontSize; // Параметр размера шрифта
-
-  const GradientButton({
-    super.key,
-    required this.text,
-    required this.onTap,
-    this.enabled = true,
-    this.showArrows = false,
-    this.width = 220,
-    this.height = 50,
-    this.fontSize = 12,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final Color arrow1 = enabled ? const Color(0x33000032) : const Color(0x33FFFFFF);
-    final Color arrow2 = enabled ? const Color(0x66000032) : const Color(0x66FFFFFF);
-    final Color arrow3 = enabled ? const Color(0x99000032) : const Color(0x99FFFFFF);
-
-    return GestureDetector(
-      onTap: enabled ? onTap : null,
-      child: Container(
-        width: width,
-        height: height,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(24),
-          gradient: enabled ? AppColors.activeButtonGradient : null,
-          color: enabled ? null : AppColors.disabledButtonColor,
-        ),
-        alignment: Alignment.center,
-        child: showArrows
-            ? Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Text(
-              text,
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
-                fontSize: fontSize,
-                fontWeight: FontWeight.w600,
-              ),
-            ),
-            const SizedBox(width: 20),
-            Icon(Icons.arrow_forward_ios_sharp, color: arrow1, size: 12),
-            Icon(Icons.arrow_forward_ios_sharp, color: arrow2, size: 12),
-            Icon(Icons.arrow_forward_ios_sharp, color: arrow3, size: 12),
-          ],
-        )
-            : Text(
-          text,
-          textAlign: TextAlign.center,
-          style: TextStyle(
-            color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
-            fontSize: fontSize,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-      ),
-    );
-  }
+// import 'package:flutter/material.dart';
+// import '../core/app_colors.dart';
+//
+//
+// class GradientButton extends StatelessWidget {
+//   final String text;
+//   final VoidCallback? onTap;
+//   final bool enabled;
+//
+//
+//   const GradientButton({
+//     super.key,
+//     required this.text,
+//     required this.onTap,
+//     this.enabled = true,
+//   });
+//
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     return GestureDetector(
+//       onTap: enabled ? onTap : null,
+//       child: Container(
+//         constraints: const BoxConstraints(
+//           maxWidth: 350, // Максимальная ширина кнопки
+//         ),
+//         height: 66,
+//         decoration: BoxDecoration(
+//           borderRadius: BorderRadius.circular(24),
+//           gradient: enabled ? AppColors.activeButtonGradient : null,
+//           color: enabled ? null : AppColors.disabledButtonColor,
+//         ),
+//         alignment: Alignment.center,
+//         child: Text(
+//           text,
+//           textAlign: TextAlign.center,
+//           style: TextStyle(
+//             color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
+//             fontSize: 20,
+//             fontWeight: FontWeight.w600,
+//           ),
+//         ),
+//       ),
+//     );
+//   }
+// }
+
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+
+class GradientButton extends StatelessWidget {
+  final String text;
+  final VoidCallback? onTap;
+  final bool enabled;
+  final bool showArrows; // Новый параметр для стрелок
+  final double height;    // Параметр высоты
+  final double width;
+  final double fontSize; // Параметр размера шрифта
+
+  const GradientButton({
+    super.key,
+    required this.text,
+    required this.onTap,
+    this.enabled = true,
+    this.showArrows = false,
+    this.width = 220,
+    this.height = 50,
+    this.fontSize = 12,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Color arrow1 = enabled ? const Color(0x33000032) : const Color(0x33FFFFFF);
+    final Color arrow2 = enabled ? const Color(0x66000032) : const Color(0x66FFFFFF);
+    final Color arrow3 = enabled ? const Color(0x99000032) : const Color(0x99FFFFFF);
+
+    return GestureDetector(
+      onTap: enabled ? onTap : null,
+      child: Container(
+        width: width,
+        height: height,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(24),
+          gradient: enabled ? AppColors.activeButtonGradient : null,
+          color: enabled ? null : AppColors.disabledButtonColor,
+        ),
+        alignment: Alignment.center,
+        child: showArrows
+            ? Row(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text(
+              text,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
+                fontSize: fontSize,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const SizedBox(width: 20),
+            Icon(Icons.arrow_forward_ios_sharp, color: arrow1, size: 12),
+            Icon(Icons.arrow_forward_ios_sharp, color: arrow2, size: 12),
+            Icon(Icons.arrow_forward_ios_sharp, color: arrow3, size: 12),
+          ],
+        )
+            : Text(
+          text,
+          textAlign: TextAlign.center,
+          style: TextStyle(
+            color: enabled ? AppColors.activeButtonText : AppColors.disabledButtonText,
+            fontSize: fontSize,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/link_row.dart b/lib/presentation/components/link_row.dart
index f7faf54..e261a9e 100644
--- a/lib/presentation/components/link_row.dart
+++ b/lib/presentation/components/link_row.dart
@@ -1,67 +1,67 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart'; // ✅ Добавлен
-
-class LinkRow extends StatelessWidget {
-  final String icon;
-  final String title;
-  final VoidCallback onTap;
-
-  const LinkRow({
-    super.key,
-    required this.icon,
-    required this.title,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      borderRadius: BorderRadius.circular(12),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 14),
-        child: Row(
-          children: [
-            Image.asset(
-              icon,
-              width: 24,
-              height: 24,
-            ),
-            const SizedBox(width: 12),
-            Expanded(
-              child: Text(
-                title,
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 16,
-                ),
-              ),
-            ),
-            Row(
-              children: [
-                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x99FFFFFF), size: 12),
-                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x66FFFFFF), size: 12),
-                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x33FFFFFF), size: 12),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-// ✅ Выносим метод открытия ссылки
-void openLink(String url) async {
-  final Uri uri = Uri.parse(url);
-
-  try {
-    await launchUrl(
-      uri,
-      mode: LaunchMode.externalApplication,
-    );
-  } catch (e) {
-    // TODO: Показать ошибку пользователю
-    print('Не удалось открыть ссылку: $e');
-  }
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart'; // ✅ Добавлен
+
+class LinkRow extends StatelessWidget {
+  final String icon;
+  final String title;
+  final VoidCallback onTap;
+
+  const LinkRow({
+    super.key,
+    required this.icon,
+    required this.title,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 14),
+        child: Row(
+          children: [
+            Image.asset(
+              icon,
+              width: 24,
+              height: 24,
+            ),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Text(
+                title,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 16,
+                ),
+              ),
+            ),
+            Row(
+              children: [
+                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x99FFFFFF), size: 12),
+                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x66FFFFFF), size: 12),
+                Icon(Icons.arrow_forward_ios_sharp, color: const Color(0x33FFFFFF), size: 12),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// ✅ Выносим метод открытия ссылки
+void openLink(String url) async {
+  final Uri uri = Uri.parse(url);
+
+  try {
+    await launchUrl(
+      uri,
+      mode: LaunchMode.externalApplication,
+    );
+  } catch (e) {
+    // TODO: Показать ошибку пользователю
+    print('Не удалось открыть ссылку: $e');
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/map_icon_painter/clusterized_icon_painter.dart b/lib/presentation/components/map_icon_painter/clusterized_icon_painter.dart
index a40a578..50741f6 100644
--- a/lib/presentation/components/map_icon_painter/clusterized_icon_painter.dart
+++ b/lib/presentation/components/map_icon_painter/clusterized_icon_painter.dart
@@ -1,97 +1,97 @@
-import 'dart:ui' as ui;
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-class ClusterIconPainter {
-  final int clusterSize;
-
-  static ui.Image? _scooterImageCache;
-
-  const ClusterIconPainter(this.clusterSize);
-
-  static Future<void> initImage(String assetPath) async {
-    if (_scooterImageCache != null) return;
-    final data = await rootBundle.load(assetPath);
-    final codec = await ui.instantiateImageCodec(data.buffer.asUint8List());
-    final frame = await codec.getNextFrame();
-    _scooterImageCache = frame.image;
-  }
-
-  Future<Uint8List> getClusterIconBytes() async {
-    const size = Size(180, 180);
-    final recorder = ui.PictureRecorder();
-    final canvas = Canvas(recorder);
-
-    final mainCenter = Offset(size.width * 0.45, size.height * 0.55);
-    final mainRadius = size.width * 0.35;
-
-    final greenPaint = Paint()
-      ..color = const Color(0xFF8BFFAA)
-      ..style = PaintingStyle.fill;
-
-    canvas.drawCircle(mainCenter, mainRadius, greenPaint);
-
-    if (_scooterImageCache != null) {
-      final imageSize = mainRadius * 1.3;
-      final rect = Rect.fromCenter(
-        center: mainCenter,
-        width: imageSize,
-        height: imageSize,
-      );
-      paintImage(
-        canvas: canvas,
-        image: _scooterImageCache!,
-        rect: rect,
-        fit: BoxFit.contain,
-      );
-    }
-
-    if (clusterSize > 1) {
-      _drawBadge(canvas, mainCenter, mainRadius);
-    }
-
-    final image = await recorder.endRecording().toImage(
-      size.width.toInt(),
-      size.height.toInt(),
-    );
-    final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
-    return byteData!.buffer.asUint8List();
-  }
-
-  void _drawBadge(Canvas canvas, Offset mainCenter, double mainRadius) {
-    final badgeCenter = Offset(
-      mainCenter.dx + mainRadius * 0.7,
-      mainCenter.dy - mainRadius * 0.7,
-    );
-    final badgeRadius = mainRadius * 0.45;
-
-    final badgePaint = Paint()..color = Color(0xFF000032);
-
-
-    canvas.drawCircle(badgeCenter, badgeRadius, Paint()
-      ..color = Colors.black26
-      ..maskFilter = const MaskFilter.blur(BlurStyle.normal, 3));
-
-    canvas.drawCircle(badgeCenter, badgeRadius, badgePaint);
-
-    final textPainter = TextPainter(
-      text: TextSpan(
-        text: clusterSize > 99 ? '99+' : clusterSize.toString(),
-        style: TextStyle(
-          color: Colors.white,
-          fontSize: badgeRadius * 1.1,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-      textDirection: TextDirection.ltr,
-    )..layout();
-
-    textPainter.paint(
-      canvas,
-      Offset(
-        badgeCenter.dx - textPainter.width / 2,
-        badgeCenter.dy - textPainter.height / 2,
-      ),
-    );
-  }
-}
+import 'dart:ui' as ui;
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class ClusterIconPainter {
+  final int clusterSize;
+
+  static ui.Image? _scooterImageCache;
+
+  const ClusterIconPainter(this.clusterSize);
+
+  static Future<void> initImage(String assetPath) async {
+    if (_scooterImageCache != null) return;
+    final data = await rootBundle.load(assetPath);
+    final codec = await ui.instantiateImageCodec(data.buffer.asUint8List());
+    final frame = await codec.getNextFrame();
+    _scooterImageCache = frame.image;
+  }
+
+  Future<Uint8List> getClusterIconBytes() async {
+    const size = Size(180, 180);
+    final recorder = ui.PictureRecorder();
+    final canvas = Canvas(recorder);
+
+    final mainCenter = Offset(size.width * 0.45, size.height * 0.55);
+    final mainRadius = size.width * 0.35;
+
+    final greenPaint = Paint()
+      ..color = const Color(0xFF8BFFAA)
+      ..style = PaintingStyle.fill;
+
+    canvas.drawCircle(mainCenter, mainRadius, greenPaint);
+
+    if (_scooterImageCache != null) {
+      final imageSize = mainRadius * 1.3;
+      final rect = Rect.fromCenter(
+        center: mainCenter,
+        width: imageSize,
+        height: imageSize,
+      );
+      paintImage(
+        canvas: canvas,
+        image: _scooterImageCache!,
+        rect: rect,
+        fit: BoxFit.contain,
+      );
+    }
+
+    if (clusterSize > 1) {
+      _drawBadge(canvas, mainCenter, mainRadius);
+    }
+
+    final image = await recorder.endRecording().toImage(
+      size.width.toInt(),
+      size.height.toInt(),
+    );
+    final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+    return byteData!.buffer.asUint8List();
+  }
+
+  void _drawBadge(Canvas canvas, Offset mainCenter, double mainRadius) {
+    final badgeCenter = Offset(
+      mainCenter.dx + mainRadius * 0.7,
+      mainCenter.dy - mainRadius * 0.7,
+    );
+    final badgeRadius = mainRadius * 0.45;
+
+    final badgePaint = Paint()..color = Color(0xFF000032);
+
+
+    canvas.drawCircle(badgeCenter, badgeRadius, Paint()
+      ..color = Colors.black26
+      ..maskFilter = const MaskFilter.blur(BlurStyle.normal, 3));
+
+    canvas.drawCircle(badgeCenter, badgeRadius, badgePaint);
+
+    final textPainter = TextPainter(
+      text: TextSpan(
+        text: clusterSize > 99 ? '99+' : clusterSize.toString(),
+        style: TextStyle(
+          color: Colors.white,
+          fontSize: badgeRadius * 1.1,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+      textDirection: TextDirection.ltr,
+    )..layout();
+
+    textPainter.paint(
+      canvas,
+      Offset(
+        badgeCenter.dx - textPainter.width / 2,
+        badgeCenter.dy - textPainter.height / 2,
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/notification_toast.dart b/lib/presentation/components/notification_toast.dart
index 2dadd20..02f817e 100644
--- a/lib/presentation/components/notification_toast.dart
+++ b/lib/presentation/components/notification_toast.dart
@@ -1,73 +1,73 @@
-import 'package:flutter/material.dart';
-
-class NotificationToast extends StatelessWidget {
-  final String title;
-  final VoidCallback onClose;
-
-  const NotificationToast({required this.title, required this.onClose});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 50),
-      child: Material(
-        elevation: 8,
-        shadowColor: Colors.black26,
-        color: Colors.red,
-        borderRadius: BorderRadius.circular(12),
-        clipBehavior: Clip.antiAlias,
-        child: IntrinsicHeight(
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: [
-              Container(
-                width: 60,
-                child: Image.asset(
-                  'assets/icons/clichnik.png',
-                  fit: BoxFit.contain,
-                ),
-              ),
-
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.all(12.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        "Данная территория не предназначена для катания!",
-                        style: const TextStyle(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 16,
-                        ),
-                        // maxLines: 1,
-                        // overflow: TextOverflow.ellipsis,
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        "Самокат 123-456! Вернитесь на разрешенный участок дороги",
-                        style: TextStyle(
-                          fontSize: 14,
-                        ),
-                        // maxLines: 2,
-                        // overflow: TextOverflow.ellipsis,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-
-              Align(
-                alignment: Alignment.topRight,
-                child: IconButton(
-                  icon: const Icon(Icons.close, size: 20),
-                  onPressed: onClose,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+
+class NotificationToast extends StatelessWidget {
+  final String title;
+  final VoidCallback onClose;
+
+  const NotificationToast({required this.title, required this.onClose});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 50),
+      child: Material(
+        elevation: 8,
+        shadowColor: Colors.black26,
+        color: Colors.red,
+        borderRadius: BorderRadius.circular(12),
+        clipBehavior: Clip.antiAlias,
+        child: IntrinsicHeight(
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Container(
+                width: 60,
+                child: Image.asset(
+                  'assets/icons/clichnik.png',
+                  fit: BoxFit.contain,
+                ),
+              ),
+
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.all(12.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        "Данная территория не предназначена для катания!",
+                        style: const TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 16,
+                        ),
+                        // maxLines: 1,
+                        // overflow: TextOverflow.ellipsis,
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        "Самокат 123-456! Вернитесь на разрешенный участок дороги",
+                        style: TextStyle(
+                          fontSize: 14,
+                        ),
+                        // maxLines: 2,
+                        // overflow: TextOverflow.ellipsis,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+
+              Align(
+                alignment: Alignment.topRight,
+                child: IconButton(
+                  icon: const Icon(Icons.close, size: 20),
+                  onPressed: onClose,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/payment_notification_card.dart b/lib/presentation/components/payment_notification_card.dart
index 3ae39be..7acb4fd 100644
--- a/lib/presentation/components/payment_notification_card.dart
+++ b/lib/presentation/components/payment_notification_card.dart
@@ -1,131 +1,131 @@
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-
-class PaymentNotificationCard extends StatelessWidget {
-  final VoidCallback onBindCard;
-  final VoidCallback onClose;
-
-  const PaymentNotificationCard({
-    super.key,
-    required this.onBindCard,
-    required this.onClose,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Container(
-            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
-            decoration: BoxDecoration(
-              color: const Color(0xFF2D2B4D),
-              borderRadius: BorderRadius.circular(32),
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(height: 8),
-                Padding(
-                  padding: const EdgeInsets.only(left: 64),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const Text(
-                        'Не привязана карта',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      const SizedBox(height: 12),
-                      const Text(
-                        'Привяжите карту, чтобы начать поездку',
-                        style: TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                          height: 1.2,
-                        ),
-                      ),
-                      const SizedBox(height: 8),
-                      FilledButton(
-                        onPressed: onBindCard,
-                        style: FilledButton.styleFrom(
-                          backgroundColor: const Color(0xFF0D0B26),
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 20,
-                            vertical: 10,
-                          ),
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(24),
-                          ),
-                        ),
-                        child: const Row(
-                          children: [
-                            const Icon(
-                              Icons.credit_card,
-                              color: Color(0xFF80FFD1),
-                              size: 28,
-                            ),
-                            const SizedBox(width: 16),
-                            const Expanded(
-                              child: Text(
-                                'Привязать карту',
-                                style: TextStyle(
-                                  color: Colors.white,
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w500,
-                                ),
-                              ),
-                            ),
-                            Icon(
-                              Icons.add,
-                              color: Colors.cyanAccent,
-                              size: 20,
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-
-          Positioned(
-            top: -20,
-            left: -30,
-            child: Image.asset(
-              'assets/icons/card-screen.png',
-              width: 120,
-              height: 120,
-              fit: BoxFit.contain,
-            ),
-          ),
-
-          Positioned(
-            top: 15,
-            right: 15,
-            child: GestureDetector(
-              onTap: onClose,
-              child: Container(
-                padding: const EdgeInsets.all(6),
-                decoration: BoxDecoration(
-                  color: Colors.white.withOpacity(0.2),
-                  shape: BoxShape.circle,
-                ),
-                child: const Icon(Icons.close, color: Colors.white70, size: 20),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class PaymentNotificationCard extends StatelessWidget {
+  final VoidCallback onBindCard;
+  final VoidCallback onClose;
+
+  const PaymentNotificationCard({
+    super.key,
+    required this.onBindCard,
+    required this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Container(
+            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
+            decoration: BoxDecoration(
+              color: const Color(0xFF2D2B4D),
+              borderRadius: BorderRadius.circular(32),
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 8),
+                Padding(
+                  padding: const EdgeInsets.only(left: 64),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        'Не привязана карта',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const SizedBox(height: 12),
+                      const Text(
+                        'Привяжите карту, чтобы начать поездку',
+                        style: TextStyle(
+                          color: Colors.white70,
+                          fontSize: 14,
+                          height: 1.2,
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      FilledButton(
+                        onPressed: onBindCard,
+                        style: FilledButton.styleFrom(
+                          backgroundColor: const Color(0xFF0D0B26),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 20,
+                            vertical: 10,
+                          ),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(24),
+                          ),
+                        ),
+                        child: const Row(
+                          children: [
+                            const Icon(
+                              Icons.credit_card,
+                              color: Color(0xFF80FFD1),
+                              size: 28,
+                            ),
+                            const SizedBox(width: 16),
+                            const Expanded(
+                              child: Text(
+                                'Привязать карту',
+                                style: TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 14,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+                            ),
+                            Icon(
+                              Icons.add,
+                              color: Colors.cyanAccent,
+                              size: 20,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          Positioned(
+            top: -20,
+            left: -30,
+            child: Image.asset(
+              'assets/icons/card-screen.png',
+              width: 120,
+              height: 120,
+              fit: BoxFit.contain,
+            ),
+          ),
+
+          Positioned(
+            top: 15,
+            right: 15,
+            child: GestureDetector(
+              onTap: onClose,
+              child: Container(
+                padding: const EdgeInsets.all(6),
+                decoration: BoxDecoration(
+                  color: Colors.white.withOpacity(0.2),
+                  shape: BoxShape.circle,
+                ),
+                child: const Icon(Icons.close, color: Colors.white70, size: 20),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/payment_option.dart b/lib/presentation/components/payment_option.dart
index 0defc95..51033d1 100644
--- a/lib/presentation/components/payment_option.dart
+++ b/lib/presentation/components/payment_option.dart
@@ -1,86 +1,86 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
-class PaymentOption extends StatelessWidget {
-  final String title;
-  final String subtitle;
-  final bool isSelected;
-  final VoidCallback onTap;
-
-  const PaymentOption({
-    required this.title,
-    required this.subtitle,
-    required this.isSelected,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        height: 56,
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        decoration: BoxDecoration(
-          color: const Color(0x00000032).withOpacity(1),
-          borderRadius: BorderRadius.circular(24),
-        ),
-        child: Row(
-          children: [
-            Expanded(
-              child: Row(
-                children: [
-                  Text(
-                    title,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  const SizedBox(width: 6),
-                  Text(
-                    subtitle,
-                    style: TextStyle(
-                      color: Colors.white.withOpacity(0.6),
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            // 🔹 РАДИО-КНОПКА
-            Container(
-              width: 20,
-              height: 20,
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                border: Border.all(
-                  color: isSelected
-                      ? const Color(0xFF66E3C4)
-                      : Colors.white.withOpacity(0.4),
-                  width: 2,
-                ),
-              ),
-              child: isSelected
-                  ? const Center(
-                child: SizedBox(
-                  width: 10,
-                  height: 10,
-                  child: DecoratedBox(
-                    decoration: BoxDecoration(
-                      color: Color(0xFF66E3C4),
-                      shape: BoxShape.circle,
-                    ),
-                  ),
-                ),
-              )
-                  : null,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class PaymentOption extends StatelessWidget {
+  final String title;
+  final String subtitle;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  const PaymentOption({
+    required this.title,
+    required this.subtitle,
+    required this.isSelected,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        height: 56,
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        decoration: BoxDecoration(
+          color: const Color(0x00000032).withOpacity(1),
+          borderRadius: BorderRadius.circular(24),
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              child: Row(
+                children: [
+                  Text(
+                    title,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  const SizedBox(width: 6),
+                  Text(
+                    subtitle,
+                    style: TextStyle(
+                      color: Colors.white.withOpacity(0.6),
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            // 🔹 РАДИО-КНОПКА
+            Container(
+              width: 20,
+              height: 20,
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                border: Border.all(
+                  color: isSelected
+                      ? const Color(0xFF66E3C4)
+                      : Colors.white.withOpacity(0.4),
+                  width: 2,
+                ),
+              ),
+              child: isSelected
+                  ? const Center(
+                child: SizedBox(
+                  width: 10,
+                  height: 10,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: Color(0xFF66E3C4),
+                      shape: BoxShape.circle,
+                    ),
+                  ),
+                ),
+              )
+                  : null,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/period_selector.dart b/lib/presentation/components/period_selector.dart
index 7dcf94c..abe4550 100644
--- a/lib/presentation/components/period_selector.dart
+++ b/lib/presentation/components/period_selector.dart
@@ -1,37 +1,37 @@
-import 'package:flutter/material.dart';
-
-class PeriodSelector extends StatelessWidget {
-  final List<String> periods;
-  final int currentIndex;
-  final Function(int) onSelect;
-
-  PeriodSelector({required this.currentIndex, required this.onSelect, required this.periods});
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: List.generate(periods.length, (index) {
-        bool isSelected = currentIndex == index;
-        return GestureDetector(
-          onTap: () => onSelect(index),
-          child: AnimatedContainer(
-            duration: const Duration(milliseconds: 200),
-            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-            decoration: BoxDecoration(
-              color: isSelected ? const Color(0xFF80FFD1) : const Color(0xFF1E2652),
-              borderRadius: BorderRadius.circular(20),
-            ),
-            child: Text(
-              periods[index],
-              style: TextStyle(
-                color: isSelected ? Colors.black : Colors.white.withOpacity(0.5),
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        );
-      }),
-    );
-  }
+import 'package:flutter/material.dart';
+
+class PeriodSelector extends StatelessWidget {
+  final List<String> periods;
+  final int currentIndex;
+  final Function(int) onSelect;
+
+  PeriodSelector({required this.currentIndex, required this.onSelect, required this.periods});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: List.generate(periods.length, (index) {
+        bool isSelected = currentIndex == index;
+        return GestureDetector(
+          onTap: () => onSelect(index),
+          child: AnimatedContainer(
+            duration: const Duration(milliseconds: 200),
+            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+            decoration: BoxDecoration(
+              color: isSelected ? const Color(0xFF80FFD1) : const Color(0xFF1E2652),
+              borderRadius: BorderRadius.circular(20),
+            ),
+            child: Text(
+              periods[index],
+              style: TextStyle(
+                color: isSelected ? Colors.black : Colors.white.withOpacity(0.5),
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          ),
+        );
+      }),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/scooter/battery_indicator.dart b/lib/presentation/components/scooter/battery_indicator.dart
index f0c8549..2374f83 100644
--- a/lib/presentation/components/scooter/battery_indicator.dart
+++ b/lib/presentation/components/scooter/battery_indicator.dart
@@ -1,170 +1,170 @@
-import 'dart:math';
-import 'package:flutter/material.dart';
-
-class BatteryIndicator extends StatelessWidget {
-  final double percent;
-
-  const BatteryIndicator({super.key, required this.percent});
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: 400,
-      child: Stack(
-        alignment: Alignment.center,
-        children: [
-          CustomPaint(
-            size: const Size(320, 320),
-            painter: _BatteryRingPainter(percent: percent),
-          ),
-          Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Text(
-                'Заряд батареи',
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 16,
-                ),
-              ),
-              const SizedBox(height: 8),
-              Text(
-                '${(percent * 100).toInt()}%',
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 48,
-                  fontWeight: FontWeight.w300,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _BatteryRingPainter extends CustomPainter {
-  final double percent;
-
-  _BatteryRingPainter({required this.percent});
-
-  // 🔹 Возвращает цвета и stops для текущего диапазона
-  (List<Color>, List<double>?) _getGradientForPercent() {
-    final p = percent * 100;
-
-    if (p >= 51) {
-      return (
-      const [
-        Color(0xFF86EFAC),
-        Color(0xFF67E8F9),
-        Color(0xFF86EFAC),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    } else if (p >= 16) {
-      return (
-      const [
-        Color(0xFFF1FF8B),
-        Color(0xFF8BFFAA),
-        Color(0xFFF1FF8B),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    } else {
-      return (
-      const [
-        Color(0xFFFF5757),
-        Color(0xFFF1FF8B),
-        Color(0xFFFF5757),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    }
-  }
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final center = size.center(Offset.zero);
-    final radius = size.width / 2 - 20;
-
-    // Фоновое кольцо
-    final backgroundPaint = Paint()
-      ..color = Colors.white.withOpacity(0.08)
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 40;
-    canvas.drawCircle(center, radius, backgroundPaint);
-
-    // Деления
-    final tickPaint = Paint()
-      ..color = Colors.white.withOpacity(0.15)
-      ..strokeWidth = 2;
-    for (int i = 0; i < 100; i++) {
-      final angle = 2 * pi * i / 100 - pi / 2;
-      final isMajor = i % 10 == 0;
-
-      final innerRadius = radius - 40;
-      final outerRadius = isMajor ? radius - 28 : radius - 32;
-
-      final p1 = Offset(
-        center.dx + cos(angle) * innerRadius,
-        center.dy + sin(angle) * innerRadius,
-      );
-      final p2 = Offset(
-        center.dx + cos(angle) * outerRadius,
-        center.dy + sin(angle) * outerRadius,
-      );
-
-      canvas.drawLine(p1, p2, tickPaint);
-    }
-
-    // Получаем градиент по проценту
-    final (colors, stops) = _getGradientForPercent();
-
-    // Glow дуга
-    final glowPaint = Paint()
-      ..shader = SweepGradient(
-        colors: colors,
-        stops: stops,
-      ).createShader(Rect.fromCircle(center: center, radius: radius))
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 25
-      ..maskFilter = const MaskFilter.blur(BlurStyle.normal, 85)
-      ..strokeCap = StrokeCap.round;
-
-    canvas.drawArc(
-      Rect.fromCircle(center: center, radius: radius),
-      -pi / 2,
-      2 * pi * percent,
-      false,
-      glowPaint,
-    );
-
-    // Основная дуга
-    final progressPaint = Paint()
-      ..shader = SweepGradient(
-        colors: colors,
-        stops: stops,
-      ).createShader(Rect.fromCircle(center: center, radius: radius))
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 20
-      ..strokeCap = StrokeCap.round;
-
-    canvas.drawArc(
-      Rect.fromCircle(center: center, radius: radius),
-      -pi / 2,
-      2 * pi * percent,
-      false,
-      progressPaint,
-    );
-
-    // Внутренний круг
-    final innerCircle = Paint()
-      ..color = const Color(0xFF16233F)
-      ..style = PaintingStyle.fill;
-    canvas.drawCircle(center, radius - 60, innerCircle);
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+import 'dart:math';
+import 'package:flutter/material.dart';
+
+class BatteryIndicator extends StatelessWidget {
+  final double percent;
+
+  const BatteryIndicator({super.key, required this.percent});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 400,
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          CustomPaint(
+            size: const Size(320, 320),
+            painter: _BatteryRingPainter(percent: percent),
+          ),
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Text(
+                'Заряд батареи',
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 16,
+                ),
+              ),
+              const SizedBox(height: 8),
+              Text(
+                '${(percent * 100).toInt()}%',
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 48,
+                  fontWeight: FontWeight.w300,
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BatteryRingPainter extends CustomPainter {
+  final double percent;
+
+  _BatteryRingPainter({required this.percent});
+
+  // 🔹 Возвращает цвета и stops для текущего диапазона
+  (List<Color>, List<double>?) _getGradientForPercent() {
+    final p = percent * 100;
+
+    if (p >= 51) {
+      return (
+      const [
+        Color(0xFF86EFAC),
+        Color(0xFF67E8F9),
+        Color(0xFF86EFAC),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    } else if (p >= 16) {
+      return (
+      const [
+        Color(0xFFF1FF8B),
+        Color(0xFF8BFFAA),
+        Color(0xFFF1FF8B),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    } else {
+      return (
+      const [
+        Color(0xFFFF5757),
+        Color(0xFFF1FF8B),
+        Color(0xFFFF5757),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    }
+  }
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final center = size.center(Offset.zero);
+    final radius = size.width / 2 - 20;
+
+    // Фоновое кольцо
+    final backgroundPaint = Paint()
+      ..color = Colors.white.withOpacity(0.08)
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 40;
+    canvas.drawCircle(center, radius, backgroundPaint);
+
+    // Деления
+    final tickPaint = Paint()
+      ..color = Colors.white.withOpacity(0.15)
+      ..strokeWidth = 2;
+    for (int i = 0; i < 100; i++) {
+      final angle = 2 * pi * i / 100 - pi / 2;
+      final isMajor = i % 10 == 0;
+
+      final innerRadius = radius - 40;
+      final outerRadius = isMajor ? radius - 28 : radius - 32;
+
+      final p1 = Offset(
+        center.dx + cos(angle) * innerRadius,
+        center.dy + sin(angle) * innerRadius,
+      );
+      final p2 = Offset(
+        center.dx + cos(angle) * outerRadius,
+        center.dy + sin(angle) * outerRadius,
+      );
+
+      canvas.drawLine(p1, p2, tickPaint);
+    }
+
+    // Получаем градиент по проценту
+    final (colors, stops) = _getGradientForPercent();
+
+    // Glow дуга
+    final glowPaint = Paint()
+      ..shader = SweepGradient(
+        colors: colors,
+        stops: stops,
+      ).createShader(Rect.fromCircle(center: center, radius: radius))
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 25
+      ..maskFilter = const MaskFilter.blur(BlurStyle.normal, 85)
+      ..strokeCap = StrokeCap.round;
+
+    canvas.drawArc(
+      Rect.fromCircle(center: center, radius: radius),
+      -pi / 2,
+      2 * pi * percent,
+      false,
+      glowPaint,
+    );
+
+    // Основная дуга
+    final progressPaint = Paint()
+      ..shader = SweepGradient(
+        colors: colors,
+        stops: stops,
+      ).createShader(Rect.fromCircle(center: center, radius: radius))
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 20
+      ..strokeCap = StrokeCap.round;
+
+    canvas.drawArc(
+      Rect.fromCircle(center: center, radius: radius),
+      -pi / 2,
+      2 * pi * percent,
+      false,
+      progressPaint,
+    );
+
+    // Внутренний круг
+    final innerCircle = Paint()
+      ..color = const Color(0xFF16233F)
+      ..style = PaintingStyle.fill;
+    canvas.drawCircle(center, radius - 60, innerCircle);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
 }
\ No newline at end of file
diff --git a/lib/presentation/components/scooter/mini_battery_indicator.dart b/lib/presentation/components/scooter/mini_battery_indicator.dart
index 73564a0..e6d7325 100644
--- a/lib/presentation/components/scooter/mini_battery_indicator.dart
+++ b/lib/presentation/components/scooter/mini_battery_indicator.dart
@@ -1,95 +1,95 @@
-import 'dart:math';
-import 'package:flutter/material.dart';
-
-class MiniBatteryIndicator extends StatelessWidget {
-  final int percent;
-
-  const MiniBatteryIndicator({super.key, required this.percent});
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 40,
-      height: 40,
-      child: CustomPaint(
-        painter: _MiniBatteryRingPainter(percent: percent),
-      ),
-    );
-  }
-}
-
-class _MiniBatteryRingPainter extends CustomPainter {
-  final int percent;
-
-  _MiniBatteryRingPainter({required this.percent});
-
-  (List<Color>, List<double>?) _getGradientForPercent() {
-    final p = percent;
-
-    if (p >= 51) {
-      return (
-      const [
-        Color(0xFF86EFAC),
-        Color(0xFF67E8F9),
-        Color(0xFF86EFAC),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    } else if (p >= 16) {
-      return (
-      const [
-        Color(0xFFF1FF8B),
-        Color(0xFF8BFFAA),
-        Color(0xFFF1FF8B),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    } else {
-      return (
-      const [
-        Color(0xFFFF5757),
-        Color(0xFFF1FF8B),
-        Color(0xFFFF5757),
-      ],
-      const [0.0, 0.5, 1.0],
-      );
-    }
-  }
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final center = size.center(Offset.zero);
-    final radius = size.width / 2 - 4; // поменьше
-
-    // Фоновое кольцо
-    final backgroundPaint = Paint()
-      ..color = Colors.white.withOpacity(0.08)
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 4;
-    canvas.drawCircle(center, radius, backgroundPaint);
-
-    // Получаем цвета
-    final (colors, stops) = _getGradientForPercent();
-
-    // Основная дуга
-    final progressPaint = Paint()
-      ..shader = SweepGradient(
-        colors: colors,
-        stops: stops,
-      ).createShader(Rect.fromCircle(center: center, radius: radius))
-      ..style = PaintingStyle.stroke
-      ..strokeWidth = 4
-      ..strokeCap = StrokeCap.round;
-
-    canvas.drawArc(
-      Rect.fromCircle(center: center, radius: radius),
-      -pi / 2,
-      2 * pi * (percent / 100),
-      false,
-      progressPaint,
-    );
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
-}
+import 'dart:math';
+import 'package:flutter/material.dart';
+
+class MiniBatteryIndicator extends StatelessWidget {
+  final int percent;
+
+  const MiniBatteryIndicator({super.key, required this.percent});
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 40,
+      height: 40,
+      child: CustomPaint(
+        painter: _MiniBatteryRingPainter(percent: percent),
+      ),
+    );
+  }
+}
+
+class _MiniBatteryRingPainter extends CustomPainter {
+  final int percent;
+
+  _MiniBatteryRingPainter({required this.percent});
+
+  (List<Color>, List<double>?) _getGradientForPercent() {
+    final p = percent;
+
+    if (p >= 51) {
+      return (
+      const [
+        Color(0xFF86EFAC),
+        Color(0xFF67E8F9),
+        Color(0xFF86EFAC),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    } else if (p >= 16) {
+      return (
+      const [
+        Color(0xFFF1FF8B),
+        Color(0xFF8BFFAA),
+        Color(0xFFF1FF8B),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    } else {
+      return (
+      const [
+        Color(0xFFFF5757),
+        Color(0xFFF1FF8B),
+        Color(0xFFFF5757),
+      ],
+      const [0.0, 0.5, 1.0],
+      );
+    }
+  }
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final center = size.center(Offset.zero);
+    final radius = size.width / 2 - 4; // поменьше
+
+    // Фоновое кольцо
+    final backgroundPaint = Paint()
+      ..color = Colors.white.withOpacity(0.08)
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 4;
+    canvas.drawCircle(center, radius, backgroundPaint);
+
+    // Получаем цвета
+    final (colors, stops) = _getGradientForPercent();
+
+    // Основная дуга
+    final progressPaint = Paint()
+      ..shader = SweepGradient(
+        colors: colors,
+        stops: stops,
+      ).createShader(Rect.fromCircle(center: center, radius: radius))
+      ..style = PaintingStyle.stroke
+      ..strokeWidth = 4
+      ..strokeCap = StrokeCap.round;
+
+    canvas.drawArc(
+      Rect.fromCircle(center: center, radius: radius),
+      -pi / 2,
+      2 * pi * (percent / 100),
+      false,
+      progressPaint,
+    );
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+}
diff --git a/lib/presentation/components/scooter/scooter_info_item.dart b/lib/presentation/components/scooter/scooter_info_item.dart
index 5e73a34..ebabc62 100644
--- a/lib/presentation/components/scooter/scooter_info_item.dart
+++ b/lib/presentation/components/scooter/scooter_info_item.dart
@@ -1,33 +1,33 @@
-import 'package:flutter/material.dart';
-import '../../../core/app_colors.dart';
-
-class ScooterInfoItem extends StatelessWidget {
-  final String icon;
-  final String text;
-
-  const ScooterInfoItem({super.key, required this.icon, required this.text});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Row(
-        children: [
-          Image.asset(
-              icon,
-            height: 20,
-            width: 20,
-          ),
-          const SizedBox(width: 6),
-          Text(
-            text,
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 14,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../../core/app_colors.dart';
+
+class ScooterInfoItem extends StatelessWidget {
+  final String icon;
+  final String text;
+
+  const ScooterInfoItem({super.key, required this.icon, required this.text});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Row(
+        children: [
+          Image.asset(
+              icon,
+            height: 20,
+            width: 20,
+          ),
+          const SizedBox(width: 6),
+          Text(
+            text,
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 14,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/scooter/scooter_info_section.dart b/lib/presentation/components/scooter/scooter_info_section.dart
index a1e3563..f590409 100644
--- a/lib/presentation/components/scooter/scooter_info_section.dart
+++ b/lib/presentation/components/scooter/scooter_info_section.dart
@@ -1,87 +1,87 @@
-import 'package:flutter/material.dart';
-import 'scooter_info_item.dart';
-
-class ScooterInfoSection extends StatelessWidget {
-  final double distance;
-  final String location;
-  final int batteryLevel;
-
-  const ScooterInfoSection({
-    super.key,
-    required this.distance,
-    required this.location,
-    required this.batteryLevel,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    // 1. Расчет оставшегося расстояния (макс. 62 км)
-    final double remainingKm = (62 * batteryLevel) / 100;
-
-    // Красиво форматируем: если число целое — убираем точку (например, 31 км вместо 31.0 км)
-    final String kmText = remainingKm % 1 == 0
-        ? '${remainingKm.toInt()} км'
-        : '${remainingKm.toStringAsFixed(1)} км';
-
-    // 2. Расчет оставшегося времени (макс. 2.5 часа = 150 минут)
-    final int totalMinutes = ((150 * batteryLevel) / 100).round();
-    final int hours = totalMinutes ~/ 60;
-    final int minutes = totalMinutes % 60;
-
-    // Формируем строку времени в зависимости от получившихся значений
-    String timeText = '';
-    if (hours > 0 && minutes > 0) {
-      timeText = '$hours ч $minutes мин';
-    } else if (hours > 0) {
-      timeText = '$hours ч';
-    } else {
-      timeText = '$minutes мин';
-    }
-
-    final int walkingMinutes = (distance / 80).round().clamp(1, 999);
-    final int walkHours = walkingMinutes ~/ 60;
-    final int walkMins = walkingMinutes % 60;
-
-    String walkingText = '';
-    if (walkHours > 0 && walkMins > 0) {
-      walkingText = '$walkHours ч $walkMins мин';
-    } else if (walkHours > 0) {
-      walkingText = '$walkHours ч';
-    } else {
-      walkingText = '$walkingMinutes мин';
-    }
-
-    return Column(
-      children: [
-        // Динамическая строка с зарядом
-        ScooterInfoItem(
-          icon: 'assets/icons/bolt.png',
-          text: '$kmText или $timeText',
-        ),
-        ScooterInfoItem(
-          icon: 'assets/icons/speed.png',
-          text: 'max = 25 км/ч',
-        ),
-        ScooterInfoItem(
-          icon: 'assets/icons/location.png',
-          text: location,
-        ),
-        Row(
-          children: [
-            ScooterInfoItem(
-              icon: 'assets/icons/person.png',
-              text: distance.toInt() >= 1000
-                  ? '${((distance.toInt()) / 1000).toStringAsFixed(1)} km'
-                  : '${distance.toInt()} m',
-            ),
-            const SizedBox(width: 16),
-            ScooterInfoItem(
-              icon: 'assets/icons/time.png',
-              text: walkingText,
-            ),
-          ],
-        ),
-      ],
-    );
-  }
+import 'package:flutter/material.dart';
+import 'scooter_info_item.dart';
+
+class ScooterInfoSection extends StatelessWidget {
+  final double distance;
+  final String location;
+  final int batteryLevel;
+
+  const ScooterInfoSection({
+    super.key,
+    required this.distance,
+    required this.location,
+    required this.batteryLevel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // 1. Расчет оставшегося расстояния (макс. 62 км)
+    final double remainingKm = (62 * batteryLevel) / 100;
+
+    // Красиво форматируем: если число целое — убираем точку (например, 31 км вместо 31.0 км)
+    final String kmText = remainingKm % 1 == 0
+        ? '${remainingKm.toInt()} км'
+        : '${remainingKm.toStringAsFixed(1)} км';
+
+    // 2. Расчет оставшегося времени (макс. 2.5 часа = 150 минут)
+    final int totalMinutes = ((150 * batteryLevel) / 100).round();
+    final int hours = totalMinutes ~/ 60;
+    final int minutes = totalMinutes % 60;
+
+    // Формируем строку времени в зависимости от получившихся значений
+    String timeText = '';
+    if (hours > 0 && minutes > 0) {
+      timeText = '$hours ч $minutes мин';
+    } else if (hours > 0) {
+      timeText = '$hours ч';
+    } else {
+      timeText = '$minutes мин';
+    }
+
+    final int walkingMinutes = (distance / 80).round().clamp(1, 999);
+    final int walkHours = walkingMinutes ~/ 60;
+    final int walkMins = walkingMinutes % 60;
+
+    String walkingText = '';
+    if (walkHours > 0 && walkMins > 0) {
+      walkingText = '$walkHours ч $walkMins мин';
+    } else if (walkHours > 0) {
+      walkingText = '$walkHours ч';
+    } else {
+      walkingText = '$walkingMinutes мин';
+    }
+
+    return Column(
+      children: [
+        // Динамическая строка с зарядом
+        ScooterInfoItem(
+          icon: 'assets/icons/bolt.png',
+          text: '$kmText или $timeText',
+        ),
+        ScooterInfoItem(
+          icon: 'assets/icons/speed.png',
+          text: 'max = 25 км/ч',
+        ),
+        ScooterInfoItem(
+          icon: 'assets/icons/location.png',
+          text: location,
+        ),
+        Row(
+          children: [
+            ScooterInfoItem(
+              icon: 'assets/icons/person.png',
+              text: distance.toInt() >= 1000
+                  ? '${((distance.toInt()) / 1000).toStringAsFixed(1)} km'
+                  : '${distance.toInt()} m',
+            ),
+            const SizedBox(width: 16),
+            ScooterInfoItem(
+              icon: 'assets/icons/time.png',
+              text: walkingText,
+            ),
+          ],
+        ),
+      ],
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/scooter/slide_to_reserve_button.dart b/lib/presentation/components/scooter/slide_to_reserve_button.dart
index 1307633..bec4561 100644
--- a/lib/presentation/components/scooter/slide_to_reserve_button.dart
+++ b/lib/presentation/components/scooter/slide_to_reserve_button.dart
@@ -1,172 +1,172 @@
-import 'package:flutter/material.dart';
-
-class SlideToReserveButton extends StatefulWidget {
-  final VoidCallback onSlideComplete;
-
-  const SlideToReserveButton({
-    super.key,
-    required this.onSlideComplete,
-  });
-
-  @override
-  State<SlideToReserveButton> createState() => _SlideToReserveButtonState();
-}
-
-class _SlideToReserveButtonState extends State<SlideToReserveButton>
-    with TickerProviderStateMixin {
-  late AnimationController _controller;
-  late Animation<double> _dragAnimation;
-  double _dragOffset = 0;
-  final double _maxDrag = 240; // ширина кнопки - ширина круга
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 300),
-    );
-    _dragAnimation = Tween<double>(begin: 0, end: 1).animate(
-      CurvedAnimation(parent: _controller, curve: Curves.easeOut),
-    );
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  void _onDragUpdate(DragUpdateDetails details) {
-    setState(() {
-      _dragOffset += details.delta.dx;
-      if (_dragOffset < 0) _dragOffset = 0;
-      if (_dragOffset > _maxDrag) _dragOffset = _maxDrag;
-    });
-  }
-
-  void _onDragEnd(DragEndDetails details) {
-    if (_dragOffset >= _maxDrag * 0.8) {
-      _controller.forward();
-      Future.delayed(const Duration(milliseconds: 300), () {
-        widget.onSlideComplete();
-      });
-    } else {
-      _controller.reverse();
-      setState(() {
-        _dragOffset = 0;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isSlided = _dragOffset >= _maxDrag * 0.8;
-    final progress = _dragOffset / _maxDrag;
-
-    return SizedBox(
-      height: 64,
-      child: Stack(
-        children: [
-          // Фон кнопки: темный → градиент
-          Container(
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(40),
-              color: isSlided
-                  ? Colors.transparent
-                  : const Color(0xFF141530),
-            ),
-          ),
-
-          // Градиентный фон (появляется при свайпе)
-          if (isSlided)
-            ShaderMask(
-              shaderCallback: (Rect bounds) {
-                return const LinearGradient(
-                  colors: [Color(0xFF67E8F9), Color(0xFF86EFAC)],
-                ).createShader(bounds);
-              },
-              blendMode: BlendMode.srcIn,
-              child: Container(
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(40),
-                  color: Colors.white,
-                ),
-              ),
-            ),
-
-          // Текст «Забронировать» — виден только в начальном состоянии
-          if (!isSlided)
-            Center(
-              child: Text(
-                'Забронировать',
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.w600,
-                  fontSize: 16,
-                ),
-              ),
-            ),
-
-          // Три стрелки — справа от текста (только когда текст виден)
-          if (!isSlided)
-            Positioned(
-              right: 40,
-              child: Row(
-                children: [
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white),
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.3)),
-                ],
-              ),
-            ),
-
-          // Круг с иконкой самоката — двигается слева направо
-          Transform.translate(
-            offset: Offset(_dragOffset, 0),
-            child: SizedBox(
-              width: 56,
-              height: 56,
-              child: Container(
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  shape: BoxShape.circle,
-                ),
-                child: const Center(
-                  child: Icon(
-                    Icons.electric_scooter,
-                    color: Color(0xFF141530),
-                    size: 24,
-                  ),
-                ),
-              ),
-            ),
-          ),
-
-          // Иконка самоката справа — появляется при полном свайпе
-          if (isSlided)
-            Positioned(
-              right: 16,
-              child: SizedBox(
-                width: 32,
-                height: 32,
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: Colors.white.withOpacity(0.2),
-                    shape: BoxShape.circle,
-                  ),
-                  child: const Center(
-                    child: Icon(
-                      Icons.electric_scooter,
-                      color: Colors.white,
-                      size: 16,
-                    ),
-                  ),
-                ),
-              ),
-            ),
-        ],
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+
+class SlideToReserveButton extends StatefulWidget {
+  final VoidCallback onSlideComplete;
+
+  const SlideToReserveButton({
+    super.key,
+    required this.onSlideComplete,
+  });
+
+  @override
+  State<SlideToReserveButton> createState() => _SlideToReserveButtonState();
+}
+
+class _SlideToReserveButtonState extends State<SlideToReserveButton>
+    with TickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _dragAnimation;
+  double _dragOffset = 0;
+  final double _maxDrag = 240; // ширина кнопки - ширина круга
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 300),
+    );
+    _dragAnimation = Tween<double>(begin: 0, end: 1).animate(
+      CurvedAnimation(parent: _controller, curve: Curves.easeOut),
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _onDragUpdate(DragUpdateDetails details) {
+    setState(() {
+      _dragOffset += details.delta.dx;
+      if (_dragOffset < 0) _dragOffset = 0;
+      if (_dragOffset > _maxDrag) _dragOffset = _maxDrag;
+    });
+  }
+
+  void _onDragEnd(DragEndDetails details) {
+    if (_dragOffset >= _maxDrag * 0.8) {
+      _controller.forward();
+      Future.delayed(const Duration(milliseconds: 300), () {
+        widget.onSlideComplete();
+      });
+    } else {
+      _controller.reverse();
+      setState(() {
+        _dragOffset = 0;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isSlided = _dragOffset >= _maxDrag * 0.8;
+    final progress = _dragOffset / _maxDrag;
+
+    return SizedBox(
+      height: 64,
+      child: Stack(
+        children: [
+          // Фон кнопки: темный → градиент
+          Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(40),
+              color: isSlided
+                  ? Colors.transparent
+                  : const Color(0xFF141530),
+            ),
+          ),
+
+          // Градиентный фон (появляется при свайпе)
+          if (isSlided)
+            ShaderMask(
+              shaderCallback: (Rect bounds) {
+                return const LinearGradient(
+                  colors: [Color(0xFF67E8F9), Color(0xFF86EFAC)],
+                ).createShader(bounds);
+              },
+              blendMode: BlendMode.srcIn,
+              child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(40),
+                  color: Colors.white,
+                ),
+              ),
+            ),
+
+          // Текст «Забронировать» — виден только в начальном состоянии
+          if (!isSlided)
+            Center(
+              child: Text(
+                'Забронировать',
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontWeight: FontWeight.w600,
+                  fontSize: 16,
+                ),
+              ),
+            ),
+
+          // Три стрелки — справа от текста (только когда текст виден)
+          if (!isSlided)
+            Positioned(
+              right: 40,
+              child: Row(
+                children: [
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white),
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.3)),
+                ],
+              ),
+            ),
+
+          // Круг с иконкой самоката — двигается слева направо
+          Transform.translate(
+            offset: Offset(_dragOffset, 0),
+            child: SizedBox(
+              width: 56,
+              height: 56,
+              child: Container(
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  shape: BoxShape.circle,
+                ),
+                child: const Center(
+                  child: Icon(
+                    Icons.electric_scooter,
+                    color: Color(0xFF141530),
+                    size: 24,
+                  ),
+                ),
+              ),
+            ),
+          ),
+
+          // Иконка самоката справа — появляется при полном свайпе
+          if (isSlided)
+            Positioned(
+              right: 16,
+              child: SizedBox(
+                width: 32,
+                height: 32,
+                child: Container(
+                  decoration: BoxDecoration(
+                    color: Colors.white.withOpacity(0.2),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Center(
+                    child: Icon(
+                      Icons.electric_scooter,
+                      color: Colors.white,
+                      size: 16,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/scooter_bottom_sheet.dart b/lib/presentation/components/scooter_bottom_sheet.dart
index aabdea3..d31344c 100644
--- a/lib/presentation/components/scooter_bottom_sheet.dart
+++ b/lib/presentation/components/scooter_bottom_sheet.dart
@@ -1,271 +1,268 @@
-import 'dart:ui';
-import 'package:be_happy/presentation/components/scooter/mini_battery_indicator.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-
-import '../../domain/entities/scooter.dart';
-import '../state/scooter_detail_modal_state.dart';
-import '../viewmodel/scooter_detail_modal_bloc.dart';
-import 'gradient_button.dart';
-
-class ScooterData {
-  final String distance;
-  final String number;
-  final double batteryPercent;
-
-  ScooterData({
-    required this.distance,
-    required this.number,
-    required this.batteryPercent,
-  });
-}
-
-class ScooterBottomSheet extends StatefulWidget {
-
-  const ScooterBottomSheet({super.key});
-
-  @override
-  State<ScooterBottomSheet> createState() => _ScooterBottomSheetState();
-}
-
-class _ScooterBottomSheetState extends State<ScooterBottomSheet> {
-
-  final PageController _pageController = PageController(viewportFraction: 0.5);
-  double _currentPage = 0;
-
-  _ScooterBottomSheetState();
-
-  @override
-  void initState() {
-    super.initState();
-    _pageController.addListener(() {
-      setState(() {
-        _currentPage = _pageController.page ?? 0;
-      });
-    });
-  }
-
-
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ScooterDetailModalBloc, ScooterDetailModalState>(
-      builder: (context, state) {
-        if (state.status == ScooterDetailModalStatus.loading) {
-          return const Center(
-            child: CircularProgressIndicator(color: Colors.white),
-          );
-        }
-
-        if (state.status == ScooterDetailModalStatus.success) {
-          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: 320,
-                  padding: const EdgeInsets.only(top: 20, bottom: 10),
-                  decoration: BoxDecoration(
-                    color: const Color(0xFF000032).withOpacity(0.88),
-                    borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-                  ),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      // Header с адресом (без изменений)
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: Row(
-                          children: [
-                            GestureDetector(
-                              onTap: () => Navigator.pop(context),
-                              child: const Icon(Icons.arrow_back_ios, color: Colors.white),
-                            ),
-                            const SizedBox(width: 12),
-                            Expanded(
-                              child: Text(
-                                state.address ?? "Unknown address",
-                                style: const TextStyle(
-                                  color: Colors.white,
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w600,
-                                ),
-                                overflow: TextOverflow.ellipsis,
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-
-                      // PageView с динамическим списком
-                      SizedBox(
-                        height: 220,
-                        child: PageView.builder(
-                          controller: _pageController,
-                          padEnds: false, // Оставляем false, чтобы первый элемент прилипал к левому краю
-                          itemCount: state.scooters!.length,
-                          itemBuilder: (context, index) {
-                            final scooter = state.scooters![index];
-                            final diff = (_currentPage - index).abs();
-                            final isActive = diff < 0.5;
-
-                            return AnimatedContainer(
-                              duration: const Duration(milliseconds: 250),
-                              // 2. Добавляем левый отступ ТОЛЬКО для первого элемента,
-                              // чтобы он совпадал с заголовком
-                              margin: EdgeInsets.only(
-                                left: index == 0 ? 20 : 0,
-                                right: 16,
-                              ),
-                              child: Align(
-                                alignment: Alignment.bottomCenter,
-                                child: Transform.scale(
-                                  scale: isActive ? 1.0 : 0.9,
-                                  child: _ScooterCard(
-                                    scooter: scooter,
-                                    isActive: isActive,
-                                    address: state.address ?? "Unknown address",
-                                  ),
-                                ),
-                              ),
-                            );
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-          );
-        }
-        return Center(child: Text("Error"));
-      },
-    );
-  }
-}
-
-class _ScooterCard extends StatelessWidget {
-  final Scooter scooter;
-  final bool isActive;
-  final String address;
-
-  const _ScooterCard({required this.scooter, required this.isActive, required this.address});
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Container(
-          width: 220,
-          padding: const EdgeInsets.all(16),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(28),
-            gradient: LinearGradient(
-              colors: [
-                Colors.white.withOpacity(isActive ? 0.35 : 0.25),
-                Colors.white.withOpacity(isActive ? 0.25 : 0.18),
-              ],
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-            ),
-            border: Border.all(color: Colors.white.withOpacity(0.4), width: 1),
-          ),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Row(
-                children: [
-                  const Icon(
-                    Icons.location_on_outlined,
-                    color: Colors.white,
-                    size: 18,
-                  ),
-                  const SizedBox(width: 6),
-                  Text(
-                    (scooter.distance?.toInt() ?? 0) >= 1000
-                        ? '${((scooter.distance?.toInt() ?? 0) / 1000).toStringAsFixed(1)} km'
-                        : '${scooter.distance?.toInt() ?? 0} m',
-                    style: const TextStyle(color: Colors.white, fontSize: 14),
-                  ),
-                ],
-              ),
-
-              const SizedBox(height: 12),
-
-              Row(
-                children: [
-                  const Icon(Icons.qr_code_2, color: Colors.white, size: 18),
-                  const SizedBox(width: 6),
-                  Text(
-                    scooter.number,
-                    style: const TextStyle(color: Colors.white, fontSize: 16),
-                  ),
-                ],
-              ),
-
-              const SizedBox(height: 20),
-
-              Row(
-                children: [
-                  MiniBatteryIndicator(percent: scooter.batteryLevel),
-                  const SizedBox(width: 8),
-                  Transform.translate(
-                    offset: const Offset(-40, 0),
-                    child: Text(
-                      '${(scooter.batteryLevel)}%',
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 12,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-
-              const Spacer(),
-
-              GestureDetector(
-                onTap: () {
-                  context.go('/home/scooter/${scooter.id}', extra: [address, scooter.distance]);
-                },
-                child: Container(
-                  height: 42,
-                  alignment: Alignment.center,
-                  child: GradientButton(
-                    text: "Подробнеe",
-                    showArrows: true,
-                    height: 32,
-                    width: double.infinity,
-                    fontSize: 12,
-                    onTap: () {
-                      context.go('/home/scooter/${scooter.id}', extra: [address, scooter.distance]);
-                    },
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-
-        Positioned(
-          right: isActive ? -30 : -5,
-          top: isActive ? -10 : 15,
-          child: SizedBox(
-            height: isActive ? 170 : 120,
-            child: Image.asset(
-              "assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png",
-              fit: BoxFit.contain,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
+import 'dart:ui';
+import 'package:be_happy/presentation/components/scooter/mini_battery_indicator.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+
+import '../../domain/entities/scooter.dart';
+import '../state/scooter_detail_modal_state.dart';
+import '../viewmodel/scooter_detail_modal_bloc.dart';
+import 'gradient_button.dart';
+
+class ScooterData {
+  final String distance;
+  final String number;
+  final double batteryPercent;
+
+  ScooterData({
+    required this.distance,
+    required this.number,
+    required this.batteryPercent,
+  });
+}
+
+class ScooterBottomSheet extends StatefulWidget {
+
+  const ScooterBottomSheet({super.key});
+
+  @override
+  State<ScooterBottomSheet> createState() => _ScooterBottomSheetState();
+}
+
+class _ScooterBottomSheetState extends State<ScooterBottomSheet> {
+
+  final PageController _pageController = PageController(viewportFraction: 0.5);
+  double _currentPage = 0;
+
+  _ScooterBottomSheetState();
+
+  @override
+  void initState() {
+    super.initState();
+    _pageController.addListener(() {
+      setState(() {
+        _currentPage = _pageController.page ?? 0;
+      });
+    });
+  }
+
+
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<ScooterDetailModalBloc, ScooterDetailModalState>(
+      builder: (context, state) {
+        if (state.status == ScooterDetailModalStatus.loading) {
+          return const Center(
+            child: CircularProgressIndicator(color: Colors.white),
+          );
+        }
+
+        if (state.status == ScooterDetailModalStatus.success) {
+          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: 320,
+                  padding: const EdgeInsets.only(top: 20, bottom: 10),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF000032).withOpacity(0.88),
+                    borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+                  ),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      // Header с адресом (без изменений)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: Row(
+                          children: [
+                            GestureDetector(
+                              onTap: () => Navigator.pop(context),
+                              child: const Icon(Icons.arrow_back_ios, color: Colors.white),
+                            ),
+                            const SizedBox(width: 12),
+                            Expanded(
+                              child: Text(
+                                state.address ?? "Unknown address",
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+
+                      SizedBox(
+                        height: 220,
+                        child: PageView.builder(
+                          controller: _pageController,
+                          padEnds: false, // Оставляем false, чтобы первый элемент прилипал к левому краю
+                          itemCount: state.scooters!.length,
+                          itemBuilder: (context, index) {
+                            final scooter = state.scooters![index];
+                            final diff = (_currentPage - index).abs();
+                            final isActive = diff < 0.5;
+
+                            return AnimatedContainer(
+                              duration: const Duration(milliseconds: 250),
+                              margin: EdgeInsets.only(
+                                left: index == 0 ? 20 : 0,
+                                right: 16,
+                              ),
+                              child: Align(
+                                alignment: Alignment.bottomCenter,
+                                child: Transform.scale(
+                                  scale: isActive ? 1.0 : 0.9,
+                                  child: _ScooterCard(
+                                    scooter: scooter,
+                                    isActive: isActive,
+                                    address: state.address ?? "Unknown address",
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          );
+        }
+        return Center(child: Text("Error"));
+      },
+    );
+  }
+}
+
+class _ScooterCard extends StatelessWidget {
+  final Scooter scooter;
+  final bool isActive;
+  final String address;
+
+  const _ScooterCard({required this.scooter, required this.isActive, required this.address});
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        Container(
+          width: 220,
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(28),
+            gradient: LinearGradient(
+              colors: [
+                Colors.white.withOpacity(isActive ? 0.35 : 0.25),
+                Colors.white.withOpacity(isActive ? 0.25 : 0.18),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+            ),
+            border: Border.all(color: Colors.white.withOpacity(0.4), width: 1),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  const Icon(
+                    Icons.location_on_outlined,
+                    color: Colors.white,
+                    size: 18,
+                  ),
+                  const SizedBox(width: 6),
+                  Text(
+                    (scooter.distance?.toInt() ?? 0) >= 1000
+                        ? '${((scooter.distance?.toInt() ?? 0) / 1000).toStringAsFixed(1)} km'
+                        : '${scooter.distance?.toInt() ?? 0} m',
+                    style: const TextStyle(color: Colors.white, fontSize: 14),
+                  ),
+                ],
+              ),
+
+              const SizedBox(height: 12),
+
+              Row(
+                children: [
+                  const Icon(Icons.qr_code_2, color: Colors.white, size: 18),
+                  const SizedBox(width: 6),
+                  Text(
+                    scooter.number,
+                    style: const TextStyle(color: Colors.white, fontSize: 16),
+                  ),
+                ],
+              ),
+
+              const SizedBox(height: 20),
+
+              Row(
+                children: [
+                  MiniBatteryIndicator(percent: scooter.batteryLevel),
+                  const SizedBox(width: 8),
+                  Transform.translate(
+                    offset: const Offset(-40, 0),
+                    child: Text(
+                      '${(scooter.batteryLevel)}%',
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 12,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+
+              const Spacer(),
+
+              GestureDetector(
+                onTap: () {
+                  context.go('/home/scooter/${scooter.id}', extra: [address, scooter.distance]);
+                },
+                child: Container(
+                  height: 42,
+                  alignment: Alignment.center,
+                  child: GradientButton(
+                    text: "Подробнеe",
+                    showArrows: true,
+                    height: 32,
+                    width: double.infinity,
+                    fontSize: 12,
+                    onTap: () {
+                      context.go('/home/scooter/${scooter.id}', extra: [address, scooter.distance]);
+                    },
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+
+        Positioned(
+          right: isActive ? -30 : -5,
+          top: isActive ? -10 : 15,
+          child: SizedBox(
+            height: isActive ? 170 : 120,
+            child: Image.asset(
+              "assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png",
+              fit: BoxFit.contain,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/presentation/components/sheet/active_ride_sheet.dart b/lib/presentation/components/sheet/active_ride_sheet.dart
index 2be73e1..a4d33a1 100644
--- a/lib/presentation/components/sheet/active_ride_sheet.dart
+++ b/lib/presentation/components/sheet/active_ride_sheet.dart
@@ -1,536 +1,536 @@
-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 {
-  final int orderId;
-  final String scooterNumber;
-  final Duration initialElapsedTime;
-
-  const ActiveRideSheet({
-    super.key,
-    required this.orderId,
-    required this.scooterNumber,
-    this.initialElapsedTime = Duration.zero,
-  });
-
-  @override
-  State<ActiveRideSheet> createState() => _ActiveRideSheetState();
-}
-
-class _ActiveRideSheetState extends State<ActiveRideSheet> {
-  late final ActiveRideBloc _bloc;
-  Timer? _localTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    _bloc = getIt<ActiveRideBloc>();
-    _bloc.add(LoadScooterOrder(widget.orderId));
-    
-    _localTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      if (mounted && !_bloc.state.isPaused) {
-        setState(() {});
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _bloc.close();
-    _localTimer?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: _bloc,
-      child: BlocConsumer<ActiveRideBloc, ActiveRideState>(
-        listenWhen: (previous, current) => previous.inZone != current.inZone || previous.status != current.status,
-        listener: (context, state) {
-          if (!state.inZone) {
-            BotToast.showCustomNotification(
-
-              toastBuilder: (_) {
-                return NotificationToast(
-                  title: "Вы покинули зону разрешенную для езды",
-                  onClose: () {
-                    BotToast.cleanAll();
-                  },
-                );
-              },
-            );
-          }
-
-          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) {
-          // Логика отображения загрузки и ошибок остается прежней
-          if (state.status == ActiveRideStatus.loading && state.order == null) {
-            return _buildLoading();
-          }
-
-          if (state.status == ActiveRideStatus.failure && state.order == null) {
-            return _buildError(state.errorMessage);
-          }
-
-          return _buildContent(state);
-        },
-      ),
-    );
-  }
-
-  Widget _buildLoading() {
-    return Align(
-      alignment: Alignment.bottomCenter,
-      child: Container(
-        padding: const EdgeInsets.all(40),
-        decoration: BoxDecoration(
-          color: const Color(0x00000032).withOpacity(0.6),
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-        ),
-        child: const CircularProgressIndicator(color: Colors.white),
-      ),
-    );
-  }
-
-  Widget _buildError(String? message) {
-    return Align(
-      alignment: Alignment.bottomCenter,
-      child: Container(
-        padding: const EdgeInsets.all(40),
-        decoration: BoxDecoration(
-          color: const Color(0x00000032).withOpacity(0.6),
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-        ),
-        child: Text(
-          message ?? 'Ошибка загрузки',
-          style: const TextStyle(color: Colors.white),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildContent(ActiveRideState state) {
-    final displayTime = state.isPaused 
-        ? state.elapsedTime 
-        : state.elapsedTime + (DateTime.now().difference(DateTime.now().subtract(const Duration(seconds: 1))));
-    
-    final effectiveElapsedTime = state.isPaused
-        ? state.elapsedTime 
-        : DateTime.now().difference(state.order?.startAt ?? state.order?.createdAt ?? DateTime.now());
-
-    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(
-            padding: const EdgeInsets.only(top: 20, bottom: 10),
-            decoration: BoxDecoration(
-              color: const Color(0x00000032).withOpacity(0.6),
-              borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      GestureDetector(
-                        onTap: () => Navigator.pop(context),
-                        child: Row(
-                          children: [
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x99FFFFFF),
-                              size: 20,
-                            ),
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x66FFFFFF),
-                              size: 20,
-                            ),
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x22FFFFFF),
-                              size: 20,
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Text(
-                          'Самокат ${widget.scooterNumber}',
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                          ),
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-                const SizedBox(height: 20),
-
-                Container(
-                  width: double.infinity,
-                  margin: const EdgeInsets.symmetric(horizontal: 20),
-                  padding: const EdgeInsets.symmetric(vertical: 16),
-                  decoration: BoxDecoration(
-                    color: Colors.white.withOpacity(0.15),
-                    borderRadius: BorderRadius.circular(16),
-                  ),
-                  child: Column(
-                    children: [
-                      Text(
-                        _formatDuration(effectiveElapsedTime),
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 32,
-                          fontWeight: FontWeight.bold,
-                          fontFeatures: const [FontFeature.tabularFigures()],
-                          fontFamily: 'DigitalNumbers',
-                        ),
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        state.isPaused ? 'на паузе' : 'время в пути',
-                        style: TextStyle(
-                          color: Colors.white.withOpacity(0.6),
-                          fontSize: 13,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-                const SizedBox(height: 20),
-
-                // 🔹 КНОПКИ УПРАВЛЕНИЯ
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      Expanded(
-                        child: Container(
-                          height: 56,
-                          decoration: BoxDecoration(
-                            gradient: state.isPaused
-                                ? null
-                                : const LinearGradient(
-                                    colors: [Color(0xFF66E3C4), Color(0xFF4CD1B5)],
-                                  ),
-                            color: state.isPaused ? Colors.white.withOpacity(0.15) : null,
-                            borderRadius: BorderRadius.circular(16),
-                          ),
-                          child: Material(
-                            color: Colors.transparent,
-                            child: InkWell(
-                              onTap: state.status == ActiveRideStatus.loading
-                                  ? null
-                                  : () {
-                                      if (state.isPaused) {
-                                        _bloc.add(ResumeRide(widget.orderId));
-                                      } else {
-                                        _bloc.add(PauseRide(widget.orderId));
-                                      }
-                                    },
-                              borderRadius: BorderRadius.circular(16),
-                              child: Column(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  Icon(
-                                    state.isPaused ? Icons.play_arrow : Icons.pause,
-                                    color: state.isPaused
-                                        ? Colors.white.withOpacity(0.8)
-                                        : const Color(0xFF0A0F2E),
-                                    size: 24,
-                                  ),
-                                  const SizedBox(height: 4),
-                                  Text(
-                                    state.isPaused ? 'ПРОДОЛЖИТЬ' : 'ПАУЗА',
-                                    style: TextStyle(
-                                      color: state.isPaused
-                                          ? Colors.white.withOpacity(0.8)
-                                          : const Color(0xFF0A0F2E),
-                                      fontSize: 12,
-                                      fontWeight: FontWeight.w600,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Container(
-                          height: 56,
-                          decoration: BoxDecoration(
-                            color: const Color(0xFFB84949),
-                            borderRadius: BorderRadius.circular(16),
-                          ),
-                          child: Material(
-                            color: Colors.transparent,
-                            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); // закрываем ActiveRideSheet
-                                  context.go("/home/order-photos/${widget.orderId}");
-                                }
-                                // 🔹 Если отменил — ничего не делаем, диалог уже закрылся
-                              },
-                              borderRadius: BorderRadius.circular(16),
-                              child: Column( // ✅ Вернули Column с иконкой и текстом
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  const Icon(
-                                    Icons.stop,
-                                    color: Colors.white,
-                                    size: 24,
-                                  ),
-                                  const SizedBox(height: 4),
-                                  const Text(
-                                    'ЗАВЕРШИТЬ',
-                                    style: TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 12,
-                                      fontWeight: FontWeight.w600,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Container(
-                          height: 56,
-                          decoration: BoxDecoration(
-                            color: Colors.white.withOpacity(0.1),
-                            borderRadius: BorderRadius.circular(16),
-                            border: Border.all(
-                              color: Colors.white.withOpacity(0.2),
-                              width: 1,
-                            ),
-                          ),
-                          child: Material(
-                            color: Colors.transparent,
-                            child: InkWell(
-                              onTap: () {
-                                // TODO: Поддержка
-                              },
-                              borderRadius: BorderRadius.circular(16),
-                              child: Column(
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  Icon(
-                                    Icons.phone_in_talk,
-                                    color: Colors.white.withOpacity(0.8),
-                                    size: 24,
-                                  ),
-                                  const SizedBox(height: 4),
-                                  Text(
-                                    'Поддержка',
-                                    style: TextStyle(
-                                      color: Colors.white.withOpacity(0.8),
-                                      fontSize: 12,
-                                      fontWeight: FontWeight.w600,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-                const SizedBox(height: 16),
-
-                // 🔹 СТАТИСТИКА (2 равных столбца, правый на всю высоту)
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: IntrinsicHeight(
-                    child: Row(
-                      children: [
-                        // 🔹 ЛЕВЫЙ СТОЛБЕЦ: Скорость + Расстояние
-                        Expanded(
-                          child: Column(
-                            children: [
-                              // Скорость
-                              Container(
-                                width: double.infinity,
-                                padding: const EdgeInsets.all(16),
-                                decoration: BoxDecoration(
-                                  color: Colors.white.withOpacity(0.15),
-                                  borderRadius: BorderRadius.circular(16),
-                                ),
-                                child: Column(
-                                  children: [
-                                    Text(
-                                      state.speed.toStringAsFixed(1),
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                    const SizedBox(height: 4),
-                                    Text(
-                                      'скорость',
-                                      style: TextStyle(
-                                        color: Colors.white.withOpacity(0.6),
-                                        fontSize: 12,
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              const SizedBox(height: 12),
-                              // Расстояние
-                              Container(
-                                width: double.infinity,
-                                padding: const EdgeInsets.all(16),
-                                decoration: BoxDecoration(
-                                  color: Colors.white.withOpacity(0.15),
-                                  borderRadius: BorderRadius.circular(16),
-                                ),
-                                child: Column(
-                                  children: [
-                                    Text(
-                                      state.distance.toStringAsFixed(1),
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
-                                    const SizedBox(height: 4),
-                                    Text(
-                                      'расстояние',
-                                      style: TextStyle(
-                                        color: Colors.white.withOpacity(0.6),
-                                        fontSize: 12,
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-
-                        const SizedBox(width: 12),
-
-                        // 🔹 ПРАВЫЙ СТОЛБЕЦ: Стоимость (на всю высоту)
-                        Expanded(
-                          child: Container(
-                            padding: const EdgeInsets.all(16),
-                            decoration: BoxDecoration(
-                              color: Colors.white.withOpacity(0.15),
-                              borderRadius: BorderRadius.circular(16),
-                            ),
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: [
-                                Text(
-                                  'Стоимость',
-                                  style: TextStyle(
-                                    color: Colors.white.withOpacity(0.6),
-                                    fontSize: 12,
-                                  ),
-                                ),
-                                const SizedBox(height: 8),
-                                RichText(
-                                  text: TextSpan(
-                                    children: [
-                                      TextSpan(
-                                        text: state.cost.toStringAsFixed(1),
-                                        style: const TextStyle(
-                                          color: Colors.white,
-                                          fontSize: 24,
-                                          fontWeight: FontWeight.bold,
-                                          fontFamily: 'Digital Numbers',
-                                          fontFeatures: [FontFeature.tabularFigures()],
-                                        ),
-                                      ),
-                                      const TextSpan(
-                                        text: ' BYN',
-                                        style: TextStyle(
-                                          color: Colors.white,
-                                          fontSize: 16,
-                                          fontWeight: FontWeight.w600,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-
-                const SizedBox(height: 24),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  String _formatDuration(Duration duration) {
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    final hours = twoDigits(duration.inHours);
-    final minutes = twoDigits(duration.inMinutes.remainder(60));
-    final seconds = twoDigits(duration.inSeconds.remainder(60));
-    return '$hours:$minutes:$seconds';
-  }
+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 {
+  final int orderId;
+  final String scooterNumber;
+  final Duration initialElapsedTime;
+
+  const ActiveRideSheet({
+    super.key,
+    required this.orderId,
+    required this.scooterNumber,
+    this.initialElapsedTime = Duration.zero,
+  });
+
+  @override
+  State<ActiveRideSheet> createState() => _ActiveRideSheetState();
+}
+
+class _ActiveRideSheetState extends State<ActiveRideSheet> {
+  late final ActiveRideBloc _bloc;
+  Timer? _localTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _bloc = getIt<ActiveRideBloc>();
+    _bloc.add(LoadScooterOrder(widget.orderId));
+    
+    _localTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (mounted && !_bloc.state.isPaused) {
+        setState(() {});
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _bloc.close();
+    _localTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider.value(
+      value: _bloc,
+      child: BlocConsumer<ActiveRideBloc, ActiveRideState>(
+        listenWhen: (previous, current) => previous.inZone != current.inZone || previous.status != current.status,
+        listener: (context, state) {
+          if (!state.inZone) {
+            BotToast.showCustomNotification(
+
+              toastBuilder: (_) {
+                return NotificationToast(
+                  title: "Вы покинули зону разрешенную для езды",
+                  onClose: () {
+                    BotToast.cleanAll();
+                  },
+                );
+              },
+            );
+          }
+
+          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) {
+          // Логика отображения загрузки и ошибок остается прежней
+          if (state.status == ActiveRideStatus.loading && state.order == null) {
+            return _buildLoading();
+          }
+
+          if (state.status == ActiveRideStatus.failure && state.order == null) {
+            return _buildError(state.errorMessage);
+          }
+
+          return _buildContent(state);
+        },
+      ),
+    );
+  }
+
+  Widget _buildLoading() {
+    return Align(
+      alignment: Alignment.bottomCenter,
+      child: Container(
+        padding: const EdgeInsets.all(40),
+        decoration: BoxDecoration(
+          color: const Color(0x00000032).withOpacity(0.6),
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+        ),
+        child: const CircularProgressIndicator(color: Colors.white),
+      ),
+    );
+  }
+
+  Widget _buildError(String? message) {
+    return Align(
+      alignment: Alignment.bottomCenter,
+      child: Container(
+        padding: const EdgeInsets.all(40),
+        decoration: BoxDecoration(
+          color: const Color(0x00000032).withOpacity(0.6),
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+        ),
+        child: Text(
+          message ?? 'Ошибка загрузки',
+          style: const TextStyle(color: Colors.white),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildContent(ActiveRideState state) {
+    final displayTime = state.isPaused 
+        ? state.elapsedTime 
+        : state.elapsedTime + (DateTime.now().difference(DateTime.now().subtract(const Duration(seconds: 1))));
+    
+    final effectiveElapsedTime = state.isPaused
+        ? state.elapsedTime 
+        : DateTime.now().difference(state.order?.startAt ?? state.order?.createdAt ?? DateTime.now());
+
+    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(
+            padding: const EdgeInsets.only(top: 20, bottom: 10),
+            decoration: BoxDecoration(
+              color: const Color(0x00000032).withOpacity(0.6),
+              borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Row(
+                    children: [
+                      GestureDetector(
+                        onTap: () => Navigator.pop(context),
+                        child: Row(
+                          children: [
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x99FFFFFF),
+                              size: 20,
+                            ),
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x66FFFFFF),
+                              size: 20,
+                            ),
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x22FFFFFF),
+                              size: 20,
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Text(
+                          'Самокат ${widget.scooterNumber}',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 16,
+                            fontWeight: FontWeight.w600,
+                          ),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+                const SizedBox(height: 20),
+
+                Container(
+                  width: double.infinity,
+                  margin: const EdgeInsets.symmetric(horizontal: 20),
+                  padding: const EdgeInsets.symmetric(vertical: 16),
+                  decoration: BoxDecoration(
+                    color: Colors.white.withOpacity(0.15),
+                    borderRadius: BorderRadius.circular(16),
+                  ),
+                  child: Column(
+                    children: [
+                      Text(
+                        _formatDuration(effectiveElapsedTime),
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 32,
+                          fontWeight: FontWeight.bold,
+                          fontFeatures: const [FontFeature.tabularFigures()],
+                          fontFamily: 'DigitalNumbers',
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        state.isPaused ? 'на паузе' : 'время в пути',
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.6),
+                          fontSize: 13,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+                const SizedBox(height: 20),
+
+                // 🔹 КНОПКИ УПРАВЛЕНИЯ
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: Container(
+                          height: 56,
+                          decoration: BoxDecoration(
+                            gradient: state.isPaused
+                                ? null
+                                : const LinearGradient(
+                                    colors: [Color(0xFF66E3C4), Color(0xFF4CD1B5)],
+                                  ),
+                            color: state.isPaused ? Colors.white.withOpacity(0.15) : null,
+                            borderRadius: BorderRadius.circular(16),
+                          ),
+                          child: Material(
+                            color: Colors.transparent,
+                            child: InkWell(
+                              onTap: state.status == ActiveRideStatus.loading
+                                  ? null
+                                  : () {
+                                      if (state.isPaused) {
+                                        _bloc.add(ResumeRide(widget.orderId));
+                                      } else {
+                                        _bloc.add(PauseRide(widget.orderId));
+                                      }
+                                    },
+                              borderRadius: BorderRadius.circular(16),
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Icon(
+                                    state.isPaused ? Icons.play_arrow : Icons.pause,
+                                    color: state.isPaused
+                                        ? Colors.white.withOpacity(0.8)
+                                        : const Color(0xFF0A0F2E),
+                                    size: 24,
+                                  ),
+                                  const SizedBox(height: 4),
+                                  Text(
+                                    state.isPaused ? 'ПРОДОЛЖИТЬ' : 'ПАУЗА',
+                                    style: TextStyle(
+                                      color: state.isPaused
+                                          ? Colors.white.withOpacity(0.8)
+                                          : const Color(0xFF0A0F2E),
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Container(
+                          height: 56,
+                          decoration: BoxDecoration(
+                            color: const Color(0xFFB84949),
+                            borderRadius: BorderRadius.circular(16),
+                          ),
+                          child: Material(
+                            color: Colors.transparent,
+                            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); // закрываем ActiveRideSheet
+                                  context.go("/home/order-photos/${widget.orderId}");
+                                }
+                                // 🔹 Если отменил — ничего не делаем, диалог уже закрылся
+                              },
+                              borderRadius: BorderRadius.circular(16),
+                              child: Column( // ✅ Вернули Column с иконкой и текстом
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  const Icon(
+                                    Icons.stop,
+                                    color: Colors.white,
+                                    size: 24,
+                                  ),
+                                  const SizedBox(height: 4),
+                                  const Text(
+                                    'ЗАВЕРШИТЬ',
+                                    style: TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Container(
+                          height: 56,
+                          decoration: BoxDecoration(
+                            color: Colors.white.withOpacity(0.1),
+                            borderRadius: BorderRadius.circular(16),
+                            border: Border.all(
+                              color: Colors.white.withOpacity(0.2),
+                              width: 1,
+                            ),
+                          ),
+                          child: Material(
+                            color: Colors.transparent,
+                            child: InkWell(
+                              onTap: () {
+                                // TODO: Поддержка
+                              },
+                              borderRadius: BorderRadius.circular(16),
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Icon(
+                                    Icons.phone_in_talk,
+                                    color: Colors.white.withOpacity(0.8),
+                                    size: 24,
+                                  ),
+                                  const SizedBox(height: 4),
+                                  Text(
+                                    'Поддержка',
+                                    style: TextStyle(
+                                      color: Colors.white.withOpacity(0.8),
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+                const SizedBox(height: 16),
+
+                // 🔹 СТАТИСТИКА (2 равных столбца, правый на всю высоту)
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: IntrinsicHeight(
+                    child: Row(
+                      children: [
+                        // 🔹 ЛЕВЫЙ СТОЛБЕЦ: Скорость + Расстояние
+                        Expanded(
+                          child: Column(
+                            children: [
+                              // Скорость
+                              Container(
+                                width: double.infinity,
+                                padding: const EdgeInsets.all(16),
+                                decoration: BoxDecoration(
+                                  color: Colors.white.withOpacity(0.15),
+                                  borderRadius: BorderRadius.circular(16),
+                                ),
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      state.speed.toStringAsFixed(1),
+                                      style: const TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 20,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                    const SizedBox(height: 4),
+                                    Text(
+                                      'скорость',
+                                      style: TextStyle(
+                                        color: Colors.white.withOpacity(0.6),
+                                        fontSize: 12,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              const SizedBox(height: 12),
+                              // Расстояние
+                              Container(
+                                width: double.infinity,
+                                padding: const EdgeInsets.all(16),
+                                decoration: BoxDecoration(
+                                  color: Colors.white.withOpacity(0.15),
+                                  borderRadius: BorderRadius.circular(16),
+                                ),
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      state.distance.toStringAsFixed(1),
+                                      style: const TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 20,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                    const SizedBox(height: 4),
+                                    Text(
+                                      'расстояние',
+                                      style: TextStyle(
+                                        color: Colors.white.withOpacity(0.6),
+                                        fontSize: 12,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+
+                        const SizedBox(width: 12),
+
+                        // 🔹 ПРАВЫЙ СТОЛБЕЦ: Стоимость (на всю высоту)
+                        Expanded(
+                          child: Container(
+                            padding: const EdgeInsets.all(16),
+                            decoration: BoxDecoration(
+                              color: Colors.white.withOpacity(0.15),
+                              borderRadius: BorderRadius.circular(16),
+                            ),
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Text(
+                                  'Стоимость',
+                                  style: TextStyle(
+                                    color: Colors.white.withOpacity(0.6),
+                                    fontSize: 12,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                RichText(
+                                  text: TextSpan(
+                                    children: [
+                                      TextSpan(
+                                        text: state.cost.toStringAsFixed(1),
+                                        style: const TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 24,
+                                          fontWeight: FontWeight.bold,
+                                          fontFamily: 'Digital Numbers',
+                                          fontFeatures: [FontFeature.tabularFigures()],
+                                        ),
+                                      ),
+                                      const TextSpan(
+                                        text: ' BYN',
+                                        style: TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.w600,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+
+                const SizedBox(height: 24),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  String _formatDuration(Duration duration) {
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    final hours = twoDigits(duration.inHours);
+    final minutes = twoDigits(duration.inMinutes.remainder(60));
+    final seconds = twoDigits(duration.inSeconds.remainder(60));
+    return '$hours:$minutes:$seconds';
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/sheet/current_rides_sheet.dart b/lib/presentation/components/sheet/current_rides_sheet.dart
index 2dad183..2922444 100644
--- a/lib/presentation/components/sheet/current_rides_sheet.dart
+++ b/lib/presentation/components/sheet/current_rides_sheet.dart
@@ -1,433 +1,433 @@
-import 'dart:async';
-import 'dart:ui';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../../di/service_locator.dart';
-import '../../../domain/entities/scooter_order.dart';
-import '../../event/current_rides_event.dart';
-import '../../state/current_rides_state.dart';
-import '../../viewmodel/current_rides_bloc.dart';
-import '../gradient_button.dart';
-import 'reserved_ride_sheet.dart';
-import 'active_ride_sheet.dart';
-
-class CurrentRidesSheet extends StatefulWidget {
-
-  const CurrentRidesSheet({super.key});
-
-  @override
-  State<CurrentRidesSheet> createState() => _CurrentRidesSheetState();
-}
-
-class _CurrentRidesSheetState extends State<CurrentRidesSheet> {
-  late final CurrentRidesBloc _bloc;
-
-  @override
-  Widget build(BuildContext context) {
-    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: 450,
-            padding: const EdgeInsets.only(top: 20, bottom: 10),
-            decoration: BoxDecoration(
-              color: const Color(0x00000032).withOpacity(0.6),
-              borderRadius: const BorderRadius.vertical(
-                top: Radius.circular(30),
-              ),
-            ),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      GestureDetector(
-                        onTap: () => Navigator.pop(context),
-                        child: Row(
-                          children: [
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x99FFFFFF),
-                              size: 20,
-                            ),
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x66FFFFFF),
-                              size: 20,
-                            ),
-                            Icon(
-                              Icons.arrow_back_ios_sharp,
-                              color: const Color(0x22FFFFFF),
-                              size: 20,
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: Text(
-                          'Текущие поездки',
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 16,
-                            fontWeight: FontWeight.w600,
-                          ),
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 20),
-                Expanded(
-                  child: BlocBuilder<CurrentRidesBloc, CurrentRidesState>(
-                    builder: (context, state) {
-                      if (state.status == CurrentRidesStatus.loading) {
-                        return const Center(
-                          child: CircularProgressIndicator(color: Colors.white),
-                        );
-                      }
-
-                      if (state.status == CurrentRidesStatus.failure) {
-                        return Center(
-                          child: Text(
-                            state.errorMessage ?? 'Ошибка загрузки',
-                            style: const TextStyle(color: Colors.white),
-                          ),
-                        );
-                      }
-
-                      if (state.orders.isEmpty) {
-                        return const Center(
-                          child: Text(
-                            'Нет активных поездок',
-                            style: TextStyle(color: Colors.white70),
-                          ),
-                        );
-                      }
-
-                      return SingleChildScrollView(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: Column(
-                          children: state.orders.map((order) {
-                            return Padding(
-                              padding: const EdgeInsets.only(bottom: 12),
-                              child: _RideCard(order: order),
-                            );
-                          }).toList(),
-                        ),
-                      );
-                    },
-                  ),
-                ),
-                const SizedBox(height: 16),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Container(
-                    height: 56,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(24),
-                      border: Border.all(
-                        color: Colors.white.withOpacity(0.4),
-                        width: 1,
-                      ),
-                    ),
-                    child: Material(
-                      color: Colors.transparent,
-                      child: InkWell(
-                        onTap: () {
-                          Navigator.pop(context);
-                        },
-                        borderRadius: BorderRadius.circular(24),
-                        child: const Center(
-                          child: Text(
-                            'Взять ещё самокат',
-                            style: TextStyle(
-                              color: Colors.white,
-                              fontSize: 16,
-                              fontWeight: FontWeight.w600,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ),
-                const SizedBox(height: 16),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _RideCard extends StatefulWidget {
-  final ScooterOrder order;
-
-  const _RideCard({required this.order});
-
-  @override
-  State<_RideCard> createState() => _RideCardState();
-}
-
-class _RideCardState extends State<_RideCard> {
-  late Timer _timer;
-  late Duration _elapsedTime;
-  late Duration _reservationTime;
-  late DateTime _startTime;
-
-  @override
-  void initState() {
-    super.initState();
-    _startTime = widget.order.startAt ?? widget.order.createdAt;
-    _elapsedTime = DateTime.now().difference(_startTime);
-    _reservationTime = const Duration(minutes: 5);
-    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      if (mounted) {
-        setState(() {
-          _elapsedTime = DateTime.now().difference(_startTime);
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _timer.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isReserved =
-        widget.order.status == 'Booking' || //Drive, Finish
-        widget.order.status == 'holding';
-    Duration displayTime;
-    if (isReserved) {
-      displayTime = _reservationTime - _elapsedTime;
-      if (displayTime.isNegative) {
-        displayTime = Duration.zero;
-      }
-    } else {
-      displayTime = _elapsedTime;
-    }
-
-    final isExpired = isReserved && (_reservationTime - _elapsedTime).isNegative;
-
-    final timeString = _formatDuration(displayTime);
-    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();
-
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Colors.white.withOpacity(0.15),
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 70,
-            child: Image.asset(
-              'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
-              height: 70,
-              fit: BoxFit.contain,
-            ),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            flex: 2,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  children: [
-                    Container(
-                      width: 8,
-                      height: 8,
-                      decoration: BoxDecoration(
-                        color: statusColor,
-                        shape: BoxShape.circle,
-                      ),
-                    ),
-                    const SizedBox(width: 6),
-                    Text(
-                      statusText,
-                      style: TextStyle(
-                        color: statusColor,
-                        fontSize: 14,
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 4),
-                Row(
-                  children: [
-                    Image.asset("assets/icons/qr_icon_order.png"),
-                    const SizedBox(width: 6),
-                    Text(
-                      scooterNumber,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                      ),
-                    ),
-                  ],
-                ),
-
-                if (isReserved)
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const SizedBox(height: 8),
-                      Text(
-                        "Тариф",
-                        style: TextStyle(
-                          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,
-                            ),
-                          ),
-                        ],
-                      )
-                    ],
-                  )
-              ],
-            ),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            flex: 1,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      timeString,
-                      style: TextStyle(
-                        color: statusColor,
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                        fontFeatures: const [FontFeature.tabularFigures()],
-                        fontFamily: 'DigitalNumbers',
-                      ),
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 8),
-                SizedBox(
-                  height: 32,
-                  child: GradientButton(
-                    text: 'Подробнее',
-                    showArrows: false,
-                    height: 32,
-                    width: 100,
-                    fontSize: 11,
-                    enabled: !isExpired,
-                    onTap: !isExpired ? () {
-                      if (isReserved) {
-                        Navigator.pop(context);
-                        showModalBottomSheet(
-                          context: context,
-                          isScrollControlled: true,
-                          backgroundColor: Colors.transparent,
-                          builder: (context) => ReservedRideSheet(
-                            orderId: widget.order.id,
-                            scooterNumber: scooterNumber,
-                            initialReservationTime:
-                                _reservationTime - _elapsedTime,
-                          ),
-                        );
-                      } else {
-                        Navigator.pop(context);
-                        showModalBottomSheet(
-                          context: context,
-                          isScrollControlled: true,
-                          backgroundColor: Colors.transparent,
-                          builder: (context) => ActiveRideSheet(
-                            orderId: widget.order.id,
-                            scooterNumber: scooterNumber,
-                            initialElapsedTime: _elapsedTime,
-                          ),
-                        );
-                      }
-                    } : null,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  String _getStatusText(String status) {
-    switch (status.toLowerCase()) {
-      case 'reserved':
-      case 'holding':
-        return 'Забронирован';
-      case 'active':
-      case 'in_progress':
-        return 'Активно';
-      case 'completed':
-        return 'Завершено';
-      default:
-        return status;
-    }
-  }
-
-  Color _getStatusColor(String status) {
-    switch (status.toLowerCase()) {
-      case 'reserved':
-      case 'holding':
-        return const Color(0xFFFFB800);
-      case 'active':
-      case 'in_progress':
-        return const Color(0xFF66E3C4);
-      default:
-        return Colors.white;
-    }
-  }
-
-  String _getLocationText() {
-    /*if (widget.order.scooter != null && widget.order.scooter!.address != null) {
-      return widget.order.scooter!.address!;
-    }*/
-    return 'Московский 33';
-  }
-
-  String _formatDuration(Duration duration) {
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    final minutes = twoDigits(duration.inMinutes.remainder(60));
-    final seconds = twoDigits(duration.inSeconds.remainder(60));
-    return '$minutes:$seconds';
-  }
-}
+import 'dart:async';
+import 'dart:ui';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../di/service_locator.dart';
+import '../../../domain/entities/scooter_order.dart';
+import '../../event/current_rides_event.dart';
+import '../../state/current_rides_state.dart';
+import '../../viewmodel/current_rides_bloc.dart';
+import '../gradient_button.dart';
+import 'reserved_ride_sheet.dart';
+import 'active_ride_sheet.dart';
+
+class CurrentRidesSheet extends StatefulWidget {
+
+  const CurrentRidesSheet({super.key});
+
+  @override
+  State<CurrentRidesSheet> createState() => _CurrentRidesSheetState();
+}
+
+class _CurrentRidesSheetState extends State<CurrentRidesSheet> {
+  late final CurrentRidesBloc _bloc;
+
+  @override
+  Widget build(BuildContext context) {
+    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: 450,
+            padding: const EdgeInsets.only(top: 20, bottom: 10),
+            decoration: BoxDecoration(
+              color: const Color(0x00000032).withOpacity(0.6),
+              borderRadius: const BorderRadius.vertical(
+                top: Radius.circular(30),
+              ),
+            ),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Row(
+                    children: [
+                      GestureDetector(
+                        onTap: () => Navigator.pop(context),
+                        child: Row(
+                          children: [
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x99FFFFFF),
+                              size: 20,
+                            ),
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x66FFFFFF),
+                              size: 20,
+                            ),
+                            Icon(
+                              Icons.arrow_back_ios_sharp,
+                              color: const Color(0x22FFFFFF),
+                              size: 20,
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: Text(
+                          'Текущие поездки',
+                          style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 16,
+                            fontWeight: FontWeight.w600,
+                          ),
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const SizedBox(height: 20),
+                Expanded(
+                  child: BlocBuilder<CurrentRidesBloc, CurrentRidesState>(
+                    builder: (context, state) {
+                      if (state.status == CurrentRidesStatus.loading) {
+                        return const Center(
+                          child: CircularProgressIndicator(color: Colors.white),
+                        );
+                      }
+
+                      if (state.status == CurrentRidesStatus.failure) {
+                        return Center(
+                          child: Text(
+                            state.errorMessage ?? 'Ошибка загрузки',
+                            style: const TextStyle(color: Colors.white),
+                          ),
+                        );
+                      }
+
+                      if (state.orders.isEmpty) {
+                        return const Center(
+                          child: Text(
+                            'Нет активных поездок',
+                            style: TextStyle(color: Colors.white70),
+                          ),
+                        );
+                      }
+
+                      return SingleChildScrollView(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: Column(
+                          children: state.orders.map((order) {
+                            return Padding(
+                              padding: const EdgeInsets.only(bottom: 12),
+                              child: _RideCard(order: order),
+                            );
+                          }).toList(),
+                        ),
+                      );
+                    },
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Container(
+                    height: 56,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(24),
+                      border: Border.all(
+                        color: Colors.white.withOpacity(0.4),
+                        width: 1,
+                      ),
+                    ),
+                    child: Material(
+                      color: Colors.transparent,
+                      child: InkWell(
+                        onTap: () {
+                          Navigator.pop(context);
+                        },
+                        borderRadius: BorderRadius.circular(24),
+                        child: const Center(
+                          child: Text(
+                            'Взять ещё самокат',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 16,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 16),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _RideCard extends StatefulWidget {
+  final ScooterOrder order;
+
+  const _RideCard({required this.order});
+
+  @override
+  State<_RideCard> createState() => _RideCardState();
+}
+
+class _RideCardState extends State<_RideCard> {
+  late Timer _timer;
+  late Duration _elapsedTime;
+  late Duration _reservationTime;
+  late DateTime _startTime;
+
+  @override
+  void initState() {
+    super.initState();
+    _startTime = widget.order.startAt ?? widget.order.createdAt;
+    _elapsedTime = DateTime.now().difference(_startTime);
+    _reservationTime = const Duration(minutes: 5);
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (mounted) {
+        setState(() {
+          _elapsedTime = DateTime.now().difference(_startTime);
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _timer.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isReserved =
+        widget.order.status == 'Booking' || //Drive, Finish
+        widget.order.status == 'holding';
+    Duration displayTime;
+    if (isReserved) {
+      displayTime = _reservationTime - _elapsedTime;
+      if (displayTime.isNegative) {
+        displayTime = Duration.zero;
+      }
+    } else {
+      displayTime = _elapsedTime;
+    }
+
+    final isExpired = isReserved && (_reservationTime - _elapsedTime).isNegative;
+
+    final timeString = _formatDuration(displayTime);
+    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();
+
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.white.withOpacity(0.15),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Row(
+        children: [
+          SizedBox(
+            width: 70,
+            child: Image.asset(
+              'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
+              height: 70,
+              fit: BoxFit.contain,
+            ),
+          ),
+          const SizedBox(width: 12),
+          Expanded(
+            flex: 2,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Container(
+                      width: 8,
+                      height: 8,
+                      decoration: BoxDecoration(
+                        color: statusColor,
+                        shape: BoxShape.circle,
+                      ),
+                    ),
+                    const SizedBox(width: 6),
+                    Text(
+                      statusText,
+                      style: TextStyle(
+                        color: statusColor,
+                        fontSize: 14,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 4),
+                Row(
+                  children: [
+                    Image.asset("assets/icons/qr_icon_order.png"),
+                    const SizedBox(width: 6),
+                    Text(
+                      scooterNumber,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ],
+                ),
+
+                if (isReserved)
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const SizedBox(height: 8),
+                      Text(
+                        "Тариф",
+                        style: TextStyle(
+                          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,
+                            ),
+                          ),
+                        ],
+                      )
+                    ],
+                  )
+              ],
+            ),
+          ),
+          const SizedBox(width: 12),
+          Expanded(
+            flex: 1,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(
+                      timeString,
+                      style: TextStyle(
+                        color: statusColor,
+                        fontSize: 20,
+                        fontWeight: FontWeight.bold,
+                        fontFeatures: const [FontFeature.tabularFigures()],
+                        fontFamily: 'DigitalNumbers',
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 8),
+                SizedBox(
+                  height: 32,
+                  child: GradientButton(
+                    text: 'Подробнее',
+                    showArrows: false,
+                    height: 32,
+                    width: 100,
+                    fontSize: 11,
+                    enabled: !isExpired,
+                    onTap: !isExpired ? () {
+                      if (isReserved) {
+                        Navigator.pop(context);
+                        showModalBottomSheet(
+                          context: context,
+                          isScrollControlled: true,
+                          backgroundColor: Colors.transparent,
+                          builder: (context) => ReservedRideSheet(
+                            orderId: widget.order.id,
+                            scooterNumber: scooterNumber,
+                            initialReservationTime:
+                                _reservationTime - _elapsedTime,
+                          ),
+                        );
+                      } else {
+                        Navigator.pop(context);
+                        showModalBottomSheet(
+                          context: context,
+                          isScrollControlled: true,
+                          backgroundColor: Colors.transparent,
+                          builder: (context) => ActiveRideSheet(
+                            orderId: widget.order.id,
+                            scooterNumber: scooterNumber,
+                            initialElapsedTime: _elapsedTime,
+                          ),
+                        );
+                      }
+                    } : null,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _getStatusText(String status) {
+    switch (status.toLowerCase()) {
+      case 'reserved':
+      case 'holding':
+        return 'Забронирован';
+      case 'active':
+      case 'in_progress':
+        return 'Активно';
+      case 'completed':
+        return 'Завершено';
+      default:
+        return status;
+    }
+  }
+
+  Color _getStatusColor(String status) {
+    switch (status.toLowerCase()) {
+      case 'reserved':
+      case 'holding':
+        return const Color(0xFFFFB800);
+      case 'active':
+      case 'in_progress':
+        return const Color(0xFF66E3C4);
+      default:
+        return Colors.white;
+    }
+  }
+
+  String _getLocationText() {
+    /*if (widget.order.scooter != null && widget.order.scooter!.address != null) {
+      return widget.order.scooter!.address!;
+    }*/
+    return 'Московский 33';
+  }
+
+  String _formatDuration(Duration duration) {
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    final minutes = twoDigits(duration.inMinutes.remainder(60));
+    final seconds = twoDigits(duration.inSeconds.remainder(60));
+    return '$minutes:$seconds';
+  }
+}
diff --git a/lib/presentation/components/sheet/map_settings_sheet.dart b/lib/presentation/components/sheet/map_settings_sheet.dart
index 27b2f5c..649e493 100644
--- a/lib/presentation/components/sheet/map_settings_sheet.dart
+++ b/lib/presentation/components/sheet/map_settings_sheet.dart
@@ -1,132 +1,132 @@
-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 '../../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.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,
-  });
-}
+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 '../../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.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,
+  });
+}
diff --git a/lib/presentation/components/sheet/payment_method_sheet.dart b/lib/presentation/components/sheet/payment_method_sheet.dart
index f83a766..bd6d444 100644
--- a/lib/presentation/components/sheet/payment_method_sheet.dart
+++ b/lib/presentation/components/sheet/payment_method_sheet.dart
@@ -1,202 +1,202 @@
-import 'dart:ui';
-import 'package:be_happy/presentation/event/tariff_sheet_event.dart';
-import 'package:be_happy/presentation/viewmodel/tariff_sheet_bloc.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:be_happy/presentation/components/payment_option.dart';
-
-import '../../../domain/entities/payment_card.dart';
-import '../../event/payment_method_sheet_event.dart';
-import '../../state/payment_method_sheet_state.dart';
-import '../../viewmodel/payment_method_sheet_bloc.dart';
-
-class PaymentMethodSheet extends StatefulWidget {
-  final PaymentCard? initialSelectedCard;
-  final bool showBalance;
-
-  const PaymentMethodSheet({
-    super.key,
-    this.initialSelectedCard,
-    this.showBalance = true,
-  });
-
-  @override
-  State<PaymentMethodSheet> createState() => _PaymentMethodSheetState();
-}
-
-class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
-  int? _selectedPaymentMethod = -2;
-  int? _processingCardId; // <-- Переменная для отслеживания отправленного запроса
-
-  @override
-  void initState() {
-    super.initState();
-    context.read<PaymentMethodSheetBloc>().add(PaymentMethodSheetStarted());
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<PaymentMethodSheetBloc, PaymentMethodSheetState>(
-      listener: (context, state) {
-        if (state.status == PaymentMethodSheetStatus.success && _processingCardId != null) {
-          final updatedCard = state.cards.cast<PaymentCard?>().firstWhere(
-                (c) => c?.id == _processingCardId,
-            orElse: () => state.cards.cast<PaymentCard?>().firstWhere((c) => c?.isMain == true, orElse: () => null),
-          );
-
-          _processingCardId = null;
-          Navigator.pop(context, updatedCard);
-        }
-      },
-      builder: (context, state) {
-
-        if (state.status == PaymentMethodSheetStatus.success && _selectedPaymentMethod == -2) {
-          if (widget.initialSelectedCard != null) {
-            final initialIndex = state.cards.indexWhere(
-                    (card) => card.cardLastNumber == widget.initialSelectedCard!.cardLastNumber
-            );
-            _selectedPaymentMethod = initialIndex != -1 ? initialIndex : -1;
-          } else {
-            final mainCardIndex = state.cards.indexWhere((card) => card.isMain);
-            _selectedPaymentMethod = mainCardIndex != -1 ? mainCardIndex : (widget.showBalance ? -1 : 0);
-          }
-        }
-
-        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: 450,
-                padding: const EdgeInsets.only(top: 20, bottom: 10),
-                decoration: BoxDecoration(
-                  color: const Color(0x00000032).withOpacity(0.6),
-                  borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-
-                    const SizedBox(height: 20),
-
-                    Expanded(
-                      child: SingleChildScrollView(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: Column(
-                          children: [
-                            if (widget.showBalance) ...[
-                              PaymentOption(
-                                title: 'Баланс',
-                                subtitle: '${state.balance} баллов',
-                                isSelected: _selectedPaymentMethod == -1,
-                                onTap: () {
-                                  setState(() {
-                                    _selectedPaymentMethod = -1;
-                                  });
-                                  Navigator.pop(context, 'balance');
-                                },
-                              ),
-                              const SizedBox(height: 12),
-                            ],
-
-                            ...state.cards.asMap().entries.map((entry) {
-                              final index = entry.key;
-                              final card = entry.value;
-                              return Padding(
-                                padding: const EdgeInsets.only(bottom: 12),
-                                child: PaymentOption(
-                                  title: card.isMain ? "Основная" : "Карта",
-                                  subtitle: '${card.cardLastNumber}',
-                                  isSelected: _selectedPaymentMethod == index,
-                                  onTap: () async {
-                                    setState(() {
-                                      _selectedPaymentMethod = index;
-                                      _processingCardId = card.id;
-                                    });
-
-                                    // Отправляем событие в Блок
-                                    context.read<PaymentMethodSheetBloc>().add(
-                                      SelectPaymentCardRequested(card),
-                                    );
-
-                                  },
-                                ),
-                              );
-                            }).toList(),
-
-                            Container(
-                              height: 56,
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.circular(24),
-                                border: Border.all(
-                                  color: Colors.white.withOpacity(0.4),
-                                  width: 1,
-                                ),
-                              ),
-                              child: Material(
-                                color: Colors.transparent,
-                                child: InkWell(
-                                  onTap: () {
-                                    context.read<PaymentMethodSheetBloc>().add(AddPaymentCardRequested());
-                                  },
-                                  borderRadius: BorderRadius.circular(24),
-                                  child: Center(
-                                    child: Row(
-                                      mainAxisAlignment: MainAxisAlignment.center,
-                                      children: [
-                                        Icon(
-                                          Icons.add,
-                                          color: const Color(0xFF66E3C4),
-                                          size: 20,
-                                        ),
-                                        const SizedBox(width: 8),
-                                        const Text(
-                                          'Добавить платежную карту',
-                                          style: TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 16,
-                                            fontWeight: FontWeight.w600,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                ),
-                              ),
-                            ),
-
-                            const SizedBox(height: 16),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-
-
-      },
-    );
-  }
-
-  String _getCardType(String lastNumber) {
-    if (lastNumber.isEmpty) return 'Card';
-    final firstDigit = lastNumber[0];
-    switch (firstDigit) {
-      case '4':
-        return 'Visa';
-      case '5':
-        return 'Mastercard';
-      case '9':
-        return 'BelCard';
-      default:
-        return 'Card';
-    }
-  }
-}
+import 'dart:ui';
+import 'package:be_happy/presentation/event/tariff_sheet_event.dart';
+import 'package:be_happy/presentation/viewmodel/tariff_sheet_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:be_happy/presentation/components/payment_option.dart';
+
+import '../../../domain/entities/payment_card.dart';
+import '../../event/payment_method_sheet_event.dart';
+import '../../state/payment_method_sheet_state.dart';
+import '../../viewmodel/payment_method_sheet_bloc.dart';
+
+class PaymentMethodSheet extends StatefulWidget {
+  final PaymentCard? initialSelectedCard;
+  final bool showBalance;
+
+  const PaymentMethodSheet({
+    super.key,
+    this.initialSelectedCard,
+    this.showBalance = true,
+  });
+
+  @override
+  State<PaymentMethodSheet> createState() => _PaymentMethodSheetState();
+}
+
+class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
+  int? _selectedPaymentMethod = -2;
+  int? _processingCardId; // <-- Переменная для отслеживания отправленного запроса
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<PaymentMethodSheetBloc>().add(PaymentMethodSheetStarted());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<PaymentMethodSheetBloc, PaymentMethodSheetState>(
+      listener: (context, state) {
+        if (state.status == PaymentMethodSheetStatus.success && _processingCardId != null) {
+          final updatedCard = state.cards.cast<PaymentCard?>().firstWhere(
+                (c) => c?.id == _processingCardId,
+            orElse: () => state.cards.cast<PaymentCard?>().firstWhere((c) => c?.isMain == true, orElse: () => null),
+          );
+
+          _processingCardId = null;
+          Navigator.pop(context, updatedCard);
+        }
+      },
+      builder: (context, state) {
+
+        if (state.status == PaymentMethodSheetStatus.success && _selectedPaymentMethod == -2) {
+          if (widget.initialSelectedCard != null) {
+            final initialIndex = state.cards.indexWhere(
+                    (card) => card.cardLastNumber == widget.initialSelectedCard!.cardLastNumber
+            );
+            _selectedPaymentMethod = initialIndex != -1 ? initialIndex : -1;
+          } else {
+            final mainCardIndex = state.cards.indexWhere((card) => card.isMain);
+            _selectedPaymentMethod = mainCardIndex != -1 ? mainCardIndex : (widget.showBalance ? -1 : 0);
+          }
+        }
+
+        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: 450,
+                padding: const EdgeInsets.only(top: 20, bottom: 10),
+                decoration: BoxDecoration(
+                  color: const Color(0x00000032).withOpacity(0.6),
+                  borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+
+                    const SizedBox(height: 20),
+
+                    Expanded(
+                      child: SingleChildScrollView(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: Column(
+                          children: [
+                            if (widget.showBalance) ...[
+                              PaymentOption(
+                                title: 'Баланс',
+                                subtitle: '${state.balance} баллов',
+                                isSelected: _selectedPaymentMethod == -1,
+                                onTap: () {
+                                  setState(() {
+                                    _selectedPaymentMethod = -1;
+                                  });
+                                  Navigator.pop(context, 'balance');
+                                },
+                              ),
+                              const SizedBox(height: 12),
+                            ],
+
+                            ...state.cards.asMap().entries.map((entry) {
+                              final index = entry.key;
+                              final card = entry.value;
+                              return Padding(
+                                padding: const EdgeInsets.only(bottom: 12),
+                                child: PaymentOption(
+                                  title: card.isMain ? "Основная" : "Карта",
+                                  subtitle: '${card.cardLastNumber}',
+                                  isSelected: _selectedPaymentMethod == index,
+                                  onTap: () async {
+                                    setState(() {
+                                      _selectedPaymentMethod = index;
+                                      _processingCardId = card.id;
+                                    });
+
+                                    // Отправляем событие в Блок
+                                    context.read<PaymentMethodSheetBloc>().add(
+                                      SelectPaymentCardRequested(card),
+                                    );
+
+                                  },
+                                ),
+                              );
+                            }).toList(),
+
+                            Container(
+                              height: 56,
+                              decoration: BoxDecoration(
+                                borderRadius: BorderRadius.circular(24),
+                                border: Border.all(
+                                  color: Colors.white.withOpacity(0.4),
+                                  width: 1,
+                                ),
+                              ),
+                              child: Material(
+                                color: Colors.transparent,
+                                child: InkWell(
+                                  onTap: () {
+                                    context.read<PaymentMethodSheetBloc>().add(AddPaymentCardRequested());
+                                  },
+                                  borderRadius: BorderRadius.circular(24),
+                                  child: Center(
+                                    child: Row(
+                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      children: [
+                                        Icon(
+                                          Icons.add,
+                                          color: const Color(0xFF66E3C4),
+                                          size: 20,
+                                        ),
+                                        const SizedBox(width: 8),
+                                        const Text(
+                                          'Добавить платежную карту',
+                                          style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.w600,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+
+                            const SizedBox(height: 16),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+
+
+      },
+    );
+  }
+
+  String _getCardType(String lastNumber) {
+    if (lastNumber.isEmpty) return 'Card';
+    final firstDigit = lastNumber[0];
+    switch (firstDigit) {
+      case '4':
+        return 'Visa';
+      case '5':
+        return 'Mastercard';
+      case '9':
+        return 'BelCard';
+      default:
+        return 'Card';
+    }
+  }
+}
diff --git a/lib/presentation/components/sheet/reserved_ride_sheet.dart b/lib/presentation/components/sheet/reserved_ride_sheet.dart
index 06c9d2f..8a7748a 100644
--- a/lib/presentation/components/sheet/reserved_ride_sheet.dart
+++ b/lib/presentation/components/sheet/reserved_ride_sheet.dart
@@ -1,357 +1,357 @@
-import 'dart:async';
-import 'dart:ui';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../../di/service_locator.dart';
-import '../../event/reserved_ride_event.dart';
-import '../../state/reserved_ride_state.dart';
-import '../../viewmodel/reserved_ride_bloc.dart';
-import '../dialog/cancel_booking_dialog.dart';
-import '../gradient_button.dart';
-import 'active_ride_sheet.dart';
-
-class ReservedRideSheet extends StatefulWidget {
-  final String scooterNumber;
-  final int orderId;
-  final Duration initialReservationTime;
-
-  const ReservedRideSheet({
-    super.key,
-    required this.scooterNumber,
-    required this.orderId,
-    this.initialReservationTime = const Duration(minutes: 3, seconds: 17),
-  });
-
-  @override
-  State<ReservedRideSheet> createState() => _ReservedRideSheetState();
-}
-
-class _ReservedRideSheetState extends State<ReservedRideSheet> {
-  late final ReservedRideBloc _bloc;
-  late Duration _reservationTime;
-  late Timer _timer;
-
-  @override
-  void initState() {
-    super.initState();
-    _bloc = getIt<ReservedRideBloc>();
-    _reservationTime = widget.initialReservationTime;
-    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      if (mounted) {
-        setState(() {
-          _reservationTime = _reservationTime - const Duration(seconds: 1);
-          if (_reservationTime.isNegative) {
-            _reservationTime = Duration.zero;
-            timer.cancel();
-          }
-        });
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _timer.cancel();
-    _bloc.close();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider.value(
-      value: _bloc,
-      child: Scaffold(
-        backgroundColor: Colors.transparent,
-        resizeToAvoidBottomInset: false,
-        body: 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(
-                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),
-                  ),
-                ),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    // HEADER
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Row(
-                        children: [
-                          GestureDetector(
-                            onTap: () => Navigator.pop(context),
-                            child: Row(
-                              children: [
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x99FFFFFF),
-                                  size: 20,
-                                ),
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x66FFFFFF),
-                                  size: 20,
-                                ),
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x22FFFFFF),
-                                  size: 20,
-                                ),
-                              ],
-                            ),
-                          ),
-                          const SizedBox(width: 12),
-                          Expanded(
-                            child: Text(
-                              'Бесплатное бронирование',
-                              style: const TextStyle(
-                                color: Colors.white,
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                              ),
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-
-                    const SizedBox(height: 20),
-
-                    // ТАЙМЕР + ИНФО О САМОКАТЕ (КОМПАКТНЫЙ)
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Row(
-                        children: [
-                          // Таймер
-                          Expanded(
-                            flex: 2,
-                            child: Text(
-                              _formatDuration(_reservationTime),
-                              style: const TextStyle(
-                                color: Colors.white,
-                                fontSize: 32,
-                                fontWeight: FontWeight.bold,
-                                fontFeatures: [FontFeature.tabularFigures()],
-                                fontFamily: 'Digital Numbers',
-                              ),
-                            ),
-                          ),
-                          // Иконка и информация (ВЫСОКИЙ БЛОК)
-                          Expanded(
-                            flex: 3,
-                            child: Container(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 12,
-                                vertical: 16,
-                              ),
-                              decoration: BoxDecoration(
-                                color: Colors.white.withOpacity(0.1),
-                                borderRadius: BorderRadius.circular(12),
-                              ),
-                              child: Row(
-                                children: [
-                                  // Иконка самоката (ВЫШЕ)
-                                  SizedBox(
-                                    width: 44,
-                                    height: 56,
-                                    child: Image.asset(
-                                      'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
-                                      fit: BoxFit.contain,
-                                    ),
-                                  ),
-                                  const SizedBox(width: 12),
-                                  // Инфо
-                                  Expanded(
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: [
-                                        Row(
-                                          mainAxisSize: MainAxisSize.min,
-                                          children: [
-                                            Container(
-                                              width: 8,
-                                              height: 8,
-                                              decoration: const BoxDecoration(
-                                                color: Color(0xFFFFB800),
-                                                shape: BoxShape.circle,
-                                              ),
-                                            ),
-                                            const SizedBox(width: 6),
-                                            const Text(
-                                              'Забронирован',
-                                              style: TextStyle(
-                                                color: Colors.white,
-                                                fontSize: 12,
-                                                fontWeight: FontWeight.w600,
-                                              ),
-                                              overflow: TextOverflow.ellipsis,
-                                            ),
-                                          ],
-                                        ),
-                                        const SizedBox(height: 8),
-                                        Text(
-                                          '№${widget.scooterNumber}',
-                                          style: const TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 15,
-                                            fontWeight: FontWeight.w600,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-
-                    const SizedBox(height: 16),
-
-                    // КНОПКА "НАЧАТЬ ПОЕЗДКУ"
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: BlocListener<ReservedRideBloc, ReservedRideState>(
-                        listener: (context, state) {
-                          if (state.rideStarted) {
-                            Navigator.pop(context);
-                            showModalBottomSheet(
-                              context: context,
-                              isScrollControlled: true,
-                              backgroundColor: Colors.transparent,
-                              builder: (context) => ActiveRideSheet(
-                                scooterNumber: widget.scooterNumber,
-                                initialElapsedTime: Duration.zero,
-                                orderId: widget.orderId,
-                              ),
-                            );
-                          } else if (state.status ==
-                              ReservedRideStatus.failure) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text(state.errorMessage ?? 'Ошибка'),
-                              ),
-                            );
-                          }
-                        },
-                        child: GradientButton(
-                          text: 'Начать поездку',
-                          showArrows: true,
-                          height: 48,
-                          width: double.infinity,
-                          fontSize: 15,
-                          onTap: () {
-                            _bloc.add(StartRide(widget.orderId));
-                          },
-                        ),
-                      ),
-                    ),
-
-                    const SizedBox(height: 12),
-
-                    // КНОПКА "ОТМЕНИТЬ БРОНИРОВАНИЕ"
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: BlocListener<ReservedRideBloc, ReservedRideState>(
-                        listener: (context, state) {
-                          if (state.rideCancelled) {
-                            Navigator.pop(context);
-                          } else if (state.status ==
-                              ReservedRideStatus.failure) {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text(state.errorMessage ?? 'Ошибка'),
-                              ),
-                            );
-                          }
-                        },
-                        child: Container(
-                          height: 48,
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(24),
-                            border: Border.all(
-                              color: Colors.white.withOpacity(0.4),
-                              width: 1,
-                            ),
-                          ),
-                          child: Material(
-                            color: Colors.transparent,
-                            child: InkWell(
-                              onTap: () async {
-                                final result = await showDialog<bool>(
-                                  context: context,
-                                  builder: (context) =>
-                                      const CancelBookingDialog(),
-                                );
-                                if (result != null && result) {
-                                  _bloc.add(CancelRide(widget.orderId));
-                                }
-                              },
-                              borderRadius: BorderRadius.circular(24),
-                              child:
-                                  BlocBuilder<
-                                    ReservedRideBloc,
-                                    ReservedRideState
-                                  >(
-                                    builder: (context, state) {
-                                      if (state.status ==
-                                          ReservedRideStatus.loading) {
-                                        return const Center(
-                                          child: SizedBox(
-                                            width: 20,
-                                            height: 20,
-                                            child: CircularProgressIndicator(
-                                              color: Colors.white,
-                                              strokeWidth: 2,
-                                            ),
-                                          ),
-                                        );
-                                      }
-                                      return const Center(
-                                        child: Text(
-                                          'Отменить бронирование',
-                                          style: TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 15,
-                                            fontWeight: FontWeight.w600,
-                                          ),
-                                        ),
-                                      );
-                                    },
-                                  ),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-
-                    const SizedBox(height: 20),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  String _formatDuration(Duration duration) {
-    String twoDigits(int n) => n.toString().padLeft(2, '0');
-    final minutes = twoDigits(duration.inMinutes.remainder(60));
-    final seconds = twoDigits(duration.inSeconds.remainder(60));
-    return '$minutes:$seconds';
-  }
-}
+import 'dart:async';
+import 'dart:ui';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../../di/service_locator.dart';
+import '../../event/reserved_ride_event.dart';
+import '../../state/reserved_ride_state.dart';
+import '../../viewmodel/reserved_ride_bloc.dart';
+import '../dialog/cancel_booking_dialog.dart';
+import '../gradient_button.dart';
+import 'active_ride_sheet.dart';
+
+class ReservedRideSheet extends StatefulWidget {
+  final String scooterNumber;
+  final int orderId;
+  final Duration initialReservationTime;
+
+  const ReservedRideSheet({
+    super.key,
+    required this.scooterNumber,
+    required this.orderId,
+    this.initialReservationTime = const Duration(minutes: 3, seconds: 17),
+  });
+
+  @override
+  State<ReservedRideSheet> createState() => _ReservedRideSheetState();
+}
+
+class _ReservedRideSheetState extends State<ReservedRideSheet> {
+  late final ReservedRideBloc _bloc;
+  late Duration _reservationTime;
+  late Timer _timer;
+
+  @override
+  void initState() {
+    super.initState();
+    _bloc = getIt<ReservedRideBloc>();
+    _reservationTime = widget.initialReservationTime;
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (mounted) {
+        setState(() {
+          _reservationTime = _reservationTime - const Duration(seconds: 1);
+          if (_reservationTime.isNegative) {
+            _reservationTime = Duration.zero;
+            timer.cancel();
+          }
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _timer.cancel();
+    _bloc.close();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider.value(
+      value: _bloc,
+      child: Scaffold(
+        backgroundColor: Colors.transparent,
+        resizeToAvoidBottomInset: false,
+        body: 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(
+                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),
+                  ),
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    // HEADER
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Row(
+                        children: [
+                          GestureDetector(
+                            onTap: () => Navigator.pop(context),
+                            child: Row(
+                              children: [
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x99FFFFFF),
+                                  size: 20,
+                                ),
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x66FFFFFF),
+                                  size: 20,
+                                ),
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x22FFFFFF),
+                                  size: 20,
+                                ),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(width: 12),
+                          Expanded(
+                            child: Text(
+                              'Бесплатное бронирование',
+                              style: const TextStyle(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+
+                    const SizedBox(height: 20),
+
+                    // ТАЙМЕР + ИНФО О САМОКАТЕ (КОМПАКТНЫЙ)
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Row(
+                        children: [
+                          // Таймер
+                          Expanded(
+                            flex: 2,
+                            child: Text(
+                              _formatDuration(_reservationTime),
+                              style: const TextStyle(
+                                color: Colors.white,
+                                fontSize: 32,
+                                fontWeight: FontWeight.bold,
+                                fontFeatures: [FontFeature.tabularFigures()],
+                                fontFamily: 'Digital Numbers',
+                              ),
+                            ),
+                          ),
+                          // Иконка и информация (ВЫСОКИЙ БЛОК)
+                          Expanded(
+                            flex: 3,
+                            child: Container(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 12,
+                                vertical: 16,
+                              ),
+                              decoration: BoxDecoration(
+                                color: Colors.white.withOpacity(0.1),
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              child: Row(
+                                children: [
+                                  // Иконка самоката (ВЫШЕ)
+                                  SizedBox(
+                                    width: 44,
+                                    height: 56,
+                                    child: Image.asset(
+                                      'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
+                                      fit: BoxFit.contain,
+                                    ),
+                                  ),
+                                  const SizedBox(width: 12),
+                                  // Инфо
+                                  Expanded(
+                                    child: Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      mainAxisSize: MainAxisSize.min,
+                                      children: [
+                                        Row(
+                                          mainAxisSize: MainAxisSize.min,
+                                          children: [
+                                            Container(
+                                              width: 8,
+                                              height: 8,
+                                              decoration: const BoxDecoration(
+                                                color: Color(0xFFFFB800),
+                                                shape: BoxShape.circle,
+                                              ),
+                                            ),
+                                            const SizedBox(width: 6),
+                                            const Text(
+                                              'Забронирован',
+                                              style: TextStyle(
+                                                color: Colors.white,
+                                                fontSize: 12,
+                                                fontWeight: FontWeight.w600,
+                                              ),
+                                              overflow: TextOverflow.ellipsis,
+                                            ),
+                                          ],
+                                        ),
+                                        const SizedBox(height: 8),
+                                        Text(
+                                          '№${widget.scooterNumber}',
+                                          style: const TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 15,
+                                            fontWeight: FontWeight.w600,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+
+                    const SizedBox(height: 16),
+
+                    // КНОПКА "НАЧАТЬ ПОЕЗДКУ"
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: BlocListener<ReservedRideBloc, ReservedRideState>(
+                        listener: (context, state) {
+                          if (state.rideStarted) {
+                            Navigator.pop(context);
+                            showModalBottomSheet(
+                              context: context,
+                              isScrollControlled: true,
+                              backgroundColor: Colors.transparent,
+                              builder: (context) => ActiveRideSheet(
+                                scooterNumber: widget.scooterNumber,
+                                initialElapsedTime: Duration.zero,
+                                orderId: widget.orderId,
+                              ),
+                            );
+                          } else if (state.status ==
+                              ReservedRideStatus.failure) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(state.errorMessage ?? 'Ошибка'),
+                              ),
+                            );
+                          }
+                        },
+                        child: GradientButton(
+                          text: 'Начать поездку',
+                          showArrows: true,
+                          height: 48,
+                          width: double.infinity,
+                          fontSize: 15,
+                          onTap: () {
+                            _bloc.add(StartRide(widget.orderId));
+                          },
+                        ),
+                      ),
+                    ),
+
+                    const SizedBox(height: 12),
+
+                    // КНОПКА "ОТМЕНИТЬ БРОНИРОВАНИЕ"
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: BlocListener<ReservedRideBloc, ReservedRideState>(
+                        listener: (context, state) {
+                          if (state.rideCancelled) {
+                            Navigator.pop(context);
+                          } else if (state.status ==
+                              ReservedRideStatus.failure) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(state.errorMessage ?? 'Ошибка'),
+                              ),
+                            );
+                          }
+                        },
+                        child: Container(
+                          height: 48,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(24),
+                            border: Border.all(
+                              color: Colors.white.withOpacity(0.4),
+                              width: 1,
+                            ),
+                          ),
+                          child: Material(
+                            color: Colors.transparent,
+                            child: InkWell(
+                              onTap: () async {
+                                final result = await showDialog<bool>(
+                                  context: context,
+                                  builder: (context) =>
+                                      const CancelBookingDialog(),
+                                );
+                                if (result != null && result) {
+                                  _bloc.add(CancelRide(widget.orderId));
+                                }
+                              },
+                              borderRadius: BorderRadius.circular(24),
+                              child:
+                                  BlocBuilder<
+                                    ReservedRideBloc,
+                                    ReservedRideState
+                                  >(
+                                    builder: (context, state) {
+                                      if (state.status ==
+                                          ReservedRideStatus.loading) {
+                                        return const Center(
+                                          child: SizedBox(
+                                            width: 20,
+                                            height: 20,
+                                            child: CircularProgressIndicator(
+                                              color: Colors.white,
+                                              strokeWidth: 2,
+                                            ),
+                                          ),
+                                        );
+                                      }
+                                      return const Center(
+                                        child: Text(
+                                          'Отменить бронирование',
+                                          style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 15,
+                                            fontWeight: FontWeight.w600,
+                                          ),
+                                        ),
+                                      );
+                                    },
+                                  ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+
+                    const SizedBox(height: 20),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  String _formatDuration(Duration duration) {
+    String twoDigits(int n) => n.toString().padLeft(2, '0');
+    final minutes = twoDigits(duration.inMinutes.remainder(60));
+    final seconds = twoDigits(duration.inSeconds.remainder(60));
+    return '$minutes:$seconds';
+  }
+}
diff --git a/lib/presentation/components/sheet/scooter_bottom_sheet.dart b/lib/presentation/components/sheet/scooter_bottom_sheet.dart
index 38dd739..435e56b 100644
--- a/lib/presentation/components/sheet/scooter_bottom_sheet.dart
+++ b/lib/presentation/components/sheet/scooter_bottom_sheet.dart
@@ -1,290 +1,287 @@
-import 'dart:ui';
-import 'package:be_happy/presentation/components/scooter/mini_battery_indicator.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-
-import '../../../domain/entities/scooter.dart';
-import '../../state/scooter_detail_modal_state.dart';
-import '../../viewmodel/scooter_detail_modal_bloc.dart';
-import '../gradient_button.dart';
-
-class ScooterData {
-  final String distance;
-  final String number;
-  final double batteryPercent;
-
-  ScooterData({
-    required this.distance,
-    required this.number,
-    required this.batteryPercent,
-  });
-}
-
-class ScooterBottomSheet extends StatefulWidget {
-  const ScooterBottomSheet({super.key});
-
-  @override
-  State<ScooterBottomSheet> createState() => _ScooterBottomSheetState();
-}
-
-class _ScooterBottomSheetState extends State<ScooterBottomSheet> {
-  final PageController _pageController = PageController(viewportFraction: 0.5);
-  double _currentPage = 0;
-
-  _ScooterBottomSheetState();
-
-  @override
-  void initState() {
-    super.initState();
-    _pageController.addListener(() {
-      setState(() {
-        _currentPage = _pageController.page ?? 0;
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ScooterDetailModalBloc, ScooterDetailModalState>(
-      builder: (context, state) {
-        if (state.status == ScooterDetailModalStatus.loading) {
-          return const Center(
-            child: CircularProgressIndicator(color: Colors.white),
-          );
-        }
-
-        if (state.status == ScooterDetailModalStatus.success) {
-          return Dismissible(
-            key: const Key('scooter-modal'),
-            direction: DismissDirection.down, // Закрытие только вниз
-            onDismissed: (_) => context.pop(),
-            child: 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: 320,
-                    padding: const EdgeInsets.only(top: 20, bottom: 10),
-                    decoration: BoxDecoration(
-                      color: const Color(0xFF000032).withOpacity(0.88),
-                      borderRadius: const BorderRadius.vertical(
-                        top: Radius.circular(30),
-                      ),
-                    ),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        // Header с адресом (без изменений)
-                        Padding(
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
-                          child: Row(
-                            children: [
-                              GestureDetector(
-                                onTap: () => Navigator.pop(context),
-                                child: Row(
-                                  children: [
-                                    Icon(
-                                      Icons.arrow_back_ios_sharp,
-                                      color: const Color(0x99FFFFFF),
-                                      size: 20,
-                                    ),
-                                    Icon(
-                                      Icons.arrow_back_ios_sharp,
-                                      color: const Color(0x66FFFFFF),
-                                      size: 20,
-                                    ),
-                                    Icon(
-                                      Icons.arrow_back_ios_sharp,
-                                      color: const Color(0x22FFFFFF),
-                                      size: 20,
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              const SizedBox(width: 12),
-                              Expanded(
-                                child: Text(
-                                  state.address ?? "Unknown address",
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w600,
-                                  ),
-                                  overflow: TextOverflow.ellipsis,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        const SizedBox(height: 20),
-
-                        // PageView с динамическим списком
-                        SizedBox(
-                          height: 220,
-                          child: PageView.builder(
-                            controller: _pageController,
-                            padEnds: false,
-                            // Оставляем false, чтобы первый элемент прилипал к левому краю
-                            itemCount: state.scooters!.length,
-                            itemBuilder: (context, index) {
-                              final scooter = state.scooters![index];
-                              final diff = (_currentPage - index).abs();
-                              final isActive = diff < 0.5;
-
-                              return AnimatedContainer(
-                                duration: const Duration(milliseconds: 250),
-                                // 2. Добавляем левый отступ ТОЛЬКО для первого элемента,
-                                // чтобы он совпадал с заголовком
-                                margin: EdgeInsets.only(
-                                  left: index == 0 ? 10 : 0,
-                                  right: 10,
-                                ),
-                                child: Align(
-                                  alignment: Alignment.bottomCenter,
-                                  child: Transform.scale(
-                                    scale: isActive ? 1.0 : 0.9,
-                                    child: _ScooterCard(
-                                      scooter: scooter,
-                                      isActive: isActive,
-                                      address: state.address ?? "Unknown address",
-                                    ),
-                                  ),
-                                ),
-                              );
-                            },
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          );
-        }
-        return Center(child: Text("Error"));
-      },
-    );
-  }
-}
-
-class _ScooterCard extends StatelessWidget {
-  final Scooter scooter;
-  final String address;
-  final bool isActive;
-
-  const _ScooterCard({required this.scooter, required this.isActive, required this.address});
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Container(
-          width: 220,
-          padding: const EdgeInsets.all(16),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(28),
-            gradient: LinearGradient(
-              colors: [
-                Colors.white.withOpacity(isActive ? 0.35 : 0.25),
-                Colors.white.withOpacity(isActive ? 0.25 : 0.18),
-              ],
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-            ),
-            border: Border.all(color: Colors.white.withOpacity(0.4), width: 1),
-          ),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Row(
-                children: [
-                  const Icon(
-                    Icons.location_on_outlined,
-                    color: Colors.white,
-                    size: 18,
-                  ),
-                  const SizedBox(width: 6),
-                  Text(
-                    (scooter.distance?.toInt() ?? 0) >= 1000
-                        ? '${((scooter.distance?.toInt() ?? 0) / 1000).toStringAsFixed(1)} km'
-                        : '${scooter.distance?.toInt() ?? 0} m',
-                    style: const TextStyle(color: Colors.white, fontSize: 14),
-                  ),
-                ],
-              ),
-
-              const SizedBox(height: 12),
-
-              Row(
-                children: [
-                  const Icon(
-                    Icons.qr_code_scanner_outlined,
-                    color: Colors.white,
-                    size: 18,
-                  ),
-                  const SizedBox(width: 6),
-                  Text(
-                    scooter.number,
-                    style: const TextStyle(color: Colors.white, fontSize: 16),
-                  ),
-                ],
-              ),
-
-              const SizedBox(height: 20),
-
-              Row(
-                children: [
-                  MiniBatteryIndicator(percent: scooter.batteryLevel),
-                  const SizedBox(width: 8),
-                  Transform.translate(
-                    offset: const Offset(-40, 0),
-                    child: Text(
-                      '${(scooter.batteryLevel)}%',
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 12,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-
-              const Spacer(),
-
-              GradientButton(
-                text: "Подробнеe",
-                showArrows: true,
-                height: 32,
-                width: double.infinity,
-                fontSize: 12,
-                onTap: () {
-                  Navigator.pop(context, [scooter, address]);
-                },
-              ),
-            ],
-          ),
-        ),
-
-        Positioned(
-          right: isActive ? -30 : -5,
-          top: isActive ? -10 : 15,
-          child: SizedBox(
-            height: isActive ? 190 : 160,
-            child: Image.asset(
-              "assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png",
-              fit: BoxFit.contain,
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
+import 'dart:ui';
+import 'package:be_happy/presentation/components/scooter/mini_battery_indicator.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+
+import '../../../domain/entities/scooter.dart';
+import '../../state/scooter_detail_modal_state.dart';
+import '../../viewmodel/scooter_detail_modal_bloc.dart';
+import '../gradient_button.dart';
+
+class ScooterData {
+  final String distance;
+  final String number;
+  final double batteryPercent;
+
+  ScooterData({
+    required this.distance,
+    required this.number,
+    required this.batteryPercent,
+  });
+}
+
+class ScooterBottomSheet extends StatefulWidget {
+  const ScooterBottomSheet({super.key});
+
+  @override
+  State<ScooterBottomSheet> createState() => _ScooterBottomSheetState();
+}
+
+class _ScooterBottomSheetState extends State<ScooterBottomSheet> {
+  final PageController _pageController = PageController(viewportFraction: 0.5);
+  double _currentPage = 0;
+
+  _ScooterBottomSheetState();
+
+  @override
+  void initState() {
+    super.initState();
+    _pageController.addListener(() {
+      setState(() {
+        _currentPage = _pageController.page ?? 0;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<ScooterDetailModalBloc, ScooterDetailModalState>(
+      builder: (context, state) {
+        if (state.status == ScooterDetailModalStatus.loading) {
+          return const Center(
+            child: CircularProgressIndicator(color: Colors.white),
+          );
+        }
+
+        if (state.status == ScooterDetailModalStatus.success) {
+          return Dismissible(
+            key: const Key('scooter-modal'),
+            direction: DismissDirection.down,
+            onDismissed: (_) => context.pop(),
+            child: 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: 320,
+                    padding: const EdgeInsets.only(top: 20, bottom: 10),
+                    decoration: BoxDecoration(
+                      color: const Color(0xFF000032).withOpacity(0.88),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(30),
+                      ),
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 20),
+                          child: Row(
+                            children: [
+                              GestureDetector(
+                                onTap: () => Navigator.pop(context),
+                                child: Row(
+                                  children: [
+                                    Icon(
+                                      Icons.arrow_back_ios_sharp,
+                                      color: const Color(0x99FFFFFF),
+                                      size: 20,
+                                    ),
+                                    Icon(
+                                      Icons.arrow_back_ios_sharp,
+                                      color: const Color(0x66FFFFFF),
+                                      size: 20,
+                                    ),
+                                    Icon(
+                                      Icons.arrow_back_ios_sharp,
+                                      color: const Color(0x22FFFFFF),
+                                      size: 20,
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              const SizedBox(width: 12),
+                              Expanded(
+                                child: Text(
+                                  state.address ?? "Unknown address",
+                                  style: const TextStyle(
+                                    color: Colors.white,
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        const SizedBox(height: 20),
+
+                        SizedBox(
+                          height: 220,
+                          child: PageView.builder(
+                            controller: _pageController,
+                            padEnds: false,
+                            itemCount: state.scooters!.length,
+                            itemBuilder: (context, index) {
+                              final scooter = state.scooters![index];
+                              final diff = (_currentPage - index).abs();
+                              final isActive = diff < 0.5;
+
+                              return AnimatedContainer(
+                                duration: const Duration(milliseconds: 250),
+                                // 2. Добавляем левый отступ ТОЛЬКО для первого элемента,
+                                // чтобы он совпадал с заголовком
+                                margin: EdgeInsets.only(
+                                  left: index == 0 ? 10 : 0,
+                                  right: 10,
+                                ),
+                                child: Align(
+                                  alignment: Alignment.bottomCenter,
+                                  child: Transform.scale(
+                                    scale: isActive ? 1.0 : 0.9,
+                                    child: _ScooterCard(
+                                      scooter: scooter,
+                                      isActive: isActive,
+                                      address: state.address ?? "Unknown address",
+                                    ),
+                                  ),
+                                ),
+                              );
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          );
+        }
+        return Center(child: Text("Error"));
+      },
+    );
+  }
+}
+
+class _ScooterCard extends StatelessWidget {
+  final Scooter scooter;
+  final String address;
+  final bool isActive;
+
+  const _ScooterCard({required this.scooter, required this.isActive, required this.address});
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        Container(
+          width: 220,
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(28),
+            gradient: LinearGradient(
+              colors: [
+                Colors.white.withOpacity(isActive ? 0.35 : 0.25),
+                Colors.white.withOpacity(isActive ? 0.25 : 0.18),
+              ],
+              begin: Alignment.topLeft,
+              end: Alignment.bottomRight,
+            ),
+            border: Border.all(color: Colors.white.withOpacity(0.4), width: 1),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  const Icon(
+                    Icons.location_on_outlined,
+                    color: Colors.white,
+                    size: 18,
+                  ),
+                  const SizedBox(width: 6),
+                  Text(
+                    (scooter.distance?.toInt() ?? 0) >= 1000
+                        ? '${((scooter.distance?.toInt() ?? 0) / 1000).toStringAsFixed(1)} km'
+                        : '${scooter.distance?.toInt() ?? 0} m',
+                    style: const TextStyle(color: Colors.white, fontSize: 14),
+                  ),
+                ],
+              ),
+
+              const SizedBox(height: 12),
+
+              Row(
+                children: [
+                  const Icon(
+                    Icons.qr_code_scanner_outlined,
+                    color: Colors.white,
+                    size: 18,
+                  ),
+                  const SizedBox(width: 6),
+                  Text(
+                    scooter.number,
+                    style: const TextStyle(color: Colors.white, fontSize: 16),
+                  ),
+                ],
+              ),
+
+              const SizedBox(height: 20),
+
+              Row(
+                children: [
+                  MiniBatteryIndicator(percent: scooter.batteryLevel),
+                  const SizedBox(width: 8),
+                  Transform.translate(
+                    offset: const Offset(-40, 0),
+                    child: Text(
+                      '${(scooter.batteryLevel)}%',
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 12,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+
+              const Spacer(),
+
+              GradientButton(
+                text: "Подробнеe",
+                showArrows: true,
+                height: 32,
+                width: double.infinity,
+                fontSize: 12,
+                onTap: () {
+                  Navigator.pop(context, [scooter, address]);
+                },
+              ),
+            ],
+          ),
+        ),
+
+        Positioned(
+          right: isActive ? -30 : -5,
+          top: isActive ? -10 : 15,
+          child: SizedBox(
+            height: isActive ? 190 : 160,
+            child: Image.asset(
+              "assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png",
+              fit: BoxFit.contain,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/presentation/components/sheet/tariff_info_sheet.dart b/lib/presentation/components/sheet/tariff_info_sheet.dart
index 522ce5f..00b194e 100644
--- a/lib/presentation/components/sheet/tariff_info_sheet.dart
+++ b/lib/presentation/components/sheet/tariff_info_sheet.dart
@@ -1,186 +1,186 @@
-import 'dart:ui';
-import 'package:be_happy/domain/entities/tariff.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/cupertino.dart';
-
-class TariffInfoSheet extends StatefulWidget {
-  final Tariff tariff;
-  final bool isInsurance;
-  final Function(bool) onChanged;
-
-  const TariffInfoSheet({super.key, required this.tariff, required this.isInsurance, required this.onChanged});
-
-  @override
-  State<TariffInfoSheet> createState() => _TariffInfoSheetState();
-}
-
-class _TariffInfoSheetState extends State<TariffInfoSheet> {
-  late bool _isInsuranceEnabled;
-
-  @override
-  void initState() {
-    super.initState();
-    _isInsuranceEnabled = widget.isInsurance;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return DraggableScrollableSheet(
-      initialChildSize: 0.6,
-      minChildSize: 0.4,
-      maxChildSize: 0.9,
-      expand: false,
-      builder: (context, scrollController) {
-        return ClipRRect(
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-          child: BackdropFilter(
-            filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
-            child: Container(
-              decoration: BoxDecoration(
-                color: const Color(0xFF000032).withOpacity(0.9),
-                borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-              ),
-              child: Column(
-                children: [
-                  // Полоска сверху (Handle)
-                  const SizedBox(height: 12),
-                  Container(
-                    width: 40,
-                    height: 4,
-                    decoration: BoxDecoration(
-                      color: Colors.white.withOpacity(0.3),
-                      borderRadius: BorderRadius.circular(2),
-                    ),
-                  ),
-                  const SizedBox(height: 12),
-
-                  // Контент со скроллом
-                  Expanded(
-                    child: ListView(
-                      controller: scrollController,
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      children: [
-                        // Заголовок
-                        Center(
-                          child: Row(
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              const Icon(Icons.timer_outlined, color: Color(0xFF66E3C4), size: 18),
-                              const SizedBox(width: 8),
-                              Text(
-                                widget.tariff.title,
-                                style: const TextStyle(
-                                  color: Color(0xFF66E3C4),
-                                  fontSize: 18,
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                        const SizedBox(height: 30),
-
-                        // Таблица цен
-                        _buildPriceRow('Старт поездки', '${widget.tariff.startPrice} BYN'),
-                        _buildPriceRow('Последующая минута', '${widget.tariff.drivePrice} BYN'),
-                        _buildPriceRow('Пауза', '${widget.tariff.pausePrice} BYN/мин'),
-                        _buildPriceRow('КЕШБЭК', '${widget.tariff.cashback * 100}%', isAccent: true),
-
-                        const Divider(color: Colors.white24, height: 40),
-
-                        Row(
-                          children: [
-                            const Text(
-                              'Страховка',
-                              style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600),
-                            ),
-                            const SizedBox(width: 8),
-                            Image.asset('assets/icons/info_icon.png', width: 18, height: 18),
-                            const Spacer(),
-                            Text(
-                              '${widget.tariff.insurance} BYN',
-                              style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
-                            ),
-                            const SizedBox(width: 12),
-                            Transform.scale(
-                              scale: 0.8,
-                              child: CupertinoSwitch(
-                                value: _isInsuranceEnabled,
-                                activeColor: const Color(0xFF66E3C4),
-                                onChanged: (val) {
-                                  setState(() => _isInsuranceEnabled = val);
-                                  widget.onChanged(val);
-                                },
-                              ),
-                            ),
-                          ],
-                        ),
-
-                        const Divider(color: Colors.white24, height: 40),
-
-                        _buildInfoBullet('Оплата страховки осуществляется только по банковской карте отдельным платежом'),
-                        _buildInfoBullet('В режиме паузы время тарифа приостанавливается'),
-                        _buildInfoBullet('При старте заказа будет заблокирована сумма в размере 7 рублей для проверки платежеспособности. Сумма разблокируется по факту списания средств за поездку.'),
-
-                        const SizedBox(height: 30),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildPriceRow(String label, String value, {bool isAccent = false}) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            label,
-            style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 15),
-          ),
-          Text(
-            value,
-            style: TextStyle(
-              color: Colors.white,
-              fontSize: 18,
-              fontWeight: isAccent ? FontWeight.bold : FontWeight.w500,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildInfoBullet(String text) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 8),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Padding(
-            padding: EdgeInsets.only(top: 6),
-            child: Icon(Icons.circle, size: 4, color: Colors.white),
-          ),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Text(
-              text,
-              style: TextStyle(
-                color: Colors.white.withOpacity(0.9),
-                fontSize: 13,
-                height: 1.5,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+import 'dart:ui';
+import 'package:be_happy/domain/entities/tariff.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+
+class TariffInfoSheet extends StatefulWidget {
+  final Tariff tariff;
+  final bool isInsurance;
+  final Function(bool) onChanged;
+
+  const TariffInfoSheet({super.key, required this.tariff, required this.isInsurance, required this.onChanged});
+
+  @override
+  State<TariffInfoSheet> createState() => _TariffInfoSheetState();
+}
+
+class _TariffInfoSheetState extends State<TariffInfoSheet> {
+  late bool _isInsuranceEnabled;
+
+  @override
+  void initState() {
+    super.initState();
+    _isInsuranceEnabled = widget.isInsurance;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DraggableScrollableSheet(
+      initialChildSize: 0.6,
+      minChildSize: 0.4,
+      maxChildSize: 0.9,
+      expand: false,
+      builder: (context, scrollController) {
+        return ClipRRect(
+          borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
+            child: Container(
+              decoration: BoxDecoration(
+                color: const Color(0xFF000032).withOpacity(0.9),
+                borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+              ),
+              child: Column(
+                children: [
+                  // Полоска сверху (Handle)
+                  const SizedBox(height: 12),
+                  Container(
+                    width: 40,
+                    height: 4,
+                    decoration: BoxDecoration(
+                      color: Colors.white.withOpacity(0.3),
+                      borderRadius: BorderRadius.circular(2),
+                    ),
+                  ),
+                  const SizedBox(height: 12),
+
+                  // Контент со скроллом
+                  Expanded(
+                    child: ListView(
+                      controller: scrollController,
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      children: [
+                        // Заголовок
+                        Center(
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              const Icon(Icons.timer_outlined, color: Color(0xFF66E3C4), size: 18),
+                              const SizedBox(width: 8),
+                              Text(
+                                widget.tariff.title,
+                                style: const TextStyle(
+                                  color: Color(0xFF66E3C4),
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.bold,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        const SizedBox(height: 30),
+
+                        // Таблица цен
+                        _buildPriceRow('Старт поездки', '${widget.tariff.startPrice} BYN'),
+                        _buildPriceRow('Последующая минута', '${widget.tariff.drivePrice} BYN'),
+                        _buildPriceRow('Пауза', '${widget.tariff.pausePrice} BYN/мин'),
+                        _buildPriceRow('КЕШБЭК', '${widget.tariff.cashback * 100}%', isAccent: true),
+
+                        const Divider(color: Colors.white24, height: 40),
+
+                        Row(
+                          children: [
+                            const Text(
+                              'Страховка',
+                              style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600),
+                            ),
+                            const SizedBox(width: 8),
+                            Image.asset('assets/icons/info_icon.png', width: 18, height: 18),
+                            const Spacer(),
+                            Text(
+                              '${widget.tariff.insurance} BYN',
+                              style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
+                            ),
+                            const SizedBox(width: 12),
+                            Transform.scale(
+                              scale: 0.8,
+                              child: CupertinoSwitch(
+                                value: _isInsuranceEnabled,
+                                activeColor: const Color(0xFF66E3C4),
+                                onChanged: (val) {
+                                  setState(() => _isInsuranceEnabled = val);
+                                  widget.onChanged(val);
+                                },
+                              ),
+                            ),
+                          ],
+                        ),
+
+                        const Divider(color: Colors.white24, height: 40),
+
+                        _buildInfoBullet('Оплата страховки осуществляется только по банковской карте отдельным платежом'),
+                        _buildInfoBullet('В режиме паузы время тарифа приостанавливается'),
+                        _buildInfoBullet('При старте заказа будет заблокирована сумма в размере 7 рублей для проверки платежеспособности. Сумма разблокируется по факту списания средств за поездку.'),
+
+                        const SizedBox(height: 30),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildPriceRow(String label, String value, {bool isAccent = false}) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            label,
+            style: TextStyle(color: Colors.white.withOpacity(0.8), fontSize: 15),
+          ),
+          Text(
+            value,
+            style: TextStyle(
+              color: Colors.white,
+              fontSize: 18,
+              fontWeight: isAccent ? FontWeight.bold : FontWeight.w500,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildInfoBullet(String text) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Padding(
+            padding: EdgeInsets.only(top: 6),
+            child: Icon(Icons.circle, size: 4, color: Colors.white),
+          ),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Text(
+              text,
+              style: TextStyle(
+                color: Colors.white.withOpacity(0.9),
+                fontSize: 13,
+                height: 1.5,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/sheet/tariff_sheet.dart b/lib/presentation/components/sheet/tariff_sheet.dart
index 9a11728..d5bae7b 100644
--- a/lib/presentation/components/sheet/tariff_sheet.dart
+++ b/lib/presentation/components/sheet/tariff_sheet.dart
@@ -1,596 +1,596 @@
-import 'dart:ui';
-import 'package:be_happy/presentation/components/payment_option.dart';
-import 'package:be_happy/presentation/components/sheet/payment_method_sheet.dart';
-import 'package:be_happy/presentation/components/sheet/tariff_info_sheet.dart';
-import 'package:be_happy/presentation/viewmodel/payment_method_sheet_bloc.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 '../../../domain/entities/payment_card.dart';
-import '../../../domain/entities/scooter.dart';
-import '../../../domain/entities/tariff.dart';
-import '../../../domain/usecase/add_payment_card_usecase.dart';
-import '../../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../../domain/usecase/get_profile_usecase.dart';
-import '../../../domain/usecase/set_main_payment_card_usecase.dart';
-import '../../event/payment_method_sheet_event.dart';
-import '../../event/tariff_sheet_event.dart';
-import '../../state/tariff_sheet_state.dart';
-import '../../viewmodel/tariff_sheet_bloc.dart';
-import '../gradient_button.dart';
-import '../scooter/mini_battery_indicator.dart';
-
-class TariffSheet extends StatefulWidget {
-  final Scooter scooter;
-
-  const TariffSheet({super.key, required this.scooter});
-
-  @override
-  State<TariffSheet> createState() => _TariffSheetState();
-}
-
-class _TariffSheetState extends State<TariffSheet> {
-  int? _selectedTariffIndex;
-
-  @override
-  void initState() {
-    super.initState();
-    context.read<TariffSheetBloc>().add(TariffSheetStarted(widget.scooter.id));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double remainingKm = (62 * widget.scooter.batteryLevel) / 100;
-
-    final String kmText = remainingKm % 1 == 0
-        ? '${remainingKm.toInt()} км'
-        : '${remainingKm.toStringAsFixed(1)} км';
-
-    final int totalMinutes = ((150 * widget.scooter.batteryLevel) / 100).round();
-    final int hours = totalMinutes ~/ 60;
-    final int minutes = totalMinutes % 60;
-
-    String timeText = '';
-    if (hours > 0 && minutes > 0) {
-      timeText = '$hours ч $minutes мин';
-    } else if (hours > 0) {
-      timeText = '$hours ч';
-    } else {
-      timeText = '$minutes мин';
-    }
-    return BlocConsumer<TariffSheetBloc, TariffSheetState>(
-      listener: (context, state) {
-        if (state.status == TariffSheetStatus.failure && state.errorMessage != null) {
-          ScaffoldMessenger.of(context).hideCurrentSnackBar();
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(
-                state.errorMessage!,
-                style: const TextStyle(color: Colors.white),
-              ),
-              backgroundColor: Colors.redAccent.withOpacity(0.9),
-              behavior: SnackBarBehavior.floating,
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(12),
-              ),
-              margin: const EdgeInsets.all(20),
-              duration: const Duration(seconds: 3),
-            ),
-          );
-        }
-      },
-      builder: (context, state) {
-        if (state.status == TariffSheetStatus.loading) {
-          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: 520,
-                  decoration: BoxDecoration(
-                    color: const Color(0xFF000032).withOpacity(0.88),
-                    borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(30),
-                    ),
-                  ),
-                  child: const Center(
-                    child: CircularProgressIndicator(color: Colors.white),
-                  ),
-                ),
-              ),
-            ),
-          );
-        }
-
-        if (state.status == TariffSheetStatus.failure) {
-          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: 520,
-                  decoration: BoxDecoration(
-                    color: const Color(0xFF000032).withOpacity(0.88),
-                    borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(30),
-                    ),
-                  ),
-                  child: Center(
-                    child: Text(
-                      state.errorMessage ?? 'Ошибка загрузки тарифов',
-                      style: const TextStyle(color: Colors.white),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          );
-        }
-
-        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: 520,
-                padding: const EdgeInsets.only(top: 20, bottom: 10),
-                decoration: BoxDecoration(
-                  color: const Color(0xFF000032).withOpacity(0.88),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(30),
-                  ),
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Row(
-                        children: [
-                          GestureDetector(
-                            onTap: () => Navigator.pop(context),
-                            child: Row(
-                              children: [
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x99FFFFFF),
-                                  size: 20,
-                                ),
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x66FFFFFF),
-                                  size: 20,
-                                ),
-                                Icon(
-                                  Icons.arrow_back_ios_sharp,
-                                  color: const Color(0x22FFFFFF),
-                                  size: 20,
-                                ),
-                              ],
-                            ),
-                          ),
-                          const SizedBox(width: 12),
-                          Expanded(
-                            child: Text(
-                              'Самокат ${widget.scooter.number}',
-                              style: const TextStyle(
-                                color: Colors.white,
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                              ),
-                              overflow: TextOverflow.ellipsis,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    const SizedBox(height: 20),
-
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Row(
-                        children: [
-                          SizedBox(
-                            height: 80,
-                            child: Image.asset(
-                              'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
-                              fit: BoxFit.contain,
-                            ),
-                          ),
-                          const SizedBox(width: 16),
-                          Expanded(
-                            child: Container(
-                              padding: const EdgeInsets.all(12),
-                              decoration: BoxDecoration(
-                                color: Colors.white.withOpacity(0.1),
-                                borderRadius: BorderRadius.circular(16),
-                              ),
-                              child: Row(
-                                children: [
-                                  Stack(
-                                    clipBehavior: Clip.none,
-                                    children: [
-                                      MiniBatteryIndicator(
-                                        percent: widget.scooter.batteryLevel,
-                                      ),
-                                      Positioned(
-                                        left: 0,
-                                        right: 0,
-                                        top: 0,
-                                        bottom: 0,
-                                        child: Center(
-                                          child: Text(
-                                            '${widget.scooter.batteryLevel.toInt()}%',
-                                            style: const TextStyle(
-                                              color: Colors.white,
-                                              fontSize: 10,
-                                              fontWeight: FontWeight.bold,
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                  const SizedBox(width: 12),
-                                  Expanded(
-                                    child: Text(
-                                      'Заряда хватит на $kmText или $timeText',
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 13,
-                                        height: 1.4,
-                                      ),
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-
-                    const SizedBox(height: 20),
-
-                    SizedBox(
-                      height: 150,
-                      child: ListView.builder(
-                        scrollDirection: Axis.horizontal,
-                        padding: const EdgeInsets.only(left: 20),
-                        itemCount: state.tariffs.length,
-                        itemBuilder: (context, index) {
-                          final tariff = state.tariffs[index];
-                          return Row(
-                            children: [
-                              _TariffCard(
-                                title: tariff.title,
-                                price: tariff.startPrice.toStringAsFixed(2),
-                                currency: tariff.currency,
-                                subtitle: 'Старт поездки',
-                                details: [
-                                  'Далее  ${tariff.drivePrice.toStringAsFixed(2)} ${tariff.currency}/мин.',
-                                  'Минута на паузе  ${tariff.pausePrice.toStringAsFixed(0)} ${tariff.currency}',
-                                ],
-                                isSelected: _selectedTariffIndex == index,
-                                isInsurance: state.isInsurance,
-                                tariff: tariff,
-                                onTap: () {
-                                  setState(() {
-                                    _selectedTariffIndex = index;
-                                  });
-                                },
-                              ),
-                              if (index < state.tariffs.length - 1)
-                                const SizedBox(width: 12),
-                            ],
-                          );
-                        },
-                      ),
-                    ),
-
-                    const SizedBox(height: 16),
-
-                    if (state.useBalance || state.selectedCard != null)
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: PaymentOption(
-                          title: state.useBalance
-                              ? 'Баланс'
-                              : "Карта",
-                          subtitle: state.useBalance
-                              ? '${state.userBalance.toStringAsFixed(2)} BYN'
-                              : '${state.selectedCard!.cardLastNumber}',
-                          isSelected: true,
-                          onTap: () async {
-                            final result = await showModalBottomSheet<dynamic>(
-                              context: context,
-                              isScrollControlled: true,
-                              backgroundColor: Colors.transparent,
-                              builder: (innerContext) => BlocProvider(
-                                create: (context) => PaymentMethodSheetBloc(
-                                  getIt<GetPaymentCardsUsecase>(),
-                                  getIt<SetMainPaymentCardUsecase>(),
-                                  getIt<GetProfileUseCase>(),
-                                  getIt<AddPaymentCardUsecase>(),
-                                )..add(PaymentMethodSheetStarted()),
-                                child: PaymentMethodSheet(
-                                  initialSelectedCard: state.useBalance ? null : state.selectedCard,
-                                ),
-                              ),
-                            );
-
-                            if (result != null && mounted) {
-                              if (result is PaymentCard) {
-                                context.read<TariffSheetBloc>().add(
-                                  PaymentCardChanged(result),
-                                );
-                              } else if (result == 'balance') {
-                                context.read<TariffSheetBloc>().add(
-                                  SelectBalancePressed(),
-                                );
-                              }
-                            }
-                          },
-                        ),
-                      )
-                    else
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        child: Container(
-                          height: 56,
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(24),
-                            border: Border.all(
-                              color: Colors.white.withOpacity(0.4),
-                              width: 1,
-                            ),
-                          ),
-                          child: Material(
-                            color: Colors.transparent,
-                            child: InkWell(
-                              onTap: () {
-                                context.pushReplacement(
-                                  '/home/payment-method-sheet',
-                                );
-                              },
-                              borderRadius: BorderRadius.circular(24),
-                              child: Center(
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
-                                    const Text(
-                                      'Способ оплаты',
-                                      style: TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.w600,
-                                      ),
-                                    ),
-                                    const SizedBox(width: 8),
-                                    Icon(
-                                      Icons.arrow_forward_ios,
-                                      size: 12,
-                                      color: Colors.white.withOpacity(0.6),
-                                    ),
-                                    Icon(
-                                      Icons.arrow_forward_ios,
-                                      size: 12,
-                                      color: Colors.white.withOpacity(0.4),
-                                    ),
-                                    Icon(
-                                      Icons.arrow_forward_ios,
-                                      size: 12,
-                                      color: Colors.white.withOpacity(0.2),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-
-                    const SizedBox(height: 12),
-
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: GradientButton(
-                        text: 'Забронировать',
-                        showArrows: true,
-                        height: 56,
-                        width: double.infinity,
-                        fontSize: 16,
-                        enabled: _selectedTariffIndex != null && (state.selectedCard != null || state.useBalance),
-                        onTap: (_selectedTariffIndex != null && (state.selectedCard != null || state.useBalance))
-                            ? () {
-                          context.read<TariffSheetBloc>().add(
-                              BookScooterPressed(
-                                  widget.scooter.id,
-                                  state.tariffs[_selectedTariffIndex!].id,
-                                  0,
-                                  state.useBalance ? null : state.selectedCard?.id,
-                                  state.useBalance,
-                                  state.isInsurance
-                              )
-                          );
-                          context.pushReplacement('/home/current-rides-sheet');
-                        }
-                            : null,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  String _getCardType(String lastNumber) {
-    if (lastNumber.isEmpty) return 'Card';
-    final firstDigit = lastNumber[0];
-    switch (firstDigit) {
-      case '4':
-        return 'Visa';
-      case '5':
-        return 'Mastercard';
-      case '9':
-        return 'BelCard';
-      default:
-        return 'Card';
-    }
-  }
-}
-
-class _TariffCard extends StatelessWidget {
-  final String title;
-  final Tariff tariff;
-  final String price;
-  final String currency;
-  final String subtitle;
-  final List<String> details;
-  final bool isInsurance;
-  final bool isSelected;
-  final VoidCallback onTap;
-
-  const _TariffCard({
-    required this.title,
-    required this.tariff,
-    required this.price,
-    required this.currency,
-    required this.subtitle,
-    required this.details,
-    required this.isSelected,
-    required this.isInsurance,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Container(
-        width: 220,
-        padding: const EdgeInsets.all(14),
-        decoration: BoxDecoration(
-          color: isSelected
-              ? const Color(0xFF1A1F3E)
-              : Colors.white.withOpacity(0.19),
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: Stack(
-          children: [
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Row(
-                  children: [
-                    const Icon(
-                      Icons.timer_outlined,
-                      size: 16,
-                      color: Color(0xFF66E3C4),
-                    ),
-                    const SizedBox(width: 8),
-                    Expanded(
-                      child: Text(
-                        title,
-                        style: const TextStyle(
-                          color: Color(0xFF66E3C4),
-                          fontSize: 13,
-                          fontWeight: FontWeight.w600,
-                        ),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    const SizedBox(width: 24),
-                  ],
-                ),
-                const SizedBox(height: 12),
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.baseline,
-                  textBaseline: TextBaseline.alphabetic,
-                  children: [
-                    Text(
-                      '$price $currency',
-                      style: const TextStyle(color: Colors.white, fontSize: 24),
-                    ),
-                    if (subtitle.isNotEmpty) ...[
-                      const SizedBox(width: 6),
-                      Expanded(
-                        child: Text(
-                          subtitle,
-                          style: TextStyle(
-                            color: isSelected ? Colors.white : Colors.white70,
-                            fontSize: 12,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ],
-                ),
-                const SizedBox(height: 12),
-                // Детали
-                ...details.map(
-                  (detail) => Padding(
-                    padding: const EdgeInsets.only(bottom: 4),
-                    child: Text(
-                      detail,
-                      style: TextStyle(
-                        color: isSelected ? Colors.white : Colors.white70,
-                        fontSize: 12,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-
-            Positioned(
-              top: 0,
-              right: 0,
-              child: GestureDetector(
-                onTap: () {
-                  showModalBottomSheet(
-                    context: context,
-                    isScrollControlled: true,
-                    backgroundColor: Colors.transparent,
-                    builder: (_) => TariffInfoSheet(
-                        tariff: tariff,
-                        isInsurance: isInsurance,
-                        onChanged: (val) {
-                      context.read<TariffSheetBloc>().add(InsuranceToggled(val));
-                    }),
-                  );
-
-
-
-                  print('Info pressed for $title');
-                },
-                child: Image.asset(
-                  'assets/icons/info_icon.png',
-                  width: 20,
-                  height: 20,
-                  fit: BoxFit.contain,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
+import 'dart:ui';
+import 'package:be_happy/presentation/components/payment_option.dart';
+import 'package:be_happy/presentation/components/sheet/payment_method_sheet.dart';
+import 'package:be_happy/presentation/components/sheet/tariff_info_sheet.dart';
+import 'package:be_happy/presentation/viewmodel/payment_method_sheet_bloc.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 '../../../domain/entities/payment_card.dart';
+import '../../../domain/entities/scooter.dart';
+import '../../../domain/entities/tariff.dart';
+import '../../../domain/usecase/add_payment_card_usecase.dart';
+import '../../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../../domain/usecase/get_profile_usecase.dart';
+import '../../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../../event/payment_method_sheet_event.dart';
+import '../../event/tariff_sheet_event.dart';
+import '../../state/tariff_sheet_state.dart';
+import '../../viewmodel/tariff_sheet_bloc.dart';
+import '../gradient_button.dart';
+import '../scooter/mini_battery_indicator.dart';
+
+class TariffSheet extends StatefulWidget {
+  final Scooter scooter;
+
+  const TariffSheet({super.key, required this.scooter});
+
+  @override
+  State<TariffSheet> createState() => _TariffSheetState();
+}
+
+class _TariffSheetState extends State<TariffSheet> {
+  int? _selectedTariffIndex;
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<TariffSheetBloc>().add(TariffSheetStarted(widget.scooter.id));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double remainingKm = (62 * widget.scooter.batteryLevel) / 100;
+
+    final String kmText = remainingKm % 1 == 0
+        ? '${remainingKm.toInt()} км'
+        : '${remainingKm.toStringAsFixed(1)} км';
+
+    final int totalMinutes = ((150 * widget.scooter.batteryLevel) / 100).round();
+    final int hours = totalMinutes ~/ 60;
+    final int minutes = totalMinutes % 60;
+
+    String timeText = '';
+    if (hours > 0 && minutes > 0) {
+      timeText = '$hours ч $minutes мин';
+    } else if (hours > 0) {
+      timeText = '$hours ч';
+    } else {
+      timeText = '$minutes мин';
+    }
+    return BlocConsumer<TariffSheetBloc, TariffSheetState>(
+      listener: (context, state) {
+        if (state.status == TariffSheetStatus.failure && state.errorMessage != null) {
+          ScaffoldMessenger.of(context).hideCurrentSnackBar();
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(
+                state.errorMessage!,
+                style: const TextStyle(color: Colors.white),
+              ),
+              backgroundColor: Colors.redAccent.withOpacity(0.9),
+              behavior: SnackBarBehavior.floating,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(12),
+              ),
+              margin: const EdgeInsets.all(20),
+              duration: const Duration(seconds: 3),
+            ),
+          );
+        }
+      },
+      builder: (context, state) {
+        if (state.status == TariffSheetStatus.loading) {
+          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: 520,
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF000032).withOpacity(0.88),
+                    borderRadius: const BorderRadius.vertical(
+                      top: Radius.circular(30),
+                    ),
+                  ),
+                  child: const Center(
+                    child: CircularProgressIndicator(color: Colors.white),
+                  ),
+                ),
+              ),
+            ),
+          );
+        }
+
+        if (state.status == TariffSheetStatus.failure) {
+          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: 520,
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF000032).withOpacity(0.88),
+                    borderRadius: const BorderRadius.vertical(
+                      top: Radius.circular(30),
+                    ),
+                  ),
+                  child: Center(
+                    child: Text(
+                      state.errorMessage ?? 'Ошибка загрузки тарифов',
+                      style: const TextStyle(color: Colors.white),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          );
+        }
+
+        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: 520,
+                padding: const EdgeInsets.only(top: 20, bottom: 10),
+                decoration: BoxDecoration(
+                  color: const Color(0xFF000032).withOpacity(0.88),
+                  borderRadius: const BorderRadius.vertical(
+                    top: Radius.circular(30),
+                  ),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Row(
+                        children: [
+                          GestureDetector(
+                            onTap: () => Navigator.pop(context),
+                            child: Row(
+                              children: [
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x99FFFFFF),
+                                  size: 20,
+                                ),
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x66FFFFFF),
+                                  size: 20,
+                                ),
+                                Icon(
+                                  Icons.arrow_back_ios_sharp,
+                                  color: const Color(0x22FFFFFF),
+                                  size: 20,
+                                ),
+                              ],
+                            ),
+                          ),
+                          const SizedBox(width: 12),
+                          Expanded(
+                            child: Text(
+                              'Самокат ${widget.scooter.number}',
+                              style: const TextStyle(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(height: 20),
+
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Row(
+                        children: [
+                          SizedBox(
+                            height: 80,
+                            child: Image.asset(
+                              'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
+                              fit: BoxFit.contain,
+                            ),
+                          ),
+                          const SizedBox(width: 16),
+                          Expanded(
+                            child: Container(
+                              padding: const EdgeInsets.all(12),
+                              decoration: BoxDecoration(
+                                color: Colors.white.withOpacity(0.1),
+                                borderRadius: BorderRadius.circular(16),
+                              ),
+                              child: Row(
+                                children: [
+                                  Stack(
+                                    clipBehavior: Clip.none,
+                                    children: [
+                                      MiniBatteryIndicator(
+                                        percent: widget.scooter.batteryLevel,
+                                      ),
+                                      Positioned(
+                                        left: 0,
+                                        right: 0,
+                                        top: 0,
+                                        bottom: 0,
+                                        child: Center(
+                                          child: Text(
+                                            '${widget.scooter.batteryLevel.toInt()}%',
+                                            style: const TextStyle(
+                                              color: Colors.white,
+                                              fontSize: 10,
+                                              fontWeight: FontWeight.bold,
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                  const SizedBox(width: 12),
+                                  Expanded(
+                                    child: Text(
+                                      'Заряда хватит на $kmText или $timeText',
+                                      style: const TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 13,
+                                        height: 1.4,
+                                      ),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+
+                    const SizedBox(height: 20),
+
+                    SizedBox(
+                      height: 150,
+                      child: ListView.builder(
+                        scrollDirection: Axis.horizontal,
+                        padding: const EdgeInsets.only(left: 20),
+                        itemCount: state.tariffs.length,
+                        itemBuilder: (context, index) {
+                          final tariff = state.tariffs[index];
+                          return Row(
+                            children: [
+                              _TariffCard(
+                                title: tariff.title,
+                                price: tariff.startPrice.toStringAsFixed(2),
+                                currency: tariff.currency,
+                                subtitle: 'Старт поездки',
+                                details: [
+                                  'Далее  ${tariff.drivePrice.toStringAsFixed(2)} ${tariff.currency}/мин.',
+                                  'Минута на паузе  ${tariff.pausePrice.toStringAsFixed(0)} ${tariff.currency}',
+                                ],
+                                isSelected: _selectedTariffIndex == index,
+                                isInsurance: state.isInsurance,
+                                tariff: tariff,
+                                onTap: () {
+                                  setState(() {
+                                    _selectedTariffIndex = index;
+                                  });
+                                },
+                              ),
+                              if (index < state.tariffs.length - 1)
+                                const SizedBox(width: 12),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+
+                    const SizedBox(height: 16),
+
+                    if (state.useBalance || state.selectedCard != null)
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: PaymentOption(
+                          title: state.useBalance
+                              ? 'Баланс'
+                              : "Карта",
+                          subtitle: state.useBalance
+                              ? '${state.userBalance.toStringAsFixed(2)} BYN'
+                              : '${state.selectedCard!.cardLastNumber}',
+                          isSelected: true,
+                          onTap: () async {
+                            final result = await showModalBottomSheet<dynamic>(
+                              context: context,
+                              isScrollControlled: true,
+                              backgroundColor: Colors.transparent,
+                              builder: (innerContext) => BlocProvider(
+                                create: (context) => PaymentMethodSheetBloc(
+                                  getIt<GetPaymentCardsUsecase>(),
+                                  getIt<SetMainPaymentCardUsecase>(),
+                                  getIt<GetProfileUseCase>(),
+                                  getIt<AddPaymentCardUsecase>(),
+                                )..add(PaymentMethodSheetStarted()),
+                                child: PaymentMethodSheet(
+                                  initialSelectedCard: state.useBalance ? null : state.selectedCard,
+                                ),
+                              ),
+                            );
+
+                            if (result != null && mounted) {
+                              if (result is PaymentCard) {
+                                context.read<TariffSheetBloc>().add(
+                                  PaymentCardChanged(result),
+                                );
+                              } else if (result == 'balance') {
+                                context.read<TariffSheetBloc>().add(
+                                  SelectBalancePressed(),
+                                );
+                              }
+                            }
+                          },
+                        ),
+                      )
+                    else
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        child: Container(
+                          height: 56,
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(24),
+                            border: Border.all(
+                              color: Colors.white.withOpacity(0.4),
+                              width: 1,
+                            ),
+                          ),
+                          child: Material(
+                            color: Colors.transparent,
+                            child: InkWell(
+                              onTap: () {
+                                context.pushReplacement(
+                                  '/home/payment-method-sheet',
+                                );
+                              },
+                              borderRadius: BorderRadius.circular(24),
+                              child: Center(
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  children: [
+                                    const Text(
+                                      'Способ оплаты',
+                                      style: TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 8),
+                                    Icon(
+                                      Icons.arrow_forward_ios,
+                                      size: 12,
+                                      color: Colors.white.withOpacity(0.6),
+                                    ),
+                                    Icon(
+                                      Icons.arrow_forward_ios,
+                                      size: 12,
+                                      color: Colors.white.withOpacity(0.4),
+                                    ),
+                                    Icon(
+                                      Icons.arrow_forward_ios,
+                                      size: 12,
+                                      color: Colors.white.withOpacity(0.2),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+
+                    const SizedBox(height: 12),
+
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: GradientButton(
+                        text: 'Забронировать',
+                        showArrows: true,
+                        height: 56,
+                        width: double.infinity,
+                        fontSize: 16,
+                        enabled: _selectedTariffIndex != null && (state.selectedCard != null || state.useBalance),
+                        onTap: (_selectedTariffIndex != null && (state.selectedCard != null || state.useBalance))
+                            ? () {
+                          context.read<TariffSheetBloc>().add(
+                              BookScooterPressed(
+                                  widget.scooter.id,
+                                  state.tariffs[_selectedTariffIndex!].id,
+                                  0,
+                                  state.useBalance ? null : state.selectedCard?.id,
+                                  state.useBalance,
+                                  state.isInsurance
+                              )
+                          );
+                          context.pushReplacement('/home/current-rides-sheet');
+                        }
+                            : null,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  String _getCardType(String lastNumber) {
+    if (lastNumber.isEmpty) return 'Card';
+    final firstDigit = lastNumber[0];
+    switch (firstDigit) {
+      case '4':
+        return 'Visa';
+      case '5':
+        return 'Mastercard';
+      case '9':
+        return 'BelCard';
+      default:
+        return 'Card';
+    }
+  }
+}
+
+class _TariffCard extends StatelessWidget {
+  final String title;
+  final Tariff tariff;
+  final String price;
+  final String currency;
+  final String subtitle;
+  final List<String> details;
+  final bool isInsurance;
+  final bool isSelected;
+  final VoidCallback onTap;
+
+  const _TariffCard({
+    required this.title,
+    required this.tariff,
+    required this.price,
+    required this.currency,
+    required this.subtitle,
+    required this.details,
+    required this.isSelected,
+    required this.isInsurance,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Container(
+        width: 220,
+        padding: const EdgeInsets.all(14),
+        decoration: BoxDecoration(
+          color: isSelected
+              ? const Color(0xFF1A1F3E)
+              : Colors.white.withOpacity(0.19),
+          borderRadius: BorderRadius.circular(20),
+        ),
+        child: Stack(
+          children: [
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    const Icon(
+                      Icons.timer_outlined,
+                      size: 16,
+                      color: Color(0xFF66E3C4),
+                    ),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: Text(
+                        title,
+                        style: const TextStyle(
+                          color: Color(0xFF66E3C4),
+                          fontSize: 13,
+                          fontWeight: FontWeight.w600,
+                        ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    const SizedBox(width: 24),
+                  ],
+                ),
+                const SizedBox(height: 12),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.baseline,
+                  textBaseline: TextBaseline.alphabetic,
+                  children: [
+                    Text(
+                      '$price $currency',
+                      style: const TextStyle(color: Colors.white, fontSize: 24),
+                    ),
+                    if (subtitle.isNotEmpty) ...[
+                      const SizedBox(width: 6),
+                      Expanded(
+                        child: Text(
+                          subtitle,
+                          style: TextStyle(
+                            color: isSelected ? Colors.white : Colors.white70,
+                            fontSize: 12,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ],
+                ),
+                const SizedBox(height: 12),
+                // Детали
+                ...details.map(
+                  (detail) => Padding(
+                    padding: const EdgeInsets.only(bottom: 4),
+                    child: Text(
+                      detail,
+                      style: TextStyle(
+                        color: isSelected ? Colors.white : Colors.white70,
+                        fontSize: 12,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+
+            Positioned(
+              top: 0,
+              right: 0,
+              child: GestureDetector(
+                onTap: () {
+                  showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    backgroundColor: Colors.transparent,
+                    builder: (_) => TariffInfoSheet(
+                        tariff: tariff,
+                        isInsurance: isInsurance,
+                        onChanged: (val) {
+                      context.read<TariffSheetBloc>().add(InsuranceToggled(val));
+                    }),
+                  );
+
+
+
+                  print('Info pressed for $title');
+                },
+                child: Image.asset(
+                  'assets/icons/info_icon.png',
+                  width: 20,
+                  height: 20,
+                  fit: BoxFit.contain,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/side_menu.dart b/lib/presentation/components/side_menu.dart
index 2f015c2..b25a24f 100644
--- a/lib/presentation/components/side_menu.dart
+++ b/lib/presentation/components/side_menu.dart
@@ -1,209 +1,209 @@
-import 'package:be_happy/presentation/viewmodel/map_bloc.dart';
-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 '../event/map_event.dart';
-
-class SideMenu extends StatelessWidget {
-
-  const SideMenu({super.key,});
-
-  @override
-  Widget build(BuildContext context) {
-
-    final state = context.watch<MapBloc>().state;
-
-    return Drawer(
-        child: Container(
-          decoration: BoxDecoration(
-            gradient: AppColors.phoneScreenBg,
-          ),
-          child: SafeArea(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                // Заголовок
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 30),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        'Добро пожаловать!',
-                        style: TextStyle(
-                          color: AppColors.smsDigit,
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                        ),
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        state.phoneNumber ?? "Загрузка...",
-                        style: const TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                        ),
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        'Баланс ${state.balance} баллов',
-                        style: const TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-
-                const Divider(color: Colors.white30, height: 1),
-
-                Expanded(
-                  child: SingleChildScrollView(
-                    child: Column(
-                      children: [
-                        Column(
-                          children: [
-                            _MenuItem(
-                              icon: 'assets/icons/person_icon.png',
-                              title: 'Профиль',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go('/home/profile');
-                              },
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/list_star_icon.png',
-                              title: 'История поездок',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go("/home/order-history");
-                                },
-                            ),
-                            const Divider(color: Colors.white30, height: 1),
-                            _MenuItem(
-                              icon: 'assets/icons/creditcard_icon.png',
-                              title: 'Способ оплаты',
-                              onTap: () {
-                                    Navigator.pop(context);
-                                    context.go("/home/payment-methods");
-                                  },
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/promo_icon.png',
-                              title: 'Промокоды',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go("/home/promo");
-                              },
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/plans_icon.png',
-                              title: 'Абонементы',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.push("/home/subscriptions");
-                              },
-                            ),
-                            const Divider(color: Colors.white30, height: 1),
-                            _MenuItem(
-                              icon: 'assets/icons/magazine_icon.png',
-                              title: 'Правила пользования самокатом',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go("/home/rules");
-                              }
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/headphones_icon.png',
-                              title: 'Техподдержка',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go('/home/support');
-                              },
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/doc_icon.png',
-                              title: 'Документы',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go("/home/documents");
-                              },
-                            ),
-                            _MenuItem(
-                              icon: 'assets/icons/news_icon.png',
-                              title: 'Новости',
-                              onTap: () {
-                                Navigator.pop(context);
-                                context.go("/home/news");
-                                },
-                            ),
-                            const Divider(color: Colors.white30, height: 1),
-                            _MenuItem(
-                              icon: 'assets/icons/logout_icon.png',
-                              title: 'Выход',
-                              onTap: () {
-                                context.read<MapBloc>().stopNotificationStream();
-                                context.read<MapBloc>().add(LogoutPressed());
-                                context.go('/login');
-                              },
-                            ),
-                          ],
-                        ),
-
-                        // Картинка внизу (внутри скролла)
-                        Padding(
-                          padding: const EdgeInsets.only(top: 2),
-                          child: Image.asset(
-                            'assets/wave.png',
-                            width: double.infinity,
-                            fit: BoxFit.fitWidth,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        )
-    );
-  }
-}
-
-class _MenuItem extends StatelessWidget {
-  final String icon;
-  final String title;
-  final Color? color;
-  final VoidCallback onTap;
-
-  const _MenuItem({
-    required this.icon,
-    required this.title,
-    required this.onTap,
-    this.color,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      leading: Image.asset(
-          icon,
-          width: 24,
-          height: 24
-      ),
-      title: Text(
-        title,
-        style: TextStyle(
-          color: color ?? Colors.white,
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-        ),
-      ),
-      onTap: onTap,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 5),
-    );
-  }
+import 'package:be_happy/presentation/viewmodel/map_bloc.dart';
+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 '../event/map_event.dart';
+
+class SideMenu extends StatelessWidget {
+
+  const SideMenu({super.key,});
+
+  @override
+  Widget build(BuildContext context) {
+
+    final state = context.watch<MapBloc>().state;
+
+    return Drawer(
+        child: Container(
+          decoration: BoxDecoration(
+            gradient: AppColors.phoneScreenBg,
+          ),
+          child: SafeArea(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Заголовок
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 30),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Добро пожаловать!',
+                        style: TextStyle(
+                          color: AppColors.smsDigit,
+                          fontSize: 16,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        state.phoneNumber ?? "Загрузка...",
+                        style: const TextStyle(
+                          color: Colors.white70,
+                          fontSize: 14,
+                        ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        'Баланс ${state.balance} баллов',
+                        style: const TextStyle(
+                          color: Colors.white70,
+                          fontSize: 14,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+                const Divider(color: Colors.white30, height: 1),
+
+                Expanded(
+                  child: SingleChildScrollView(
+                    child: Column(
+                      children: [
+                        Column(
+                          children: [
+                            _MenuItem(
+                              icon: 'assets/icons/person_icon.png',
+                              title: 'Профиль',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go('/home/profile');
+                              },
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/list_star_icon.png',
+                              title: 'История поездок',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go("/home/order-history");
+                                },
+                            ),
+                            const Divider(color: Colors.white30, height: 1),
+                            _MenuItem(
+                              icon: 'assets/icons/creditcard_icon.png',
+                              title: 'Способ оплаты',
+                              onTap: () {
+                                    Navigator.pop(context);
+                                    context.go("/home/payment-methods");
+                                  },
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/promo_icon.png',
+                              title: 'Промокоды',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go("/home/promo");
+                              },
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/plans_icon.png',
+                              title: 'Абонементы',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.push("/home/subscriptions");
+                              },
+                            ),
+                            const Divider(color: Colors.white30, height: 1),
+                            _MenuItem(
+                              icon: 'assets/icons/magazine_icon.png',
+                              title: 'Правила пользования самокатом',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go("/home/rules");
+                              }
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/headphones_icon.png',
+                              title: 'Техподдержка',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go('/home/support');
+                              },
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/doc_icon.png',
+                              title: 'Документы',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go("/home/documents");
+                              },
+                            ),
+                            _MenuItem(
+                              icon: 'assets/icons/news_icon.png',
+                              title: 'Новости',
+                              onTap: () {
+                                Navigator.pop(context);
+                                context.go("/home/news");
+                                },
+                            ),
+                            const Divider(color: Colors.white30, height: 1),
+                            _MenuItem(
+                              icon: 'assets/icons/logout_icon.png',
+                              title: 'Выход',
+                              onTap: () {
+                                context.read<MapBloc>().stopNotificationStream();
+                                context.read<MapBloc>().add(LogoutPressed());
+                                context.go('/login');
+                              },
+                            ),
+                          ],
+                        ),
+
+                        // Картинка внизу (внутри скролла)
+                        Padding(
+                          padding: const EdgeInsets.only(top: 2),
+                          child: Image.asset(
+                            'assets/wave.png',
+                            width: double.infinity,
+                            fit: BoxFit.fitWidth,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        )
+    );
+  }
+}
+
+class _MenuItem extends StatelessWidget {
+  final String icon;
+  final String title;
+  final Color? color;
+  final VoidCallback onTap;
+
+  const _MenuItem({
+    required this.icon,
+    required this.title,
+    required this.onTap,
+    this.color,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: Image.asset(
+          icon,
+          width: 24,
+          height: 24
+      ),
+      title: Text(
+        title,
+        style: TextStyle(
+          color: color ?? Colors.white,
+          fontSize: 14,
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      onTap: onTap,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 5),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/subscription_card.dart b/lib/presentation/components/subscription_card.dart
index a7a26ec..185a028 100644
--- a/lib/presentation/components/subscription_card.dart
+++ b/lib/presentation/components/subscription_card.dart
@@ -1,117 +1,117 @@
-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, this.expiredAt, this.onRefresh});
-
-  @override
-  Widget build(BuildContext context) {
-    final minPriceOption = subscription.options.isNotEmpty
-        ? subscription.options.reduce((a, b) => a.price < b.price ? a : b)
-        : null;
-
-    /*final maxDaysOption = subscription.options.isNotEmpty
-        ? subscription.options.reduce((a, b) => a.days > b.days ? a : b)
-        : null;*/
-
-    return Container(
-      margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-      padding: const EdgeInsets.all(20),
-      decoration: BoxDecoration(
-        color: const Color(0xFF0D143C),
-        borderRadius: BorderRadius.circular(24),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: isActive ? MainAxisAlignment.spaceBetween : MainAxisAlignment.start,
-            children: [
-              Text(
-                subscription.title,
-                style: const TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
-              ),
-              if (isActive)
-                Container(
-                width: 100,
-                alignment: Alignment.center,
-                padding: EdgeInsets.all(4),
-                decoration: BoxDecoration(
-                  color: Colors.white.withOpacity(0.3),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Text(
-                  "АКТИВНА",
-                  style: TextStyle(
-                    color:  Colors.greenAccent,
-                    fontSize: 12,
-                    fontWeight: FontWeight.bold,
-                    letterSpacing: 0.5,
-                  ),
-                ),
-              ),
-
-            ]
-          ),
-
-          const SizedBox(height: 12),
-          Text(
-            subscription.shortDescription,
-            style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 14),
-          ),
-          Spacer(),
-          if (isActive && expiredAt != null) ...[
-            const SizedBox(height: 16),
-            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),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              if (minPriceOption != null)
-                Text(
-                  "от ${minPriceOption.pricePrint}",
-                  style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
-                )
-              else
-                const SizedBox.shrink(),
-              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,
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
+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, this.expiredAt, this.onRefresh});
+
+  @override
+  Widget build(BuildContext context) {
+    final minPriceOption = subscription.options.isNotEmpty
+        ? subscription.options.reduce((a, b) => a.price < b.price ? a : b)
+        : null;
+
+    /*final maxDaysOption = subscription.options.isNotEmpty
+        ? subscription.options.reduce((a, b) => a.days > b.days ? a : b)
+        : null;*/
+
+    return Container(
+      margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      padding: const EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        color: const Color(0xFF0D143C),
+        borderRadius: BorderRadius.circular(24),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: isActive ? MainAxisAlignment.spaceBetween : MainAxisAlignment.start,
+            children: [
+              Text(
+                subscription.title,
+                style: const TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.bold),
+              ),
+              if (isActive)
+                Container(
+                width: 100,
+                alignment: Alignment.center,
+                padding: EdgeInsets.all(4),
+                decoration: BoxDecoration(
+                  color: Colors.white.withOpacity(0.3),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Text(
+                  "АКТИВНА",
+                  style: TextStyle(
+                    color:  Colors.greenAccent,
+                    fontSize: 12,
+                    fontWeight: FontWeight.bold,
+                    letterSpacing: 0.5,
+                  ),
+                ),
+              ),
+
+            ]
+          ),
+
+          const SizedBox(height: 12),
+          Text(
+            subscription.shortDescription,
+            style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 14),
+          ),
+          Spacer(),
+          if (isActive && expiredAt != null) ...[
+            const SizedBox(height: 16),
+            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),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (minPriceOption != null)
+                Text(
+                  "от ${minPriceOption.pricePrint}",
+                  style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
+                )
+              else
+                const SizedBox.shrink(),
+              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,
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/components/unpaid_order_notification_card.dart b/lib/presentation/components/unpaid_order_notification_card.dart
index e62deb3..d0bc1af 100644
--- a/lib/presentation/components/unpaid_order_notification_card.dart
+++ b/lib/presentation/components/unpaid_order_notification_card.dart
@@ -1,90 +1,90 @@
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-
-class UnpaidOrderNotificationCard extends StatelessWidget {
-  final VoidCallback onClose;
-
-  const UnpaidOrderNotificationCard({
-    super.key,
-    required this.onClose,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Container(
-            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
-            decoration: BoxDecoration(
-              color: const Color(0xFF2D2B4D),
-              borderRadius: BorderRadius.circular(32),
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const SizedBox(height: 8),
-                const Padding(
-                  padding: EdgeInsets.only(left: 64),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        'У вас имеются неоплаченные поездки!',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 18,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      SizedBox(height: 12),
-                      Text(
-                        'Оплатите поездки, чтобы начать новую поездку',
-                        style: TextStyle(
-                          color: Colors.white70,
-                          fontSize: 14,
-                          height: 1.2,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-
-          Positioned(
-            top: -20,
-            left: -30,
-            child: Image.asset(
-              'assets/icons/card-screen.png',
-              width: 120,
-              height: 120,
-              fit: BoxFit.contain,
-            ),
-          ),
-
-          Positioned(
-            top: 15,
-            right: 15,
-            child: GestureDetector(
-              onTap: onClose,
-              child: Container(
-                padding: const EdgeInsets.all(6),
-                decoration: BoxDecoration(
-                  color: Colors.white.withOpacity(0.2),
-                  shape: BoxShape.circle,
-                ),
-                child: const Icon(Icons.close, color: Colors.white70, size: 20),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class UnpaidOrderNotificationCard extends StatelessWidget {
+  final VoidCallback onClose;
+
+  const UnpaidOrderNotificationCard({
+    super.key,
+    required this.onClose,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Container(
+            padding: const EdgeInsets.fromLTRB(24, 10, 20, 24),
+            decoration: BoxDecoration(
+              color: const Color(0xFF2D2B4D),
+              borderRadius: BorderRadius.circular(32),
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 8),
+                const Padding(
+                  padding: EdgeInsets.only(left: 64),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'У вас имеются неоплаченные поездки!',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      SizedBox(height: 12),
+                      Text(
+                        'Оплатите поездки, чтобы начать новую поездку',
+                        style: TextStyle(
+                          color: Colors.white70,
+                          fontSize: 14,
+                          height: 1.2,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          Positioned(
+            top: -20,
+            left: -30,
+            child: Image.asset(
+              'assets/icons/card-screen.png',
+              width: 120,
+              height: 120,
+              fit: BoxFit.contain,
+            ),
+          ),
+
+          Positioned(
+            top: 15,
+            right: 15,
+            child: GestureDetector(
+              onTap: onClose,
+              child: Container(
+                padding: const EdgeInsets.all(6),
+                decoration: BoxDecoration(
+                  color: Colors.white.withOpacity(0.2),
+                  shape: BoxShape.circle,
+                ),
+                child: const Icon(Icons.close, color: Colors.white70, size: 20),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/components/utils/card_formatter.dart b/lib/presentation/components/utils/card_formatter.dart
index bbb256d..4710175 100644
--- a/lib/presentation/components/utils/card_formatter.dart
+++ b/lib/presentation/components/utils/card_formatter.dart
@@ -1,49 +1,49 @@
-import 'package:flutter/services.dart';
-
-class CardNumberFormatter extends TextInputFormatter {
-  @override
-  TextEditingValue formatEditUpdate(
-      TextEditingValue oldValue,
-      TextEditingValue newValue,
-      ) {
-    var text = newValue.text.replaceAll(' ', '');
-    var buffer = StringBuffer();
-    for (int i = 0; i < text.length; i++) {
-      buffer.write(text[i]);
-      var nonZeroIndex = i + 1;
-      if (nonZeroIndex % 4 == 0 && nonZeroIndex != text.length) {
-        buffer.write(' '); // Добавляем пробел каждые 4 цифры
-      }
-    }
-    var string = buffer.toString();
-    return newValue.copyWith(
-      text: string,
-      selection: TextSelection.collapsed(offset: string.length),
-    );
-  }
-}
-
-class CardMonthInputFormatter extends TextInputFormatter {
-  @override
-  TextEditingValue formatEditUpdate(
-      TextEditingValue oldValue,
-      TextEditingValue newValue,
-      ) {
-    var newText = newValue.text;
-    if (newValue.selection.baseOffset == 0) return newValue;
-
-    var buffer = StringBuffer();
-    for (int i = 0; i < newText.length; i++) {
-      buffer.write(newText[i]);
-      var nonZeroIndex = i + 1;
-      if (nonZeroIndex % 2 == 0 && nonZeroIndex != newText.length) {
-        buffer.write('/'); // Добавляем слэш после 2-й цифры
-      }
-    }
-    var string = buffer.toString();
-    return newValue.copyWith(
-      text: string,
-      selection: TextSelection.collapsed(offset: string.length),
-    );
-  }
+import 'package:flutter/services.dart';
+
+class CardNumberFormatter extends TextInputFormatter {
+  @override
+  TextEditingValue formatEditUpdate(
+      TextEditingValue oldValue,
+      TextEditingValue newValue,
+      ) {
+    var text = newValue.text.replaceAll(' ', '');
+    var buffer = StringBuffer();
+    for (int i = 0; i < text.length; i++) {
+      buffer.write(text[i]);
+      var nonZeroIndex = i + 1;
+      if (nonZeroIndex % 4 == 0 && nonZeroIndex != text.length) {
+        buffer.write(' '); // Добавляем пробел каждые 4 цифры
+      }
+    }
+    var string = buffer.toString();
+    return newValue.copyWith(
+      text: string,
+      selection: TextSelection.collapsed(offset: string.length),
+    );
+  }
+}
+
+class CardMonthInputFormatter extends TextInputFormatter {
+  @override
+  TextEditingValue formatEditUpdate(
+      TextEditingValue oldValue,
+      TextEditingValue newValue,
+      ) {
+    var newText = newValue.text;
+    if (newValue.selection.baseOffset == 0) return newValue;
+
+    var buffer = StringBuffer();
+    for (int i = 0; i < newText.length; i++) {
+      buffer.write(newText[i]);
+      var nonZeroIndex = i + 1;
+      if (nonZeroIndex % 2 == 0 && nonZeroIndex != newText.length) {
+        buffer.write('/'); // Добавляем слэш после 2-й цифры
+      }
+    }
+    var string = buffer.toString();
+    return newValue.copyWith(
+      text: string,
+      selection: TextSelection.collapsed(offset: string.length),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/event/active_ride_event.dart b/lib/presentation/event/active_ride_event.dart
index 5971acd..4484ced 100644
--- a/lib/presentation/event/active_ride_event.dart
+++ b/lib/presentation/event/active_ride_event.dart
@@ -1,31 +1,31 @@
-sealed class ActiveRideEvent {}
-
-class LoadScooterOrder extends ActiveRideEvent {
-  final int orderId;
-  
-  LoadScooterOrder(this.orderId);
-}
-
-class PauseRide extends ActiveRideEvent {
-  final int orderId;
-  
-  PauseRide(this.orderId);
-}
-
-class ResumeRide extends ActiveRideEvent {
-  final int orderId;
-  
-  ResumeRide(this.orderId);
-}
-
-class FinishRide extends ActiveRideEvent {
-  final int orderId;
-  
-  FinishRide(this.orderId);
-}
-
-class SyncScooterOrder extends ActiveRideEvent {
-  final int orderId;
-  
-  SyncScooterOrder(this.orderId);
-}
+sealed class ActiveRideEvent {}
+
+class LoadScooterOrder extends ActiveRideEvent {
+  final int orderId;
+  
+  LoadScooterOrder(this.orderId);
+}
+
+class PauseRide extends ActiveRideEvent {
+  final int orderId;
+  
+  PauseRide(this.orderId);
+}
+
+class ResumeRide extends ActiveRideEvent {
+  final int orderId;
+  
+  ResumeRide(this.orderId);
+}
+
+class FinishRide extends ActiveRideEvent {
+  final int orderId;
+  
+  FinishRide(this.orderId);
+}
+
+class SyncScooterOrder extends ActiveRideEvent {
+  final int orderId;
+  
+  SyncScooterOrder(this.orderId);
+}
diff --git a/lib/presentation/event/add_card_event.dart b/lib/presentation/event/add_card_event.dart
index 6ed3170..ce151e2 100644
--- a/lib/presentation/event/add_card_event.dart
+++ b/lib/presentation/event/add_card_event.dart
@@ -1,27 +1,27 @@
-abstract class AddCardEvent {}
-
-class AddCardSubmitted extends AddCardEvent {}
-
-class CardNumberChanged extends AddCardEvent {
-  final String cardNumber;
-
-  CardNumberChanged(this.cardNumber);
-}
-
-class ExpiryDateChanged extends AddCardEvent {
-  final String expiryDate;
-
-  ExpiryDateChanged(this.expiryDate);
-}
-
-class CvvChanged extends AddCardEvent {
-  final String cvv;
-
-  CvvChanged(this.cvv);
-}
-
-class CardHolderChanged extends AddCardEvent {
-  final String cardHolder;
-
-  CardHolderChanged(this.cardHolder);
+abstract class AddCardEvent {}
+
+class AddCardSubmitted extends AddCardEvent {}
+
+class CardNumberChanged extends AddCardEvent {
+  final String cardNumber;
+
+  CardNumberChanged(this.cardNumber);
+}
+
+class ExpiryDateChanged extends AddCardEvent {
+  final String expiryDate;
+
+  ExpiryDateChanged(this.expiryDate);
+}
+
+class CvvChanged extends AddCardEvent {
+  final String cvv;
+
+  CvvChanged(this.cvv);
+}
+
+class CardHolderChanged extends AddCardEvent {
+  final String cardHolder;
+
+  CardHolderChanged(this.cardHolder);
 }
\ No newline at end of file
diff --git a/lib/presentation/event/auth_event.dart b/lib/presentation/event/auth_event.dart
index 83ba6fd..f120381 100644
--- a/lib/presentation/event/auth_event.dart
+++ b/lib/presentation/event/auth_event.dart
@@ -1,23 +1,23 @@
-abstract class PhoneAuthEvent {}
-
-class PhoneAuthStarted extends PhoneAuthEvent {}
-
-class PhoneChanged extends PhoneAuthEvent {
-  final String phone;
-
-  PhoneChanged(this.phone);
-}
-
-class IsAdultChanged extends PhoneAuthEvent {
-  final bool isAdult;
-
-  IsAdultChanged(this.isAdult);
-}
-
-class PrivacyAcceptedChanged extends PhoneAuthEvent {
-  final bool accepted;
-
-  PrivacyAcceptedChanged(this.accepted);
-}
-
+abstract class PhoneAuthEvent {}
+
+class PhoneAuthStarted extends PhoneAuthEvent {}
+
+class PhoneChanged extends PhoneAuthEvent {
+  final String phone;
+
+  PhoneChanged(this.phone);
+}
+
+class IsAdultChanged extends PhoneAuthEvent {
+  final bool isAdult;
+
+  IsAdultChanged(this.isAdult);
+}
+
+class PrivacyAcceptedChanged extends PhoneAuthEvent {
+  final bool accepted;
+
+  PrivacyAcceptedChanged(this.accepted);
+}
+
 class SubmitPhonePressed extends PhoneAuthEvent {}
\ No newline at end of file
diff --git a/lib/presentation/event/current_rides_event.dart b/lib/presentation/event/current_rides_event.dart
index 60bb5ac..495b85e 100644
--- a/lib/presentation/event/current_rides_event.dart
+++ b/lib/presentation/event/current_rides_event.dart
@@ -1,3 +1,3 @@
-sealed class CurrentRidesEvent {}
-
-class LoadClientOrders extends CurrentRidesEvent {}
+sealed class CurrentRidesEvent {}
+
+class LoadClientOrders extends CurrentRidesEvent {}
diff --git a/lib/presentation/event/edit_profile_event.dart b/lib/presentation/event/edit_profile_event.dart
index 66ee0dc..b0197ce 100644
--- a/lib/presentation/event/edit_profile_event.dart
+++ b/lib/presentation/event/edit_profile_event.dart
@@ -1,13 +1,13 @@
-import '../../domain/entities/user_profile.dart';
-
-abstract class EditProfileEvent {}
-
-class EditProfileStarted extends EditProfileEvent {}
-
-
-class EditProfileSubmitted extends EditProfileEvent {
-  final UserProfile profile;
-
-  EditProfileSubmitted(this.profile);
-}
-
+import '../../domain/entities/user_profile.dart';
+
+abstract class EditProfileEvent {}
+
+class EditProfileStarted extends EditProfileEvent {}
+
+
+class EditProfileSubmitted extends EditProfileEvent {
+  final UserProfile profile;
+
+  EditProfileSubmitted(this.profile);
+}
+
diff --git a/lib/presentation/event/fine_payment_event.dart b/lib/presentation/event/fine_payment_event.dart
new file mode 100644
index 0000000..abbc00a
--- /dev/null
+++ b/lib/presentation/event/fine_payment_event.dart
@@ -0,0 +1,29 @@
+import 'package:equatable/equatable.dart';
+import '../../domain/entities/payment_card.dart';
+
+abstract class FinePaymentEvent extends Equatable {
+  const FinePaymentEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class FetchFineDetails extends FinePaymentEvent {
+  final int fineId;
+  const FetchFineDetails(this.fineId);
+
+  @override
+  List<Object?> get props => [fineId];
+}
+
+class FinePaymentCardChanged extends FinePaymentEvent {
+  final PaymentCard card;
+  const FinePaymentCardChanged(this.card);
+
+  @override
+  List<Object?> get props => [card];
+}
+
+class SelectFineBalancePressed extends FinePaymentEvent {}
+
+class PayFineSubmitted extends FinePaymentEvent {}
\ No newline at end of file
diff --git a/lib/presentation/event/map_event.dart b/lib/presentation/event/map_event.dart
index 16886ef..1897ae6 100644
--- a/lib/presentation/event/map_event.dart
+++ b/lib/presentation/event/map_event.dart
@@ -1,43 +1,43 @@
-import '../../domain/entities/client_notification.dart';
-import '../../domain/entities/point.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/zone.dart';
-
-abstract class ScooterEvent {}
-
-class CheckUser extends ScooterEvent {}
-
-class FetchScooters extends ScooterEvent {
-  final List<double> area;
-  final List<double> areaScooters;
-  FetchScooters(this.area, this.areaScooters);
-}
-
-class UpdateMap extends ScooterEvent {}
-
-class FetchProfileData extends ScooterEvent {}
-
-class LogoutPressed extends ScooterEvent {}
-
-class UpdateUserLocation extends ScooterEvent {
-  final double latitude;
-  final double longitude;
-  UpdateUserLocation(this.latitude, this.longitude);
-}
-
-class NotificationReceived extends ScooterEvent {
-  final ClientNotification notification;
-  NotificationReceived(this.notification);
-}
-
-class FocusOnScooter extends ScooterEvent {
-  final Scooter scooter;
-  FocusOnScooter(this.scooter);
-}
-
-class ClearMapPlacemarks extends ScooterEvent {}
-class ClearMapFocus extends ScooterEvent {}
-
-
-
-
+import '../../domain/entities/client_notification.dart';
+import '../../domain/entities/point.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/zone.dart';
+
+abstract class ScooterEvent {}
+
+class CheckUser extends ScooterEvent {}
+
+class FetchScooters extends ScooterEvent {
+  final List<double> area;
+  final List<double> areaScooters;
+  FetchScooters(this.area, this.areaScooters);
+}
+
+class UpdateMap extends ScooterEvent {}
+
+class FetchProfileData extends ScooterEvent {}
+
+class LogoutPressed extends ScooterEvent {}
+
+class UpdateUserLocation extends ScooterEvent {
+  final double latitude;
+  final double longitude;
+  UpdateUserLocation(this.latitude, this.longitude);
+}
+
+class NotificationReceived extends ScooterEvent {
+  final ClientNotification notification;
+  NotificationReceived(this.notification);
+}
+
+class FocusOnScooter extends ScooterEvent {
+  final Scooter scooter;
+  FocusOnScooter(this.scooter);
+}
+
+class ClearMapPlacemarks extends ScooterEvent {}
+class ClearMapFocus extends ScooterEvent {}
+
+
+
+
diff --git a/lib/presentation/event/map_settings_modal_event.dart b/lib/presentation/event/map_settings_modal_event.dart
index 8107f1b..8c6df11 100644
--- a/lib/presentation/event/map_settings_modal_event.dart
+++ b/lib/presentation/event/map_settings_modal_event.dart
@@ -1,33 +1,33 @@
-sealed class MapSettingsModalEvent {}
-
-class AllGeomarksToggled extends MapSettingsModalEvent {
-  final bool value;
-  AllGeomarksToggled(this.value);
-}
-
-class AllGeozonesToggled extends MapSettingsModalEvent {
-  final bool value;
-  AllGeozonesToggled(this.value);
-}
-
-class RestrictedDrivingZonesToggled extends MapSettingsModalEvent {
-  final bool value;
-  RestrictedDrivingZonesToggled(this.value);
-}
-
-class RestrictedParkingZonesToggled extends MapSettingsModalEvent {
-  final bool value;
-  RestrictedParkingZonesToggled(this.value);
-}
-
-class ParkingZonesToggled extends MapSettingsModalEvent {
-  final bool value;
-  ParkingZonesToggled(this.value);
-}
-
-class ApllyButtonClick extends MapSettingsModalEvent {}
-
-class MapSettingsModalStarted extends MapSettingsModalEvent {}
-
-
-
+sealed class MapSettingsModalEvent {}
+
+class AllGeomarksToggled extends MapSettingsModalEvent {
+  final bool value;
+  AllGeomarksToggled(this.value);
+}
+
+class AllGeozonesToggled extends MapSettingsModalEvent {
+  final bool value;
+  AllGeozonesToggled(this.value);
+}
+
+class RestrictedDrivingZonesToggled extends MapSettingsModalEvent {
+  final bool value;
+  RestrictedDrivingZonesToggled(this.value);
+}
+
+class RestrictedParkingZonesToggled extends MapSettingsModalEvent {
+  final bool value;
+  RestrictedParkingZonesToggled(this.value);
+}
+
+class ParkingZonesToggled extends MapSettingsModalEvent {
+  final bool value;
+  ParkingZonesToggled(this.value);
+}
+
+class ApllyButtonClick extends MapSettingsModalEvent {}
+
+class MapSettingsModalStarted extends MapSettingsModalEvent {}
+
+
+
diff --git a/lib/presentation/event/news_event.dart b/lib/presentation/event/news_event.dart
index 408618d..e751e8e 100644
--- a/lib/presentation/event/news_event.dart
+++ b/lib/presentation/event/news_event.dart
@@ -1,7 +1,7 @@
-abstract class NewsEvent {
-  const NewsEvent();
-}
-
-class NewsFetchRequested extends NewsEvent {
-  const NewsFetchRequested();
+abstract class NewsEvent {
+  const NewsEvent();
+}
+
+class NewsFetchRequested extends NewsEvent {
+  const NewsFetchRequested();
 }
\ No newline at end of file
diff --git a/lib/presentation/event/notifications_event.dart b/lib/presentation/event/notifications_event.dart
index ac737b8..d93d4ca 100644
--- a/lib/presentation/event/notifications_event.dart
+++ b/lib/presentation/event/notifications_event.dart
@@ -1,8 +1,8 @@
-sealed class NotificationsEvent {}
-
-class NotificationsFetchRequested extends NotificationsEvent {
-  final int page;
-  NotificationsFetchRequested({this.page = 1});
-}
-
+sealed class NotificationsEvent {}
+
+class NotificationsFetchRequested extends NotificationsEvent {
+  final int page;
+  NotificationsFetchRequested({this.page = 1});
+}
+
 class NotificationsLoadMoreRequested extends NotificationsEvent {}
\ No newline at end of file
diff --git a/lib/presentation/event/payment_confirm_event.dart b/lib/presentation/event/payment_confirm_event.dart
index 8ae04f5..5fa3f24 100644
--- a/lib/presentation/event/payment_confirm_event.dart
+++ b/lib/presentation/event/payment_confirm_event.dart
@@ -1,29 +1,29 @@
-import '../../domain/entities/payment_card.dart';
-
-sealed class PaymentConfirmEvent {}
-
-class PaymentConfirmStarted extends PaymentConfirmEvent {
-  final int orderId;
-  PaymentConfirmStarted(this.orderId);
-}
-
-class PaymentCardChanged extends PaymentConfirmEvent {
-  final PaymentCard card;
-  PaymentCardChanged(this.card);
-}
-
-class SelectBalancePressed extends PaymentConfirmEvent {}
-
-class PayRide extends PaymentConfirmEvent {
-  final int orderId;
-  final int? cardId;
-  final bool isBalance;
-  final List<int> photoIds;
-
-  PayRide({
-    required this.orderId,
-    required this.cardId,
-    required this.isBalance,
-    required this.photoIds,
-  });
-}
+import '../../domain/entities/payment_card.dart';
+
+sealed class PaymentConfirmEvent {}
+
+class PaymentConfirmStarted extends PaymentConfirmEvent {
+  final int orderId;
+  PaymentConfirmStarted(this.orderId);
+}
+
+class PaymentCardChanged extends PaymentConfirmEvent {
+  final PaymentCard card;
+  PaymentCardChanged(this.card);
+}
+
+class SelectBalancePressed extends PaymentConfirmEvent {}
+
+class PayRide extends PaymentConfirmEvent {
+  final int orderId;
+  final int? cardId;
+  final bool isBalance;
+  final List<int> photoIds;
+
+  PayRide({
+    required this.orderId,
+    required this.cardId,
+    required this.isBalance,
+    required this.photoIds,
+  });
+}
diff --git a/lib/presentation/event/payment_method_sheet_event.dart b/lib/presentation/event/payment_method_sheet_event.dart
index 872c67a..26b1084 100644
--- a/lib/presentation/event/payment_method_sheet_event.dart
+++ b/lib/presentation/event/payment_method_sheet_event.dart
@@ -1,12 +1,12 @@
-import '../../domain/entities/payment_card.dart';
-
-sealed class PaymentMethodSheetEvent {}
-
-class PaymentMethodSheetStarted extends PaymentMethodSheetEvent {}
-
-class SelectPaymentCardRequested extends PaymentMethodSheetEvent {
-  final PaymentCard card;
-  SelectPaymentCardRequested(this.card);
-}
-
-class AddPaymentCardRequested extends PaymentMethodSheetEvent {}
+import '../../domain/entities/payment_card.dart';
+
+sealed class PaymentMethodSheetEvent {}
+
+class PaymentMethodSheetStarted extends PaymentMethodSheetEvent {}
+
+class SelectPaymentCardRequested extends PaymentMethodSheetEvent {
+  final PaymentCard card;
+  SelectPaymentCardRequested(this.card);
+}
+
+class AddPaymentCardRequested extends PaymentMethodSheetEvent {}
diff --git a/lib/presentation/event/payment_methods_event.dart b/lib/presentation/event/payment_methods_event.dart
index 85f6e43..e4767f8 100644
--- a/lib/presentation/event/payment_methods_event.dart
+++ b/lib/presentation/event/payment_methods_event.dart
@@ -1,17 +1,17 @@
-sealed class PaymentMethodsEvent {}
-
-class PaymentMethodsStarted extends PaymentMethodsEvent {}
-
-class AddPayemntCardPressed extends PaymentMethodsEvent {}
-
-class PaymentMethodsDeleteCard extends PaymentMethodsEvent {
-  final int cardId;
-
-  PaymentMethodsDeleteCard(this.cardId);
-}
-
-class PaymentMethodsSetMainCard extends PaymentMethodsEvent {
-  final int cardId;
-
-  PaymentMethodsSetMainCard(this.cardId);
-}
+sealed class PaymentMethodsEvent {}
+
+class PaymentMethodsStarted extends PaymentMethodsEvent {}
+
+class AddPayemntCardPressed extends PaymentMethodsEvent {}
+
+class PaymentMethodsDeleteCard extends PaymentMethodsEvent {
+  final int cardId;
+
+  PaymentMethodsDeleteCard(this.cardId);
+}
+
+class PaymentMethodsSetMainCard extends PaymentMethodsEvent {
+  final int cardId;
+
+  PaymentMethodsSetMainCard(this.cardId);
+}
diff --git a/lib/presentation/event/pin_event.dart b/lib/presentation/event/pin_event.dart
index 3d61108..a84c2d9 100644
--- a/lib/presentation/event/pin_event.dart
+++ b/lib/presentation/event/pin_event.dart
@@ -1,15 +1,15 @@
-abstract class PinEvent {}
-
-class PinScreenStarted extends PinEvent {}
-
-class PinDigitChanged extends PinEvent {
-  final String pin;
-
-  PinDigitChanged(this.pin);
-}
-
-class PinSubmitted extends PinEvent {
-  final String pin;
-
-  PinSubmitted(this.pin);
+abstract class PinEvent {}
+
+class PinScreenStarted extends PinEvent {}
+
+class PinDigitChanged extends PinEvent {
+  final String pin;
+
+  PinDigitChanged(this.pin);
+}
+
+class PinSubmitted extends PinEvent {
+  final String pin;
+
+  PinSubmitted(this.pin);
 }
\ No newline at end of file
diff --git a/lib/presentation/event/profile_event.dart b/lib/presentation/event/profile_event.dart
index e6a993b..ce1e57c 100644
--- a/lib/presentation/event/profile_event.dart
+++ b/lib/presentation/event/profile_event.dart
@@ -1,15 +1,15 @@
-import 'dart:io';
-
-import '../../domain/entities/user_profile.dart';
-
-abstract class ProfileEvent {}
-
-class ProfileStarted extends ProfileEvent {}
-
-class ProfileUpdated extends ProfileEvent {}
-
-class ProfilePhotoUpdated extends ProfileEvent{
-  final File imageFile;
-
-  ProfilePhotoUpdated(this.imageFile);
-}
+import 'dart:io';
+
+import '../../domain/entities/user_profile.dart';
+
+abstract class ProfileEvent {}
+
+class ProfileStarted extends ProfileEvent {}
+
+class ProfileUpdated extends ProfileEvent {}
+
+class ProfilePhotoUpdated extends ProfileEvent{
+  final File imageFile;
+
+  ProfilePhotoUpdated(this.imageFile);
+}
diff --git a/lib/presentation/event/promo_code_event.dart b/lib/presentation/event/promo_code_event.dart
index 65c8852..84783d6 100644
--- a/lib/presentation/event/promo_code_event.dart
+++ b/lib/presentation/event/promo_code_event.dart
@@ -1,8 +1,8 @@
-sealed class PromoCodeEvent {}
-
-class PromoCodeApplyRequested extends PromoCodeEvent {
-  final String code;
-  PromoCodeApplyRequested(this.code);
-}
-
+sealed class PromoCodeEvent {}
+
+class PromoCodeApplyRequested extends PromoCodeEvent {
+  final String code;
+  PromoCodeApplyRequested(this.code);
+}
+
 class PromoCodeReset extends PromoCodeEvent {}
\ No newline at end of file
diff --git a/lib/presentation/event/reserved_ride_event.dart b/lib/presentation/event/reserved_ride_event.dart
index fef4911..ce08b97 100644
--- a/lib/presentation/event/reserved_ride_event.dart
+++ b/lib/presentation/event/reserved_ride_event.dart
@@ -1,13 +1,13 @@
-sealed class ReservedRideEvent {}
-
-class StartRide extends ReservedRideEvent {
-  final int orderId;
-  
-  StartRide(this.orderId);
-}
-
-class CancelRide extends ReservedRideEvent {
-  final int orderId;
-  
-  CancelRide(this.orderId);
-}
+sealed class ReservedRideEvent {}
+
+class StartRide extends ReservedRideEvent {
+  final int orderId;
+  
+  StartRide(this.orderId);
+}
+
+class CancelRide extends ReservedRideEvent {
+  final int orderId;
+  
+  CancelRide(this.orderId);
+}
diff --git a/lib/presentation/event/route_event.dart b/lib/presentation/event/route_event.dart
index 160f7c1..3485610 100644
--- a/lib/presentation/event/route_event.dart
+++ b/lib/presentation/event/route_event.dart
@@ -1,7 +1,7 @@
-abstract class RouteEvent {}
-
-class FetchRouteEvent extends RouteEvent {
-  final int orderId;
-  FetchRouteEvent(this.orderId);
-}
-
+abstract class RouteEvent {}
+
+class FetchRouteEvent extends RouteEvent {
+  final int orderId;
+  FetchRouteEvent(this.orderId);
+}
+
diff --git a/lib/presentation/event/scooter_code_event.dart b/lib/presentation/event/scooter_code_event.dart
index b9c4cd7..6f8eb53 100644
--- a/lib/presentation/event/scooter_code_event.dart
+++ b/lib/presentation/event/scooter_code_event.dart
@@ -1,11 +1,11 @@
-abstract class ScooterCodeEvent {}
-
-class ScooterCodeChanged extends ScooterCodeEvent {
-  final String code;
-  ScooterCodeChanged(this.code);
-}
-
-class ScooterCodeSubmitted extends ScooterCodeEvent {
-  final String code;
-  ScooterCodeSubmitted(this.code);
+abstract class ScooterCodeEvent {}
+
+class ScooterCodeChanged extends ScooterCodeEvent {
+  final String code;
+  ScooterCodeChanged(this.code);
+}
+
+class ScooterCodeSubmitted extends ScooterCodeEvent {
+  final String code;
+  ScooterCodeSubmitted(this.code);
 }
\ No newline at end of file
diff --git a/lib/presentation/event/scooter_detail_event.dart b/lib/presentation/event/scooter_detail_event.dart
index 7df0e5a..6136406 100644
--- a/lib/presentation/event/scooter_detail_event.dart
+++ b/lib/presentation/event/scooter_detail_event.dart
@@ -1,6 +1,6 @@
-sealed class ScooterDetailEvent {}
-
-class LoadScooterDetails extends ScooterDetailEvent {
-  final int scooterId;
-  LoadScooterDetails(this.scooterId);
-}
+sealed class ScooterDetailEvent {}
+
+class LoadScooterDetails extends ScooterDetailEvent {
+  final int scooterId;
+  LoadScooterDetails(this.scooterId);
+}
diff --git a/lib/presentation/event/scooter_detail_modal_event.dart b/lib/presentation/event/scooter_detail_modal_event.dart
index 915f2ba..9f49370 100644
--- a/lib/presentation/event/scooter_detail_modal_event.dart
+++ b/lib/presentation/event/scooter_detail_modal_event.dart
@@ -1,13 +1,13 @@
-import '../../domain/entities/scooter.dart';
-
-sealed class ScooterDetailModalEvent {}
-
-class ScooterDetailModalStarted extends ScooterDetailModalEvent {
-  final List<Scooter> scooters;
-  final double userLatitude;
-  final double userLongitude;
-
-  ScooterDetailModalStarted(this.scooters, this.userLatitude, this.userLongitude);
-}
-
-
+import '../../domain/entities/scooter.dart';
+
+sealed class ScooterDetailModalEvent {}
+
+class ScooterDetailModalStarted extends ScooterDetailModalEvent {
+  final List<Scooter> scooters;
+  final double userLatitude;
+  final double userLongitude;
+
+  ScooterDetailModalStarted(this.scooters, this.userLatitude, this.userLongitude);
+}
+
+
diff --git a/lib/presentation/event/send_photo_event.dart b/lib/presentation/event/send_photo_event.dart
index e8b7a23..a709e94 100644
--- a/lib/presentation/event/send_photo_event.dart
+++ b/lib/presentation/event/send_photo_event.dart
@@ -1,13 +1,13 @@
-abstract class SendPhotoEvent {}
-
-class PhotoSelected extends SendPhotoEvent {
-  final List<String> imagePaths;
-
-  PhotoSelected(this.imagePaths);
-}
-
-class PhotoUploadSubmitted extends SendPhotoEvent {
-  final int orderId;
-
-  PhotoUploadSubmitted(this.orderId);
-}
+abstract class SendPhotoEvent {}
+
+class PhotoSelected extends SendPhotoEvent {
+  final List<String> imagePaths;
+
+  PhotoSelected(this.imagePaths);
+}
+
+class PhotoUploadSubmitted extends SendPhotoEvent {
+  final int orderId;
+
+  PhotoUploadSubmitted(this.orderId);
+}
diff --git a/lib/presentation/event/spalsh_event.dart b/lib/presentation/event/spalsh_event.dart
index 3874d80..e566bd0 100644
--- a/lib/presentation/event/spalsh_event.dart
+++ b/lib/presentation/event/spalsh_event.dart
@@ -1,17 +1,17 @@
-import 'package:equatable/equatable.dart';
-
-abstract class SplashEvent extends Equatable {
-  const SplashEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-// Событие, которое будет отправляться со SplashScreen
-class AuthCheckRequested extends SplashEvent {}
-
-class AuthStarted extends SplashEvent {}
-
-class PinVerificationSuccess extends SplashEvent {}
-
-class AuthLogoutRequested extends SplashEvent {}
+import 'package:equatable/equatable.dart';
+
+abstract class SplashEvent extends Equatable {
+  const SplashEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+// Событие, которое будет отправляться со SplashScreen
+class AuthCheckRequested extends SplashEvent {}
+
+class AuthStarted extends SplashEvent {}
+
+class PinVerificationSuccess extends SplashEvent {}
+
+class AuthLogoutRequested extends SplashEvent {}
diff --git a/lib/presentation/event/subscription_details_event.dart b/lib/presentation/event/subscription_details_event.dart
index 62ff771..45edcc3 100644
--- a/lib/presentation/event/subscription_details_event.dart
+++ b/lib/presentation/event/subscription_details_event.dart
@@ -1,27 +1,27 @@
-import '../../domain/entities/payment_card.dart';
-import '../../domain/entities/subscription_period.dart';
-
-abstract class SubscriptionDetailsEvent {}
-
-class LoadDetailsEvent extends SubscriptionDetailsEvent {
-  final int subscriptionId;
-  LoadDetailsEvent(this.subscriptionId);
-}
-
-class SelectPeriodEvent extends SubscriptionDetailsEvent {
-  final SubscriptionPeriod period;
-  SelectPeriodEvent(this.period);
-}
-
-class ToggleAgreementEvent extends SubscriptionDetailsEvent {
-  final bool value;
-  ToggleAgreementEvent(this.value);
-}
-
-class ActivateSubscriptionPressed extends SubscriptionDetailsEvent {}
-
-class SelectCardEvent extends SubscriptionDetailsEvent {
-  final PaymentCard card;
-
-  SelectCardEvent(this.card);
+import '../../domain/entities/payment_card.dart';
+import '../../domain/entities/subscription_period.dart';
+
+abstract class SubscriptionDetailsEvent {}
+
+class LoadDetailsEvent extends SubscriptionDetailsEvent {
+  final int subscriptionId;
+  LoadDetailsEvent(this.subscriptionId);
+}
+
+class SelectPeriodEvent extends SubscriptionDetailsEvent {
+  final SubscriptionPeriod period;
+  SelectPeriodEvent(this.period);
+}
+
+class ToggleAgreementEvent extends SubscriptionDetailsEvent {
+  final bool value;
+  ToggleAgreementEvent(this.value);
+}
+
+class ActivateSubscriptionPressed extends SubscriptionDetailsEvent {}
+
+class SelectCardEvent extends SubscriptionDetailsEvent {
+  final PaymentCard card;
+
+  SelectCardEvent(this.card);
 }
\ No newline at end of file
diff --git a/lib/presentation/event/subscription_list_event.dart b/lib/presentation/event/subscription_list_event.dart
index ba862c2..e45571d 100644
--- a/lib/presentation/event/subscription_list_event.dart
+++ b/lib/presentation/event/subscription_list_event.dart
@@ -1,5 +1,5 @@
-// subscription_event.dart
-abstract class SubscriptionEvent {}
-
-class LoadSubscriptionsEvent extends SubscriptionEvent {}
-
+// subscription_event.dart
+abstract class SubscriptionEvent {}
+
+class LoadSubscriptionsEvent extends SubscriptionEvent {}
+
diff --git a/lib/presentation/event/tariff_sheet_event.dart b/lib/presentation/event/tariff_sheet_event.dart
index 7545ddc..55dc39b 100644
--- a/lib/presentation/event/tariff_sheet_event.dart
+++ b/lib/presentation/event/tariff_sheet_event.dart
@@ -1,36 +1,36 @@
-import 'package:be_happy/domain/entities/payment_card.dart';
-
-sealed class TariffSheetEvent {}
-
-class TariffSheetStarted extends TariffSheetEvent {
-  final int scooterId;
-
-  TariffSheetStarted(this.scooterId);
-}
-
-class PaymentCardChanged extends TariffSheetEvent {
-  final PaymentCard card;
-
-  PaymentCardChanged(this.card);
-}
-
-class InsuranceToggled extends TariffSheetEvent {
-  final bool isEnabled;
-  InsuranceToggled(this.isEnabled);
-}
-
-class SelectBalancePressed extends TariffSheetEvent {}
-
-class BookScooterPressed extends TariffSheetEvent {
-  final int scooterId;
-  final int planId;
-  final int? subscriptionId;
-  final int? cardId;
-  final bool isBalance;
-  final bool isInsurance;
-
-  BookScooterPressed(this.scooterId, this.planId, this.subscriptionId,
-      this.cardId, this.isBalance, this.isInsurance);
-
-
-}
+import 'package:be_happy/domain/entities/payment_card.dart';
+
+sealed class TariffSheetEvent {}
+
+class TariffSheetStarted extends TariffSheetEvent {
+  final int scooterId;
+
+  TariffSheetStarted(this.scooterId);
+}
+
+class PaymentCardChanged extends TariffSheetEvent {
+  final PaymentCard card;
+
+  PaymentCardChanged(this.card);
+}
+
+class InsuranceToggled extends TariffSheetEvent {
+  final bool isEnabled;
+  InsuranceToggled(this.isEnabled);
+}
+
+class SelectBalancePressed extends TariffSheetEvent {}
+
+class BookScooterPressed extends TariffSheetEvent {
+  final int scooterId;
+  final int planId;
+  final int? subscriptionId;
+  final int? cardId;
+  final bool isBalance;
+  final bool isInsurance;
+
+  BookScooterPressed(this.scooterId, this.planId, this.subscriptionId,
+      this.cardId, this.isBalance, this.isInsurance);
+
+
+}
diff --git a/lib/presentation/event/top_up_event.dart b/lib/presentation/event/top_up_event.dart
index 7f21d77..bb1b969 100644
--- a/lib/presentation/event/top_up_event.dart
+++ b/lib/presentation/event/top_up_event.dart
@@ -1,25 +1,25 @@
-import 'package:be_happy/domain/entities/certificate.dart';
-import 'package:be_happy/domain/entities/payment_card.dart';
-
-import '../../domain/entities/top_up_tariff.dart';
-
-abstract class TopUpEvent {}
-
-class LoadTopUpData extends TopUpEvent {}
-
-class SelectCertificate extends TopUpEvent {
-  final Certificate certificate;
-  SelectCertificate(this.certificate);
-}
-
-class SelectCard extends TopUpEvent {
-  final PaymentCard card;
-  SelectCard(this.card);
-}
-
-class ToggleAgreement extends TopUpEvent {
-  final bool value;
-  ToggleAgreement(this.value);
-}
-
+import 'package:be_happy/domain/entities/certificate.dart';
+import 'package:be_happy/domain/entities/payment_card.dart';
+
+import '../../domain/entities/top_up_tariff.dart';
+
+abstract class TopUpEvent {}
+
+class LoadTopUpData extends TopUpEvent {}
+
+class SelectCertificate extends TopUpEvent {
+  final Certificate certificate;
+  SelectCertificate(this.certificate);
+}
+
+class SelectCard extends TopUpEvent {
+  final PaymentCard card;
+  SelectCard(this.card);
+}
+
+class ToggleAgreement extends TopUpEvent {
+  final bool value;
+  ToggleAgreement(this.value);
+}
+
 class TopUpButtonPressed extends TopUpEvent {}
\ No newline at end of file
diff --git a/lib/presentation/event/verify_code_event.dart b/lib/presentation/event/verify_code_event.dart
index 8601233..a2cb62f 100644
--- a/lib/presentation/event/verify_code_event.dart
+++ b/lib/presentation/event/verify_code_event.dart
@@ -1,23 +1,23 @@
-abstract class VerifyCodeEvent {}
-
-class VerifyCodeStarted extends VerifyCodeEvent {
-  final String phoneNumber;
-  final String tempToken;
-
-  VerifyCodeStarted({required this.phoneNumber, required this.tempToken});
-}
-
-class CodeChanged extends VerifyCodeEvent {
-  final String code;
-
-  CodeChanged(this.code);
-}
-
-class TimerTicked extends VerifyCodeEvent {
-  final int secondsLeft;
-  TimerTicked(this.secondsLeft);
-}
-
-class ResendCodePressed extends VerifyCodeEvent {}
-
+abstract class VerifyCodeEvent {}
+
+class VerifyCodeStarted extends VerifyCodeEvent {
+  final String phoneNumber;
+  final String tempToken;
+
+  VerifyCodeStarted({required this.phoneNumber, required this.tempToken});
+}
+
+class CodeChanged extends VerifyCodeEvent {
+  final String code;
+
+  CodeChanged(this.code);
+}
+
+class TimerTicked extends VerifyCodeEvent {
+  final int secondsLeft;
+  TimerTicked(this.secondsLeft);
+}
+
+class ResendCodePressed extends VerifyCodeEvent {}
+
 class VerifyCodeSubmitted extends VerifyCodeEvent {}
\ No newline at end of file
diff --git a/lib/presentation/navigation/app_router.dart b/lib/presentation/navigation/app_router.dart
index 83ecbc2..015ec3e 100644
--- a/lib/presentation/navigation/app_router.dart
+++ b/lib/presentation/navigation/app_router.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 
 import 'package:be_happy/presentation/screens/card_binding_result_screen.dart';
+import 'package:be_happy/presentation/screens/lease_agreement_screen.dart';
+import 'package:be_happy/presentation/screens/payment_rules_screen.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:be_happy/core/app_colors.dart';
 import 'package:be_happy/di/service_locator.dart';
diff --git a/lib/presentation/screens/add_card_screen.dart b/lib/presentation/screens/add_card_screen.dart
index 0b4044e..5a0936c 100644
--- a/lib/presentation/screens/add_card_screen.dart
+++ b/lib/presentation/screens/add_card_screen.dart
@@ -1,233 +1,233 @@
-import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-import '../components/card_input_field.dart'; // ← новый импорт
-import '../components/utils/card_formatter.dart';
-import '../event/payment_methods_event.dart';
-import '../viewmodel/add_card_bloc.dart';
-import '../event/add_card_event.dart';
-import '../state/add_card_state.dart';
-
-class AddCardScreen extends StatelessWidget {
-  const AddCardScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: BlocListener<AddCardBloc, AddCardState>(
-          listenWhen: (previous, current) {
-            print(
-                'Смена статуса: ${previous.status} -> ${current.status} ${current.errorMessage}');
-            return previous.status != current.status &&
-                current.status == AddCardStatus.success;
-          },
-          listener: (context, state) {
-            context.pop(true);
-          },
-          child: Container(
-            decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-            child: SafeArea(
-              child: Column(
-                children: [
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      child: Column(
-                        children: [
-                          const SizedBox(height: 16),
-                          const CustomAppBar(title: 'Добавление карты'),
-                          const SizedBox(height: 24),
-
-                          Container(
-                            padding: const EdgeInsets.all(20),
-                            decoration: BoxDecoration(
-                              color: const Color(0xFF0A0F2E),
-                              borderRadius: BorderRadius.circular(20),
-                            ),
-                            child: Column(
-                              children: [
-                                BlocBuilder<AddCardBloc, AddCardState>(
-                                  builder: (context, state) {
-                                    return CardInputField(
-                                      hintText: '0000 0000 0000 0000',
-                                      icon: Icons.credit_card,
-                                      keyboardType: TextInputType.number,
-                                      inputFormatters: [
-                                        FilteringTextInputFormatter.digitsOnly,
-                                        LengthLimitingTextInputFormatter(16),
-                                        CardNumberFormatter(),
-                                      ],
-                                      letterSpacing: 2,
-                                      onChanged: (value) {
-                                        final cleanValue = value.replaceAll(' ', '');
-                                        context.read<AddCardBloc>().add(CardNumberChanged(cleanValue));
-                                      },
-                                    );
-                                  },
-                                ),
-
-                                const SizedBox(height: 16),
-
-                                Row(
-                                  children: [
-                                    Expanded(
-                                      child: BlocBuilder<AddCardBloc, AddCardState>(
-                                        builder: (context, state) {
-                                          return CardInputField(
-                                            hintText: 'MM/YY',
-                                            keyboardType: TextInputType.number,
-                                            inputFormatters: [
-                                              FilteringTextInputFormatter.digitsOnly,
-                                              LengthLimitingTextInputFormatter(4),
-                                              CardMonthInputFormatter(),
-                                            ],
-                                            onChanged: (value) {
-                                              final cleanValue = value.replaceAll('/', '');
-                                              context.read<AddCardBloc>().add(ExpiryDateChanged(cleanValue));
-                                            },
-                                          );
-                                        },
-                                      ),
-                                    ),
-                                    const SizedBox(width: 12),
-                                    Expanded(
-                                      child: BlocBuilder<
-                                          AddCardBloc,
-                                          AddCardState>(
-                                        builder: (context, state) {
-                                          return CardInputField(
-                                            hintText: 'CVV',
-                                            obscureText: true,
-                                            keyboardType: TextInputType.number,
-                                            inputFormatters: [
-                                              FilteringTextInputFormatter
-                                                  .digitsOnly,
-                                              LengthLimitingTextInputFormatter(
-                                                  3),
-                                            ],
-                                            onChanged: (value) {
-                                              context.read<AddCardBloc>().add(
-                                                  CvvChanged(value));
-                                            },
-                                          );
-                                        },
-                                      ),
-                                    ),
-                                  ],
-                                ),
-
-                                const SizedBox(height: 16),
-
-                                BlocBuilder<AddCardBloc, AddCardState>(
-                                  builder: (context, state) {
-                                    return CardInputField(
-                                      hintText: 'Имя и фамилия на карте',
-                                      keyboardType: TextInputType.text,
-                                      textCapitalization: TextCapitalization
-                                          .words,
-                                      onChanged: (value) {
-                                        context.read<AddCardBloc>().add(
-                                            CardHolderChanged(value));
-                                      },
-                                    );
-                                  },
-                                ),
-
-                                const SizedBox(height: 20),
-
-                                BlocBuilder<AddCardBloc, AddCardState>(
-                                  builder: (context, state) {
-                                    return Container(
-                                      height: 46,
-                                      decoration: BoxDecoration(
-                                        borderRadius: BorderRadius.circular(24),
-                                        color: Colors.white.withOpacity(0.15),
-                                      ),
-                                      child: Material(
-                                        color: Colors.transparent,
-                                        child: InkWell(
-                                          onTap: state.isFormValid
-                                              ? () => {
-                                            context.read<AddCardBloc>().add(AddCardSubmitted()),
-                                          }
-                                              : null,
-                                          borderRadius: BorderRadius.circular(
-                                              24),
-                                          child: Center(
-                                            child: Row(
-                                              mainAxisAlignment: MainAxisAlignment
-                                                  .center,
-                                              children: [
-                                                Icon(
-                                                  Icons.add,
-                                                  color: state.isFormValid
-                                                      ? const Color(0xFF66E3C4)
-                                                      : Colors.white
-                                                      .withOpacity(0.3),
-                                                  size: 20,
-                                                ),
-                                                const SizedBox(width: 8),
-                                                Text(
-                                                  'Добавить карту',
-                                                  style: TextStyle(
-                                                    color: state.isFormValid
-                                                        ? Colors.white
-                                                        : Colors.white
-                                                        .withOpacity(0.3),
-                                                    fontSize: 16,
-                                                    fontWeight: FontWeight.w600,
-                                                  ),
-                                                ),
-                                              ],
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    );
-                                  },
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-
-                  Container(
-                    width: double.infinity,
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 20, vertical: 24),
-                    child: Column(
-                      children: [
-                        const Text(
-                          'Мы не сохраняем данные карты у себя. Оплата происходит '
-                              'через сертифицированный провайдер Беларуси bePaid. '
-                              'Платежная страница системы bePaid отвечает требованиям '
-                              'безопасности передачи данных PCI DSS Level I. '
-                              'Все конфиденциальные данные хранятся в зашифрованном виде.',
-                          style: TextStyle(
-                            color: Colors.white38,
-                            fontSize: 11,
-                            height: 1.5,
-                          ),
-                          textAlign: TextAlign.justify,
-                        ),
-
-                        const SizedBox(height: 24),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        )
-    );
-    }
-}
+import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+import '../components/card_input_field.dart'; // ← новый импорт
+import '../components/utils/card_formatter.dart';
+import '../event/payment_methods_event.dart';
+import '../viewmodel/add_card_bloc.dart';
+import '../event/add_card_event.dart';
+import '../state/add_card_state.dart';
+
+class AddCardScreen extends StatelessWidget {
+  const AddCardScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        body: BlocListener<AddCardBloc, AddCardState>(
+          listenWhen: (previous, current) {
+            print(
+                'Смена статуса: ${previous.status} -> ${current.status} ${current.errorMessage}');
+            return previous.status != current.status &&
+                current.status == AddCardStatus.success;
+          },
+          listener: (context, state) {
+            context.pop(true);
+          },
+          child: Container(
+            decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+            child: SafeArea(
+              child: Column(
+                children: [
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Column(
+                        children: [
+                          const SizedBox(height: 16),
+                          const CustomAppBar(title: 'Добавление карты'),
+                          const SizedBox(height: 24),
+
+                          Container(
+                            padding: const EdgeInsets.all(20),
+                            decoration: BoxDecoration(
+                              color: const Color(0xFF0A0F2E),
+                              borderRadius: BorderRadius.circular(20),
+                            ),
+                            child: Column(
+                              children: [
+                                BlocBuilder<AddCardBloc, AddCardState>(
+                                  builder: (context, state) {
+                                    return CardInputField(
+                                      hintText: '0000 0000 0000 0000',
+                                      icon: Icons.credit_card,
+                                      keyboardType: TextInputType.number,
+                                      inputFormatters: [
+                                        FilteringTextInputFormatter.digitsOnly,
+                                        LengthLimitingTextInputFormatter(16),
+                                        CardNumberFormatter(),
+                                      ],
+                                      letterSpacing: 2,
+                                      onChanged: (value) {
+                                        final cleanValue = value.replaceAll(' ', '');
+                                        context.read<AddCardBloc>().add(CardNumberChanged(cleanValue));
+                                      },
+                                    );
+                                  },
+                                ),
+
+                                const SizedBox(height: 16),
+
+                                Row(
+                                  children: [
+                                    Expanded(
+                                      child: BlocBuilder<AddCardBloc, AddCardState>(
+                                        builder: (context, state) {
+                                          return CardInputField(
+                                            hintText: 'MM/YY',
+                                            keyboardType: TextInputType.number,
+                                            inputFormatters: [
+                                              FilteringTextInputFormatter.digitsOnly,
+                                              LengthLimitingTextInputFormatter(4),
+                                              CardMonthInputFormatter(),
+                                            ],
+                                            onChanged: (value) {
+                                              final cleanValue = value.replaceAll('/', '');
+                                              context.read<AddCardBloc>().add(ExpiryDateChanged(cleanValue));
+                                            },
+                                          );
+                                        },
+                                      ),
+                                    ),
+                                    const SizedBox(width: 12),
+                                    Expanded(
+                                      child: BlocBuilder<
+                                          AddCardBloc,
+                                          AddCardState>(
+                                        builder: (context, state) {
+                                          return CardInputField(
+                                            hintText: 'CVV',
+                                            obscureText: true,
+                                            keyboardType: TextInputType.number,
+                                            inputFormatters: [
+                                              FilteringTextInputFormatter
+                                                  .digitsOnly,
+                                              LengthLimitingTextInputFormatter(
+                                                  3),
+                                            ],
+                                            onChanged: (value) {
+                                              context.read<AddCardBloc>().add(
+                                                  CvvChanged(value));
+                                            },
+                                          );
+                                        },
+                                      ),
+                                    ),
+                                  ],
+                                ),
+
+                                const SizedBox(height: 16),
+
+                                BlocBuilder<AddCardBloc, AddCardState>(
+                                  builder: (context, state) {
+                                    return CardInputField(
+                                      hintText: 'Имя и фамилия на карте',
+                                      keyboardType: TextInputType.text,
+                                      textCapitalization: TextCapitalization
+                                          .words,
+                                      onChanged: (value) {
+                                        context.read<AddCardBloc>().add(
+                                            CardHolderChanged(value));
+                                      },
+                                    );
+                                  },
+                                ),
+
+                                const SizedBox(height: 20),
+
+                                BlocBuilder<AddCardBloc, AddCardState>(
+                                  builder: (context, state) {
+                                    return Container(
+                                      height: 46,
+                                      decoration: BoxDecoration(
+                                        borderRadius: BorderRadius.circular(24),
+                                        color: Colors.white.withOpacity(0.15),
+                                      ),
+                                      child: Material(
+                                        color: Colors.transparent,
+                                        child: InkWell(
+                                          onTap: state.isFormValid
+                                              ? () => {
+                                            context.read<AddCardBloc>().add(AddCardSubmitted()),
+                                          }
+                                              : null,
+                                          borderRadius: BorderRadius.circular(
+                                              24),
+                                          child: Center(
+                                            child: Row(
+                                              mainAxisAlignment: MainAxisAlignment
+                                                  .center,
+                                              children: [
+                                                Icon(
+                                                  Icons.add,
+                                                  color: state.isFormValid
+                                                      ? const Color(0xFF66E3C4)
+                                                      : Colors.white
+                                                      .withOpacity(0.3),
+                                                  size: 20,
+                                                ),
+                                                const SizedBox(width: 8),
+                                                Text(
+                                                  'Добавить карту',
+                                                  style: TextStyle(
+                                                    color: state.isFormValid
+                                                        ? Colors.white
+                                                        : Colors.white
+                                                        .withOpacity(0.3),
+                                                    fontSize: 16,
+                                                    fontWeight: FontWeight.w600,
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                    );
+                                  },
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+
+                  Container(
+                    width: double.infinity,
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 20, vertical: 24),
+                    child: Column(
+                      children: [
+                        const Text(
+                          'Мы не сохраняем данные карты у себя. Оплата происходит '
+                              'через сертифицированный провайдер Беларуси bePaid. '
+                              'Платежная страница системы bePaid отвечает требованиям '
+                              'безопасности передачи данных PCI DSS Level I. '
+                              'Все конфиденциальные данные хранятся в зашифрованном виде.',
+                          style: TextStyle(
+                            color: Colors.white38,
+                            fontSize: 11,
+                            height: 1.5,
+                          ),
+                          textAlign: TextAlign.justify,
+                        ),
+
+                        const SizedBox(height: 24),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        )
+    );
+    }
+}
diff --git a/lib/presentation/screens/block_screen.dart b/lib/presentation/screens/block_screen.dart
index a9087db..1e3a3af 100644
--- a/lib/presentation/screens/block_screen.dart
+++ b/lib/presentation/screens/block_screen.dart
@@ -1,50 +1,50 @@
-import 'package:flutter/material.dart';
-
-import '../components/gradient_button.dart';
-import '../../core/app_colors.dart';
-
-class BlockedScreen extends StatelessWidget {
-  const BlockedScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.transparent,
-      body: Container(
-        decoration: const BoxDecoration(
-          gradient: AppColors.phoneScreenBg,
-        ),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 20),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              const Text(
-                "Аккаунт заблокирован",
-                textAlign: TextAlign.center,
-                style: TextStyle(color: Colors.white, fontSize: 22),
-              ),
-
-              const SizedBox(height: 40),
-              Image.asset(
-                'assets/ban.png',
-                width: double.infinity,
-                fit: BoxFit.cover,
-              ),
-              const SizedBox(height: 40),
-
-              GradientButton(
-                text: "Обратиться в техподдержку",
-                onTap: () {},
-                showArrows: true,
-                height: 50,
-                width: 290,
-                fontSize: 14,
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+
+import '../components/gradient_button.dart';
+import '../../core/app_colors.dart';
+
+class BlockedScreen extends StatelessWidget {
+  const BlockedScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      body: Container(
+        decoration: const BoxDecoration(
+          gradient: AppColors.phoneScreenBg,
+        ),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 20),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Text(
+                "Аккаунт заблокирован",
+                textAlign: TextAlign.center,
+                style: TextStyle(color: Colors.white, fontSize: 22),
+              ),
+
+              const SizedBox(height: 40),
+              Image.asset(
+                'assets/ban.png',
+                width: double.infinity,
+                fit: BoxFit.cover,
+              ),
+              const SizedBox(height: 40),
+
+              GradientButton(
+                text: "Обратиться в техподдержку",
+                onTap: () {},
+                showArrows: true,
+                height: 50,
+                width: 290,
+                fontSize: 14,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/card_binding_result_screen.dart b/lib/presentation/screens/card_binding_result_screen.dart
index 64c2804..5790e71 100644
--- a/lib/presentation/screens/card_binding_result_screen.dart
+++ b/lib/presentation/screens/card_binding_result_screen.dart
@@ -1,173 +1,173 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-
-import '../components/gradient_button.dart';
-
-enum CardBindingStatus { success, failed }
-
-class CardBindingResultScreen extends StatefulWidget {
-  final CardBindingStatus status;
-  final String title;
-  final String cardImagePath;
-
-  const CardBindingResultScreen({
-    super.key,
-    required this.status,
-    required this.title,
-    required this.cardImagePath,
-  });
-
-  @override
-  State<CardBindingResultScreen> createState() => _CardBindingResultScreenState();
-}
-
-class _CardBindingResultScreenState extends State<CardBindingResultScreen> {
-  Timer? _autoPopTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    if (widget.status == CardBindingStatus.success) {
-      _autoPopTimer = Timer(const Duration(seconds: 5), () {
-        if (mounted) {
-          final timestamp = DateTime.now().millisecondsSinceEpoch;
-          context.go("/home/payment-methods?refreshId=$timestamp");
-        }
-      });
-    }
-  }
-
-  @override
-  void dispose() {
-    _autoPopTimer?.cancel();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isSuccess = widget.status == CardBindingStatus.success;
-
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(
-          gradient: LinearGradient(
-            begin: Alignment.topCenter,
-            end: Alignment.bottomCenter,
-            colors: [
-              Color(0xFF1B284F),
-              Color(0xFF0F172A),
-            ],
-          ),
-        ),
-        child: SafeArea(
-          child: Stack(
-            children: [
-              // Positioned(
-              //   bottom: 50,
-              //   left: 0,
-              //   right: 0,
-              //   child: Image.asset(
-              //     'assets/wave.png',
-              //     fit: BoxFit.cover,
-              //   ),
-              // ),
-
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 16.0),
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [
-                    // const Spacer(),
-
-                    Text(
-                      widget.title,
-                      textAlign: TextAlign.center,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 24,
-                        fontWeight: FontWeight.w500,
-                      ),
-                    ),
-                    const SizedBox(height: 40),
-
-                    Image.asset(
-                      isSuccess
-                          ? 'assets/icons/success.png'
-                          : 'assets/icons/failed.png',
-                      width: 140,
-                      height: 140,
-                    ),
-
-                    const SizedBox(height: 40),
-
-                    if (isSuccess) ...[
-                      Padding(
-                        padding: const EdgeInsets.only(bottom: 40.0),
-                        // child: Image.asset(
-                        //   widget.cardImagePath,
-                        //   width: double.infinity,
-                        //   fit: BoxFit.contain,
-                        // ),
-                      ),
-                    ] else ...[
-                      const Text(
-                        'Проверьте подключение к\nинтернету и попробуйте снова',
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                          color: Color(0xFF94A3B8),
-                          fontSize: 16,
-                          height: 1.4,
-                        ),
-                      ),
-
-                      const SizedBox(height: 40),
-
-                      GradientButton(
-                        text: "Попробовать снова",
-                        onTap: () {
-                          final timestamp = DateTime.now().millisecondsSinceEpoch;
-                          context.go("/home/payment-methods?refreshId=$timestamp");
-                        },
-                        enabled: true,
-                        showArrows: true,
-                      ),
-                      const SizedBox(height: 12),
-
-                      SizedBox(
-                        width: double.infinity,
-                        height: 56,
-                        child: TextButton(
-                          onPressed: ()
-                          {
-                            final timestamp = DateTime.now().millisecondsSinceEpoch;
-                            context.go("/home/payment-methods?refreshId=$timestamp");
-                          },
-                          style: TextButton.styleFrom(
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(28),
-                            ),
-                            backgroundColor: const Color(0xFF0F172A).withOpacity(0.4),
-                          ),
-                          child: const Text(
-                            'Закрыть',
-                            style: TextStyle(
-                              color: Colors.white,
-                              fontSize: 16,
-                              fontWeight: FontWeight.w500,
-                            ),
-                          ),
-                        ),
-                      ),
-                    ],
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
+import 'dart:async';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+import '../components/gradient_button.dart';
+
+enum CardBindingStatus { success, failed }
+
+class CardBindingResultScreen extends StatefulWidget {
+  final CardBindingStatus status;
+  final String title;
+  final String cardImagePath;
+
+  const CardBindingResultScreen({
+    super.key,
+    required this.status,
+    required this.title,
+    required this.cardImagePath,
+  });
+
+  @override
+  State<CardBindingResultScreen> createState() => _CardBindingResultScreenState();
+}
+
+class _CardBindingResultScreenState extends State<CardBindingResultScreen> {
+  Timer? _autoPopTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.status == CardBindingStatus.success) {
+      _autoPopTimer = Timer(const Duration(seconds: 5), () {
+        if (mounted) {
+          final timestamp = DateTime.now().millisecondsSinceEpoch;
+          context.go("/home/payment-methods?refreshId=$timestamp");
+        }
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _autoPopTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isSuccess = widget.status == CardBindingStatus.success;
+
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              Color(0xFF1B284F),
+              Color(0xFF0F172A),
+            ],
+          ),
+        ),
+        child: SafeArea(
+          child: Stack(
+            children: [
+              // Positioned(
+              //   bottom: 50,
+              //   left: 0,
+              //   right: 0,
+              //   child: Image.asset(
+              //     'assets/wave.png',
+              //     fit: BoxFit.cover,
+              //   ),
+              // ),
+
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 16.0),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    // const Spacer(),
+
+                    Text(
+                      widget.title,
+                      textAlign: TextAlign.center,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 24,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                    const SizedBox(height: 40),
+
+                    Image.asset(
+                      isSuccess
+                          ? 'assets/icons/success.png'
+                          : 'assets/icons/failed.png',
+                      width: 140,
+                      height: 140,
+                    ),
+
+                    const SizedBox(height: 40),
+
+                    if (isSuccess) ...[
+                      Padding(
+                        padding: const EdgeInsets.only(bottom: 40.0),
+                        // child: Image.asset(
+                        //   widget.cardImagePath,
+                        //   width: double.infinity,
+                        //   fit: BoxFit.contain,
+                        // ),
+                      ),
+                    ] else ...[
+                      const Text(
+                        'Проверьте подключение к\nинтернету и попробуйте снова',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          color: Color(0xFF94A3B8),
+                          fontSize: 16,
+                          height: 1.4,
+                        ),
+                      ),
+
+                      const SizedBox(height: 40),
+
+                      GradientButton(
+                        text: "Попробовать снова",
+                        onTap: () {
+                          final timestamp = DateTime.now().millisecondsSinceEpoch;
+                          context.go("/home/payment-methods?refreshId=$timestamp");
+                        },
+                        enabled: true,
+                        showArrows: true,
+                      ),
+                      const SizedBox(height: 12),
+
+                      SizedBox(
+                        width: double.infinity,
+                        height: 56,
+                        child: TextButton(
+                          onPressed: ()
+                          {
+                            final timestamp = DateTime.now().millisecondsSinceEpoch;
+                            context.go("/home/payment-methods?refreshId=$timestamp");
+                          },
+                          style: TextButton.styleFrom(
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(28),
+                            ),
+                            backgroundColor: const Color(0xFF0F172A).withOpacity(0.4),
+                          ),
+                          child: const Text(
+                            'Закрыть',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 16,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/documents_screen.dart b/lib/presentation/screens/documents_screen.dart
index 9e71c22..20531c1 100644
--- a/lib/presentation/screens/documents_screen.dart
+++ b/lib/presentation/screens/documents_screen.dart
@@ -1,65 +1,65 @@
-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';
-import '../components/link_row.dart';
-
-class DocumentsScreen extends StatelessWidget {
-  const DocumentsScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20),
-            child: Column(
-              children: [
-                const SizedBox(height: 16),
-                CustomAppBar(title: 'Документы'),
-                const SizedBox(height: 32),
-
-                LinkRow(
-                  icon: 'assets/icons/doc.png',
-                  title: 'Договор аренды',
-                  onTap: () => openLink('https://...'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-                LinkRow(
-                  icon: 'assets/icons/doc.png',
-                  title: 'Политика конфиденциальности',
-                  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://behappybel.by/#rule'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-                LinkRow(
-                  icon: 'assets/icons/doc.png',
-                  title: 'Правила оплаты картой',
-                  onTap: () => openLink('https://...'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-
-                const Spacer(), // Отодвигаем картинку вниз
-
-
-                const SizedBox(height: 20),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
+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';
+import '../components/link_row.dart';
+
+class DocumentsScreen extends StatelessWidget {
+  const DocumentsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20),
+            child: Column(
+              children: [
+                const SizedBox(height: 16),
+                CustomAppBar(title: 'Документы'),
+                const SizedBox(height: 32),
+
+                LinkRow(
+                  icon: 'assets/icons/doc.png',
+                  title: 'Договор аренды',
+                  onTap: () => context.push('/home/documents/lease-agreement'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+                LinkRow(
+                  icon: 'assets/icons/doc.png',
+                  title: 'Политика конфиденциальности',
+                  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://behappybel.by/#rule'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+                LinkRow(
+                  icon: 'assets/icons/doc.png',
+                  title: 'Правила оплаты картой',
+                  onTap: () => context.push('/home/documents/payment-rules'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+
+                const Spacer(), // Отодвигаем картинку вниз
+
+
+                const SizedBox(height: 20),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/edit_profile_screen.dart b/lib/presentation/screens/edit_profile_screen.dart
index 7541c80..4a02e95 100644
--- a/lib/presentation/screens/edit_profile_screen.dart
+++ b/lib/presentation/screens/edit_profile_screen.dart
@@ -1,240 +1,240 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:intl/intl.dart';
-
-import '../../core/app_colors.dart';
-import '../../di/service_locator.dart';
-import '../../domain/entities/user_profile.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../event/edit_profile_event.dart';
-import '../state/edit_profile_state.dart';
-import '../event/profile_event.dart';
-import '../viewmodel/edit_profile_bloc.dart';
-import '../viewmodel/profile_bloc.dart';
-
-class EditProfileScreen extends StatefulWidget {
-  final UserProfile profile;
-
-  const EditProfileScreen({super.key, required this.profile});
-
-  @override
-  State<EditProfileScreen> createState() => _EditProfileScreenState();
-}
-
-class _EditProfileScreenState extends State<EditProfileScreen> {
-  late final TextEditingController nameController;
-  late final TextEditingController birthDateController;
-  late final TextEditingController phoneController;
-  late final TextEditingController emailController;
-
-  DateTime? _selectedBirthDate;
-
-  @override
-  void initState() {
-    super.initState();
-    context.read<EditProfileBloc>().add(EditProfileStarted());
-
-    nameController = TextEditingController();
-    phoneController = TextEditingController();
-    emailController = TextEditingController();
-
-    String initialDateText = '';
-
-    if (widget.profile.birthDate.isNotEmpty) {
-      try {
-        _selectedBirthDate = DateFormat('dd.MM.yyyy').parse(widget.profile.birthDate);
-        initialDateText = DateFormat('dd.MM.yyyy').format(_selectedBirthDate!);
-      } catch (e) {
-        initialDateText = widget.profile.birthDate;
-        print("EXCEPTION:  $e");
-      }
-    }
-    birthDateController = TextEditingController(text: initialDateText);
-  }
-
-  void _submit(BuildContext context) {
-    final profileFromState = context.read<EditProfileBloc>().state.profile;
-    if (profileFromState == null) return;
-
-    final String birthDateForApi = _selectedBirthDate?.toIso8601String() ?? '';
-
-    final updatedProfile = profileFromState.copyWith(
-      name: nameController.text,
-      birthDate: birthDateForApi.isNotEmpty ? "${birthDateForApi}Z" : '',
-      email: emailController.text,
-    );
-
-    context.read<EditProfileBloc>().add(EditProfileSubmitted(updatedProfile));
-    context.read<ProfileBloc>().add(ProfileUpdated());
-
-  }
-
-  Future<void> _selectDate(BuildContext context) async {
-    final DateTime? picked = await showDatePicker(
-      context: context,
-      initialDate: _selectedBirthDate ?? DateTime.now(),
-      firstDate: DateTime(DateTime.now().year - 100),
-      lastDate: DateTime.now(),
-    );
-
-    if (picked != null && picked != _selectedBirthDate) {
-      setState(() {
-        _selectedBirthDate = picked;
-        birthDateController.text = DateFormat('dd.MM.yyyy').format(picked);
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20),
-            child: BlocConsumer<EditProfileBloc, EditProfileState>(
-              listener: (context, state) {
-                final profile = state.profile;
-                if (profile != null && nameController.text.isEmpty) {
-                  nameController.text = profile.name;
-                  phoneController.text = profile.phone;
-                  emailController.text = profile.email;
-                  birthDateController.text = profile.birthDate;
-
-                }
-
-                if (state.isSuccess) {
-                  getIt<ProfileBloc>().add(ProfileUpdated());
-                  context.pop();
-                }
-                if (state.error != null) {
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(state.error!)));
-                }
-              },
-              builder: (context, state) {
-                if (state.profile == null) {
-                  return const Center(
-                    child: CircularProgressIndicator(color: Colors.white),
-                  );
-                }
-
-                return Column(
-                  children: [
-                    const SizedBox(height: 16),
-                    CustomAppBar(title: 'Личные данные'),
-                    const SizedBox(height: 32),
-                    _Field(
-                      'Имя',
-                      nameController,
-                      iconPath: 'assets/icons/edit.png',
-                    ),
-                    _Field(
-                      'Дата рождения',
-                      birthDateController,
-                      iconPath: 'assets/icons/edit.png',
-                      readOnly: true,
-                      onTap: () => _selectDate(
-                        context,
-                      ),
-                    ),
-                    _Field(
-                      'Телефон',
-                      phoneController,
-                      iconPath: 'assets/icons/lock.png',
-                      enabled: false,
-                    ),
-                    _Field(
-                      'E-mail',
-                      emailController,
-                      iconPath: 'assets/icons/edit.png',
-                    ),
-                    const Spacer(),
-                    state.isSaving
-                        ? const CircularProgressIndicator(color: Colors.white)
-                        : GradientButton(
-                            text: 'Сохранить изменения',
-                            onTap: () => _submit(context),
-                            width: double.infinity,
-                            height: 56,
-                            fontSize: 16,
-                            showArrows: true,
-                          ),
-                    const SizedBox(height: 24),
-                  ],
-                );
-              },
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-}
-
-class _Field extends StatelessWidget {
-  final String label;
-  final TextEditingController controller;
-  final String iconPath;
-  final bool enabled;
-  final bool readOnly;
-  final VoidCallback? onTap;
-
-  const _Field(
-    this.label,
-    this.controller, {
-    required this.iconPath,
-    this.enabled = true,
-    this.readOnly = false,
-    this.onTap
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final borderColor = enabled
-        ? Colors.white.withOpacity(0.3)
-        : Colors.white.withOpacity(0.15);
-    final iconOpacity = enabled ? 0.7 : 0.3;
-
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 16),
-      child: TextField(
-        controller: controller,
-        enabled: enabled,
-        readOnly: readOnly,
-        onTap: onTap,
-        style: const TextStyle(color: Colors.white),
-        decoration: InputDecoration(
-          labelText: label,
-          labelStyle: const TextStyle(color: AppColors.white70),
-          enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
-            borderSide: BorderSide(color: borderColor),
-          ),
-          disabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
-            borderSide: BorderSide(color: borderColor),
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(4),
-            borderSide: const BorderSide(color: AppColors.smsDigit, width: 1.5),
-          ),
-          suffixIcon: Padding(
-            padding: const EdgeInsets.only(right: 12),
-            child: Opacity(
-              opacity: iconOpacity,
-              child: Image.asset(iconPath, width: 20, height: 20),
-            ),
-          ),
-          suffixIconConstraints: const BoxConstraints(
-            minWidth: 44,
-            minHeight: 44,
-          ),
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:intl/intl.dart';
+
+import '../../core/app_colors.dart';
+import '../../di/service_locator.dart';
+import '../../domain/entities/user_profile.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../event/edit_profile_event.dart';
+import '../state/edit_profile_state.dart';
+import '../event/profile_event.dart';
+import '../viewmodel/edit_profile_bloc.dart';
+import '../viewmodel/profile_bloc.dart';
+
+class EditProfileScreen extends StatefulWidget {
+  final UserProfile profile;
+
+  const EditProfileScreen({super.key, required this.profile});
+
+  @override
+  State<EditProfileScreen> createState() => _EditProfileScreenState();
+}
+
+class _EditProfileScreenState extends State<EditProfileScreen> {
+  late final TextEditingController nameController;
+  late final TextEditingController birthDateController;
+  late final TextEditingController phoneController;
+  late final TextEditingController emailController;
+
+  DateTime? _selectedBirthDate;
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<EditProfileBloc>().add(EditProfileStarted());
+
+    nameController = TextEditingController();
+    phoneController = TextEditingController();
+    emailController = TextEditingController();
+
+    String initialDateText = '';
+
+    if (widget.profile.birthDate.isNotEmpty) {
+      try {
+        _selectedBirthDate = DateFormat('dd.MM.yyyy').parse(widget.profile.birthDate);
+        initialDateText = DateFormat('dd.MM.yyyy').format(_selectedBirthDate!);
+      } catch (e) {
+        initialDateText = widget.profile.birthDate;
+        print("EXCEPTION:  $e");
+      }
+    }
+    birthDateController = TextEditingController(text: initialDateText);
+  }
+
+  void _submit(BuildContext context) {
+    final profileFromState = context.read<EditProfileBloc>().state.profile;
+    if (profileFromState == null) return;
+
+    final String birthDateForApi = _selectedBirthDate?.toIso8601String() ?? '';
+
+    final updatedProfile = profileFromState.copyWith(
+      name: nameController.text,
+      birthDate: birthDateForApi.isNotEmpty ? "${birthDateForApi}Z" : '',
+      email: emailController.text,
+    );
+
+    context.read<EditProfileBloc>().add(EditProfileSubmitted(updatedProfile));
+    context.read<ProfileBloc>().add(ProfileUpdated());
+
+  }
+
+  Future<void> _selectDate(BuildContext context) async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: _selectedBirthDate ?? DateTime.now(),
+      firstDate: DateTime(DateTime.now().year - 100),
+      lastDate: DateTime.now(),
+    );
+
+    if (picked != null && picked != _selectedBirthDate) {
+      setState(() {
+        _selectedBirthDate = picked;
+        birthDateController.text = DateFormat('dd.MM.yyyy').format(picked);
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20),
+            child: BlocConsumer<EditProfileBloc, EditProfileState>(
+              listener: (context, state) {
+                final profile = state.profile;
+                if (profile != null && nameController.text.isEmpty) {
+                  nameController.text = profile.name;
+                  phoneController.text = profile.phone;
+                  emailController.text = profile.email;
+                  birthDateController.text = profile.birthDate;
+
+                }
+
+                if (state.isSuccess) {
+                  getIt<ProfileBloc>().add(ProfileUpdated());
+                  context.pop();
+                }
+                if (state.error != null) {
+                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(state.error!)));
+                }
+              },
+              builder: (context, state) {
+                if (state.profile == null) {
+                  return const Center(
+                    child: CircularProgressIndicator(color: Colors.white),
+                  );
+                }
+
+                return Column(
+                  children: [
+                    const SizedBox(height: 16),
+                    CustomAppBar(title: 'Личные данные'),
+                    const SizedBox(height: 32),
+                    _Field(
+                      'Имя',
+                      nameController,
+                      iconPath: 'assets/icons/edit.png',
+                    ),
+                    _Field(
+                      'Дата рождения',
+                      birthDateController,
+                      iconPath: 'assets/icons/edit.png',
+                      readOnly: true,
+                      onTap: () => _selectDate(
+                        context,
+                      ),
+                    ),
+                    _Field(
+                      'Телефон',
+                      phoneController,
+                      iconPath: 'assets/icons/lock.png',
+                      enabled: false,
+                    ),
+                    _Field(
+                      'E-mail',
+                      emailController,
+                      iconPath: 'assets/icons/edit.png',
+                    ),
+                    const Spacer(),
+                    state.isSaving
+                        ? const CircularProgressIndicator(color: Colors.white)
+                        : GradientButton(
+                            text: 'Сохранить изменения',
+                            onTap: () => _submit(context),
+                            width: double.infinity,
+                            height: 56,
+                            fontSize: 16,
+                            showArrows: true,
+                          ),
+                    const SizedBox(height: 24),
+                  ],
+                );
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+}
+
+class _Field extends StatelessWidget {
+  final String label;
+  final TextEditingController controller;
+  final String iconPath;
+  final bool enabled;
+  final bool readOnly;
+  final VoidCallback? onTap;
+
+  const _Field(
+    this.label,
+    this.controller, {
+    required this.iconPath,
+    this.enabled = true,
+    this.readOnly = false,
+    this.onTap
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final borderColor = enabled
+        ? Colors.white.withOpacity(0.3)
+        : Colors.white.withOpacity(0.15);
+    final iconOpacity = enabled ? 0.7 : 0.3;
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16),
+      child: TextField(
+        controller: controller,
+        enabled: enabled,
+        readOnly: readOnly,
+        onTap: onTap,
+        style: const TextStyle(color: Colors.white),
+        decoration: InputDecoration(
+          labelText: label,
+          labelStyle: const TextStyle(color: AppColors.white70),
+          enabledBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(4),
+            borderSide: BorderSide(color: borderColor),
+          ),
+          disabledBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(4),
+            borderSide: BorderSide(color: borderColor),
+          ),
+          focusedBorder: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(4),
+            borderSide: const BorderSide(color: AppColors.smsDigit, width: 1.5),
+          ),
+          suffixIcon: Padding(
+            padding: const EdgeInsets.only(right: 12),
+            child: Opacity(
+              opacity: iconOpacity,
+              child: Image.asset(iconPath, width: 20, height: 20),
+            ),
+          ),
+          suffixIconConstraints: const BoxConstraints(
+            minWidth: 44,
+            minHeight: 44,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/fine_payment_screen.dart b/lib/presentation/screens/fine_payment_screen.dart
new file mode 100644
index 0000000..4cf3a80
--- /dev/null
+++ b/lib/presentation/screens/fine_payment_screen.dart
@@ -0,0 +1,421 @@
+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 '../../di/service_locator.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/add_payment_card_usecase.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../components/custom_app_bar.dart';
+import '../components/full_screen_image_viewer.dart';
+import '../components/gradient_button.dart';
+import '../components/payment_option.dart';
+import '../components/sheet/payment_method_sheet.dart';
+import '../event/fine_payment_event.dart';
+import '../event/payment_method_sheet_event.dart';
+import '../state/fine_payment_state.dart';
+import '../viewmodel/fine_payment_bloc.dart';
+import '../viewmodel/payment_method_sheet_bloc.dart';
+
+class FinePaymentScreen extends StatelessWidget {
+  final int fineId;
+
+  const FinePaymentScreen({
+    super.key,
+    required this.fineId,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => FinePaymentBloc(
+        getFineDetailsUsecase: getIt(),
+        payFineUsecase: getIt(),
+      )..add(FetchFineDetails(fineId)),
+      child: const _FinePaymentScreenContent(),
+    );
+  }
+}
+
+class _FinePaymentScreenContent extends StatelessWidget {
+  const _FinePaymentScreenContent();
+
+  void _openFullScreenImage(BuildContext context, List<String> photos, int initialIndex) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (_) => FullScreenImageViewer(
+          photoUrls: photos,
+          initialIndex: initialIndex,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Stack(
+            children: [
+              Positioned(
+                bottom: 60,
+                left: 0,
+                right: 0,
+                child: Image.asset(
+                  'assets/wave.png',
+                  fit: BoxFit.fitWidth,
+                  color: Colors.white.withOpacity(0.1),
+                ),
+              ),
+
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(height: 16),
+                  const Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 20),
+                    child: CustomAppBar(title: 'Оплата штрафа'),
+                  ),
+
+                  Expanded(
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.symmetric(horizontal: 24),
+                      child: BlocConsumer<FinePaymentBloc, FinePaymentState>(
+                        listenWhen: (previous, current) => previous.status != current.status,
+                        listener: (context, state) {
+                          if (state.status == FinePaymentStatus.success && state.paymentCompleted) {
+                            context.go('/home');
+                          } else if (state.status == FinePaymentStatus.failure) {
+                            ScaffoldMessenger.of(context).hideCurrentSnackBar();
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                  state.errorMessage ?? 'Произошла ошибка при оплате штрафа',
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                                backgroundColor: Colors.redAccent.withOpacity(0.9),
+                                behavior: SnackBarBehavior.floating,
+                                shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(12),
+                                ),
+                                margin: const EdgeInsets.all(20),
+                                duration: const Duration(seconds: 3),
+                              ),
+                            );
+                          }
+                        },
+                        builder: (context, state) {
+                          final fine = state.fine;
+
+                          if (state.status == FinePaymentStatus.loading && fine == null) {
+                            return const SizedBox(
+                              height: 400,
+                              child: Center(
+                                child: CircularProgressIndicator(color: Colors.white),
+                              ),
+                            );
+                          }
+
+                          if (fine == null) return const SizedBox.shrink();
+
+                          return Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              const SizedBox(height: 20),
+
+                              if (fine.photoUrls.isNotEmpty)
+                                SizedBox(
+                                  height: 110,
+                                  child: ListView.separated(
+                                    scrollDirection: Axis.horizontal,
+                                    itemCount: fine.photoUrls.length,
+                                    separatorBuilder: (_, __) => const SizedBox(width: 12),
+                                    itemBuilder: (context, index) {
+                                      final photo = fine.photoUrls[index];
+                                      final isNetwork = photo.startsWith('http');
+                                      return GestureDetector(
+                                        onTap: () => _openFullScreenImage(
+                                          context,
+                                          fine.photoUrls,
+                                          index,
+                                        ),
+                                        child: ClipRRect(
+                                          borderRadius: BorderRadius.circular(16),
+                                          child: isNetwork
+                                              ? Image.network(
+                                            photo,
+                                            width: 110,
+                                            height: 110,
+                                            fit: BoxFit.cover,
+                                          )
+                                              : Image.asset(
+                                            photo,
+                                            width: 110,
+                                            height: 110,
+                                            fit: BoxFit.cover,
+                                          ),
+                                        ),
+                                      );
+                                    },
+                                  ),
+                                ),
+
+                              const SizedBox(height: 24),
+
+                              _buildInfoLabel('Самокат:'),
+                              _buildValueRow(
+                                'qr_icon.png',
+                                fine.scooterNumber,
+                              ),
+
+                              const SizedBox(height: 20),
+
+                              _buildInfoLabel('Дата:'),
+                              Text(
+                                fine.date,
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+
+                              const SizedBox(height: 20),
+
+                              _buildInfoLabel('Описание:'),
+                              Text(
+                                fine.description,
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+
+                              const SizedBox(height: 28),
+
+                              Container(
+                                width: double.infinity,
+                                padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
+                                decoration: BoxDecoration(
+                                  color: Colors.white.withOpacity(0.07),
+                                  borderRadius: BorderRadius.circular(20),
+                                  border: Border.all(
+                                    color: Colors.white.withOpacity(0.2),
+                                    width: 1,
+                                  ),
+                                ),
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Сумма штрафа:',
+                                      style: TextStyle(
+                                        color: Colors.white.withOpacity(0.8),
+                                        fontSize: 16,
+                                      ),
+                                    ),
+                                    const SizedBox(height: 10),
+                                    Row(
+                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      children: [
+                                        Image.asset(
+                                          'assets/icons/money_icon.png',
+                                          width: 36,
+                                          height: 36,
+                                        ),
+                                        const SizedBox(width: 10),
+                                        Text(
+                                          fine.amountPrint,
+                                          style: const TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 28,
+                                            fontWeight: FontWeight.bold,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                              ),
+
+                              const SizedBox(height: 28),
+
+                              (state.useBalance || state.selectedCard != null)
+                                  ? PaymentOption(
+                                title: state.useBalance ? 'Баланс' : "",
+                                subtitle: state.useBalance
+                                    ? '${state.userBalance.toStringAsFixed(2)} BYN'
+                                    : '${state.selectedCard!.cardLastNumber}',
+                                isSelected: true,
+                                onTap: () async {
+                                  final result = await showModalBottomSheet<dynamic>(
+                                    context: context,
+                                    isScrollControlled: true,
+                                    backgroundColor: Colors.transparent,
+                                    builder: (innerContext) => BlocProvider(
+                                      create: (context) => PaymentMethodSheetBloc(
+                                        getIt<GetPaymentCardsUsecase>(),
+                                        getIt<SetMainPaymentCardUsecase>(),
+                                        getIt<GetProfileUseCase>(),
+                                        getIt<AddPaymentCardUsecase>(),
+                                      )..add(PaymentMethodSheetStarted()),
+                                      child: PaymentMethodSheet(
+                                        initialSelectedCard: state.useBalance ? null : state.selectedCard,
+                                      ),
+                                    ),
+                                  );
+
+                                  if (result != null && context.mounted) {
+                                    if (result is PaymentCard) {
+                                      context.read<FinePaymentBloc>().add(FinePaymentCardChanged(result));
+                                    } else if (result == 'balance') {
+                                      context.read<FinePaymentBloc>().add(SelectFineBalancePressed());
+                                    }
+                                  }
+                                },
+                              )
+                                  : Container(
+                                height: 56,
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(24),
+                                  border: Border.all(
+                                    color: Colors.white.withOpacity(0.4),
+                                    width: 1,
+                                  ),
+                                ),
+                                child: Material(
+                                  color: Colors.transparent,
+                                  child: InkWell(
+                                    onTap: () async {
+                                      final result = await showModalBottomSheet<dynamic>(
+                                        context: context,
+                                        isScrollControlled: true,
+                                        backgroundColor: Colors.transparent,
+                                        builder: (innerContext) => BlocProvider(
+                                          create: (context) => PaymentMethodSheetBloc(
+                                            getIt<GetPaymentCardsUsecase>(),
+                                            getIt<SetMainPaymentCardUsecase>(),
+                                            getIt<GetProfileUseCase>(),
+                                            getIt<AddPaymentCardUsecase>(),
+                                          )..add(PaymentMethodSheetStarted()),
+                                          child: const PaymentMethodSheet(),
+                                        ),
+                                      );
+
+                                      if (result != null && context.mounted) {
+                                        if (result is PaymentCard) {
+                                          context.read<FinePaymentBloc>().add(FinePaymentCardChanged(result));
+                                        } else if (result == 'balance') {
+                                          context.read<FinePaymentBloc>().add(SelectFineBalancePressed());
+                                        }
+                                      }
+                                    },
+                                    borderRadius: BorderRadius.circular(24),
+                                    child: Center(
+                                      child: Row(
+                                        mainAxisAlignment: MainAxisAlignment.center,
+                                        children: [
+                                          const Text(
+                                            'Способ оплаты',
+                                            style: TextStyle(
+                                              color: Colors.white,
+                                              fontSize: 16,
+                                              fontWeight: FontWeight.w600,
+                                            ),
+                                          ),
+                                          const SizedBox(width: 8),
+                                          Icon(
+                                            Icons.arrow_forward_ios,
+                                            size: 12,
+                                            color: Colors.white.withOpacity(0.6),
+                                          ),
+                                          Icon(
+                                            Icons.arrow_forward_ios,
+                                            size: 12,
+                                            color: Colors.white.withOpacity(0.4),
+                                          ),
+                                          Icon(
+                                            Icons.arrow_forward_ios,
+                                            size: 12,
+                                            color: Colors.white.withOpacity(0.2),
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              const SizedBox(height: 20),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+
+                  Padding(
+                    padding: const EdgeInsets.all(24.0),
+                    child: BlocBuilder<FinePaymentBloc, FinePaymentState>(
+                      builder: (context, state) {
+                        final isButtonDisabled = state.status == FinePaymentStatus.loading ||
+                            (!state.useBalance && state.selectedCard == null);
+
+                        return GradientButton(
+                          text: state.status == FinePaymentStatus.loading
+                              ? 'Обработка...'
+                              : 'Оплатить',
+                          showArrows: true,
+                          height: 56,
+                          width: double.infinity,
+                          onTap: isButtonDisabled
+                              ? null
+                              : () {
+                            context.read<FinePaymentBloc>().add(PayFineSubmitted());
+                          },
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildInfoLabel(String text) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 6),
+      child: Text(
+        text,
+        style: TextStyle(
+          color: Colors.white.withOpacity(0.7),
+          fontSize: 15,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildValueRow(String iconName, String value) {
+    return Row(
+      children: [
+        Image.asset('assets/icons/$iconName', width: 24, height: 24),
+        const SizedBox(width: 12),
+        Text(
+          value,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 18,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ],
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/presentation/screens/lease_agreement_screen.dart b/lib/presentation/screens/lease_agreement_screen.dart
new file mode 100644
index 0000000..c0033c9
--- /dev/null
+++ b/lib/presentation/screens/lease_agreement_screen.dart
@@ -0,0 +1,383 @@
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+
+class LeaseAgreementScreen extends StatelessWidget {
+  const LeaseAgreementScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        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: ''),
+              ),
+
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        'Договор (публичная оферта) на аренду имущества',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      _buildParagraph(
+                        'ООО “БИХЕППИБЕЛ” Республика Беларусь, г. Витебск, г. Полоцк, г. Новополоцк, г. Борисов, г. Могилев, г. Молодечно, является «Арендодатель». Арендодатель (юридическое лицо) указывается при выборе объекта аренды в акте приема-передачи публичной оферты аренды имущества, с одной стороны и полностью дееспособное физическое лицо (гражданин РБ, иностранный гражданин, лицо без гражданства), акцептующее настоящий договор аренды, именуемое в дальнейшем «Арендатор», с другой стороны, совместно именуемые «Стороны» заключили настоящий Договор публичный оферты (далее - Договор) о нижеследующем: Стороны заключают настоящий Договор, который создает для Арендатора юридические обязательства. Арендодатель при заключение руководствуется законодательством об аренде имущества, Конвенция Совета Европы о защите физических лиц при автоматизированной обработке персональных данных от 28 января 1981 года ETS N 108. Если вы не согласны с каким-либо из условий настоящего Договора, пожалуйста, не переходите к сервису по аренде объекта в приложение BeHappy, не используйте любые услуги, предлагаемые через приложения, и не создавайте учетную запись для таких услуг. Используя электронные Платформы, вы соглашаетесь с условиями настоящего Договора. Вы подтверждаете, что внимательно прочитали и поняли условия настоящего Договора.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('1. Основные термины и определения, используемые в Договоре'),
+                      _buildParagraph(
+                        'В настоящем Договоре используются следующие термины, имеющие определенное ниже значение. В случае, если в Договоре используются термины и понятия, не определенные в настоящем разделе, они имеют значения, которые обычно придаются им в соответствующей отрасли/сфере.\n\n'
+                            '1.1. Акцепт – ответ физического лица (гражданина РБ, иностранного гражданина, лица без гражданства), достигшего 18 лет и не состоящего под опекой или попечительством, о принятии настоящей Оферты, который совершается в порядке, предусмотренным настоящим Договором. Ответ должен быть полным и безоговорочным;\n\n'
+                            '1.2. Аренда – использование имущества (объекта) в соответствии с его целевым назначением, с момента начала аренды до момента его завершения, по правилам, определенным настоящим Договором;\n\n'
+                            '1.3. Арендатор - физическое лицо (гражданин РБ, иностранный гражданин, лицо без гражданства), достигшего 18 лет и не состоящего под опекой или попечительством;\n\n'
+                            '1.4. Объект (имущество), технические характеристики объекта и собственник объекта указывается в акте-приема передачи в момент выбора объекта на аренду в приложение BeHappy;\n\n'
+                            '1.5. Стоимость аренды объекта – расценка имущества указаны в личном кабинете Арендатора, отображаемые в Приложении BeHappy. Иные Тарифы (в т.ч. используемые в рамках отдельных акций) размещаются на Сайте и/или в Приложении " BeHappy " и являются неотъемлемой частью к настоящему Договору;\n\n'
+                            '1.6. Безакцептное списание – списание денежных средств с банковской карты, указанной Арендатором во исполнение условий настоящего Договора. Списание денежных средств производится без получения дополнительного согласия со стороны Арендатора, по правилам и в порядке, предусмотренными законодательством Республики Беларусь и настоящим Договором;\n\n'
+                            '1.7. Несезон – это то время, когда погодные или иные условия не позволяют предоставить качественный и безопасный сервис и Объекта изымаются из города без возможности аренды;\n\n'
+                            '1.8. Служба поддержки – структурное подразделение Арендодателя, осуществляющее консультационную поддержку Пользователей в круглосуточном режиме семь дней в неделю, без выходных и праздничных дней, в дни работы сервиса (кроме несезона, см. п.1.7), оказывающая помощь Пользователям и их информирование в процессе предоставления Арендодателем Сервиса BeHappy. Поддержка и информирование осуществляются при обращении Пользователя в Службу поддержки через приложение в устройстве по мессенджерам (WhatsApp, Viber, Telegram);\n\n'
+                            '1.9. Лицевой счет Арендатора - счётчик, на котором фиксируются платежи Арендатора и суммы денежных средств, внесенных в качестве оплаты за аренду имущества;\n\n'
+                            '1.10. Зона начала/завершения аренды - территория города, обозначенная в приложении BeHappy - «Разрешено кататься», кроме территории, обозначенной «Парковка запрещена»;\n\n'
+                            '1.11. Зона, разрешенная для поездок - территория города, обозначенная в приложении BeHappy - «Разрешено кататься»;\n\n'
+                            '1.12. Парковка — место, отмеченное на карте в мобильном приложении Арендодателя, где Арендатор может завершить сессию аренды. Кроме территории, обозначенной «Парковка запрещена»;\n\n'
+                            '1.13. Бронирование – закрепление выбранного Арендатором Объекта за данным Пользователем на период бронирования;\n\n'
+                            '1.14. Групповая поездка — функция в Приложении, позволяющая одному Арендатору начать аренду сразу на нескольких Объектах.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('2. Предмет Договора и общие положения'),
+                      _buildParagraph(
+                        '2.1. Арендодатель передает во временное владение и пользование Арендатору Объект, а Арендатор принимает Объект для использования в потребительских целях (для личных нужд), не связанных с осуществлением предпринимательской деятельности;\n\n'
+                            '2.2. Арендатор гарантирует, что не будет использовать Приложение BeHappy с нарушением требований действующего законодательства, а также условий Договора Аренды, либо в целях причинения вреда Арендодателю или третьим лицам;\n\n'
+                            '2.3. На момент заключения настоящего договора сдаваемый в аренду Объект принадлежит Арендодателю на праве собственности. Переход права собственности на указанный Объект к другому лицу не является основанием для изменения или расторжения настоящего договора.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('3. Условия и порядок заключения Договора'),
+                      _buildParagraph(
+                        '3.1. На момент заключения договора Арендатор должен достигнуть 18-летнего возраста, не состоять под опекой или попечительством;\n\n'
+                            '3.2. Акцепт считается совершенным Арендатором при условии выполнения им следующей совокупности действий:\n'
+                            '3.2.1. Арендатор самостоятельно совершает загрузку (скачивание) на Устройство Приложения с использованием магазинов приложений AppStore (itunes.apple.com) и / или Google Play (play.google.com) в сети Интернет;\n'
+                            '3.2.2. Заполняет анкету в полном объеме, предоставляя требуемую в этой анкете информацию: номер своего мобильного телефона, адрес электронной почты, имя фамилию и отчество, а также дату рождения, в соответствии с данными паспорта;\n'
+                            '3.2.3. Ознакомление Арендатора в полном объеме с условиями настоящего Договора и политики конфиденциальности, путем нажатия кнопки «продолжить» при регистрации в Мобильном приложении, которую Арендодатель и Арендатор признают аналогом собственноручной подписи Арендатора, равным по юридической силе собственноручной подписи Арендатора на бумажном носителе и принятие условия настоящего Договора и Политики конфиденциальности путем проставления галочки в чек-боксе «Я принимаю условия использования сервиса» и «Я даю согласие на обработку моих персональных данных» и нажатия кнопки «продолжить»;\n\n'
+                            '3.3. Арендатор не может завершить Регистрацию, не приняв условия настоящего Договора путем проставления галочки в чек-боксе «Я принимаю условия лицензионного договора», «Я принимаю условия договора оферты аренды» и «Я даю согласие на обработку моих персональных данных»;\n\n'
+                            '3.4. Договор заключается Арендатором к установленным Договором условиям в целом, без каких-либо условий и оговорок;\n\n'
+                            '3.5. Стороны договорились о том, что в случае возникновения у Арендодателя сомнений в достоверности указанных в Анкете персональных данных, он вправе через Мобильное приложение или иным способом направить запрос о предоставлении дополнительной информации о личности Арендатора, в том числе, фотографий страниц его паспорта, или иного документа, удостоверяющего личность. Стороны договорились, что при не предоставлении дополнительной информации, позволяющей устранить сомнения в достоверности указанных в Анкете персональных данных, акцепт может считаться не совершенным, а Договор может считаться не заключенным;\n\n'
+                            '3.6. Арендодатель не несет ответственности или каких-либо обязательств в случае, если оферта не акцептована и Договор не заключен по причине невозможности обработки предоставленных Арендатором сведений и информации по техническим причинам;\n\n'
+                            '3.7. Посредством акцепта настоящей оферты Арендатор подтверждает, что любые действия, осуществляемые в Мобильном приложении под его учетной записью, совершены лично Арендатором. Все риски, связанные с несанкционированным использованием учетной записи или мобильного устройства Арендатора, лежат на Арендаторе;\n\n'
+                            '3.8. Посредством акцепта настоящей оферты Арендатор подтверждает с записью разговоров/сообщений/уведомлений при обращении в Службу Поддержки BeHappy;\n\n'
+                            '3.9. Арендатор обязуется сохранять в тайне данные анкеты, а также иные данные, посредством которых может быть получен доступ к Приложению от имени Пользователя. В случае утраты номера телефона, или при наличии оснований полагать, что этими данными (а также иными данными) завладело третье лицо, Арендатор обязан с использованием контактных данных, указанных им при Регистрации, подать Службе Поддержки запрос (путем отправки на электронный адрес указанный в разделе мобильного приложения BeHappy ПОДДЕРЖКА. Запрос о блокировании доступа в личный кабинет рассматривается Арендодателем в течение 1 (одного) часа в рабочее время с момента направления запроса. Все риски, вытекающие из невыполнения данного обязательства Пользователем, лежат на Арендаторе;\n\n'
+                            '3.10. По окончании Регистрации все вызовы в Службу поддержки осуществляются Арендатором с номера мобильного телефона, указанного при заполнении анкеты, либо иного номера телефона при условии предоставления Арендатором дополнительных данных по запросу сотрудника Службы поддержки;',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('4. Заявления Арендатора'),
+                      _buildParagraph(
+                        'Принимая условия настоящего Договора, Арендатор заявляет, что он:\n\n'
+                            '4.1. владеет русским языком (на уровне, достаточном для прочтения и осознания смысла и значения настоящего Договора);\n\n'
+                            '4.2. прочитал условия Договора, осознал значение и смысл указанного документа, согласен с его содержанием и принимает его без каких-либо оговорок, условий и изъятий и обязуется выполнять установленные им требования, нести ответственность за неисполнение/ненадлежащее исполнение изложенных в нем требований и условий, а также понимает все последствия своих действий по Регистрации, пользованию Сервисами Приложения, Сервисом BeHappy;\n\n'
+                            '4.3. Арендатор дает свое согласие на обработку Арендодателем предоставленных им (а также полученных от любых третьих лиц) своих персональных данных: ФИО, дата, месяц и год рождения, место рождения, серия и номер удостоверяющего личность документа (паспорта или иного заменяющего его документа), сведения об адресе регистрации по месту жительства, данные водительского удостоверения, контактные данные, в том числе (но не ограничиваясь) номер телефона, адрес электронной почты, данные о наличии (отсутствии) медицинских противопоказаний к использованию транспортного средства, биометрические данные (фотографии), данные о месте работы, должности, также иные персональные данные, связанные с заключением и исполнением Договора, и подтверждает, что давая такое согласие, действует по своей воле и в своих интересах;\n\n'
+                            '4.4. прочитал Политику конфиденциальности, осознал значение и смысл указанного документа, согласен с его содержанием;\n\n'
+                            '4.5. предоставил Арендодателю при Регистрации полные, действительные и достоверные данные (в том числе, персональные данные);\n\n'
+                            '4.6. соответствует всем требованиям, предъявляемым к нему настоящим Договором, в частности, обладает правом управления транспортными средствами в соответствии с требованиями действующего законодательства, того государства, на чей территории подписывается Договор аренды, у Арендатора отсутствуют предусмотренные действующим законодательством, того государства (страны) противопоказания для управления транспортными средствами, его возраст составляет не менее 18 (восемнадцати) лет, он соответствует требованиям, предъявляемым действующим законодательством , того государства (страны), которое дает право управлять транспортными средствами. Указанные требования к Арендатору не являются исчерпывающими. Сервис BeHappy вправе отказать в Регистрации, а также не заключать Договор присоединения с Арендатором, не соответствующим указанным требованиям, равно как в случае, если у Сервиса BeHappy есть основания полагать, что Арендатор может допустить нарушение настоящего Договора;\n\n'
+                            '4.7. согласен с размещением в Объекта, позволяющего отследить и зафиксировать точные координаты Объекта, а также нарушения обязательств по Договору со стороны Арендатора;\n\n'
+                            '4.8. безусловно и безоговорочно согласен с тем, что размер причиненных Арендатором повреждений или иного рода ухудшений Объекту, а также иных убытков Арендодателю, возникших в результате ненадлежащего использования (эксплуатации) Арендатором Объекта и/или нарушения Арендатором иных условий Аренды по настоящему Договору, определяются (оцениваются) Арендодателем самостоятельно и единолично, исходя из имеющихся у Арендодателя данных и сведений, полученных, в том числе (но не ограничиваясь), при использовании данных технической поддержки Приложения " BeHappy " (включая, но не ограничиваясь, сведения и данные, в том числе фотографии, предоставленные Арендатором с использованием Приложения "BeHappy"), а Арендатор безусловно и безоговорочно соглашается возмещать их Арендодателю в полном объеме по первому требованию Арендодателя, заявленному (направленному) как с использованием Приложения " BeHappy ", так и предъявленному Арендатору в ином порядке и иным доступным способом;\n\n'
+                            '4.9. признает юридическую силу за документами, направленными Арендодателем посредством Сайта или Приложения, как за собственноручно подписанными документами, за действиями, совершенными посредством Сайта или Приложения;\n\n'
+                            '4.10. признает, что средства идентификации, используемые Арендодателем, являются достаточными для установления лица, от которого исходят соответствующие документы и действия;\n\n'
+                            '4.11. Ознакомление с условиями настоящего Договора должно быть произведено Пользователем до момента проставления галочки в чек-боксе «Я принимаю условия использования сервиса» и «Я даю согласие на обработку моих персональных данных» и нажатия кнопки «продолжить». Арендатор, своевременно не ознакомившийся с условиями настоящего Договора, принимает на себя все риски связанных с этим неблагоприятных последствий.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('5. Содержание Договора'),
+                      _buildParagraph(
+                        '5.1. Арендодатель обязан:\n'
+                            '5.1.1. предоставить Арендатору через Мобильное приложение и путем размещения в мобильном приложение BeHappy полной информации об объекте Арендодателя, его технических характеристиках, размере арендных платежей и прочих условиях Договора;\n'
+                            '5.1.2. выставить в доступ Объекты в технически исправном состоянии;\n'
+                            '5.1.3. нести расходы на содержание Объекта, возникающие в связи с его правильной эксплуатацией (за исключением расходов, которые прямо возложены на Арендатора Договором);\n'
+                            '5.1.4. обеспечивать соблюдение требований законодательства при получении и обработке персональных данных Арендатора;\n'
+                            '5.1.5. надлежащим образом исполнять обязательства, вытекающие из настоящего Договора.\n\n'
+                            '5.2. Арендодатель вправе:\n'
+                            '5.2.1. требовать от Арендатора исполнения обязательств по Договору;\n'
+                            '5.2.2. осуществлять проверку сведений, в том числе персональных данных, предоставляемых Арендатором в момент регистрации в Мобильном приложении;\n'
+                            '5.2.3. обрабатывать персональные данные Арендатора, предоставленные в момент регистрации в Мобильном приложении, а также полученные при заключении и исполнении настоящего Договора;\n'
+                            '5.2.4. осуществлять контроль за обеспечением сохранности Объекта, а также за его техническим состоянием, контролировать соответствие эксплуатации Объекта целям, установленным настоящим Договором;\n'
+                            '5.2.5. отказать в заключении Договора, в случае предоставления Арендатором в момент регистрации в Мобильном приложении недостоверных или неполных персональных данных;\n'
+                            '5.2.6. отказать в заключении Договора, приостановить либо прекратить его действие, при наличии у Арендатора задолженности, вытекающей из настоящего и иных Договоров, заключенных между Арендатором и Арендодателем, до момента погашения задолженности в полном объеме, а также в случае нарушения Арендатором иных условий данного Договора;\n'
+                            '5.2.7. в одностороннем порядке вносить изменения в настоящий Договор (в т.ч. в стоимость и условия аренды);\n'
+                            '5.2.8. по истечении 24 часов после возникновения задолженности по оплате арендных платежей без предупреждения изъять Объект у Арендатора, а также прибегнуть к иным предусмотренным законодательством действующим законодательством, того государства (страны) противопоказания Республики Беларусь способам защиты своих прав;\n'
+                            '5.2.9. в случае удаления Объекта Арендатором от Зоны, разрешенной для поездок, более чем на 150 метров, за отказ вернуться в разрешенную зону, за невозможность связаться по указанному номеру телефона, Арендодатель предпринимает меры для возврата Объекта в разрешенную зону: отправляет уведомление на телефон о факте нарушения и с просьбой вернуться в зону для катания, снижает скорость до 5 км/ч, блокирует колесо Объекта. Если после всех мер Арендодателя, Объект не вернулся в разрешенную зону, Арендодатель заявляет в правоохранительные органы о факте кражи, а также прибегнуть к иным предусмотренным законодательством Республики Беларусь способам защиты своих прав;\n'
+                            '5.2.10. в случае наличия у Арендодателя достаточных оснований полагать о возможности совершения Арендатором мошеннических действий, а также иных проявлениях недобросовестного поведения, в одностороннем порядке прекратить исполнение по данному Договору, уведомив Арендатора через Мобильное приложение, а также прибегнуть к иным предусмотренным законодательством РБ способам защиты своих прав;\n'
+                            '5.2.11. перевести Объект в режим экономии энергии (снижение скорости) в случае снижения заряда аккумулятора ниже 20%;\n'
+                            '5.2.12. осуществлять списание с банковской карты Арендатора денежных средств в оплату денежных обязательств Арендатора перед Арендодателем в соответствии с Договором и Приложениями к нему, в том числе, в случаях, предусмотренных Договором, в безакцептном порядке (без получения дополнительного согласия Арендатора);\n'
+                            '5.2.13. уступить свои права по взысканию задолженностей, образовавшихся за Аренду по настоящему Договору, любым третьим лицам, в соответствии с действующим законодательством без согласия Арендатора, но с уведомлением Арендатора;\n'
+                            '5.2.14. осуществлять исходящие вызовы Арендатору и отправлять голосовые и иные сообщения уведомительного характера, содержащие информацию о состоянии задолженности, иную информацию, касающуюся предоставления Аренды, информацию об изменениях условий Договора (в т.ч. Тарифов), о новых услугах, новости, а также сообщения рекламного характера на номер мобильного телефона Арендатора, указанный при Регистрации (или на иные номера, сообщенные Арендатора Арендодателю на условиях настоящего Договора), а также направлять всю вышеуказанную информацию на адрес электронной почты, указанный при Регистрации (или на иной электронный адрес, сообщенный Арендатором Арендодателю на условиях настоящего Договора);\n\n'
+                            '5.3. Арендатор вправе:\n'
+                            '5.3.1. Арендатор вправе использовать Объект в сроки, в порядке и на условиях, предусмотренных настоящим Договором.\n\n'
+                            '5.4. Арендатор обязан:\n'
+                            '5.4.1. использовать сервисы иных сайтов приложения BeHappy, Сервисы Сайта и Приложения только в личных некоммерческих целях, не связанных с осуществлением предпринимательской деятельности и только в соответствии с условиями настоящего Договора;\n'
+                            '5.4.2. Арендатор понимает и соглашается, что для надлежащего использования Сервисов Сайта и Приложения, он сам должен обеспечить надлежащую скорость интернет-подключения устройств. Арендатор перед использованием Сервисов Сайта и Приложения должен самостоятельно убедиться в том, что его устройство обладает необходимыми для этого характеристиками. Все вопросы приобретения прав доступа в Интернет, покупки и наладки для этого соответствующих устройств и программных продуктов решаются Пользователем самостоятельно и за свой счет и не подпадают под действие Договора;\n'
+                            '5.4.3. до начала использования Объекта произвести его осмотр на предмет наличия повреждений;\n'
+                            '5.4.4. при обнаружении повреждений или иного рода ухудшений Объекта до начала его использования, сообщить об этом Арендодателю путем отправки ему фотографии при помощи Мобильного приложения. В случае если Арендатор до начала использования не уведомил Арендодателя о существующих повреждениях или иного рода ухудшениях Объекта, Арендатор признает себя виновным в причинении повреждений во время Аренды им Объекта, если такие были обнаружены другим Арендатором или Арендодателем в дальнейшем;\n'
+                            '5.4.5. при отсутствии повреждений на Объекта, принять Объект во временное владение и пользование в порядке, предусмотренном разделом 10 настоящего Договора;\n'
+                            '5.4.6. использовать Объект в строгом соответствии с его целевым назначением без коммерческого использования и без использования, подразумевающего мошеннические действия;\n'
+                            '5.4.7. своевременно, в соответствии с условиями настоящего Договора, вносить любые платежи, предусмотренные Договором и Приложениями к нему, обеспечивать остаток денежных средств на банковской карте в количестве, достаточном для осуществления всех платежей, предусмотренных настоящим Договором и Приложениями к нему;\n'
+                            '5.4.8. осуществлять управление Объектом лично. Арендатор не вправе передавать Объект в пользование третьим лицам в субаренду;\n'
+                            '5.4.9. Арендатор не вправе передавать Объект в пользование третьим лицам, не достигшим возраста 18 лет;\n'
+                            '5.4.10. обеспечивать сохранность Объекта с момента приема до момента прекращения Аренды;\n'
+                            '5.4.11. бережно использовать имущество Арендодателя. Принимать меры по предотвращению ущерба имуществу Арендодателя. В связи с этим, Арендатору запрещается ряд действий;\n'
+                            '5.4.12. Арендатору запрещается использовать Объект на неровных поверхностях, вне тротуаров и дорожек/дорог с твердым покрытием, на песке, переезжать через любые ямы, выбоины, бордюры, горки, бугры, выпуклости и иные неровности, отличающиеся от основного полотна более чем на 3 см, равно как и имеющие острые края, либо иные особенности дорожного полотна, создающие дополнительную нагрузку для колес Объекта, а также лужи, глубиной более 2 см вне зависимости от возможности внешнего определения глубины;\n'
+                            '5.4.13. Арендатору запрещается использовать Объект для езды по бездорожью, пересеченной местности;\n'
+                            '5.4.14. Арендатору запрещается выполнять акробатические трюки, совершать прыжки, наезды на препятствия, бордюры, ступени, а также использовать Объект в соревнованиях;\n'
+                            '5.4.15. Арендатору запрещается использовать Объект для транспортировки, буксирования грузов, передвигаться на Объекте более чем одному человеку, а также перевозить детей и животных, перемещаться на Объекте при превышении суммарного веса (с одеждой, сумкой, рюкзаком и т.д.) свыше 100 кг;\n'
+                            '5.4.16. Арендатору запрещается оставлять Объект вовремя и после окончания аренды не пристегнутым, при условии оснащения объекта электромеханическим замком. Арендатору запрещается парковка Объекта в горизонтальном состоянии. Арендатору запрещается эксплуатировать Объект, если блокировочный трос не находится в замке, а также Арендатору запрещается оставлять Объект после окончания аренды не пристегнутым к стойке или другому парковочному объекту, указанному на карте в зоне Парковки. Так же запрещается, парковка Объекта в труднодоступных местах, пристегивание его к неразрешенным конструкциям или иным образом блокирование Объекта;\n'
+                            '5.4.17. Арендатору запрещается складывать Объект (в том числе с использованием штатного механизма);\n'
+                            '5.4.18. Арендатору запрещается снимать наклейки, идентификационные номера, штрихкоды, равно как и наносить надписи, наклеивать наклейки, наносить пометки, повреждать лакокрасочное покрытие Объекта, пачкать его (за исключением нормального загрязнения платформы уличной обувью);\n'
+                            '5.4.19. Арендатору запрещается допускать полный разряд аккумулятора Объекта;\n'
+                            '5.4.20. Арендатору запрещается использовать технологии или предпринимать действия, которые могут нанести вред сервисам иных сайтов мобильного приложения BeHappy, Объекту, иному имуществу Арендодателя;\n'
+                            '5.4.21. Арендатору запрещается вносить любые изменения в Объект, изменять какие-либо характеристики, производить улучшения или ухудшения Объекта;\n'
+                            '5.4.22. незамедлительно известить Арендодателя через Мобильное приложение о любых повреждениях Объекта, полученных во время Аренды, отключении любой из систем, иных неисправностях, дорожно-транспортных происшествиях с участием Объекта; нарушениях функционирования Мобильного приложения. При таких обстоятельствах Арендатор должен прекратить использование Объекта, о чем требуется проинформировать Арендодателя через Мобильное приложение BeHappy;\n'
+                            '5.4.23. принимать надлежащие меры для защиты своей учетной записи, включая свои имя и пароль, в Мобильном приложении от несанкционированного использования другими лицами, и незамедлительно сообщить Арендодателю соответствующую информацию, в случае обнаружения такого использования;\n'
+                            '5.4.24. Арендатор не вправе передавать данные своей учетной записи третьим лицам;\n'
+                            '5.4.25. в случае возникновения у Арендодателя сомнений относительно правомочности использования зарегистрированной учетной записи, Арендодатель вправе направить запрос о предоставлении дополнительной информации о личности Арендатора, в том числе, фотографий страниц его паспорта, или иного документа, удостоверяющего личность. Стороны договорились, что при непредставлении ответа на запрос, Арендодатель вправе приостановить, а по истечении трех суток прекратить действие настоящего Договора;\n'
+                            '5.4.26. своевременно, в соответствии с условиями настоящего Договора вносить арендную плату, оплачивать иные платежи, предусмотренные Договором, обеспечивать на банковской карте, указанной Арендатором во исполнение условий настоящего Договора, денежные средства в количестве, достаточном для оплаты Аренды Объекта;\n'
+                            '5.4.27. своевременно, в соответствии с условиями настоящего Договора оплатить в полной мере аренду Объекта, даже если Объект из-за снижения заряда перешёл в экономный режим, либо отключился из-за того, что был разряжен во время предыдущего периода аренды этим Арендодателем;\n'
+                            '5.4.28. в случае списания денежных средств со счета Арендатора в размере, не соответствующим тарифам, немедленно уведомить Арендодателя в разделе мобильного приложения BeHappy ПОДДЕРЖКА;\n'
+                            '5.4.29. по завершении использования и прекращении аренды Арендатор обязан припарковать Объект в зоне начала/завершения аренды на велопарковке или иной парковке, разрешенной в Мобильном Приложении и не противоречащей действующим законам Республики Беларусь. В случае её отсутствия Объект следует припарковать на обочине дороги или на тротуаре, но таким образом, чтобы Объект не препятствовал движению пешеходов или транспортных средств и не находился на проезжей части. Арендатору запрещено допускать парковки Объекта на проезжей части дороги и на расстоянии ближе 1 метра от неё, на мостах и путепроводах, на железнодорожных переездах, в тоннелях, на эстокадах, мостах, путепроводах, вблизи опасных поворотов, на велосипедных дорожках, на пешеходных переходах (наземных, подземных и надземных) и на расстоянии ближе 5 метров от них, на тротуарах шириной менее 1,5 метров, на остановочных пунктах общественного транспорта и на расстоянии ближе 5 метров от них, ближе 15 метров от мест остановки маршрутных транспортных средств или стоянки легковых такси, на газонах и других участках с зелёными насаждениями (клумбы, цветники и иные подобные элементы благоустройства), на территориях, прилегающих к памятникам и мемориалам, ближе 10 метров от служебных дверей и рамп магазинов, через которые производятся погрузочно-разгрузочные работы, ворот, в том числе ворот гаражей, и на других участках, где может быть создано препятствие для движения пешеходов и транспорта, под навесами из железобетонных перекрытий;\n'
+                            '5.4.30. при завершении использования Объекта и прекращении Аренды Арендатор обязан закрепить Объект тросом и замком к конструкции велопарковки (где она предусмотрена), в случае ее отсутствия к иной замкнутой металлической конструкции, в разрешенном, обозначенном на карте в Мобильном приложении месте. Трос должен быть закреплен через замкнутую часть конструкции, замок плотно закрыт. Парковка и закрытие замка подтверждается путем отправки фотографий Объекта через мобильное приложение. В случае отсутствия в конструкции Объекта механизма фиксации (замка), Арендатор обязан припарковать объект строго в разрешённом месте в соответствии с нанесённой парковочной разметкой, а в случае её отсутствия, припарковать объект так, чтобы он не создавал помех другим участникам движения и не нарушал правила благоустройства города;\n'
+                            '5.4.31. объект должен быть возвращен Арендодателю в технически исправном состоянии, без каких-либо повреждений, в порядке, предусмотренном настоящим Договором;\n'
+                            '5.4.32. во время использования Объекта Арендатор обязан соблюдать ПДД и нести ответственность за их нарушение. В этой связи, Арендатор при использовании Объекта, в частности, обязан:\n'
+                            '5.4.32.1. безоговорочно уступать движение пешеходам;\n'
+                            '5.4.32.2. осуществлять движение по велосипедной, велопешеходной дорожкам или полосе для велосипедистов не создавая препятствий;\n'
+                            '5.4.32.3. в случае, если отсутствуют велосипедная и велопешеходная дорожки, полоса для велосипедистов либо отсутствует возможность двигаться по ним или по правому краю проезжей части, допускается движение по обочине не создавая препятствий;\n'
+                            '5.4.32.4. в случае, если отсутствуют велосипедная и велопешеходная дорожки, полоса для велосипедистов либо отсутствует возможность двигаться по ним, а также по правому краю проезжей части или обочине, допускается движение по тротуару или пешеходной дорожке не создавая препятствий;\n'
+                            '5.4.32.5. если движение по тротуару, пешеходной дорожке, обочине или в пределах пешеходных зон подвергает опасности или создает помехи для движения иных лиц, рекомендуется спешиться и уступить дорогу пешеходам;\n'
+                            '5.4.32.6. при движении в темное время суток или в условиях недостаточной видимости необходимо включить фару и фонарь самоката, а также необходимо обозначить себя световозвращающими элементами и обеспечивать видимость этих предметов другим участникам дорожного движения;\n'
+                            '5.4.32.7. пересекать проезжаю часть со скоростью идущего шагом пешехода по велосипедному переезду или пешеходному переходу, не создавая препятствий;\n'
+                            '5.4.32.8. при использовании Объекта рекомендуется надевать защитный шлем и другую защиту.\n'
+                            '5.4.33. Для предотвращения вероятности привлечения к ответственности за нарушение ПДД, Арендатору запрещается:\n'
+                            '5.4.33.1. управлять Объектом в состоянии алкогольного, наркотического, токсического или иного опьянения, а также после приема медицинских препаратов вызывающих аналогичные свойства организма, равно как и отказываться от проведения процедуры медицинского освидетельствования по запросу уполномоченного должностного лица;\n'
+                            '5.4.33.2. управлять Объектом, не держась за руль хотя бы одной рукой;\n'
+                            '5.4.33.3. пересекать проезжую часть по надземным, наземным, подземным и иным переходам, не спускаясь с Объектом;\n'
+                            '5.4.33.4. спускаться на Объекте в метро, катание непосредственно по зоне метро не допускается, заезжать на нем внутрь зданий, территорий ограниченного доступа и т.д.\n'
+                            '5.4.34. не допускать причинение вреда жизни, здоровью и имуществу третьих лиц, в том числе других участников дорожного движения. В случае причинения вреда с использованием Объекта, Арендатор привлекается к ответственности в порядке, предусмотренном действующим законодательством Республики Беларусь;\n'
+                            '5.4.35. своевременно, в соответствии с условиями настоящего договора, оплатить в полной мере аренду Объекта, даже если из-за снижения заряда аккумулятора во время аренды Арендатором Объекта перешел в экономный режим и/или колесо Объекта заблокировано;\n'
+                            '5.4.36. парковать Объект на тактильных дорожках, предназначенных для перемещения людей с инвалидностью по зрению;\n'
+                            '5.4.37. перевозить на Объекте других лиц.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('6. Гарантии и ответственность Арендодателя'),
+                      _buildParagraph(
+                        '6.1. Предоставляет Арендатору Сервисы иных Сайтов Приложения BeHappy, а также любую информацию, содержащуюся на Сайте и/или в Приложении «как есть» («as is») без гарантий любого рода. Это означает, среди прочего, что Арендодатель:\n'
+                            '6.1.1. не несет ответственности за скорость и бесперебойную работу Сайта, Приложения, их совместимость с программным обеспечением и операционными системами устройств Пользователя, а также скорость интернет-подключения устройств;\n'
+                            '6.1.2. не несет ответственности за отсутствие ошибок и/или вирусов при работе Сайта и Приложения, прерывание каналов связи и выход из строя серверной инфраструктуры на уровне магистральных каналов связи, центров обмена данными, вычислительных центров, а также линий связи регионального и местного значения;\n'
+                            '6.1.3. не несет ответственности за временную неработоспособность платежных систем, обеспечивающую прием и перевод платы Арендатором, вызванную не зависящими от Арендодателя причинами, а также обстоятельствами непреодолимой силы;\n'
+                            '6.1.4. не несет ответственности за нарушение условий Договора, если такое нарушение вызвано действием обстоятельств непреодолимой силы (форс-мажор), включая среди прочих: действия и решения органов государственной власти и/или местного самоуправления, пожар, наводнение, землетрясение, другие стихийные действия, отсутствие электроэнергии и/или сбои работы компьютерной сети, забастовки, гражданские волнения, беспорядки, любые иные обстоятельства, которые могут повлиять на выполнение Сервисом BeHappy условий настоящего Договора;\n'
+                            '6.1.5. не несет ответственности за неисполнение либо ненадлежащее исполнение своих обязательств, если это вызвано действиями/бездействием Арендатора, находящимися вне контроля Арендодателя, в том числе в результате совершения ошибочных действий/бездействия Арендатора;\n\n'
+                            '6.2. Сайт и Приложение могут содержать ссылки на сайты, приложения и иные ресурсы третьих лиц. Указанные сайты, приложения и иные ресурсы третьих лиц и их материалы не проверяются Арендодателем на соответствие требованиям законодательства и ответственность за их содержание Арендодатель не несет;\n\n'
+                            '6.3. Действия любых третьих лиц, а также действия платежных систем, операторов связи не являются действиями Арендодателя, и ответственности за них Арендодатель не несет;\n\n'
+                            '6.4. Арендодатель гарантирует добросовестную и законную обработку персональных данных Пользователя в соответствии с предусмотренными в настоящем Договоре целями;\n\n'
+                            '6.5. Арендодатель гарантирует своевременное обновление данных Арендатора в случае предоставления им обновленных данных;\n\n'
+                            '6.6. Арендодатель несёт ответственность только за прямой действительный ущерб, причиненный вследствие виновного невыполнения обязательств Арендодателя, в пределах суммы всех платежей за пользование имуществом (не включая возмещение расходов, штрафы и убытки), уплаченных Арендатору Арендодателем за весь срок, предшествующий предъявлению соответствующего требования, но не более 12 (двенадцати) месяцев.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('7. Гарантии и ответственность Арендатора'),
+                      _buildParagraph(
+                        '7.1. Арендатор лично (самостоятельно) отвечает за свою жизнь и здоровье во время аренды Объекта;\n\n'
+                            '7.2. Риск случайной гибели или случайного повреждения Объекта с момента нажатия в Мобильном приложении кнопки «Начало поездки» и до момента завершения аренды лично несет Арендатор;\n\n'
+                            '7.3. Арендатор несет лично (самостоятельно) полную ответственность за вред, причиненный третьим лицам, и их имуществу в результате использования Объекта;\n\n'
+                            '7.4. Невозврат Объекта в соответствии с правилами настоящего Договора в течение разрешенного периода пользования, будет считаться утратой Объекта до момента его обнаружения. В случае утраты Объекта Арендатор обязуется возместить ущерб в размере восстановительной стоимости Объекта в сумме 3500 (трех тысяч пятьсот) рублей Республики Беларусь (далее РБ). В случае обнаружения Объекта после разрешенного периода пользования, Арендатор обязуется оплатить стоимость пользования Объекта до момента фактического возврата Объекта Арендодателю по предусмотренным тарифам, но не более восстановительной стоимости;\n\n'
+                            '7.5. Удаление от разрешенной зоны катания более, чем на 800 метров во время аренды Объекта будет считаться попыткой кражи. Арендодатель будет обязан заявить в правоохранительные органы о факте кражи, а также прибегнуть к иным предусмотренным законодательством Республики Беларусь способам защиты своих прав;\n\n'
+                            '7.6. В случае хищения Объекта до его возврата, Арендатор незамедлительно обязуется сообщить об этом в Службу поддержки сразу же, как только установит факт хищения. При этом Арендатор должен обратиться в правоохранительные органы с заявлением о хищении имущества и получить соответствующую справку из правоохранительных органов о возбуждении уголовного дела либо об отказе в возбуждении уголовного дела. Копию справки пользователь обязан предоставить в Службу поддержки указанные в разделе мобильного приложения BeHappy ПОДДЕРЖКА.\n\n'
+                            '7.7. В случае обнаружения Объекта Арендодатель возвращает Арендатору списанные при утрате Объекта со счета банковской карты Арендатора денежные средства за вычетом стоимости повреждений обнаруженного Объекта, а также стоимости пользования Объекта. При этом Арендатор обязан предоставить справку из правоохранительных органов;\n\n'
+                            '7.8. В случае дорожно-транспортного или иного происшествия с участием Арендатора на Объекте, Арендатор обязан сообщить об этом незамедлительно в Службу поддержки, контакты указаны в мобильном приложение BeHappy в разделе ПОДДЕРЖКА. В любом случае Арендатор остается ответственным за Объектом до момента возврата Объекта, либо передачи его представителю Арендодателя;\n\n'
+                            '7.9. В случае причинения вреда (повреждения) Объекту, Арендатор обязан возместить Арендодателю причиненный ущерб в размере, определяемом Арендодателем исходя из прейскуранта перечня запчастей, указанного на сайте. В случае несогласия Арендатора с произведенным расчетом, он вправе обратиться к Арендодателю для разрешения споров в порядке, предусмотренном настоящим Договором;\n\n'
+                            '7.10. Арендатор гарантирует, что он физически способен и умеет пользоваться объектом и обладает достаточным опытом для езды в городских условиях по проезжей части, по тротуарам и велодорожкам. Арендатор подтверждает, что введенные им при регистрации Пользователя данные соответствуют действительности, а также что Арендатору принадлежит банковская карта, указанная при регистрации Арендатора и денежных средств, находящихся на счете указанной банковской карты достаточно для оплаты услуг пользования Объекта и Арендатор обязуется пополнять счет указанной карты в размере, достаточном для оплаты услуг пользования Объектом. Арендатор настоящим уполномочивает банк-эмитент, выпустивший банковскую карту, указанную при регистрации Пользователя, а также процессинговый центр банка, с которым Арендодателем заключен договор эквайринга и /или платежного агента Арендодателя на списание денежных средств в размере причиненного вреда;\n\n'
+                            '7.11. В случае невозврата или утраты Объекта Арендодателя в соответствии с правилами настоящего Договора, Арендатор несет ответственность за Объект в сумме 3500 (трех тысяч пятьсот) рублей Республики Беларусь;\n\n'
+                            '7.12. Арендатор дает свое согласие на получение от Арендодателя рекламных сообщений, содержащих рекламу товаров и услуг, реализуемых Арендодателем и/или его партнерами и/или иными третьими лицами, на адрес электронной почты и номер мобильного телефона (включая привязанные к нему аккаунты в мессенджерах WhatsApp, Viber, Telegram и пр.), указанные Пользователем в процессе Регистрации, а также иные адреса электронной почты и номера мобильных телефонов (включая привязанные к ним аккаунты в мессенджерах WhatsApp, Viber, Telegram и пр.), сообщенные Пользователем Арендодателю в соответствии с настоящим Договором. В случае, если Арендатор обращается к Арендодателю с требованием прекратить распространение в его адрес рекламных сообщений, Арендодатель обязуется немедленно прекратить такое распространение в отношении Арендатора, обратившегося с соответствующим требованием;\n\n'
+                            '7.13. В случае нарушения Арендатором условий Договора, Арендатор блокируется.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('8. Размер, порядок и форма оплаты'),
+                      _buildParagraph(
+                        '8.1. Осуществление арендных платежей, штрафов и иных платежей, предусмотренных настоящим Договором, производится посредством безакцептного списания денежных средств с банковской карты Арендатора в соответствие с тарифами Арендодателя;\n\n'
+                            '8.2. При акцепте настоящей Оферты Арендатор выражает свое безоговорочное согласие на отправление Арендодателем поручений, запросов, требований банку Арендатора, а также на безакцептное списание денежных средств, составляющих арендные платежи, штрафы и иные платежи, предусмотренные настоящим Договором;\n\n'
+                            '8.3. В момент регистрации у Арендатора в целях подтверждения верности введения данных банковской карты списывается сумма в размере до 1 (одного) рубля. Поступление вышеуказанных денежных средств на счет Арендодателя является одним из условий акцепта настоящего Договора. Данная денежная сумма не засчитывается в качестве арендного платежа и возвращается в течение суток (обычно сразу, но зависит от оператора) на банковскую карту Арендатора;\n\n'
+                            '8.4. За пользование Объектом Арендатор уплачивает Арендодателю арендную плату согласно тарифов, обозначенных в Мобильном приложении;\n\n'
+                            '8.5. В стоимость аренды Объекта, включены все налоги, в соответствии с законодательством страны, на чей территории арендуется Объект;\n\n'
+                            '8.6. Арендодатель вправе производить списание с банковской карты Арендатора причитающихся ему платежей в любой момент до наступления момента завершения аренды (оплата аренды производится согласно условиям выбранного тарифа аренды Объекта и могут осуществляться как разовым списанием, так и списанием несколькими транзакциями, согласно условий тарифа);\n\n'
+                            '8.7. В целях гарантии оплаты поездки Арендодатель имеет право заблокировать на карте Арендатора в момент начала аренды сумму в размере до 20 (двадцати) рублей. Данная денежная сумма может быть зачтена в качестве арендного платежа, если стоимость аренды более заблокированной суммы. По завершении аренды, если стоимость аренды менее заблокированной суммы, Арендодатель снимает блокировку и денежные средства остаются на карте Арендатора, а Арендодатель производит списание стоимости поездки. Поступление вышеуказанных денежных средств на счет Арендодателя является одним из условий акцепта настоящего Договора;\n\n'
+                            '8.8. Списание денежных средств за пользование Объектом производится сразу после прекращения аренды. В случае, когда длительность аренды превышает 30 минут, то возможны промежуточные списания денежных средств. Также в начале, в зависимости от выбранного тарифного плана, аренды возможно резервирование денежный средств на банковской карте Арендатора.\n\n'
+                            '8.9. В случае недостатка денежных средств или невозможности их списания со счета Арендатора, а также в случае достижения задолженности, Арендодатель вправе в принудительном порядке завершить аренду Объекта и установить блокировку учетной записи, не допускающей возобновление аренды, до момента полной оплаты Арендатором образовавшейся задолженности по Договору. Арендатор обязуется погасить возникшую задолженность в течение 48 часов с момента возникновения задолженности за аренду и отображавшиеся в личном кабинете Арендатора,обеспечив достаточный для проведения списания остаток средств на банковской карте, при этом до момента погашения возникшей задолженности Арендодатель вправе присвоить Пользователю статус должника и заблокировать ему доступ к Сервису BeHappy полностью или в части;\n\n'
+                            '8.10. Списание штрафов и иных платежей, предусмотренных Договором, за исключением арендных платежей, производится в течение 30 (тридцати) календарных дней с даты направления Арендатору требования об оплате с использованием Мобильного приложения. В случае недостаточности денежных средств на счете Арендатора, любой возникший в рамках данного Договора платеж признается задолженностью;\n\n'
+                            '8.11. В случае неисполнения Пользователем обязательств по оплате, предусмотренных настоящим Договором (в том числе, настоящим разделом Договора), Арендодатель вправе направить соответствующие сведения (включая персональные данные Пользователя) в уполномоченные органы для привлечения Пользователя к административной ответственности, а также в организации, осуществляющие взыскание денежных средств;\n\n'
+                            '8.12. В случае ошибочного списания денежных средств с банковской карты Пользователя Арендатор вправе обратиться к Арендодателю по реквизитам указанные в разделе мобильного приложения BeHappy ПОДДЕРЖКА. Арендодатель вправе потребовать от Пользователя предоставить копию паспорта и документов, подтверждающих ошибочное списание (выписки со счета и пр.). Арендодатель не позднее 10 (десяти) рабочих дней рассматривает данное обращение и принимает по нему меры, за исключением случаев, когда денежные средства Пользователя были списаны в соответствии с Договором и/или Приложениями. Возврат денежных средств осуществляется на банковский счет Пользователя, с которого было произведено списание, в течение 14 (четырнадцати) рабочих дней, если более длительный срок не установлен внутренними банковскими процедурами. Порядок возврата денежных средств регулируется правилами международных платежных систем. Возврат наличными денежными средствами не допускается.\n\n'
+                            '8.13. При отсутствии вины Арендатора в нарушении условий настоящего Договора Арендодатель в течение 7 календарных дней с даты направления Арендатором Претензии с использованием Мобильного приложения производит возврат ошибочно списанных денежных средств;\n\n'
+                            '8.14. В случае нарушения Арендатором положений, предусмотренных п.п. 5.4.12, 5.4.13, 5.4.17, 5.4.29 настоящего Договора, Арендатор уплачивает штраф в размере до 400 (четырехсот) рублей Республики Беларусь;\n\n'
+                            '8.15. В случае нарушения Арендатором положений, предусмотренных п.п. 5.4.4, 5.4.23, 5.4.24, настоящего Договора, Арендатор оплачивает штраф в размере до 300 (трехсот) рублей Республики Беларусь;\n\n'
+                            '8.16. В случае нарушения Арендатором положений, предусмотренных п.п.5.4.32 (5.4.32.1 - 5.4.32.8), 5.4.33 (5.4.33.1 – 5.4.33.4), 5.4.37 настоящего Договора, Арендатор оплачивает штраф в размере до 500 (пятьсот) рублей Республики Беларусь;\n\n'
+                            '8.17. В случае нарушения Арендатором положений, предусмотренных п.п.5.4.6, 5.4.8, 5.4.9 настоящего Договора, Арендатор оплачивает штраф в размере до 300 (трехсот) рублей;\n\n'
+                            '8.18. В случае нарушения Арендатором положений, предусмотренных п.п. 5.4.31 настоящего Договора, Арендатор оплачивает штраф в размере до 2 000 (двух тысяч) рублей;\n\n'
+                            '8.19. За нарушение ПДД на Арендатора возлагается ответственность, предусмотренная Кодексом об административных правонарушениях РБ. Если оплата штрафа за Арендатора была произведена Арендодателем, Арендатор обязан возместить Арендодателю понесенные им в этой связи расходы;\n\n'
+                            '8.20. В случае причинения Арендатором во время использования Объектом вреда жизни, здоровью или имуществу третьих лиц, в том числе других участников дорожного движения, Арендатор обязуется в полном объеме возместить ущерб, причиненный его действиями как третьим лицам, так и Арендодателю;\n\n'
+                            '8.21. В случае нарушения Арендатором положений, предусмотренных п.п. 5.4.30, 5.4.18, 5.4.19 настоящего Договора, Арендатор уплачивает штраф в размере до 100 (ста) рублей;\n\n'
+                            '8.22. В случае утраты (кражи) объекта Арендатором применяется пункт 7.4 настоящего договора;\n\n'
+                            '8.23. В случае повторного нарушения Арендатором положений, предусмотренных п.п. 5.4.29, которые не привели к утере или порче Объекта, Арендатор уплачивает штраф в размере до 300 (трехсот) рублей;\n\n'
+                            '8.24. В случае нарушения Арендатором положений, предусмотренных п.п.8.9 настоящего Договора, Арендатор уплачивает арендодателю пеню в размере 2% за каждый день просрочки оплаты задолженности;\n\n'
+                            '8.25. В случае нарушения Арендатором положений, предусмотренных п.п.5.4.14 настоящего Договора, Арендатор оплачивает штраф в размере до 30 (тридцати) рублей;\n\n'
+                            '8.26. В случае нарушения Арендатором положений, предусмотренных п.п.5.4.15 настоящего Договора, Арендатор оплачивает штраф в размере до 100 (ста) рублей;',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('9. Срок Аренды'),
+                      _buildParagraph(
+                        '9.1. Срок Аренды Объекта исчисляется минутами и часами и/или километрами и метрами. Это зависит от выбранного тарифа;\n\n'
+                            '9.2. Период Аренды Объекта исчисляется с момента нажатия в Мобильном приложении кнопки «Начать поездку» до фактического прекращения Аренды Объекта Арендатором путем нажатия соответствующей кнопки в Мобильном приложении, и, при запросе Арендодателя, направления в качестве подтверждения фотографии общего вида, припаркованного Объекта через Мобильное приложение.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('10. Прием-передача от Арендодателя к Арендатору осуществляется следующим образом:'),
+                      _buildParagraph(
+                        '10.1. Арендатор при помощи Мобильного приложения выбирает на карте конкретный Объект. Арендатор при помощи камеры телефона сканирует QR штрихкод, размещенный на Объекте либо вводит номер самоката. При этом в Мобильном приложении отражаются следующие сведения о выбранном Объекте: местоположение, тариф, уровень заряда. Во время выбора Объекта Арендатор должен проверить достаточность денежных средств на банковской карте, привязанной к его аккаунту в Мобильном приложении;\n\n'
+                            '10.2. Арендатор при помощи Мобильного приложения может забронировать конкретный Объект по тарифу и на срок, обозначенные в мобильном приложении. Бронирование может быть отменено Арендатором через мобильное приложение;\n\n'
+                            '10.3. Арендодатель вправе отказать Арендатору в бронировании Объекта в случае отмены хотя бы одного бронирования Объекта;\n\n'
+                            '10.4. Допускается бронирование нескольких Объектов одним Арендатором;\n\n'
+                            '10.5. Допускается аренда более чем одного Объекта одним Арендатором с одного аккаунта — Групповая поездка. В этом случае Арендатор может передать Объект для управления только третьим лица достигшим возраста 18 лет. В случае групповой поездки ответственность за всё взятое в аренду имущество Арендодателя и за соблюдение условий аренду Объекта в рамках этого Договора несёт Арендатор, а не третье лицо, которому был передан Объект. Начиная аренду сразу нескольких Объектов Арендатор обязуется оплатить все начатые аренды от его имени и в случае нарушений условий договора, оплатить наложенные штрафные санкций на все поездки, начатые от его аккаунта;\n'
+                            'В случае начала групповой поездки — каждая аренда начинается Арендатором отдельно, как и завершается. Максимальное число арендованных Объектов для Групповой поездки в одном аккаунте — 4 (четыре);\n\n'
+                            '10.6. В момент нажатия кнопки «Начало поездки» в Мобильном приложении Арендатор подтверждает фактический прием выбранного Объекта и применяемого к его аренде тарифа и с этого момента начинает исчисляться период Аренды конкретного Объекта.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('11. Прием-передача Объекта от Арендатора к Арендодателю осуществляется следующим образом:'),
+                      _buildParagraph(
+                        '11.1. После выбора Объекта Арендатор подписывает акт приема-передачи Объекта в аренду, где указывается наименование объекта, технические характеристики Объекта. Реквизиты Арендодателя: наименование ,регистрационный номер регистрации юридического лица, юридический адрес, банковские реквизиты, контакты.\n'
+                            'Арендатор паркует Объект в разрешенном месте в Зоне начала/завершения аренды, нажимает в Мобильном приложении кнопку «Завершить аренду», и по запросу Арендодателя отправляет через Мобильное приложение фотографию общего вида, припаркованного Объекта, а также пристегивает замком к парковке (при наличии таких мест и оборудовании Объектов замками);\n\n'
+                            '11.2. После получения Арендодателем фотографий общего вида, припаркованного Объекта, заканчивается срок его Аренды. При соблюдении Арендатором предусмотренного Договором порядка приема-передачи Объекта, ему в Мобильном приложении приходит сообщение от Арендодателя с указанием суммы арендной платы, подлежащей к оплате.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('12. Срок действия Договора'),
+                      _buildParagraph(
+                        '12.1. Договор вступает в силу с момента акцепта Оферты в порядке, предусмотренным настоящим Договором;\n\n'
+                            '12.2. Договор заключен сроком на 12 месяцев с даты акцепта. Если ни одна из Сторон за 10 календарных дней до окончания срока действия настоящего Договора письменно не сообщит другой о его прекращении, Договор считается продленным на следующие 12 месяцев на прежних условиях, при этом количество продлений не ограничено.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('13. Основания и порядок расторжения Договора'),
+                      _buildParagraph(
+                        '13.1. Настоящий Договор может быть расторгнут до истечения срока, предусмотренного настоящим Договором, по соглашению Сторон или по инициативе одной из Сторон выраженной в понятном обеим Сторонам виде;\n\n'
+                            '13.2. Настоящий Договор может быть расторгнут досрочно в одностороннем внесудебном порядке по инициативе Арендодателя по следующим основаниям:\n'
+                            '13.2.1. При неоднократном (более двух раз) нарушении Арендатором ПДД РБ при использовании Объекта;\n'
+                            '13.2.2. При неоднократном (более двух раз) нарушении Арендатором правил парковки Объекта;\n'
+                            '13.2.3. При установлении факта причинения Арендатором ущерба Объекта;\n'
+                            '13.2.4. При установлении факта применения Арендатором технических средств, блокирующих GPS-сигнал, а также иных способов отключения защитных систем или систем контроля, установленных на Объекта;\n\n'
+                            '13.3. При досрочном расторжении Договора по инициативе Арендодателя Договор считается расторгнутым с момента уведомления Арендатора через Мобильное приложение, сообщением на телефонный номер Арендатора или электронную почту, указанную при регистрации;\n\n'
+                            '13.4. Настоящий Договор может быть расторгнут досрочно в одностороннем внесудебном порядке по инициативе Арендатора, в случае направления им запроса на удаление аккаунта, при условии отсутствия задолженности по арендным платежам, штрафам и иным платежам, предусмотренным настоящим Договором;\n\n'
+                            '13.5. Запрос на удаление аккаунта направляется Арендатором Арендодателю на реквизиты указанные в разделе мобильного приложения BeHappy ПОДДЕРЖКА.\n\n'
+                            '13.6. В случае расторжения Договора по инициативе Арендатора, при отсутствии задолженности, Договор считается расторгнутым по истечении 10 календарных дней с даты направления Арендатором запроса на удаление аккаунта. При наличии у Арендатора задолженности, Договор считается расторгнутым по истечении 10 календарных дней с даты полного погашения Арендатором задолженности по арендным платежам, штрафам и иным платежам, предусмотренным настоящим Договором. В день расторжения Договора Арендодатель производит удаление аккаунта Арендатора;\n\n'
+                            '13.7. По всем другим основаниям, которые не перечислены в п.13.2 настоящего Договора, при отсутствии согласия Сторон, Договор расторгается в судебном порядке;\n\n'
+                            '13.8. Окончание срока действия Договора не освобождает Арендатора от обязанности оплатить арендные платежи, штрафы и иные платежи по Договору, а также не освобождает от ответственности за нарушение условий Договора.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('14. Заключительные положения'),
+                      _buildParagraph(
+                        '14.1. Любая переписка, телефонные и иные переговоры, имевшие место до заключения Договора, теряют юридическую силу с момента заключения Договора;\n\n'
+                            '14.2. При нахождении Арендатора за пределами территории Республики Беларусь или при указании Арендатора номера мобильного телефона зарубежного оператора мобильной связи при Регистрации, а также для целей получения сообщений/уведомлений, предусмотренных настоящим Договором, Арендатор принимает на себя все риски несвоевременного получения или неполучения Арендатор сообщений от Арендодателя;\n\n'
+                            '14.3. Сообщения, направленные на электронную почту, считаются полученными адресатом в момент их отправки;\n\n'
+                            '14.4. Арендатор обязуется уведомлять Арендодателя об изменении места жительства (регистрации), места пребывания, номера мобильного телефона, адреса электронной почты, иных данных, предоставленных Пользователем Арендодателю, о перемене имени, фамилии, изменении реквизитов документа, удостоверяющего личность, изменении реквизитов или лишении водительского удостоверения, изменении данных документа, подтверждающего право иностранного гражданина/лица без гражданства на пребывание (проживание) на территории Республики Беларусь, изменении гражданства, иных персональных данных, а также об утрате вышеуказанных данных, обратившись в Службу поддержки в раздел поддержка мобильного приложения BeHappy ПОДДЕРЖКА. Арендодатель не несет ответственность за какие-либо последствия, связанные с изменением указанных в настоящем пункте Договора данных Арендатора, если Арендатор не оповестил об указанных в настоящем пункте Договора обстоятельствах Арендодателя, и/или предоставил Арендодателю неверные данные;\n\n'
+                            '14.5. Настоящий Договор составлен на русском языке.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('15. Разрешение споров и подсудность'),
+                      _buildParagraph(
+                        '15.1. Все споры и разногласия по настоящему Договору разрешаются путем переговоров;\n\n'
+                            '15.2. В случае, если Арендодатель и Арендатор не пришли к решению посредством переговоров в течение 10 (десяти) рабочих дней, споры и разногласия передаются на разрешение суда по месту нахождения Арендодателя.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('16. Адрес и иные реквизиты Арендодателя:'),
+                      _buildParagraph(
+                        'ООО “БИХЕППИБЕЛ” (Оказывает услуги в городах Молодечно, Витебск, Полоцк, Новополоцк, Могилев, Борисов является организатором эквайринговой площадки)\n'
+                            'УНП 392026683\n'
+                            'Свидетельство о государственной регистрации № 0239895 от 22.01.2026 выдано администрацией Октябрьского района г.Витебска\n'
+                            'ОКПО 511318892000\n'
+                            'Юридический адрес: Республика Беларусь, 210017, г. Витебск, ул. Гагарина 105 кБ, офис 11А.\n'
+                            'Банковские реквизиты в белорусских рублях:\n'
+                            'Расчетный счет: BY86ALFA30122G27690010270000\n'
+                            'ЗАО «Альфа-Банк», 220013, Республика Беларусь,220013, г. Минск, ул. Сурганова, 43-47, 220013\n'
+                            'БИК ALFABY2X\n'
+                            'Почтовый адрес: behappybelarus@gmail.com',
+                      ),
+
+                      const SizedBox(height: 32),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildParagraph(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Color(0xFFD1D1D6),
+        fontSize: 14,
+        height: 1.5,
+      ),
+    );
+  }
+
+  Widget _buildSectionHeader(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Colors.white,
+        fontSize: 16,
+        fontWeight: FontWeight.bold,
+        height: 1.4,
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/presentation/screens/license_agreement_screen.dart b/lib/presentation/screens/license_agreement_screen.dart
index 526c58b..65a7a5c 100644
--- a/lib/presentation/screens/license_agreement_screen.dart
+++ b/lib/presentation/screens/license_agreement_screen.dart
@@ -1,168 +1,168 @@
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-
-class LicenseAgreementScreen extends StatelessWidget {
-  const LicenseAgreementScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        width: double.infinity,
-        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: ' '),
-              ),
-
-              // 🔹 ПРОКРУЧИВАЕМЫЙ ТЕКСТ
-              Expanded(
-                child: SingleChildScrollView(
-                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        'Лицензионное соглашение на использование программы «Be Happy» для мобильных устройств',
-                        style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 18
-                        ),
-                      ),
-
-                      const SizedBox(height: 16),
-
-                      _buildParagraph(
-                        'Перед использованием программы, пожалуйста, ознакомьтесь с условиями нижеследующего лицензионного соглашения.\n\n'
-                        'Любое использование Вами программы означает полное и безоговорочное принятие Вами условий настоящего лицензионного соглашения.\n\n'
-                        'Если Вы не принимаете условия лицензионного соглашения в полном объёме, Вы не имеете права использовать программу в каких-либо целях.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('1. Общие положения'),
-                      _buildParagraph(
-                        '1.1. Настоящее Лицензионное соглашение («Лицензия») устанавливает условия использования программы «Be Happy» для мобильных устройств («Программа») и заключено между любым лицом, использующим Программу («Пользователь»), и ООО “БИХЕППИБЕЛ”, Республика Беларусь, 210017 Витебская область, Октябрьский район, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А, являющимся правообладателем исключительного права на Программу («Лицензиар»).\n\n'
-                        '1.2. Копируя Программу, устанавливая её на свое мобильное устройство или используя Программу любым образом, Пользователь выражает свое полное и безоговорочное согласие со всеми условиями Лицензии.\n\n'
-                        '1.3. Использование Программы разрешается только на условиях настоящей Лицензии. Если Пользователь не принимает условия Лицензии в полном объёме, Пользователь не имеет права использовать Программу в каких-либо целях. Использование Программы с нарушением (невыполнением) какого-либо из условий Лицензии запрещено.\n\n'
-                        '1.4. Использование Программы Пользователем на условиях настоящей Лицензии в личных некоммерческих целях осуществляется безвозмездно. Использование Программы на условиях и способами, не предусмотренными настоящей Лицензией, возможно только на основании отдельного соглашения с Лицензиаром.\n\n'
-                        '• Оферта на подключение к программе «Be Happy», размещенная в сети Интернет по адресу: https://behappybel.by,\n'
-                        '• Условия подключения к сервису «Be Happy», размещенные в сети Интернет по адресу: https://behappybel.by,\n'
-                        '• «Политика конфиденциальности», размещенная в сети Интернет по адресу: https://behappybel.by.\n\n'
-                        'Указанные документы (в том числе любые из их частей) могут быть изменены Правообладателем в одностороннем порядке без какого-либо специального уведомления, новая редакция документов вступает в силу с момента их опубликования, если иное не предусмотрено новыми редакциями документов.\n\n'
-                        '1.6. Все или некоторые функции Программы могут быть недоступны или ограничены в зависимости от наличия или отсутствия акцепта Пользователем документов, указанных в пункте 1.5 настоящей Лицензии.\n\n'
-                        '1.7. К настоящей Лицензии и всем отношениям, связанным с использованием Программы, подлежит применению право Республики Беларусь и любые претензии или иски, вытекающие из настоящей Лицензии или использования Программы, должны быть поданы и рассмотрены в суде по месту нахождения Правообладателя.\n\n'
-                        '1.8. Лицензиар может предоставить Пользователю перевод настоящей Лицензии с русского на другие языки, однако в случае противоречия между условиями Лицензии на русском языке и ее переводом, юридическую силу имеет исключительно русскоязычная версия Лицензии. Русскоязычная версия Лицензии размещена по адресу: https://behappybel.by.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('2. Права на Программу'),
-                      _buildParagraph(
-                        '2.1. Исключительное право на Программу принадлежит Лицензиар.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('3. Лицензия'),
-                      _buildParagraph(
-                        '3.1. Лицензиар безвозмездно, на условиях простой (неисключительной) лицензии, предоставляет Пользователю непередаваемое право использования Программы на территории всех стран мира следующими способами:\n\n'
-                        '3.1.1. Воспроизводить Программу путем её копирования и установки на мобильное (-ые) устройство (-ва) Пользователя. При установке на мобильное устройство каждой копии Программы присваивается индивидуальный номер, который автоматически сообщается Правообладателю;\n\n'
-                        '3.1.2. Применять Программу по прямому функциональному назначению только после принятия Пользователем указанных в пункте 1.5 настоящей Лицензии документов и ввода в интерфейсе Программы специального кода (пароля), предоставленного Пользователю в подтверждение принятия указанных документов.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('4. Ограничения'),
-                      _buildParagraph(
-                        '4.1. За исключением использования в объемах и способами, прямо предусмотренными настоящей Лицензией или законодательством Республики Беларусь, Пользователь не имеет права изменять, декомпилировать, дизассемблировать, дешифровать и производить иные действия с объектным кодом Программы, имеющие целью получение информации о реализации алгоритмов, используемых в Программе, создавать производные произведения с использованием Программы, а также осуществлять (разрешать осуществлять) иное использование Программы, без письменного согласия Лицензиара.\n\n'
-                        '4.2. Пользователь не имеет право воспроизводить и распространять Программу в коммерческих целях (в том числе за плату), в том числе в составе сборников программных продуктов, без письменного согласия Лицензиара.\n\n'
-                        '4.3. Пользователь не имеет права распространять Программу в виде, отличном от того, в котором он ее получил, без письменного согласия Правообладателя.\n\n'
-                        '4.4. Программа должна использоваться (в том числе распространяться) под наименованием: «Be Happy». Пользователь не вправе изменять наименование Программы, изменять и/или удалять знак охраны авторского права (copyright notice) или иные указания на Лицензиара.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('5. Условия использования отдельных функций Программы'),
-                      _buildParagraph(
-                        '5.1. Выполнение некоторых функций Программы возможно только при наличии доступа к сети Интернет. Пользователь самостоятельно получает и оплачивает такой доступ на условиях и по тарифам своего оператора связи или провайдера доступа к сети Интернет.\n\n'
-                        '5.2. Пользователь считается правомерно владеющим экземпляром Программы, при условии ввода в интерфейсе Программы специального кода (пароля), который выдается Лицензиар Пользователю в случае акцепта Пользователем Оферты на подключение к программе «Be Happy» размещенной в сети Интернет по адресу: https://behappybel.by и при условии соответствия Пользователя требованиям, указанным в Условиях подключения к сервису «Be Happy», размещенных в сети Интернет по адресу: https://behappybel.by В этом случае Пользователь вправе использовать функциональные возможности Программы.\n\n'
-                        '5.3. Специальных код (пароль), необходимый для подтверждения правомерности владения (использования) Пользователем экземпляром Программы, не считается действительным, если он был получен без принятия Пользователем указанных в пункте 1.5 настоящей Лицензии документов.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('6. Ответственность по Лицензии'),
-                      _buildParagraph(
-                        '6.1. Программа (включая её части и содержание) предоставляется на условиях «как есть» (as is). Лицензиар не предоставляет никаких гарантий в отношении безошибочной и бесперебойной работы Программы или отдельных её компонентов и/или функций, соответствия Программы конкретным целям и ожиданиям Пользователя, не гарантирует достоверность, точность, полноту и своевременность Данных, а также не предоставляет никаких иных гарантий, прямо не указанных в настоящей Лицензии.\n\n'
-                        '6.2. Лицензиар не несет ответственности за какие-либо прямые или косвенные последствия какого-либо использования или невозможности использования Программы (включая ей части и содержание) и/или ущерб, причиненный Пользователю и/или третьим сторонам в результате какого-либо использования, неиспользования или невозможности использования Программы (включая ей части и содержание) или отдельных её компонентов и/или функций, в том числе из-за возможных ошибок или сбоев в работе Программы, за исключением случаев, прямо предусмотренных законодательством.\n\n'
-                        '6.3. Пользователь настоящим уведомлен и соглашается, что при использовании Программы Лицензиар в автоматическом передается следующая информация: тип операционной системы мобильного устройства Пользователя, версия и идентификатор Программы, статистика использования функций Программы, а также иная техническая информация.\n\n'
-                        '6.4. Программа может содержать ссылки на сайты и приложения третьих лиц. Правообладатель не контролирует и не несет ответственности за содержание и порядок использования таких сайтов и приложений. Условия использования таких сайтов и приложений определены в их соглашениях и политиках конфиденциальности.\n\n'
-                        '6.5. Все вопросы и претензии, связанные с использованием/невозможностью использования Программы, а также возможным нарушением Программой законодательства и/или прав третьих лиц, должны направляться через форму обратной связи по адресу:',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('7. Обновления/новые версии Программы'),
-                      _buildParagraph(
-                        '7.1. Действие настоящей Лицензии распространяется на все последующие обновления/новые версии Программы. Соглашаясь с установкой обновления/новой версии Программы, Пользователь принимает условия настоящей Лицензии для соответствующих обновлений/новых версий Программы, если обновление/установка новой версии Программы не сопровождается иным Лицензионным соглашением.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('8. Изменения условий настоящей Лицензии'),
-                      _buildParagraph(
-                        '8.1. Настоящее лицензионное соглашение может изменяться Лицензиром в одностороннем порядке. Уведомление Пользователя о внесенных изменениях в условия настоящей Лицензии публикуется на странице: https://behappybel.by. Указанные изменения в условиях лицензионного соглашения вступают в силу с даты их публикации, если иное не оговорено в соответствующей публикации.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('Лицензиар'),
-                      _buildParagraph(
-                        'ООО “БИХЕППИБЕЛ”\n'
-                        'УНП 392050943\n'
-                        'ОКПО 511318892000\n'
-                        'Свидетельство о государственной регистрации № 392026683 от 22.01.2026 выдано Инспекцией Министерства по налогам и сборам Республики Беларусь по Октябрьскому району г.Витебска\n\n'
-                        'Юридический адрес: Республика Беларусь, 210017, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А',
-                      ),
-
-                      const SizedBox(height: 32),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildParagraph(String text) {
-    return Text(
-      text,
-      style: const TextStyle(
-        color: Color(0xFFD1D1D6),
-        fontSize: 14,
-        height: 1.5,
-      ),
-    );
-  }
-
-  Widget _buildSectionHeader(String text) {
-    return Text(
-      text,
-      style: const TextStyle(
-        color: Colors.white,
-        fontSize: 16,
-        fontWeight: FontWeight.bold,
-        height: 1.4,
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+
+class LicenseAgreementScreen extends StatelessWidget {
+  const LicenseAgreementScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        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: ' '),
+              ),
+
+              // 🔹 ПРОКРУЧИВАЕМЫЙ ТЕКСТ
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Лицензионное соглашение на использование программы «Be Happy» для мобильных устройств',
+                        style: const TextStyle(
+                            color: Colors.white,
+                            fontSize: 18
+                        ),
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      _buildParagraph(
+                        'Перед использованием программы, пожалуйста, ознакомьтесь с условиями нижеследующего лицензионного соглашения.\n\n'
+                        'Любое использование Вами программы означает полное и безоговорочное принятие Вами условий настоящего лицензионного соглашения.\n\n'
+                        'Если Вы не принимаете условия лицензионного соглашения в полном объёме, Вы не имеете права использовать программу в каких-либо целях.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('1. Общие положения'),
+                      _buildParagraph(
+                        '1.1. Настоящее Лицензионное соглашение («Лицензия») устанавливает условия использования программы «Be Happy» для мобильных устройств («Программа») и заключено между любым лицом, использующим Программу («Пользователь»), и ООО “БИХЕППИБЕЛ”, Республика Беларусь, 210017 Витебская область, Октябрьский район, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А, являющимся правообладателем исключительного права на Программу («Лицензиар»).\n\n'
+                        '1.2. Копируя Программу, устанавливая её на свое мобильное устройство или используя Программу любым образом, Пользователь выражает свое полное и безоговорочное согласие со всеми условиями Лицензии.\n\n'
+                        '1.3. Использование Программы разрешается только на условиях настоящей Лицензии. Если Пользователь не принимает условия Лицензии в полном объёме, Пользователь не имеет права использовать Программу в каких-либо целях. Использование Программы с нарушением (невыполнением) какого-либо из условий Лицензии запрещено.\n\n'
+                        '1.4. Использование Программы Пользователем на условиях настоящей Лицензии в личных некоммерческих целях осуществляется безвозмездно. Использование Программы на условиях и способами, не предусмотренными настоящей Лицензией, возможно только на основании отдельного соглашения с Лицензиаром.\n\n'
+                        '• Оферта на подключение к программе «Be Happy», размещенная в сети Интернет по адресу: https://behappybel.by,\n'
+                        '• Условия подключения к сервису «Be Happy», размещенные в сети Интернет по адресу: https://behappybel.by,\n'
+                        '• «Политика конфиденциальности», размещенная в сети Интернет по адресу: https://behappybel.by.\n\n'
+                        'Указанные документы (в том числе любые из их частей) могут быть изменены Правообладателем в одностороннем порядке без какого-либо специального уведомления, новая редакция документов вступает в силу с момента их опубликования, если иное не предусмотрено новыми редакциями документов.\n\n'
+                        '1.6. Все или некоторые функции Программы могут быть недоступны или ограничены в зависимости от наличия или отсутствия акцепта Пользователем документов, указанных в пункте 1.5 настоящей Лицензии.\n\n'
+                        '1.7. К настоящей Лицензии и всем отношениям, связанным с использованием Программы, подлежит применению право Республики Беларусь и любые претензии или иски, вытекающие из настоящей Лицензии или использования Программы, должны быть поданы и рассмотрены в суде по месту нахождения Правообладателя.\n\n'
+                        '1.8. Лицензиар может предоставить Пользователю перевод настоящей Лицензии с русского на другие языки, однако в случае противоречия между условиями Лицензии на русском языке и ее переводом, юридическую силу имеет исключительно русскоязычная версия Лицензии. Русскоязычная версия Лицензии размещена по адресу: https://behappybel.by.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('2. Права на Программу'),
+                      _buildParagraph(
+                        '2.1. Исключительное право на Программу принадлежит Лицензиар.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('3. Лицензия'),
+                      _buildParagraph(
+                        '3.1. Лицензиар безвозмездно, на условиях простой (неисключительной) лицензии, предоставляет Пользователю непередаваемое право использования Программы на территории всех стран мира следующими способами:\n\n'
+                        '3.1.1. Воспроизводить Программу путем её копирования и установки на мобильное (-ые) устройство (-ва) Пользователя. При установке на мобильное устройство каждой копии Программы присваивается индивидуальный номер, который автоматически сообщается Правообладателю;\n\n'
+                        '3.1.2. Применять Программу по прямому функциональному назначению только после принятия Пользователем указанных в пункте 1.5 настоящей Лицензии документов и ввода в интерфейсе Программы специального кода (пароля), предоставленного Пользователю в подтверждение принятия указанных документов.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('4. Ограничения'),
+                      _buildParagraph(
+                        '4.1. За исключением использования в объемах и способами, прямо предусмотренными настоящей Лицензией или законодательством Республики Беларусь, Пользователь не имеет права изменять, декомпилировать, дизассемблировать, дешифровать и производить иные действия с объектным кодом Программы, имеющие целью получение информации о реализации алгоритмов, используемых в Программе, создавать производные произведения с использованием Программы, а также осуществлять (разрешать осуществлять) иное использование Программы, без письменного согласия Лицензиара.\n\n'
+                        '4.2. Пользователь не имеет право воспроизводить и распространять Программу в коммерческих целях (в том числе за плату), в том числе в составе сборников программных продуктов, без письменного согласия Лицензиара.\n\n'
+                        '4.3. Пользователь не имеет права распространять Программу в виде, отличном от того, в котором он ее получил, без письменного согласия Правообладателя.\n\n'
+                        '4.4. Программа должна использоваться (в том числе распространяться) под наименованием: «Be Happy». Пользователь не вправе изменять наименование Программы, изменять и/или удалять знак охраны авторского права (copyright notice) или иные указания на Лицензиара.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('5. Условия использования отдельных функций Программы'),
+                      _buildParagraph(
+                        '5.1. Выполнение некоторых функций Программы возможно только при наличии доступа к сети Интернет. Пользователь самостоятельно получает и оплачивает такой доступ на условиях и по тарифам своего оператора связи или провайдера доступа к сети Интернет.\n\n'
+                        '5.2. Пользователь считается правомерно владеющим экземпляром Программы, при условии ввода в интерфейсе Программы специального кода (пароля), который выдается Лицензиар Пользователю в случае акцепта Пользователем Оферты на подключение к программе «Be Happy» размещенной в сети Интернет по адресу: https://behappybel.by и при условии соответствия Пользователя требованиям, указанным в Условиях подключения к сервису «Be Happy», размещенных в сети Интернет по адресу: https://behappybel.by В этом случае Пользователь вправе использовать функциональные возможности Программы.\n\n'
+                        '5.3. Специальных код (пароль), необходимый для подтверждения правомерности владения (использования) Пользователем экземпляром Программы, не считается действительным, если он был получен без принятия Пользователем указанных в пункте 1.5 настоящей Лицензии документов.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('6. Ответственность по Лицензии'),
+                      _buildParagraph(
+                        '6.1. Программа (включая её части и содержание) предоставляется на условиях «как есть» (as is). Лицензиар не предоставляет никаких гарантий в отношении безошибочной и бесперебойной работы Программы или отдельных её компонентов и/или функций, соответствия Программы конкретным целям и ожиданиям Пользователя, не гарантирует достоверность, точность, полноту и своевременность Данных, а также не предоставляет никаких иных гарантий, прямо не указанных в настоящей Лицензии.\n\n'
+                        '6.2. Лицензиар не несет ответственности за какие-либо прямые или косвенные последствия какого-либо использования или невозможности использования Программы (включая ей части и содержание) и/или ущерб, причиненный Пользователю и/или третьим сторонам в результате какого-либо использования, неиспользования или невозможности использования Программы (включая ей части и содержание) или отдельных её компонентов и/или функций, в том числе из-за возможных ошибок или сбоев в работе Программы, за исключением случаев, прямо предусмотренных законодательством.\n\n'
+                        '6.3. Пользователь настоящим уведомлен и соглашается, что при использовании Программы Лицензиар в автоматическом передается следующая информация: тип операционной системы мобильного устройства Пользователя, версия и идентификатор Программы, статистика использования функций Программы, а также иная техническая информация.\n\n'
+                        '6.4. Программа может содержать ссылки на сайты и приложения третьих лиц. Правообладатель не контролирует и не несет ответственности за содержание и порядок использования таких сайтов и приложений. Условия использования таких сайтов и приложений определены в их соглашениях и политиках конфиденциальности.\n\n'
+                        '6.5. Все вопросы и претензии, связанные с использованием/невозможностью использования Программы, а также возможным нарушением Программой законодательства и/или прав третьих лиц, должны направляться через форму обратной связи по адресу:',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('7. Обновления/новые версии Программы'),
+                      _buildParagraph(
+                        '7.1. Действие настоящей Лицензии распространяется на все последующие обновления/новые версии Программы. Соглашаясь с установкой обновления/новой версии Программы, Пользователь принимает условия настоящей Лицензии для соответствующих обновлений/новых версий Программы, если обновление/установка новой версии Программы не сопровождается иным Лицензионным соглашением.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('8. Изменения условий настоящей Лицензии'),
+                      _buildParagraph(
+                        '8.1. Настоящее лицензионное соглашение может изменяться Лицензиром в одностороннем порядке. Уведомление Пользователя о внесенных изменениях в условия настоящей Лицензии публикуется на странице: https://behappybel.by. Указанные изменения в условиях лицензионного соглашения вступают в силу с даты их публикации, если иное не оговорено в соответствующей публикации.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('Лицензиар'),
+                      _buildParagraph(
+                        'ООО “БИХЕППИБЕЛ”\n'
+                        'УНП 392050943\n'
+                        'ОКПО 511318892000\n'
+                        'Свидетельство о государственной регистрации № 392026683 от 22.01.2026 выдано Инспекцией Министерства по налогам и сборам Республики Беларусь по Октябрьскому району г.Витебска\n\n'
+                        'Юридический адрес: Республика Беларусь, 210017, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А',
+                      ),
+
+                      const SizedBox(height: 32),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildParagraph(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Color(0xFFD1D1D6),
+        fontSize: 14,
+        height: 1.5,
+      ),
+    );
+  }
+
+  Widget _buildSectionHeader(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Colors.white,
+        fontSize: 16,
+        fontWeight: FontWeight.bold,
+        height: 1.4,
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/map_screen.dart b/lib/presentation/screens/map_screen.dart
index 9244a48..3341b44 100644
--- a/lib/presentation/screens/map_screen.dart
+++ b/lib/presentation/screens/map_screen.dart
@@ -1,940 +1,940 @@
-import 'dart:async';
-import 'dart:typed_data';
-import 'dart:ui' as ui;
-
-import 'package:bot_toast/bot_toast.dart';
-import 'package:be_happy/domain/entities/client_notification.dart';
-import 'package:be_happy/presentation/components/fine_notification_card.dart';
-import 'package:be_happy/presentation/components/map_icon_painter/clusterized_icon_painter.dart';
-import 'package:be_happy/presentation/components/payment_notification_card.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:go_router/go_router.dart';
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-import '../../core/app_colors.dart';
-import '../../di/service_locator.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/zone.dart';
-import '../../domain/usecase/get_notifications_stream_usecase.dart';
-import '../components/side_menu.dart';
-import '../components/unpaid_order_notification_card.dart';
-import '../event/map_event.dart';
-import '../state/map_state.dart';
-import '../viewmodel/map_bloc.dart';
-
-class MapScreen extends StatefulWidget {
-  const MapScreen({super.key});
-
-  @override
-  State<MapScreen> createState() => _MapScreenState();
-}
-
-class _MapScreenState extends State<MapScreen> {
-  YandexMapController? mapController;
-  Position? _currentPosition;
-  StreamSubscription<Position>? _positionStreamSubscription;
-  StreamSubscription<ClientNotification>? _notificationStreamSubscription;
-  bool _isFirstLocationUpdate = true;
-  Timer? _debounceTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    _checkLocationPermission();
-    _initScooterIcon();
-    _startNotificationStream();
-    context.read<MapBloc>().add(FetchProfileData());
-    context.read<MapBloc>().add(CheckUser());
-  }
-
-  @override
-  void dispose() {
-    _debounceTimer?.cancel();
-    _positionStreamSubscription?.cancel();
-    _notificationStreamSubscription?.cancel();
-    context.read<MapBloc>().stopNotificationStream();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.transparent,
-      drawer: const SideMenu(),
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Stack(
-            children: [
-              BlocConsumer<MapBloc, ScooterState>(
-                listenWhen: (previous, current) {
-                  return current.lastNotification !=
-                      previous.lastNotification ||
-                      current.flags != previous.flags ||
-                      previous.selectedScooterForFocus?.id
-                          != current.selectedScooterForFocus?.id;
-                },
-
-                listener: (context, state) {
-                  if (state.lastNotification != null) {
-                    _showNotificationToast(state.lastNotification!);
-                  }
-
-                  if (state.flags != null) {
-                    if (!state.flags.hasCard) {
-                      BotToast.showCustomNotification(
-                        duration: null,
-                        toastBuilder: (_) {
-                          return Container(
-                            margin: const EdgeInsets.only(top: 120),
-                            child: Material(
-                              color: Colors.transparent,
-                              child: PaymentNotificationCard(
-                                onBindCard: () {
-                                  BotToast.cleanAll();
-                                  context.push("/home/payment-methods");
-                                },
-                                onClose: () => BotToast.cleanAll(),
-                              ),
-                            ),
-                          );
-                        },
-                      );
-                    }
-                    if (state.flags.hasFine) {
-                      BotToast.showCustomNotification(
-                        duration: null,
-                        toastBuilder: (_) {
-                          return Container(
-                            margin: const EdgeInsets.only(top: 120),
-                            child: Material(
-                              color: Colors.transparent,
-                              child: FineNotificationCard(
-                                /*onBindCard: () {
-                                  BotToast.cleanAll();
-                                  context.push("/home/payment-methods");
-                                },*/
-                                onClose: () => BotToast.cleanAll(),
-                              ),
-                            ),
-                          );
-                        },
-                      );
-                    }
-
-                    if (state.flags.hasUnpaidOrder) {
-                      BotToast.showCustomNotification(
-                        duration: null,
-                        toastBuilder: (_) {
-                          return Container(
-                            margin: const EdgeInsets.only(top: 120),
-                            child: Material(
-                              color: Colors.transparent,
-                              child: UnpaidOrderNotificationCard(
-                                /*onBindCard: () {
-                                  BotToast.cleanAll();
-                                  context.push("/home/payment-methods");
-                                },*/
-                                onClose: () => BotToast.cleanAll(),
-                              ),
-                            ),
-                          );
-                        },
-                      );
-                    }
-                  }
-
-                  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) {
-                  return previous.scooters != current.scooters ||
-                      previous.reservedScooters != current.reservedScooters ||
-                      previous.zones != current.zones ||
-                      previous.status != current.status;
-                },
-
-                builder: (context, state) {
-                  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);
-
-                  return RepaintBoundary(
-                    child: YandexMap(
-                      onMapCreated: (controller) {
-                        controller.toggleUserLayer(visible: true);
-                        mapController = controller;
-                        if (_currentPosition != null) {
-                          _fetchScooters();
-                        }
-                      },
-                      onCameraPositionChanged:
-                          (cameraPosition, reason, finished) {
-                        if (finished) {
-                          _fetchScooters();
-                        }
-                      },
-                      mapObjects: [
-                        ...zonePolygons,
-                        ...reservedScooters,
-                        ClusterizedPlacemarkCollection(
-                          mapId: const MapObjectId('scooters_cluster'),
-                          placemarks: freeScooters,
-                          radius: 30,
-                          minZoom: 15,
-                          consumeTapEvents: true,
-                          onClusterTap: (collection, cluster) {
-                            final clusteredPlacemarks = cluster.placemarks;
-                            final filtered = state.scooters.where((scooter) {
-                              return clusteredPlacemarks.any(
-                                    (pm) => pm.mapId.value == scooter.id.toString(),
-                              );
-                            }).toList();
-                            _onMarkerTap(filtered);
-                          },
-                          onClusterAdded: (self, cluster) async {
-                            return cluster.copyWith(
-                              appearance: cluster.appearance.copyWith(
-                                opacity: 1.0,
-                                icon: PlacemarkIcon.single(
-                                  PlacemarkIconStyle(
-                                    image: BitmapDescriptor.fromBytes(
-                                      await ClusterIconPainter(
-                                        cluster.size,
-                                      ).getClusterIconBytes(),
-                                    ),
-                                    scale: 0.8,
-                                  ),
-                                ),
-                              ),
-                            );
-                          },
-                        ),
-                      ],
-                    ),
-                  );
-                },
-              ),
-
-              BlocBuilder<MapBloc, ScooterState>(
-                buildWhen: (previous, current) =>
-                previous.status != current.status,
-                builder: (context, state) {
-                  if (state.status == ScooterStatus.loading) {
-                    return const Positioned(
-                      top: 80,
-                      left: 0,
-                      right: 0,
-                      child: Center(child: CircularProgressIndicator()),
-                    );
-                  }
-                  return const SizedBox.shrink();
-                },
-              ),
-
-              // Кнопки управления (Меню, Уведомления)
-              _buildTopButtons(),
-
-              // Кнопки навигации
-              if (_currentPosition != null) _buildSideControls(),
-
-              _buildCentralQrButton(),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  void _startNotificationStream() {
-    final notificationsStreamUseCase = getIt<GetNotificationsStreamUseCase>();
-
-    _notificationStreamSubscription = notificationsStreamUseCase().listen(
-      (notification) {
-        if (mounted) {
-          context.read<MapBloc>().add(NotificationReceived(notification));
-        }
-      },
-      onError: (error) {
-        print("SSE NOTIFICATION ERROR: $error");
-      },
-    );
-  }
-
-  void _checkLocationPermission() async {
-    final permission = await Geolocator.checkPermission();
-    if (permission == LocationPermission.denied ||
-        permission == LocationPermission.deniedForever) {
-      await Geolocator.requestPermission();
-    }
-    _getCurrentLocation();
-    // _startTrackingLocation();
-  }
-
-  void _startTrackingLocation() {
-    const LocationSettings locationSettings = LocationSettings(
-      accuracy: LocationAccuracy.high,
-      distanceFilter: 10,
-    );
-
-    _positionStreamSubscription =
-        Geolocator.getPositionStream(
-          locationSettings: locationSettings,
-        ).listen((Position position) {
-          if (!mounted) return;
-
-          print(
-            "-----------------------------------------------------      tracking...     --------------------------------------------------------",
-          );
-
-          setState(() => _currentPosition = position);
-
-          context.read<MapBloc>().add(
-            UpdateUserLocation(position.latitude, position.longitude),
-          );
-
-          if (_isFirstLocationUpdate) {
-            _moveCameraToPoint(position.latitude, position.longitude, zoom: 15);
-            _isFirstLocationUpdate = false;
-          }
-          _fetchScooters();
-        });
-  }
-
-  void _getCurrentLocation() async {
-    try {
-      final position = await Geolocator.getCurrentPosition(
-        desiredAccuracy: LocationAccuracy.high,
-      );
-      setState(() => _currentPosition = position);
-
-      if (mapController != null && mounted) {
-        await _moveCameraToPoint(position.latitude, position.longitude);
-        _fetchScooters();
-      }
-    } catch (e) {
-      debugPrint('Ошибка геолокации: $e');
-    }
-  }
-
-  void _fetchScooters() async {
-    final controller = mapController;
-    if (controller == null) return;
-
-    if (_debounceTimer?.isActive ?? false) _debounceTimer!.cancel();
-
-    _debounceTimer = Timer(const Duration(milliseconds: 500), () async {
-      final visibleRegion = await controller.getVisibleRegion();
-
-      final areaScooters = [
-        visibleRegion.bottomRight.longitude,
-        visibleRegion.bottomRight.latitude,
-        visibleRegion.topLeft.latitude,
-        visibleRegion.topLeft.longitude,
-      ];
-
-      final areaZones = [
-        visibleRegion.bottomRight.longitude,
-        visibleRegion.bottomRight.latitude,
-        visibleRegion.topLeft.longitude,
-        visibleRegion.topLeft.latitude,
-      ];
-
-      if (mounted) {
-        context.read<MapBloc>().add(FetchScooters(areaZones, areaScooters));
-      }
-    });
-  }
-  Future<void> _moveCameraToPoint(
-    double lat,
-    double lon, {
-    double zoom = 15,
-  }) async {
-    await mapController?.moveCamera(
-      CameraUpdate.newCameraPosition(
-        CameraPosition(
-          target: Point(latitude: lat, longitude: lon),
-          zoom: zoom,
-        ),
-      ),
-    );
-  }
-
-  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},
-    );
-  }
-
-  void _onMapSettingsTap() {
-    context.push("/home/map-settings-sheet");
-    /*showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      backgroundColor: Colors.transparent,
-      isDismissible: true,
-      builder: (context) {
-        return BlocProvider(
-          create: (context) => MapSettingsModalBloc(
-            getIt<GetMapSettingsUsecase>(),
-            getIt<SaveMapSettingsUsecase>(),
-          )..add(MapSettingsModalStarted()),
-          child: MapSettingsSheet(),
-        );
-      },
-    );*/
-  }
-
-  void _onNotificationTap() {
-    context.push("/home/current-rides-sheet");
-
-    /*showModalBottomSheet(
-      context: context,
-      builder: (context) => BlocProvider(
-        create: (context) =>
-            CurrentRidesBloc(getIt<GetClientOrdersUsecase>())
-              ..add(LoadClientOrders()),
-        child: CurrentRidesSheet(),
-      ),
-    );*/
-
-    // BotToast.showCustomNotification(
-    //   duration: const Duration(seconds: 4),
-    //
-    //   toastBuilder: (_) {
-    //     return NotificationToast(
-    //       title: "",
-    //       onClose: () {
-    //         BotToast.cleanAll();
-    //       },
-    //     );
-    //   },
-    // );
-  }
-
-  void _showNotificationToast(ClientNotification notification) {
-    String title = _getNotificationTitle(notification.type);
-    Color backgroundColor = _getNotificationColor(notification.type);
-
-    BotToast.showCustomNotification(
-      duration: null,
-      toastBuilder: (_) {
-        return Container(
-          margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 50),
-          child: Material(
-            elevation: 8,
-            shadowColor: Colors.black26,
-            color: backgroundColor,
-            borderRadius: BorderRadius.circular(12),
-            clipBehavior: Clip.antiAlias,
-            child: IntrinsicHeight(
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Container(
-                    width: 60,
-                    child: Image.asset(
-                      'assets/icons/clichnik.png',
-                      fit: BoxFit.contain,
-                    ),
-                  ),
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.all(12.0),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Text(
-                            title,
-                            style: const TextStyle(
-                              fontWeight: FontWeight.bold,
-                              fontSize: 16,
-                            ),
-                          ),
-                          const SizedBox(height: 4),
-                          Text(
-                            notification.content,
-                            style: TextStyle(fontSize: 14),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  Align(
-                    alignment: Alignment.topRight,
-                    child: IconButton(
-                      icon: const Icon(Icons.close, size: 20),
-                      onPressed: () {
-                        BotToast.cleanAll();
-                      },
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  String _getNotificationTitle(NotificationType type) {
-    switch (type) {
-      case NotificationType.info:
-        return 'Информация';
-      case NotificationType.attention:
-        return 'Внимание';
-      case NotificationType.warning:
-        return 'Предупреждение';
-    }
-  }
-
-  Color _getNotificationColor(NotificationType type) {
-    switch (type) {
-      case NotificationType.info:
-        return const Color(0xFF2196F3);
-      case NotificationType.attention:
-        return const Color(0xFFFF9800);
-      case NotificationType.warning:
-        return Colors.red;
-    }
-  }
-
-  void _initScooterIcon() async {
-    await ClusterIconPainter.initImage('assets/icons/scooter_placemark.png');
-  }
-
-  List<PlacemarkMapObject> _buildScooterPlacemarks({
-    required List<Scooter> scooters,
-    required String iconAsset,
-    required bool isClickable,
-  }) {
-    return scooters.map((scooter) {
-      return PlacemarkMapObject(
-        mapId: MapObjectId('${isClickable ? "" : "reserved_"}${scooter.id}'), // уникальный ID для карты
-        point: Point(latitude: scooter.longitude, longitude: scooter.latitude),
-        icon: PlacemarkIcon.single(
-          PlacemarkIconStyle(
-            image: BitmapDescriptor.fromAssetImage(iconAsset),
-            scale: 0.2,
-          ),
-        ),
-        opacity: 1.0,
-        consumeTapEvents: isClickable,
-        onTap: isClickable
-            ? (object, point) async => _onMarkerTap([scooter])
-            : null,
-      );
-    }).toList();
-  }
-
-  List<MapObject> _buildZonePolygons(List<Zone>? zones) {
-    if (zones == null || zones.isEmpty) return [];
-
-    List<MapObject> objects = [];
-    List<LinearRing> driveOuterRings = [];
-
-    for (var zone in zones) {
-      if (zone.type == "Drive") {
-        for (var polygonData in zone.geometry) {
-          if (polygonData.isEmpty) continue;
-
-          var outerPoints = polygonData[0].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
-
-          var cleanPoints = <Point>[];
-          for (var p in outerPoints) {
-            if (cleanPoints.isEmpty || cleanPoints.last != p) {
-              cleanPoints.add(p);
-            }
-          }
-
-          if (cleanPoints.length > 2) {
-            if (cleanPoints.first != cleanPoints.last) {
-              cleanPoints.add(cleanPoints.first);
-            }
-            driveOuterRings.add(LinearRing(points: cleanPoints));
-          }
-        }
-      }
-    }
-
-    // Добавляем глобальную маску (все, что НЕ Drive — затеняется красным)
-    objects.add(
-      PolygonMapObject(
-        mapId: const MapObjectId('global_inverse_mask'),
-        polygon: Polygon(
-          outerRing: const LinearRing(points: [
-            Point(latitude: 85, longitude: -179.9),
-            Point(latitude: 85, longitude: 179.9),
-            Point(latitude: -85, longitude: 179.9),
-            Point(latitude: -85, longitude: -179.9),
-          ]),
-          innerRings: driveOuterRings, // Вырезаем только зоны Drive
-        ),
-        strokeWidth: 0,
-        fillColor: Colors.red.withOpacity(0.15),
-        zIndex: 0,
-      ),
-    );
-
-    // 2. Отрисовываем каждую зону (включая MultiPolygon и вложенные NotDrive/Finish)
-    for (var zone in zones) {
-      Color borderColor;
-      Color fillColor;
-
-      // Стилизация в зависимости от типа зоны
-      if (zone.type == "Drive") {
-        borderColor = const Color(0xFF5ECD4C); // Зеленый бордюр
-        fillColor = Colors.transparent;        // Прозрачная внутри маски
-      } else if (zone.type == "NotDrive") {
-        borderColor = const Color(0xFFEF4444); // Красный бордюр
-        fillColor = const Color(0xFFEF4444).withOpacity(0.3); // Красная полупрозрачная заливка для наглядности внутри Drive
-      } else {
-        borderColor = const Color(0xFFA78BFA); // Фиолетовый бордюр (Парковка)
-        fillColor = const Color(0xFFA78BFA).withOpacity(0.25); // Фиолетовая заливка
-      }
-
-      int polyIndex = 0;
-      for (var polygonData in zone.geometry) {
-        if (polygonData.isEmpty) continue;
-
-        // Строим внешнее кольцо текущего полигона
-        var outerPoints = polygonData[0].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
-        if (outerPoints.first != outerPoints.last) {
-          outerPoints.add(outerPoints.first);
-        }
-        LinearRing outerRing = LinearRing(points: outerPoints);
-
-        // Строим внутренние кольца (дыры), если они есть у этого полигона
-        List<LinearRing> innerRings = [];
-        for (int i = 1; i < polygonData.length; i++) {
-          var innerPoints = polygonData[i].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
-          if (innerPoints.isNotEmpty) {
-            if (innerPoints.first != innerPoints.last) {
-              innerPoints.add(innerPoints.first);
-            }
-            innerRings.add(LinearRing(points: innerPoints));
-          }
-        }
-
-        // Рендерим полноценный PolygonMapObject (он поддерживает и заливку, и обводку)
-        objects.add(
-          PolygonMapObject(
-            mapId: MapObjectId('zone_poly_${zone.type}_${zone.id}_$polyIndex'),
-            polygon: Polygon(
-              outerRing: outerRing,
-              innerRings: innerRings,
-            ),
-            strokeColor: borderColor,
-            strokeWidth: 2.0,
-            fillColor: fillColor,
-            // Поднимаем зоны ограничений и парковок выше маски и контуров Drive
-            zIndex: zone.type == "Drive" ? 1 : 2,
-          ),
-        );
-        polyIndex++;
-      }
-    }
-
-    return objects;
-  }
-
-  Widget _buildTopButtons() {
-    return Stack(
-      children: [
-        Positioned(
-          top: 16,
-          left: 16,
-          child: Builder(
-            builder: (innerContext) => _RoundIconButton(
-              icon: Icons.menu,
-              onPressed: () {
-                context.read<MapBloc>().add(FetchProfileData());
-                Scaffold.of(innerContext).openDrawer();
-                },
-            ),
-          ),
-        ),
-        Positioned(
-          top: 16,
-          right: 16,
-          child: Column(
-            children: [
-              _RoundIconButton(
-                icon: Icons.notifications_sharp,
-                onPressed: () => context.push("/home/notifications"),
-              ),
-              const SizedBox(height: 12),
-              _RoundButton(
-                imagePath: 'assets/icons/scooter_placemark.png',
-                onPressed: () => context.push("/home/current-rides-sheet"),
-              )
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildCentralQrButton() {
-    return Positioned(
-      bottom: 24,
-      left: 0,
-      right: 0,
-      child: Center(
-        child: GestureDetector(
-          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,
-            decoration: BoxDecoration(
-              color: AppColors.darkBlue,
-              shape: BoxShape.circle,
-              boxShadow: [
-                BoxShadow(
-                  color: Colors.black.withOpacity(0.3),
-                  blurRadius: 10,
-                  offset: const Offset(0, 4),
-                ),
-              ],
-            ),
-            child: const Icon(
-              Icons.qr_code_scanner,
-              color: Colors.white,
-              size: 32,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSideControls() {
-    return Positioned(
-      right: 16,
-      top: 0,
-      bottom: 0,
-      child: Center(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            _CircleIconButton(icon: Icons.map, onPressed: _onMapSettingsTap),
-            const SizedBox(height: 16),
-            _CircleIconButton(
-              icon: Icons.my_location,
-              onPressed: () {
-                context.read<MapBloc>().add(
-                  UpdateUserLocation(
-                    _currentPosition!.latitude,
-                    _currentPosition!.longitude,
-                  ),
-                );
-                _moveCameraToPoint(
-                  _currentPosition!.latitude,
-                  _currentPosition!.longitude,
-                  zoom: 17,
-                );
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-Future<Uint8List> painterToBytes(CustomPainter painter, Size size) async {
-  final recorder = ui.PictureRecorder();
-  final canvas = Canvas(recorder);
-  painter.paint(canvas, size);
-  final picture = recorder.endRecording();
-  final image = await picture.toImage(size.width.toInt(), size.height.toInt());
-  final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
-  return byteData!.buffer.asUint8List();
-}
-
-class _RoundIconButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback onPressed;
-
-  const _RoundIconButton({required this.icon, required this.onPressed});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: 40,
-      height: 40,
-      decoration: BoxDecoration(
-        color: AppColors.darkBlue,
-        borderRadius: BorderRadius.circular(12),
-      ),
-      child: IconButton(
-        icon: Icon(icon, color: Colors.white, size: 24),
-        onPressed: onPressed,
-      ),
-    );
-  }
-}
-
-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;
-
-  const _CircleIconButton({required this.icon, required this.onPressed});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: 40,
-      height: 40,
-      decoration: const BoxDecoration(
-        color: AppColors.darkBlue,
-        shape: BoxShape.circle,
-      ),
-      child: IconButton(
-        icon: Icon(icon, color: Colors.white, size: 24),
-        onPressed: onPressed,
-      ),
-    );
-  }
-}
-
-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
-        ),
-      );
-    },
-  );
-}
+import 'dart:async';
+import 'dart:typed_data';
+import 'dart:ui' as ui;
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:be_happy/domain/entities/client_notification.dart';
+import 'package:be_happy/presentation/components/fine_notification_card.dart';
+import 'package:be_happy/presentation/components/map_icon_painter/clusterized_icon_painter.dart';
+import 'package:be_happy/presentation/components/payment_notification_card.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:go_router/go_router.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+import '../../core/app_colors.dart';
+import '../../di/service_locator.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/zone.dart';
+import '../../domain/usecase/get_notifications_stream_usecase.dart';
+import '../components/side_menu.dart';
+import '../components/unpaid_order_notification_card.dart';
+import '../event/map_event.dart';
+import '../state/map_state.dart';
+import '../viewmodel/map_bloc.dart';
+
+class MapScreen extends StatefulWidget {
+  const MapScreen({super.key});
+
+  @override
+  State<MapScreen> createState() => _MapScreenState();
+}
+
+class _MapScreenState extends State<MapScreen> {
+  YandexMapController? mapController;
+  Position? _currentPosition;
+  StreamSubscription<Position>? _positionStreamSubscription;
+  StreamSubscription<ClientNotification>? _notificationStreamSubscription;
+  bool _isFirstLocationUpdate = true;
+  Timer? _debounceTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _checkLocationPermission();
+    _initScooterIcon();
+    _startNotificationStream();
+    context.read<MapBloc>().add(FetchProfileData());
+    context.read<MapBloc>().add(CheckUser());
+  }
+
+  @override
+  void dispose() {
+    _debounceTimer?.cancel();
+    _positionStreamSubscription?.cancel();
+    _notificationStreamSubscription?.cancel();
+    context.read<MapBloc>().stopNotificationStream();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      drawer: const SideMenu(),
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Stack(
+            children: [
+              BlocConsumer<MapBloc, ScooterState>(
+                listenWhen: (previous, current) {
+                  return current.lastNotification !=
+                      previous.lastNotification ||
+                      current.flags != previous.flags ||
+                      previous.selectedScooterForFocus?.id
+                          != current.selectedScooterForFocus?.id;
+                },
+
+                listener: (context, state) {
+                  if (state.lastNotification != null) {
+                    _showNotificationToast(state.lastNotification!);
+                  }
+
+                  if (state.flags != null) {
+                    if (!state.flags.hasCard) {
+                      BotToast.showCustomNotification(
+                        duration: null,
+                        toastBuilder: (_) {
+                          return Container(
+                            margin: const EdgeInsets.only(top: 120),
+                            child: Material(
+                              color: Colors.transparent,
+                              child: PaymentNotificationCard(
+                                onBindCard: () {
+                                  BotToast.cleanAll();
+                                  context.push("/home/payment-methods");
+                                },
+                                onClose: () => BotToast.cleanAll(),
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    }
+                    if (state.flags.hasFine) {
+                      BotToast.showCustomNotification(
+                        duration: null,
+                        toastBuilder: (_) {
+                          return Container(
+                            margin: const EdgeInsets.only(top: 120),
+                            child: Material(
+                              color: Colors.transparent,
+                              child: FineNotificationCard(
+                                /*onBindCard: () {
+                                  BotToast.cleanAll();
+                                  context.push("/home/payment-methods");
+                                },*/
+                                onClose: () => BotToast.cleanAll(),
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    }
+
+                    if (state.flags.hasUnpaidOrder) {
+                      BotToast.showCustomNotification(
+                        duration: null,
+                        toastBuilder: (_) {
+                          return Container(
+                            margin: const EdgeInsets.only(top: 120),
+                            child: Material(
+                              color: Colors.transparent,
+                              child: UnpaidOrderNotificationCard(
+                                /*onBindCard: () {
+                                  BotToast.cleanAll();
+                                  context.push("/home/payment-methods");
+                                },*/
+                                onClose: () => BotToast.cleanAll(),
+                              ),
+                            ),
+                          );
+                        },
+                      );
+                    }
+                  }
+
+                  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) {
+                  return previous.scooters != current.scooters ||
+                      previous.reservedScooters != current.reservedScooters ||
+                      previous.zones != current.zones ||
+                      previous.status != current.status;
+                },
+
+                builder: (context, state) {
+                  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);
+
+                  return RepaintBoundary(
+                    child: YandexMap(
+                      onMapCreated: (controller) {
+                        controller.toggleUserLayer(visible: true);
+                        mapController = controller;
+                        if (_currentPosition != null) {
+                          _fetchScooters();
+                        }
+                      },
+                      onCameraPositionChanged:
+                          (cameraPosition, reason, finished) {
+                        if (finished) {
+                          _fetchScooters();
+                        }
+                      },
+                      mapObjects: [
+                        ...zonePolygons,
+                        ...reservedScooters,
+                        ClusterizedPlacemarkCollection(
+                          mapId: const MapObjectId('scooters_cluster'),
+                          placemarks: freeScooters,
+                          radius: 30,
+                          minZoom: 15,
+                          consumeTapEvents: true,
+                          onClusterTap: (collection, cluster) {
+                            final clusteredPlacemarks = cluster.placemarks;
+                            final filtered = state.scooters.where((scooter) {
+                              return clusteredPlacemarks.any(
+                                    (pm) => pm.mapId.value == scooter.id.toString(),
+                              );
+                            }).toList();
+                            _onMarkerTap(filtered);
+                          },
+                          onClusterAdded: (self, cluster) async {
+                            return cluster.copyWith(
+                              appearance: cluster.appearance.copyWith(
+                                opacity: 1.0,
+                                icon: PlacemarkIcon.single(
+                                  PlacemarkIconStyle(
+                                    image: BitmapDescriptor.fromBytes(
+                                      await ClusterIconPainter(
+                                        cluster.size,
+                                      ).getClusterIconBytes(),
+                                    ),
+                                    scale: 0.8,
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ],
+                    ),
+                  );
+                },
+              ),
+
+              BlocBuilder<MapBloc, ScooterState>(
+                buildWhen: (previous, current) =>
+                previous.status != current.status,
+                builder: (context, state) {
+                  if (state.status == ScooterStatus.loading) {
+                    return const Positioned(
+                      top: 80,
+                      left: 0,
+                      right: 0,
+                      child: Center(child: CircularProgressIndicator()),
+                    );
+                  }
+                  return const SizedBox.shrink();
+                },
+              ),
+
+              // Кнопки управления (Меню, Уведомления)
+              _buildTopButtons(),
+
+              // Кнопки навигации
+              if (_currentPosition != null) _buildSideControls(),
+
+              _buildCentralQrButton(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _startNotificationStream() {
+    final notificationsStreamUseCase = getIt<GetNotificationsStreamUseCase>();
+
+    _notificationStreamSubscription = notificationsStreamUseCase().listen(
+      (notification) {
+        if (mounted) {
+          context.read<MapBloc>().add(NotificationReceived(notification));
+        }
+      },
+      onError: (error) {
+        print("SSE NOTIFICATION ERROR: $error");
+      },
+    );
+  }
+
+  void _checkLocationPermission() async {
+    final permission = await Geolocator.checkPermission();
+    if (permission == LocationPermission.denied ||
+        permission == LocationPermission.deniedForever) {
+      await Geolocator.requestPermission();
+    }
+    _getCurrentLocation();
+    // _startTrackingLocation();
+  }
+
+  void _startTrackingLocation() {
+    const LocationSettings locationSettings = LocationSettings(
+      accuracy: LocationAccuracy.high,
+      distanceFilter: 10,
+    );
+
+    _positionStreamSubscription =
+        Geolocator.getPositionStream(
+          locationSettings: locationSettings,
+        ).listen((Position position) {
+          if (!mounted) return;
+
+          print(
+            "-----------------------------------------------------      tracking...     --------------------------------------------------------",
+          );
+
+          setState(() => _currentPosition = position);
+
+          context.read<MapBloc>().add(
+            UpdateUserLocation(position.latitude, position.longitude),
+          );
+
+          if (_isFirstLocationUpdate) {
+            _moveCameraToPoint(position.latitude, position.longitude, zoom: 15);
+            _isFirstLocationUpdate = false;
+          }
+          _fetchScooters();
+        });
+  }
+
+  void _getCurrentLocation() async {
+    try {
+      final position = await Geolocator.getCurrentPosition(
+        desiredAccuracy: LocationAccuracy.high,
+      );
+      setState(() => _currentPosition = position);
+
+      if (mapController != null && mounted) {
+        await _moveCameraToPoint(position.latitude, position.longitude);
+        _fetchScooters();
+      }
+    } catch (e) {
+      debugPrint('Ошибка геолокации: $e');
+    }
+  }
+
+  void _fetchScooters() async {
+    final controller = mapController;
+    if (controller == null) return;
+
+    if (_debounceTimer?.isActive ?? false) _debounceTimer!.cancel();
+
+    _debounceTimer = Timer(const Duration(milliseconds: 500), () async {
+      final visibleRegion = await controller.getVisibleRegion();
+
+      final areaScooters = [
+        visibleRegion.bottomRight.longitude,
+        visibleRegion.bottomRight.latitude,
+        visibleRegion.topLeft.latitude,
+        visibleRegion.topLeft.longitude,
+      ];
+
+      final areaZones = [
+        visibleRegion.bottomRight.longitude,
+        visibleRegion.bottomRight.latitude,
+        visibleRegion.topLeft.longitude,
+        visibleRegion.topLeft.latitude,
+      ];
+
+      if (mounted) {
+        context.read<MapBloc>().add(FetchScooters(areaZones, areaScooters));
+      }
+    });
+  }
+  Future<void> _moveCameraToPoint(
+    double lat,
+    double lon, {
+    double zoom = 15,
+  }) async {
+    await mapController?.moveCamera(
+      CameraUpdate.newCameraPosition(
+        CameraPosition(
+          target: Point(latitude: lat, longitude: lon),
+          zoom: zoom,
+        ),
+      ),
+    );
+  }
+
+  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},
+    );
+  }
+
+  void _onMapSettingsTap() {
+    context.push("/home/map-settings-sheet");
+    /*showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      isDismissible: true,
+      builder: (context) {
+        return BlocProvider(
+          create: (context) => MapSettingsModalBloc(
+            getIt<GetMapSettingsUsecase>(),
+            getIt<SaveMapSettingsUsecase>(),
+          )..add(MapSettingsModalStarted()),
+          child: MapSettingsSheet(),
+        );
+      },
+    );*/
+  }
+
+  void _onNotificationTap() {
+    context.push("/home/current-rides-sheet");
+
+    /*showModalBottomSheet(
+      context: context,
+      builder: (context) => BlocProvider(
+        create: (context) =>
+            CurrentRidesBloc(getIt<GetClientOrdersUsecase>())
+              ..add(LoadClientOrders()),
+        child: CurrentRidesSheet(),
+      ),
+    );*/
+
+    // BotToast.showCustomNotification(
+    //   duration: const Duration(seconds: 4),
+    //
+    //   toastBuilder: (_) {
+    //     return NotificationToast(
+    //       title: "",
+    //       onClose: () {
+    //         BotToast.cleanAll();
+    //       },
+    //     );
+    //   },
+    // );
+  }
+
+  void _showNotificationToast(ClientNotification notification) {
+    String title = _getNotificationTitle(notification.type);
+    Color backgroundColor = _getNotificationColor(notification.type);
+
+    BotToast.showCustomNotification(
+      duration: null,
+      toastBuilder: (_) {
+        return Container(
+          margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 50),
+          child: Material(
+            elevation: 8,
+            shadowColor: Colors.black26,
+            color: backgroundColor,
+            borderRadius: BorderRadius.circular(12),
+            clipBehavior: Clip.antiAlias,
+            child: IntrinsicHeight(
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  Container(
+                    width: 60,
+                    child: Image.asset(
+                      'assets/icons/clichnik.png',
+                      fit: BoxFit.contain,
+                    ),
+                  ),
+                  Expanded(
+                    child: Padding(
+                      padding: const EdgeInsets.all(12.0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            title,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 16,
+                            ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            notification.content,
+                            style: TextStyle(fontSize: 14),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  Align(
+                    alignment: Alignment.topRight,
+                    child: IconButton(
+                      icon: const Icon(Icons.close, size: 20),
+                      onPressed: () {
+                        BotToast.cleanAll();
+                      },
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  String _getNotificationTitle(NotificationType type) {
+    switch (type) {
+      case NotificationType.info:
+        return 'Информация';
+      case NotificationType.attention:
+        return 'Внимание';
+      case NotificationType.warning:
+        return 'Предупреждение';
+    }
+  }
+
+  Color _getNotificationColor(NotificationType type) {
+    switch (type) {
+      case NotificationType.info:
+        return const Color(0xFF2196F3);
+      case NotificationType.attention:
+        return const Color(0xFFFF9800);
+      case NotificationType.warning:
+        return Colors.red;
+    }
+  }
+
+  void _initScooterIcon() async {
+    await ClusterIconPainter.initImage('assets/icons/scooter_placemark.png');
+  }
+
+  List<PlacemarkMapObject> _buildScooterPlacemarks({
+    required List<Scooter> scooters,
+    required String iconAsset,
+    required bool isClickable,
+  }) {
+    return scooters.map((scooter) {
+      return PlacemarkMapObject(
+        mapId: MapObjectId('${isClickable ? "" : "reserved_"}${scooter.id}'), // уникальный ID для карты
+        point: Point(latitude: scooter.longitude, longitude: scooter.latitude),
+        icon: PlacemarkIcon.single(
+          PlacemarkIconStyle(
+            image: BitmapDescriptor.fromAssetImage(iconAsset),
+            scale: 0.2,
+          ),
+        ),
+        opacity: 1.0,
+        consumeTapEvents: isClickable,
+        onTap: isClickable
+            ? (object, point) async => _onMarkerTap([scooter])
+            : null,
+      );
+    }).toList();
+  }
+
+  List<MapObject> _buildZonePolygons(List<Zone>? zones) {
+    if (zones == null || zones.isEmpty) return [];
+
+    List<MapObject> objects = [];
+    List<LinearRing> driveOuterRings = [];
+
+    for (var zone in zones) {
+      if (zone.type == "Drive") {
+        for (var polygonData in zone.geometry) {
+          if (polygonData.isEmpty) continue;
+
+          var outerPoints = polygonData[0].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
+
+          var cleanPoints = <Point>[];
+          for (var p in outerPoints) {
+            if (cleanPoints.isEmpty || cleanPoints.last != p) {
+              cleanPoints.add(p);
+            }
+          }
+
+          if (cleanPoints.length > 2) {
+            if (cleanPoints.first != cleanPoints.last) {
+              cleanPoints.add(cleanPoints.first);
+            }
+            driveOuterRings.add(LinearRing(points: cleanPoints));
+          }
+        }
+      }
+    }
+
+    // Добавляем глобальную маску (все, что НЕ Drive — затеняется красным)
+    objects.add(
+      PolygonMapObject(
+        mapId: const MapObjectId('global_inverse_mask'),
+        polygon: Polygon(
+          outerRing: const LinearRing(points: [
+            Point(latitude: 85, longitude: -179.9),
+            Point(latitude: 85, longitude: 179.9),
+            Point(latitude: -85, longitude: 179.9),
+            Point(latitude: -85, longitude: -179.9),
+          ]),
+          innerRings: driveOuterRings, // Вырезаем только зоны Drive
+        ),
+        strokeWidth: 0,
+        fillColor: Colors.red.withOpacity(0.15),
+        zIndex: 0,
+      ),
+    );
+
+    // 2. Отрисовываем каждую зону (включая MultiPolygon и вложенные NotDrive/Finish)
+    for (var zone in zones) {
+      Color borderColor;
+      Color fillColor;
+
+      // Стилизация в зависимости от типа зоны
+      if (zone.type == "Drive") {
+        borderColor = const Color(0xFF5ECD4C); // Зеленый бордюр
+        fillColor = Colors.transparent;        // Прозрачная внутри маски
+      } else if (zone.type == "NotDrive") {
+        borderColor = const Color(0xFFEF4444); // Красный бордюр
+        fillColor = const Color(0xFFEF4444).withOpacity(0.3); // Красная полупрозрачная заливка для наглядности внутри Drive
+      } else {
+        borderColor = const Color(0xFFA78BFA); // Фиолетовый бордюр (Парковка)
+        fillColor = const Color(0xFFA78BFA).withOpacity(0.25); // Фиолетовая заливка
+      }
+
+      int polyIndex = 0;
+      for (var polygonData in zone.geometry) {
+        if (polygonData.isEmpty) continue;
+
+        // Строим внешнее кольцо текущего полигона
+        var outerPoints = polygonData[0].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
+        if (outerPoints.first != outerPoints.last) {
+          outerPoints.add(outerPoints.first);
+        }
+        LinearRing outerRing = LinearRing(points: outerPoints);
+
+        // Строим внутренние кольца (дыры), если они есть у этого полигона
+        List<LinearRing> innerRings = [];
+        for (int i = 1; i < polygonData.length; i++) {
+          var innerPoints = polygonData[i].map((p) => Point(latitude: p.latitude, longitude: p.longitude)).toList();
+          if (innerPoints.isNotEmpty) {
+            if (innerPoints.first != innerPoints.last) {
+              innerPoints.add(innerPoints.first);
+            }
+            innerRings.add(LinearRing(points: innerPoints));
+          }
+        }
+
+        // Рендерим полноценный PolygonMapObject (он поддерживает и заливку, и обводку)
+        objects.add(
+          PolygonMapObject(
+            mapId: MapObjectId('zone_poly_${zone.type}_${zone.id}_$polyIndex'),
+            polygon: Polygon(
+              outerRing: outerRing,
+              innerRings: innerRings,
+            ),
+            strokeColor: borderColor,
+            strokeWidth: 2.0,
+            fillColor: fillColor,
+            // Поднимаем зоны ограничений и парковок выше маски и контуров Drive
+            zIndex: zone.type == "Drive" ? 1 : 2,
+          ),
+        );
+        polyIndex++;
+      }
+    }
+
+    return objects;
+  }
+
+  Widget _buildTopButtons() {
+    return Stack(
+      children: [
+        Positioned(
+          top: 16,
+          left: 16,
+          child: Builder(
+            builder: (innerContext) => _RoundIconButton(
+              icon: Icons.menu,
+              onPressed: () {
+                context.read<MapBloc>().add(FetchProfileData());
+                Scaffold.of(innerContext).openDrawer();
+                },
+            ),
+          ),
+        ),
+        Positioned(
+          top: 16,
+          right: 16,
+          child: Column(
+            children: [
+              _RoundIconButton(
+                icon: Icons.notifications_sharp,
+                onPressed: () => context.push("/home/notifications"),
+              ),
+              const SizedBox(height: 12),
+              _RoundButton(
+                imagePath: 'assets/icons/scooter_placemark.png',
+                onPressed: () => context.push("/home/current-rides-sheet"),
+              )
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildCentralQrButton() {
+    return Positioned(
+      bottom: 24,
+      left: 0,
+      right: 0,
+      child: Center(
+        child: GestureDetector(
+          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,
+            decoration: BoxDecoration(
+              color: AppColors.darkBlue,
+              shape: BoxShape.circle,
+              boxShadow: [
+                BoxShadow(
+                  color: Colors.black.withOpacity(0.3),
+                  blurRadius: 10,
+                  offset: const Offset(0, 4),
+                ),
+              ],
+            ),
+            child: const Icon(
+              Icons.qr_code_scanner,
+              color: Colors.white,
+              size: 32,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSideControls() {
+    return Positioned(
+      right: 16,
+      top: 0,
+      bottom: 0,
+      child: Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            _CircleIconButton(icon: Icons.map, onPressed: _onMapSettingsTap),
+            const SizedBox(height: 16),
+            _CircleIconButton(
+              icon: Icons.my_location,
+              onPressed: () {
+                context.read<MapBloc>().add(
+                  UpdateUserLocation(
+                    _currentPosition!.latitude,
+                    _currentPosition!.longitude,
+                  ),
+                );
+                _moveCameraToPoint(
+                  _currentPosition!.latitude,
+                  _currentPosition!.longitude,
+                  zoom: 17,
+                );
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<Uint8List> painterToBytes(CustomPainter painter, Size size) async {
+  final recorder = ui.PictureRecorder();
+  final canvas = Canvas(recorder);
+  painter.paint(canvas, size);
+  final picture = recorder.endRecording();
+  final image = await picture.toImage(size.width.toInt(), size.height.toInt());
+  final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+  return byteData!.buffer.asUint8List();
+}
+
+class _RoundIconButton extends StatelessWidget {
+  final IconData icon;
+  final VoidCallback onPressed;
+
+  const _RoundIconButton({required this.icon, required this.onPressed});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        color: AppColors.darkBlue,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: IconButton(
+        icon: Icon(icon, color: Colors.white, size: 24),
+        onPressed: onPressed,
+      ),
+    );
+  }
+}
+
+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;
+
+  const _CircleIconButton({required this.icon, required this.onPressed});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: const BoxDecoration(
+        color: AppColors.darkBlue,
+        shape: BoxShape.circle,
+      ),
+      child: IconButton(
+        icon: Icon(icon, color: Colors.white, size: 24),
+        onPressed: onPressed,
+      ),
+    );
+  }
+}
+
+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
+        ),
+      );
+    },
+  );
+}
diff --git a/lib/presentation/screens/news_detail_screen.dart b/lib/presentation/screens/news_detail_screen.dart
index c118259..8157b23 100644
--- a/lib/presentation/screens/news_detail_screen.dart
+++ b/lib/presentation/screens/news_detail_screen.dart
@@ -1,144 +1,144 @@
-import 'package:flutter/material.dart';
-import 'package:be_happy/di/service_locator.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-import '../components/content_parser.dart';
-import '../../domain/usecase/get_news_by_id_usecase.dart';
-
-class NewsDetailScreen extends StatefulWidget {
-  final int newsId;
-  final String title;
-
-  const NewsDetailScreen({
-    super.key,
-    required this.newsId,
-    required this.title,
-  });
-
-  @override
-  State<NewsDetailScreen> createState() => _NewsDetailScreenState();
-}
-
-class _NewsDetailScreenState extends State<NewsDetailScreen> {
-  bool _isLoading = true;
-  String? _errorMessage;
-  dynamic _news;
-
-  @override
-  void initState() {
-    super.initState();
-    _fetchNews();
-  }
-
-  Future<void> _fetchNews() async {
-    try {
-      final usecase = getIt<GetNewsByIdUsecase>();
-      final news = await usecase(widget.newsId);
-
-      if (mounted) {
-        setState(() {
-          _news = news;
-          _isLoading = false;
-        });
-      }
-    } catch (e) {
-      if (mounted) {
-        setState(() {
-          _errorMessage = e.toString();
-          _isLoading = false;
-        });
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      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: CustomAppBar(title: widget.title),
-              ),
-
-              // 🔹 Контент
-              Expanded(
-                child: _isLoading
-                    ? const Center(
-                  child: CircularProgressIndicator(color: Colors.white),
-                )
-                    : _errorMessage != null
-                    ? Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Text(
-                        'Ошибка загрузки новости',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                        ),
-                      ),
-                      const SizedBox(height: 16),
-                      Text(
-                        _errorMessage!,
-                        style: TextStyle(
-                          color: Colors.white.withOpacity(0.6),
-                          fontSize: 14,
-                        ),
-                        textAlign: TextAlign.center,
-                      ),
-                      const SizedBox(height: 24),
-                      ElevatedButton(
-                        onPressed: () {
-                          setState(() {
-                            _isLoading = true;
-                            _errorMessage = null;
-                            _fetchNews();
-                          });
-                        },
-                        child: const Text('Повторить'),
-                      ),
-                    ],
-                  ),
-                )
-                    : _news != null
-                    ? _buildNewsContent(_news)
-                    : const SizedBox.shrink(),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildNewsContent(dynamic news) {
-    return SingleChildScrollView(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // ✅ Используем вынесенный парсер
-          ...ContentParser.parseContent(
-            textJson: news.textJson,
-            text: news.text,
-          ),
-        ],
-      ),
-    );
-  }
-
-  // 🔹 Удалены старые методы: _parseHtmlText, _parseHtmlElements, _parseJsonText, _parseJsonNode
-
-  String _formatDate(DateTime? date) {
-    if (date == null) return '';
-    final localDate = date.toLocal();
-    return '${localDate.day.toString().padLeft(2, '0')}.${localDate.month.toString().padLeft(2, '0')}.${localDate.year}';
-  }
+import 'package:flutter/material.dart';
+import 'package:be_happy/di/service_locator.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+import '../components/content_parser.dart';
+import '../../domain/usecase/get_news_by_id_usecase.dart';
+
+class NewsDetailScreen extends StatefulWidget {
+  final int newsId;
+  final String title;
+
+  const NewsDetailScreen({
+    super.key,
+    required this.newsId,
+    required this.title,
+  });
+
+  @override
+  State<NewsDetailScreen> createState() => _NewsDetailScreenState();
+}
+
+class _NewsDetailScreenState extends State<NewsDetailScreen> {
+  bool _isLoading = true;
+  String? _errorMessage;
+  dynamic _news;
+
+  @override
+  void initState() {
+    super.initState();
+    _fetchNews();
+  }
+
+  Future<void> _fetchNews() async {
+    try {
+      final usecase = getIt<GetNewsByIdUsecase>();
+      final news = await usecase(widget.newsId);
+
+      if (mounted) {
+        setState(() {
+          _news = news;
+          _isLoading = false;
+        });
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _errorMessage = e.toString();
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      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: CustomAppBar(title: widget.title),
+              ),
+
+              // 🔹 Контент
+              Expanded(
+                child: _isLoading
+                    ? const Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                )
+                    : _errorMessage != null
+                    ? Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      const Text(
+                        'Ошибка загрузки новости',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 16,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        _errorMessage!,
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.6),
+                          fontSize: 14,
+                        ),
+                        textAlign: TextAlign.center,
+                      ),
+                      const SizedBox(height: 24),
+                      ElevatedButton(
+                        onPressed: () {
+                          setState(() {
+                            _isLoading = true;
+                            _errorMessage = null;
+                            _fetchNews();
+                          });
+                        },
+                        child: const Text('Повторить'),
+                      ),
+                    ],
+                  ),
+                )
+                    : _news != null
+                    ? _buildNewsContent(_news)
+                    : const SizedBox.shrink(),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildNewsContent(dynamic news) {
+    return SingleChildScrollView(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          // ✅ Используем вынесенный парсер
+          ...ContentParser.parseContent(
+            textJson: news.textJson,
+            text: news.text,
+          ),
+        ],
+      ),
+    );
+  }
+
+  // 🔹 Удалены старые методы: _parseHtmlText, _parseHtmlElements, _parseJsonText, _parseJsonNode
+
+  String _formatDate(DateTime? date) {
+    if (date == null) return '';
+    final localDate = date.toLocal();
+    return '${localDate.day.toString().padLeft(2, '0')}.${localDate.month.toString().padLeft(2, '0')}.${localDate.year}';
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/news_screen.dart b/lib/presentation/screens/news_screen.dart
index 8555a5f..926db42 100644
--- a/lib/presentation/screens/news_screen.dart
+++ b/lib/presentation/screens/news_screen.dart
@@ -1,257 +1,257 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-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';
-import 'news_detail_screen.dart';
-
-class NewsScreen extends StatelessWidget {
-  const NewsScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) {
-        return getIt<NewsBloc>()..add(const NewsFetchRequested());
-      },
-      child: const NewsView(),
-    );
-  }
-}
-
-class NewsView extends StatelessWidget {
-  const NewsView({super.key});
-
-  @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: 32),
-              Expanded(
-                child: BlocBuilder<NewsBloc, NewsState>(
-                  builder: (context, state) {
-
-                    if (state.status == NewsStatus.initial || state.status == NewsStatus.loading) {
-                      return const Center(
-                        child: CircularProgressIndicator(color: Colors.white),
-                      );
-                    }
-
-                    if (state.status == NewsStatus.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<NewsBloc>().add(const NewsFetchRequested());
-                              },
-                              style: ElevatedButton.styleFrom(
-                                backgroundColor: AppColors.smsDigit,
-                              ),
-                              child: const Text('Повторить'),
-                            ),
-                          ],
-                        ),
-                      );
-                    }
-
-                    if (state.news.isEmpty) {
-                      return const _EmptyState();
-                    }
-
-                    return ListView.builder(
-                      padding: const EdgeInsets.symmetric(horizontal: 20),
-                      itemCount: state.news.length,
-                      itemBuilder: (context, index) {
-                        return _NewsCard(news: state.news[index]);
-                      },
-                    );
-                  },
-                ),
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _EmptyState extends StatelessWidget {
-  const _EmptyState();
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        Image.asset(
-          'assets/news_empty.png',
-          width: 280,
-          height: 280,
-          fit: BoxFit.contain,
-          errorBuilder: (context, error, stackTrace) {
-            return const Icon(
-              Icons.newspaper_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 _NewsCard extends StatelessWidget {
-  final dynamic news;
-
-  const _NewsCard({required this.news});
-
-  @override
-  Widget build(BuildContext context) {
-    final date = _formatDate(news.publishedAt);
-
-    return Container(
-      margin: const EdgeInsets.only(bottom: 16),
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: const Color(0xFF0A0F2E).withOpacity(0.7),
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            date,
-            style: const TextStyle(
-              color: AppColors.white70,
-              fontSize: 12,
-            ),
-          ),
-          const SizedBox(height: 8),
-          Text(
-            news.title,
-            style: const TextStyle(
-              color: Colors.white,
-              fontSize: 16,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-          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(
-              color: Colors.white70,
-              fontSize: 14,
-              height: 1.4,
-            ),
-          ),
-          const SizedBox(height: 16),
-
-          Align(
-            alignment: Alignment.centerRight,
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 150),
-              child: GradientButton(
-                text: 'Подробнее',
-                onTap: () {
-                  Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (context) => NewsDetailScreen(
-                        newsId: news.id,
-                        title: news.title,
-                      ),
-                    ),
-                  );
-                },
-                showArrows: true,
-                fontSize: 14,
-                height: 40,
-                width: double.infinity,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  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}, ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
-    }
-  }
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+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';
+import 'news_detail_screen.dart';
+
+class NewsScreen extends StatelessWidget {
+  const NewsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) {
+        return getIt<NewsBloc>()..add(const NewsFetchRequested());
+      },
+      child: const NewsView(),
+    );
+  }
+}
+
+class NewsView extends StatelessWidget {
+  const NewsView({super.key});
+
+  @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: 32),
+              Expanded(
+                child: BlocBuilder<NewsBloc, NewsState>(
+                  builder: (context, state) {
+
+                    if (state.status == NewsStatus.initial || state.status == NewsStatus.loading) {
+                      return const Center(
+                        child: CircularProgressIndicator(color: Colors.white),
+                      );
+                    }
+
+                    if (state.status == NewsStatus.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<NewsBloc>().add(const NewsFetchRequested());
+                              },
+                              style: ElevatedButton.styleFrom(
+                                backgroundColor: AppColors.smsDigit,
+                              ),
+                              child: const Text('Повторить'),
+                            ),
+                          ],
+                        ),
+                      );
+                    }
+
+                    if (state.news.isEmpty) {
+                      return const _EmptyState();
+                    }
+
+                    return ListView.builder(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      itemCount: state.news.length,
+                      itemBuilder: (context, index) {
+                        return _NewsCard(news: state.news[index]);
+                      },
+                    );
+                  },
+                ),
+              ),
+              const SizedBox(height: 20),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _EmptyState extends StatelessWidget {
+  const _EmptyState();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Image.asset(
+          'assets/news_empty.png',
+          width: 280,
+          height: 280,
+          fit: BoxFit.contain,
+          errorBuilder: (context, error, stackTrace) {
+            return const Icon(
+              Icons.newspaper_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 _NewsCard extends StatelessWidget {
+  final dynamic news;
+
+  const _NewsCard({required this.news});
+
+  @override
+  Widget build(BuildContext context) {
+    final date = _formatDate(news.publishedAt);
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 16),
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: const Color(0xFF0A0F2E).withOpacity(0.7),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            date,
+            style: const TextStyle(
+              color: AppColors.white70,
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            news.title,
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 16,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          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(
+              color: Colors.white70,
+              fontSize: 14,
+              height: 1.4,
+            ),
+          ),
+          const SizedBox(height: 16),
+
+          Align(
+            alignment: Alignment.centerRight,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 150),
+              child: GradientButton(
+                text: 'Подробнее',
+                onTap: () {
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) => NewsDetailScreen(
+                        newsId: news.id,
+                        title: news.title,
+                      ),
+                    ),
+                  );
+                },
+                showArrows: true,
+                fontSize: 14,
+                height: 40,
+                width: double.infinity,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  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}, ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/notifications_screen.dart b/lib/presentation/screens/notifications_screen.dart
index ed2e60e..77bd6e8 100644
--- a/lib/presentation/screens/notifications_screen.dart
+++ b/lib/presentation/screens/notifications_screen.dart
@@ -1,394 +1,394 @@
-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 BlocProvider(
-      create: (context) => getIt<NotificationsBloc>()..add(NotificationsFetchRequested(page: 1)),
-      child: _NotificationsScreenContent(),
-    );
-  }
-}
-
-class _NotificationsScreenContent extends StatefulWidget {
-  const _NotificationsScreenContent();
-
-  @override
-  State<_NotificationsScreenContent> createState() => _NotificationsScreenContentState();
-}
-
-class _NotificationsScreenContentState extends State<_NotificationsScreenContent> {
-  NotificationFilter _filter = NotificationFilter.all;
-  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  void _setFilter(NotificationFilter filter) {
-    setState(() => _filter = filter);
-    _scrollController.jumpTo(0);
-    context.read<NotificationsBloc>().add(NotificationsFetchRequested(page: 1));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return NotificationsView(
-      filter: _filter,
-      onFilterChanged: _setFilter,
-      scrollController: _scrollController,
-    );
-  }
-}
-
-class NotificationsView extends StatelessWidget {
-  final NotificationFilter filter;
-  final ValueChanged<NotificationFilter> onFilterChanged;
-  final ScrollController? scrollController;
-
-  const NotificationsView({
-    super.key,
-    this.filter = NotificationFilter.all,
-    required this.onFilterChanged,
-    this.scrollController,
-  });
-
-  @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(page: 1));
-                              },
-                              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;
-                        default:
-                          return true;
-                      }
-                    }).toList();
-
-                    if (filtered.isEmpty) {
-                      return const _EmptyState();
-                    }
-
-                    return RefreshIndicator(
-                      onRefresh: () async {
-                        context.read<NotificationsBloc>().add(NotificationsFetchRequested(page: 1));
-                      },
-                      child: NotificationListener<ScrollNotification>(
-                        onNotification: (scrollInfo) {
-                          if (scrollInfo.metrics.pixels >= scrollInfo.metrics.maxScrollExtent - 50 &&
-                              scrollInfo.metrics.maxScrollExtent > 0 &&
-                              state.hasMore &&
-                              !state.isLoadingMore &&
-                              state.status == NotificationsStatus.success) {
-                            context.read<NotificationsBloc>().add(NotificationsLoadMoreRequested());
-                          }
-                          return false;
-                        },
-                        child: ListView.builder(
-                          controller: scrollController,
-                          padding: const EdgeInsets.symmetric(horizontal: 20),
-                          itemCount: filtered.length + (state.hasMore && filtered.length >= 10 ? 1 : 0),
-                          itemBuilder: (context, index) {
-                            if (index == filtered.length && state.hasMore && filtered.length >= 10) {
-                              return const Padding(
-                                padding: EdgeInsets.symmetric(vertical: 16),
-                                child: Center(
-                                  child: SizedBox(
-                                    width: 24,
-                                    height: 24,
-                                    child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2),
-                                  ),
-                                ),
-                              );
-                            }
-                            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 localDate = date.toLocal();
-    final now = DateTime.now();
-
-    if (localDate.year == now.year &&
-        localDate.month == now.month &&
-        localDate.day == now.day) {
-      return 'Сегодня, ${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
-    }
-
-    final yesterday = now.subtract(const Duration(days: 1));
-    if (localDate.year == yesterday.year &&
-        localDate.month == yesterday.month &&
-        localDate.day == yesterday.day) {
-      return 'Вчера, ${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
-    }
-
-    return '${localDate.day.toString().padLeft(2, '0')}.${localDate.month.toString().padLeft(2, '0')}.${localDate.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 'Самокат';
-    }
-  }
+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 BlocProvider(
+      create: (context) => getIt<NotificationsBloc>()..add(NotificationsFetchRequested(page: 1)),
+      child: _NotificationsScreenContent(),
+    );
+  }
+}
+
+class _NotificationsScreenContent extends StatefulWidget {
+  const _NotificationsScreenContent();
+
+  @override
+  State<_NotificationsScreenContent> createState() => _NotificationsScreenContentState();
+}
+
+class _NotificationsScreenContentState extends State<_NotificationsScreenContent> {
+  NotificationFilter _filter = NotificationFilter.all;
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _setFilter(NotificationFilter filter) {
+    setState(() => _filter = filter);
+    _scrollController.jumpTo(0);
+    context.read<NotificationsBloc>().add(NotificationsFetchRequested(page: 1));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return NotificationsView(
+      filter: _filter,
+      onFilterChanged: _setFilter,
+      scrollController: _scrollController,
+    );
+  }
+}
+
+class NotificationsView extends StatelessWidget {
+  final NotificationFilter filter;
+  final ValueChanged<NotificationFilter> onFilterChanged;
+  final ScrollController? scrollController;
+
+  const NotificationsView({
+    super.key,
+    this.filter = NotificationFilter.all,
+    required this.onFilterChanged,
+    this.scrollController,
+  });
+
+  @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(page: 1));
+                              },
+                              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;
+                        default:
+                          return true;
+                      }
+                    }).toList();
+
+                    if (filtered.isEmpty) {
+                      return const _EmptyState();
+                    }
+
+                    return RefreshIndicator(
+                      onRefresh: () async {
+                        context.read<NotificationsBloc>().add(NotificationsFetchRequested(page: 1));
+                      },
+                      child: NotificationListener<ScrollNotification>(
+                        onNotification: (scrollInfo) {
+                          if (scrollInfo.metrics.pixels >= scrollInfo.metrics.maxScrollExtent - 50 &&
+                              scrollInfo.metrics.maxScrollExtent > 0 &&
+                              state.hasMore &&
+                              !state.isLoadingMore &&
+                              state.status == NotificationsStatus.success) {
+                            context.read<NotificationsBloc>().add(NotificationsLoadMoreRequested());
+                          }
+                          return false;
+                        },
+                        child: ListView.builder(
+                          controller: scrollController,
+                          padding: const EdgeInsets.symmetric(horizontal: 20),
+                          itemCount: filtered.length + (state.hasMore && filtered.length >= 10 ? 1 : 0),
+                          itemBuilder: (context, index) {
+                            if (index == filtered.length && state.hasMore && filtered.length >= 10) {
+                              return const Padding(
+                                padding: EdgeInsets.symmetric(vertical: 16),
+                                child: Center(
+                                  child: SizedBox(
+                                    width: 24,
+                                    height: 24,
+                                    child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2),
+                                  ),
+                                ),
+                              );
+                            }
+                            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 localDate = date.toLocal();
+    final now = DateTime.now();
+
+    if (localDate.year == now.year &&
+        localDate.month == now.month &&
+        localDate.day == now.day) {
+      return 'Сегодня, ${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
+    }
+
+    final yesterday = now.subtract(const Duration(days: 1));
+    if (localDate.year == yesterday.year &&
+        localDate.month == yesterday.month &&
+        localDate.day == yesterday.day) {
+      return 'Вчера, ${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
+    }
+
+    return '${localDate.day.toString().padLeft(2, '0')}.${localDate.month.toString().padLeft(2, '0')}.${localDate.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 'Самокат';
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/onboarding_screen.dart b/lib/presentation/screens/onboarding_screen.dart
index fd92a4b..a330bf5 100644
--- a/lib/presentation/screens/onboarding_screen.dart
+++ b/lib/presentation/screens/onboarding_screen.dart
@@ -1,170 +1,170 @@
-import 'package:flutter/material.dart';
-import '../components/gradient_button.dart';
-
-class OnboardingScreen extends StatefulWidget {
-  const OnboardingScreen({super.key});
-
-  @override
-  State<OnboardingScreen> createState() => _OnboardingScreenState();
-}
-
-class _OnboardingScreenState extends State<OnboardingScreen> {
-  final PageController _pageController = PageController();
-  int _currentPage = 0;
-
-  final List<Map<String, String>> _slides = [
-    {
-      'image': 'assets/onboard_1.jpg',
-      'title': 'Найдите самокат на карте и выберите нужный',
-    },
-    {
-      'image': 'assets/onboard_2.jpg',
-      'title': 'Отсканируйте QR-код или введите номер который указан под козлом',
-    },
-    {
-      'image': 'assets/onboard_3.png',
-      'title': 'Дождитесь звукового сигнала. При наличии замка отстегните его',
-    },
-    {
-      'image': 'assets/onboard_4.jpg',
-      'title': 'Выберите тариф и начните поездку',
-    },
-    {
-      'image': 'assets/onboard_5.jpg',
-      'title': 'Управляйте скоростью с помощью курка тормоза',
-    },
-    {
-      'image': 'assets/onboard_6.jpg',
-      'title': 'Для торможения используйте курок тормоза',
-    },
-    {
-      'image': 'assets/onboard_7.png',
-      'title': 'Для завершения аренды припаркуйте самокат в разрешённом месте',
-    },
-  ];
-
-  void _nextPage() {
-    if (_currentPage < _slides.length - 1) {
-      _pageController.nextPage(
-        duration: const Duration(milliseconds: 300),
-        curve: Curves.easeInOut,
-      );
-    } else {
-      // TODO: переход дальше (авторизация / главная)
-      Navigator.pop(context);
-    }
-  }
-
-  @override
-  void dispose() {
-    _pageController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Stack(
-        children: [
-          /// Фон — PageView
-          PageView.builder(
-            controller: _pageController,
-            itemCount: _slides.length,
-            physics: const NeverScrollableScrollPhysics(),
-            onPageChanged: (index) {
-              setState(() {
-                _currentPage = index;
-              });
-            },
-            itemBuilder: (context, index) {
-              return Image.asset(
-                _slides[index]['image']!,
-                fit: BoxFit.cover,
-                width: double.infinity,
-                height: double.infinity,
-              );
-            },
-          ),
-
-          /// Градиент сверху для читаемости
-          Container(
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [
-                  Colors.black.withOpacity(0.35),
-                  Colors.transparent,
-                ],
-                stops: const [0.0, 0.7],
-              ),
-            ),
-          ),
-
-          /// Контент
-          SafeArea(
-            child: Column(
-              children: [
-                const Expanded(child: SizedBox()),
-
-                /// Текст
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Text(
-                    _slides[_currentPage]['title']!,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 20,
-                      fontWeight: FontWeight.bold,
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-
-                const SizedBox(height: 32),
-
-                /// Кнопка
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: GradientButton(
-                    text: _currentPage == _slides.length - 1
-                        ? 'Начать'
-                        : 'Далее',
-                    onTap: _nextPage,
-                    width: double.infinity,
-                    height: 56,
-                    fontSize: 18,
-                    showArrows: true,
-                  ),
-                ),
-
-                const SizedBox(height: 24),
-
-                /// Индикатор
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: List.generate(_slides.length, (index) {
-                    return AnimatedContainer(
-                      duration: const Duration(milliseconds: 200),
-                      width: index == _currentPage ? 10 : 8,
-                      height: index == _currentPage ? 10 : 8,
-                      margin: const EdgeInsets.symmetric(horizontal: 3),
-                      decoration: BoxDecoration(
-                        color: index == _currentPage
-                            ? Colors.greenAccent
-                            : Colors.white.withOpacity(0.3),
-                        shape: BoxShape.circle,
-                      ),
-                    );
-                  }),
-                ),
-
-                const SizedBox(height: 24),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import '../components/gradient_button.dart';
+
+class OnboardingScreen extends StatefulWidget {
+  const OnboardingScreen({super.key});
+
+  @override
+  State<OnboardingScreen> createState() => _OnboardingScreenState();
+}
+
+class _OnboardingScreenState extends State<OnboardingScreen> {
+  final PageController _pageController = PageController();
+  int _currentPage = 0;
+
+  final List<Map<String, String>> _slides = [
+    {
+      'image': 'assets/onboard_1.jpg',
+      'title': 'Найдите самокат на карте и выберите нужный',
+    },
+    {
+      'image': 'assets/onboard_2.jpg',
+      'title': 'Отсканируйте QR-код или введите номер который указан под козлом',
+    },
+    {
+      'image': 'assets/onboard_3.png',
+      'title': 'Дождитесь звукового сигнала. При наличии замка отстегните его',
+    },
+    {
+      'image': 'assets/onboard_4.jpg',
+      'title': 'Выберите тариф и начните поездку',
+    },
+    {
+      'image': 'assets/onboard_5.jpg',
+      'title': 'Управляйте скоростью с помощью курка тормоза',
+    },
+    {
+      'image': 'assets/onboard_6.jpg',
+      'title': 'Для торможения используйте курок тормоза',
+    },
+    {
+      'image': 'assets/onboard_7.png',
+      'title': 'Для завершения аренды припаркуйте самокат в разрешённом месте',
+    },
+  ];
+
+  void _nextPage() {
+    if (_currentPage < _slides.length - 1) {
+      _pageController.nextPage(
+        duration: const Duration(milliseconds: 300),
+        curve: Curves.easeInOut,
+      );
+    } else {
+      // TODO: переход дальше (авторизация / главная)
+      Navigator.pop(context);
+    }
+  }
+
+  @override
+  void dispose() {
+    _pageController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Stack(
+        children: [
+          /// Фон — PageView
+          PageView.builder(
+            controller: _pageController,
+            itemCount: _slides.length,
+            physics: const NeverScrollableScrollPhysics(),
+            onPageChanged: (index) {
+              setState(() {
+                _currentPage = index;
+              });
+            },
+            itemBuilder: (context, index) {
+              return Image.asset(
+                _slides[index]['image']!,
+                fit: BoxFit.cover,
+                width: double.infinity,
+                height: double.infinity,
+              );
+            },
+          ),
+
+          /// Градиент сверху для читаемости
+          Container(
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: [
+                  Colors.black.withOpacity(0.35),
+                  Colors.transparent,
+                ],
+                stops: const [0.0, 0.7],
+              ),
+            ),
+          ),
+
+          /// Контент
+          SafeArea(
+            child: Column(
+              children: [
+                const Expanded(child: SizedBox()),
+
+                /// Текст
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Text(
+                    _slides[_currentPage]['title']!,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                ),
+
+                const SizedBox(height: 32),
+
+                /// Кнопка
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: GradientButton(
+                    text: _currentPage == _slides.length - 1
+                        ? 'Начать'
+                        : 'Далее',
+                    onTap: _nextPage,
+                    width: double.infinity,
+                    height: 56,
+                    fontSize: 18,
+                    showArrows: true,
+                  ),
+                ),
+
+                const SizedBox(height: 24),
+
+                /// Индикатор
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: List.generate(_slides.length, (index) {
+                    return AnimatedContainer(
+                      duration: const Duration(milliseconds: 200),
+                      width: index == _currentPage ? 10 : 8,
+                      height: index == _currentPage ? 10 : 8,
+                      margin: const EdgeInsets.symmetric(horizontal: 3),
+                      decoration: BoxDecoration(
+                        color: index == _currentPage
+                            ? Colors.greenAccent
+                            : Colors.white.withOpacity(0.3),
+                        shape: BoxShape.circle,
+                      ),
+                    );
+                  }),
+                ),
+
+                const SizedBox(height: 24),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/order_history_detail_screen.dart b/lib/presentation/screens/order_history_detail_screen.dart
index 66f2e06..371bd2c 100644
--- a/lib/presentation/screens/order_history_detail_screen.dart
+++ b/lib/presentation/screens/order_history_detail_screen.dart
@@ -1,339 +1,353 @@
-import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-import '../../core/app_colors.dart';
-import '../../di/service_locator.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../event/route_event.dart';
-import '../state/route_state.dart';
-import '../viewmodel/route_bloc.dart';
-
-class OrderHistoryDetailScreen extends StatelessWidget {
-  final ScooterOrder order;
-
-  const OrderHistoryDetailScreen({
-    super.key,
-    required this.order,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final date = _formatDate(order.startAt ?? order.finishAt ?? DateTime.now());
-    final scooterNumber = order.scooter?.title ?? '№${order.scooterId}';
-    final price = order.totalPricePrint ?? '${order.totalPrice?.toStringAsFixed(2) ?? '0.00'} BYN';
-
-    return Scaffold(
-      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: CustomAppBar(title: 'Поездка $date'),
-              ),
-
-              const SizedBox(height: 16),
-
-              Expanded(
-                child: SingleChildScrollView(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      BlocProvider(
-                        create: (context) => RouteBloc(
-                          getRouteUseCase: getIt<GetScooterOrderRouteHistoryUsecase>(), // Используем DI (Service Locator)
-                        )..add(FetchRouteEvent(order.id)),
-                        child: Container(
-                          height: 280,
-                          decoration: BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: BorderRadius.circular(16),
-                          ),
-                          child: ClipRRect(
-                            borderRadius: BorderRadius.circular(16),
-                            child: BlocBuilder<RouteBloc, RouteState>(
-                              builder: (context, state) {
-                                if (state is RouteLoading) {
-                                  return const Center(child: CircularProgressIndicator());
-                                }
-
-                                if (state is RouteLoaded) {
-                                  final List<Point> yandexPoints = state.points.map((p) =>
-                                      Point(latitude: p.latitude, longitude: p.longitude)
-                                  ).toList();
-                                  return YandexMap(
-                                    rotateGesturesEnabled: false,
-                                    scrollGesturesEnabled: false,
-                                    tiltGesturesEnabled: false,
-                                    zoomGesturesEnabled: false,
-                                    mapObjects: [
-                                      PolylineMapObject(
-                                        mapId: const MapObjectId('route_line'),
-                                        polyline: Polyline(points: yandexPoints),
-                                        strokeColor: Colors.blue,
-                                        strokeWidth: 3,
-                                      ),
-                                    ],
-                                    onMapCreated: (controller) async {
-                                      final bounds = _calculateBounds(yandexPoints);
-                                      await controller.moveCamera(
-                                        CameraUpdate.newBounds(bounds),
-                                      );
-                                      await controller.moveCamera(CameraUpdate.zoomOut());
-                                    },
-                                  );
-                                }
-
-                                if (state is RouteError) {
-                                  return Center(child: Text(state.message, style: const TextStyle(color: Colors.grey)));
-                                }
-
-                                return const SizedBox.shrink();
-                              },
-                            ),
-                          ),
-                        ),
-                      ),
-
-                      const SizedBox(height: 16),
-
-                      // 🔹 ИНФОРМАЦИЯ О ПОЕЗДКЕ
-                      Container(
-                        padding: const EdgeInsets.all(16),
-                        decoration: BoxDecoration(
-                          color: const Color(0xFF0A0F2E).withOpacity(0.7),
-                          borderRadius: BorderRadius.circular(16),
-                        ),
-                        child: Row(
-                          children: [
-                            // Фото самоката
-                            Container(
-                              width: 60,
-                              height: 60,
-                              decoration: BoxDecoration(
-                                color: Colors.white.withOpacity(0.1),
-                                borderRadius: BorderRadius.circular(12),
-                              ),
-                              child: Image.asset(
-                                'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
-                                fit: BoxFit.contain,
-                                errorBuilder: (context, error, stackTrace) {
-                                  return const Icon(
-                                    Icons.electric_scooter,
-                                    color: Colors.white,
-                                    size: 32,
-                                  );
-                                },
-                              ),
-                            ),
-                            const SizedBox(width: 12),
-                            // Информация
-                            Expanded(
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(
-                                    date,
-                                    style: const TextStyle(
-                                      color: Colors.white,
-                                      fontSize: 14,
-                                      fontWeight: FontWeight.w600,
-                                    ),
-                                  ),
-                                  const SizedBox(height: 8),
-                                  Row(
-                                    children: [
-                                      Icon(
-                                        Icons.qr_code_2,
-                                        color: Colors.white.withOpacity(0.6),
-                                        size: 16,
-                                      ),
-                                      const SizedBox(width: 4),
-                                      Text(
-                                        scooterNumber,
-                                        style: TextStyle(
-                                          color: Colors.white.withOpacity(0.8),
-                                          fontSize: 14,
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ),
-                            // Цена
-                            Column(
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Container(
-                                  width: 100,
-                                  alignment: Alignment.center,
-                                  padding: EdgeInsets.all(4),
-                                  decoration: BoxDecoration(
-                                    color: Colors.white.withOpacity(0.3),
-                                    borderRadius: BorderRadius.circular(12),
-                                  ),
-                                  child: Text(
-                                    order.status == 'Paid' ? 'ОПЛАЧЕН' : 'НЕ ОПЛАЧЕН',
-                                    style: TextStyle(
-                                      color: order.status == 'Paid'
-                                          ? Colors.greenAccent
-                                          : Colors.redAccent,
-                                      fontSize: 12,
-                                      fontWeight: FontWeight.bold,
-                                      letterSpacing: 0.5,
-                                    ),
-                                  ),
-                                ),
-
-                                const SizedBox(height: 8),
-
-                                Text(
-                                  price,
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontSize: 18,
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ],
-                        ),
-                      ),
-
-
-                      if (order.status != 'Paid') ...[
-                        const SizedBox(height: 16),
-                        GradientButton(
-                          text: 'Оплатить',
-                          showArrows: true,
-                          height: 56,
-                          width: double.infinity,
-                          fontSize: 16,
-                          onTap: () {
-                            context.go('/home/checkout/${order.id}');
-                          },
-                        ),
-                      ],
-
-                      const SizedBox(height: 16),
-
-                      // 🔹 ДЕТАЛИ ПОЕЗДКИ
-                      Container(
-                        padding: const EdgeInsets.all(16),
-                        decoration: BoxDecoration(
-                          color: const Color(0xFF0A0F2E).withOpacity(0.7),
-                          borderRadius: BorderRadius.circular(16),
-                        ),
-                        child: Column(
-                          children: [
-                            _DetailRow(
-                              label: 'Старт',
-                              value: _formatTime(order.startAt),
-                            ),
-                            const SizedBox(height: 12),
-                            _DetailRow(
-                              label: 'Завершение',
-                              value: _formatTime(order.finishAt),
-                            ),
-                            const SizedBox(height: 12),
-                            _DetailRow(
-                              label: 'Расстояние',
-                              value: '${order.mileage.toStringAsFixed(2)?? '0'} км',
-                            ),
-                            const SizedBox(height: 12),
-                            _DetailRow(
-                              label: 'Скорость',
-                              value: '${order.avgSpeed ?? '0'} км/ч',
-                            ),
-                            const SizedBox(height: 12),
-                            _DetailRow(
-                              label: 'Тариф',
-                              value: order.plan?.title ?? '—',
-                            ),
-                            const SizedBox(height: 12),
-                            _DetailRow(
-                              label: 'Страховка',
-                              value: order.isInsurance ? "${order.insurancePrice} руб." : '—',
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(height: 24),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  // 🔹 ВИДЖЕТ СТРОКИ С ДЕТАЛЯМИ
-  Widget _DetailRow({required String label, required String value}) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text(
-          label,
-          style: TextStyle(
-            color: Colors.white.withOpacity(0.6),
-            fontSize: 14,
-          ),
-        ),
-        Text(
-          value,
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 14,
-            fontWeight: FontWeight.w600,
-          ),
-        ),
-      ],
-    );
-  }
-
-  String _formatDate(DateTime date) {
-    final localDate = date.toLocal();
-    const months = [
-      'января', 'февраля', 'марта', 'апреля', 'мая', 'июня',
-      'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'
-    ];
-    return '${localDate.day} ${months[localDate.month - 1]}, ${_formatTime(date)}';
-  }
-
-  String _formatTime(DateTime? date) {
-    if (date == null) return '—';
-    final localDate = date.toLocal();
-    return '${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
-  }
-
-  BoundingBox _calculateBounds(List<Point> points) {
-    double minLat = points.first.latitude;
-    double minLng = points.first.longitude;
-    double maxLat = points.first.latitude;
-    double maxLng = points.first.longitude;
-
-    for (var p in points) {
-      if (p.latitude < minLat) minLat = p.latitude;
-      if (p.latitude > maxLat) maxLat = p.latitude;
-      if (p.longitude < minLng) minLng = p.longitude;
-      if (p.longitude > maxLng) maxLng = p.longitude;
-    }
-
-    return BoundingBox(
-      southWest: Point(latitude: minLat, longitude: minLng),
-      northEast: Point(latitude: maxLat, longitude: maxLng),
-    );
-  }
+import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+import '../../core/app_colors.dart';
+import '../../di/service_locator.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../event/route_event.dart';
+import '../state/route_state.dart';
+import '../viewmodel/route_bloc.dart';
+
+class OrderHistoryDetailScreen extends StatelessWidget {
+  final ScooterOrder order;
+
+  const OrderHistoryDetailScreen({
+    super.key,
+    required this.order,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final date = _formatDate(order.startAt ?? order.finishAt ?? DateTime.now());
+    final scooterNumber = order.scooter?.title ?? '№${order.scooterId}';
+    final price = order.totalPricePrint ?? '${order.totalPrice?.toStringAsFixed(2) ?? '0.00'} BYN';
+
+    return Scaffold(
+      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: CustomAppBar(title: 'Поездка $date'),
+              ),
+
+              const SizedBox(height: 16),
+
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      BlocProvider(
+                        create: (context) => RouteBloc(
+                          getRouteUseCase: getIt<GetScooterOrderRouteHistoryUsecase>(), // Используем DI (Service Locator)
+                        )..add(FetchRouteEvent(order.id)),
+                        child: Container(
+                          height: 280,
+                          decoration: BoxDecoration(
+                            color: Colors.white,
+                            borderRadius: BorderRadius.circular(16),
+                          ),
+                          child: ClipRRect(
+                            borderRadius: BorderRadius.circular(16),
+                            child: BlocBuilder<RouteBloc, RouteState>(
+                              builder: (context, state) {
+                                if (state is RouteLoading) {
+                                  return const Center(child: CircularProgressIndicator());
+                                }
+
+                                if (state is RouteLoaded) {
+                                  final List<Point> yandexPoints = state.points.map((p) =>
+                                      Point(latitude: p.latitude, longitude: p.longitude)
+                                  ).toList();
+                                  return YandexMap(
+                                    rotateGesturesEnabled: false,
+                                    scrollGesturesEnabled: false,
+                                    tiltGesturesEnabled: false,
+                                    zoomGesturesEnabled: false,
+                                    mapObjects: [
+                                      PolylineMapObject(
+                                        mapId: const MapObjectId('route_line'),
+                                        polyline: Polyline(points: yandexPoints),
+                                        strokeColor: Colors.blue,
+                                        strokeWidth: 3,
+                                      ),
+                                    ],
+                                    onMapCreated: (controller) async {
+                                      final bounds = _calculateBounds(yandexPoints);
+                                      await controller.moveCamera(
+                                        CameraUpdate.newBounds(bounds),
+                                      );
+                                      await controller.moveCamera(CameraUpdate.zoomOut());
+                                    },
+                                  );
+                                }
+
+                                if (state is RouteError) {
+                                  return Center(child: Text(state.message, style: const TextStyle(color: Colors.grey)));
+                                }
+
+                                return const SizedBox.shrink();
+                              },
+                            ),
+                          ),
+                        ),
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      // 🔹 ИНФОРМАЦИЯ О ПОЕЗДКЕ
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          color: const Color(0xFF0A0F2E).withOpacity(0.7),
+                          borderRadius: BorderRadius.circular(16),
+                        ),
+                        child: Row(
+                          children: [
+                            // Фото самоката
+                            Container(
+                              width: 60,
+                              height: 60,
+                              decoration: BoxDecoration(
+                                color: Colors.white.withOpacity(0.1),
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              child: Image.asset(
+                                'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
+                                fit: BoxFit.contain,
+                                errorBuilder: (context, error, stackTrace) {
+                                  return const Icon(
+                                    Icons.electric_scooter,
+                                    color: Colors.white,
+                                    size: 32,
+                                  );
+                                },
+                              ),
+                            ),
+                            const SizedBox(width: 12),
+                            // Информация
+                            Expanded(
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    date,
+                                    style: const TextStyle(
+                                      color: Colors.white,
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                  const SizedBox(height: 8),
+                                  Row(
+                                    children: [
+                                      Icon(
+                                        Icons.qr_code_2,
+                                        color: Colors.white.withOpacity(0.6),
+                                        size: 16,
+                                      ),
+                                      const SizedBox(width: 4),
+                                      Text(
+                                        scooterNumber,
+                                        style: TextStyle(
+                                          color: Colors.white.withOpacity(0.8),
+                                          fontSize: 14,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            ),
+                            // Цена
+                            Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              children: [
+                                Container(
+                                  width: 100,
+                                  alignment: Alignment.center,
+                                  padding: EdgeInsets.all(4),
+                                  decoration: BoxDecoration(
+                                    color: Colors.white.withOpacity(0.3),
+                                    borderRadius: BorderRadius.circular(12),
+                                  ),
+                                  child: Text(
+                                    order.status == 'Paid' ? 'ОПЛАЧЕН' : 'НЕ ОПЛАЧЕН',
+                                    style: TextStyle(
+                                      color: order.status == 'Paid'
+                                          ? Colors.greenAccent
+                                          : Colors.redAccent,
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.bold,
+                                      letterSpacing: 0.5,
+                                    ),
+                                  ),
+                                ),
+
+                                const SizedBox(height: 8),
+
+                                Text(
+                                  price,
+                                  style: const TextStyle(
+                                    color: Colors.white,
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ),
+
+
+                      if (order.status != 'Paid') ...[
+                        const SizedBox(height: 16),
+                        GradientButton(
+                          text: 'Оплатить',
+                          showArrows: true,
+                          height: 56,
+                          width: double.infinity,
+                          fontSize: 16,
+                          onTap: () {
+                            context.go('/home/checkout/${order.id}');
+                          },
+                        ),
+                      ],
+
+                      if (order.hasFine) ...[
+                        const SizedBox(height: 16),
+                        GradientButton(
+                          text: 'Штраф',
+                          showArrows: true,
+                          height: 56,
+                          width: double.infinity,
+                          fontSize: 16,
+                          onTap: () {
+                            context.go('/home/checkout/${order.id}');
+                          },
+                        ),
+                      ],
+
+                      const SizedBox(height: 16),
+
+                      // 🔹 ДЕТАЛИ ПОЕЗДКИ
+                      Container(
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          color: const Color(0xFF0A0F2E).withOpacity(0.7),
+                          borderRadius: BorderRadius.circular(16),
+                        ),
+                        child: Column(
+                          children: [
+                            _DetailRow(
+                              label: 'Старт',
+                              value: _formatTime(order.startAt),
+                            ),
+                            const SizedBox(height: 12),
+                            _DetailRow(
+                              label: 'Завершение',
+                              value: _formatTime(order.finishAt),
+                            ),
+                            const SizedBox(height: 12),
+                            _DetailRow(
+                              label: 'Расстояние',
+                              value: '${order.mileage.toStringAsFixed(2)?? '0'} км',
+                            ),
+                            const SizedBox(height: 12),
+                            _DetailRow(
+                              label: 'Скорость',
+                              value: '${order.avgSpeed ?? '0'} км/ч',
+                            ),
+                            const SizedBox(height: 12),
+                            _DetailRow(
+                              label: 'Тариф',
+                              value: order.plan?.title ?? '—',
+                            ),
+                            const SizedBox(height: 12),
+                            _DetailRow(
+                              label: 'Страховка',
+                              value: order.isInsurance ? "${order.insurancePrice} руб." : '—',
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 24),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  // 🔹 ВИДЖЕТ СТРОКИ С ДЕТАЛЯМИ
+  Widget _DetailRow({required String label, required String value}) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Text(
+          label,
+          style: TextStyle(
+            color: Colors.white.withOpacity(0.6),
+            fontSize: 14,
+          ),
+        ),
+        Text(
+          value,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 14,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _formatDate(DateTime date) {
+    final localDate = date.toLocal();
+    const months = [
+      'января', 'февраля', 'марта', 'апреля', 'мая', 'июня',
+      'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'
+    ];
+    return '${localDate.day} ${months[localDate.month - 1]}, ${_formatTime(date)}';
+  }
+
+  String _formatTime(DateTime? date) {
+    if (date == null) return '—';
+    final localDate = date.toLocal();
+    return '${localDate.hour.toString().padLeft(2, '0')}:${localDate.minute.toString().padLeft(2, '0')}';
+  }
+
+  BoundingBox _calculateBounds(List<Point> points) {
+    double minLat = points.first.latitude;
+    double minLng = points.first.longitude;
+    double maxLat = points.first.latitude;
+    double maxLng = points.first.longitude;
+
+    for (var p in points) {
+      if (p.latitude < minLat) minLat = p.latitude;
+      if (p.latitude > maxLat) maxLat = p.latitude;
+      if (p.longitude < minLng) minLng = p.longitude;
+      if (p.longitude > maxLng) maxLng = p.longitude;
+    }
+
+    return BoundingBox(
+      southWest: Point(latitude: minLat, longitude: minLng),
+      northEast: Point(latitude: maxLat, longitude: maxLng),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/order_history_screen.dart b/lib/presentation/screens/order_history_screen.dart
index 4257a5c..c1db72e 100644
--- a/lib/presentation/screens/order_history_screen.dart
+++ b/lib/presentation/screens/order_history_screen.dart
@@ -1,399 +1,399 @@
-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 '../../di/service_locator.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../viewmodel/order_history_bloc.dart';
-import 'order_history_detail_screen.dart';
-
-class OrderHistoryScreen extends StatelessWidget {
-  const OrderHistoryScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => getIt<OrderHistoryBloc>()..add(OrderHistoryFetchRequested()),
-      child: const OrderHistoryView(),
-    );
-  }
-}
-
-class OrderHistoryView extends StatelessWidget {
-  const OrderHistoryView({super.key});
-
-  @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),
-
-              Expanded(
-                child: BlocBuilder<OrderHistoryBloc, OrderHistoryState>(
-                  builder: (context, state) {
-                    if (state.status == OrderHistoryStatus.loading && state.orders.isEmpty) {
-                      return const Center(
-                        child: CircularProgressIndicator(color: Colors.white),
-                      );
-                    }
-
-                    if (state.status == OrderHistoryStatus.failure) {
-                      return Center(
-                        child: Column(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            const Text(
-                              'Ошибка загрузки',
-                              style: TextStyle(color: Colors.white, fontSize: 16),
-                            ),
-                            const SizedBox(height: 8),
-                            Text(
-                              state.errorMessage ?? '',
-                              style: TextStyle(color: Colors.white.withOpacity(0.6), fontSize: 14),
-                              textAlign: TextAlign.center,
-                            ),
-                            const SizedBox(height: 16),
-                            ElevatedButton(
-                              onPressed: () {
-                                context.read<OrderHistoryBloc>().add(OrderHistoryFetchRequested());
-                              },
-                              child: const Text('Повторить'),
-                            ),
-                          ],
-                        ),
-                      );
-                    }
-
-                    if (state.status == OrderHistoryStatus.empty) {
-                      return const _EmptyState();
-                    }
-
-                    final groupedOrders = _groupByMonth(state.orders);
-
-                    return RefreshIndicator(
-                      onRefresh: () async {
-                        context.read<OrderHistoryBloc>().add(OrderHistoryRefreshRequested());
-                      },
-                      child: ListView.builder(
-                        padding: const EdgeInsets.symmetric(horizontal: 20),
-                        itemCount: groupedOrders.length,
-                        itemBuilder: (context, index) {
-                          final monthKey = groupedOrders.keys.elementAt(index);
-                          final orders = groupedOrders[monthKey]!;
-
-                          return Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Padding(
-                                padding: const EdgeInsets.symmetric(vertical: 12),
-                                child: Text(
-                                  _getMonthTitle(monthKey),
-                                  style: TextStyle(
-                                    color: Colors.white.withOpacity(0.7),
-                                    fontSize: 14,
-                                    fontWeight: FontWeight.w500,
-                                  ),
-                                ),
-                              ),
-                              ...orders.map((order) => _OrderCard(order: order)),
-                            ],
-                          );
-                        },
-                      ),
-                    );
-                  },
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Map<String, List<ScooterOrder>> _groupByMonth(List<ScooterOrder> orders) {
-    final Map<String, List<ScooterOrder>> grouped = {};
-
-    for (var order in orders) {
-      final date = order.startAt ?? order.finishAt ?? DateTime.now();
-      final localDate = date.toLocal();
-      final monthKey = '${localDate.year}-${localDate.month.toString().padLeft(2, '0')}';
-
-      if (!grouped.containsKey(monthKey)) {
-        grouped[monthKey] = [];
-      }
-      grouped[monthKey]!.add(order);
-    }
-
-    final sortedKeys = grouped.keys.toList()..sort((a, b) => b.compareTo(a));
-
-    return Map.fromEntries(
-      sortedKeys.map((key) => MapEntry(key, grouped[key]!)),
-    );
-  }
-
-  String _getMonthTitle(String monthKey) {
-    final parts = monthKey.split('-');
-    final year = int.parse(parts[0]);
-    final month = int.parse(parts[1]);
-
-    const months = [
-      'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
-      'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
-    ];
-
-    return '${months[month - 1]} $year';
-  }
-}
-
-class _EmptyState extends StatelessWidget {
-  const _EmptyState();
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 40),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Image.asset(
-              'assets/history.png',
-              width: 380,
-              fit: BoxFit.contain,
-              errorBuilder: (context, error, stackTrace) {
-                return Container(
-                  width: 280,
-                  height: 280,
-                  decoration: BoxDecoration(
-                    color: Colors.white.withOpacity(0.1),
-                    borderRadius: BorderRadius.circular(20),
-                  ),
-                  child: const Icon(
-                    Icons.history_outlined,
-                    size: 120,
-                    color: Colors.white38,
-                  ),
-                );
-              },
-            ),
-
-            const SizedBox(height: 40),
-
-            const Text(
-              'У вас пока нет завершенных поездок.',
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 16,
-                fontWeight: FontWeight.w500,
-                height: 1.4,
-              ),
-            ),
-
-            const SizedBox(height: 32),
-
-            GradientButton(
-              text: 'Прокатиться',
-              showArrows: true,
-              height: 56,
-              width: double.infinity,
-              fontSize: 16,
-              onTap: () {
-                context.go('/home');
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-// 🔹 КАРТОЧКА ОДНОГО ЗАКАЗА
-class _OrderCard extends StatelessWidget {
-  final ScooterOrder order;
-
-  const _OrderCard({required this.order});
-
-  @override
-  Widget build(BuildContext context) {
-    final date = _formatDate(order.startAt ?? order.finishAt ?? DateTime.now());
-    final scooterNumber = order.scooter?.title ?? '№${order.scooterId}';
-    final price = '${order.totalPrice?.toStringAsFixed(2)} BYN' ?? '${order.totalPrice?.toStringAsFixed(2) ?? '0.00'} BYN';
-
-    return GestureDetector(
-      onTap: () {
-        Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => OrderHistoryDetailScreen(order: order),
-          ),
-        );
-      },
-      child: Container(
-        margin: const EdgeInsets.only(bottom: 12),
-        padding: const EdgeInsets.fromLTRB(4, 4, 16, 4),
-        decoration: BoxDecoration(
-          color: const Color(0xFF0A0F2E).withOpacity(0.7),
-          borderRadius: BorderRadius.circular(16),
-        ),
-        child: Row(
-          children: [
-            Container(
-              width: 80,
-              height: 80,
-              decoration: BoxDecoration(
-                color: Colors.white.withOpacity(0.1),
-                borderRadius: BorderRadius.circular(12),
-              ),
-              child: ClipRRect(
-                borderRadius: BorderRadius.circular(12),
-                child: Image.asset(
-                  'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
-                  fit: BoxFit.contain,
-                  errorBuilder: (context, error, stackTrace) {
-                    return const Icon(
-                      Icons.electric_scooter,
-                      color: Colors.white,
-                      size: 48,
-                    );
-                  },
-                ),
-              ),
-            ),
-
-            const SizedBox(width: 16),
-
-            // 🔹 СТОЛБЕЦ 2: Дата, время, ID самоката
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  // Дата и время
-                  Text(
-                    date,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  // ID самоката
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.qr_code_2,
-                        color: Colors.white.withOpacity(0.6),
-                        size: 18,
-                      ),
-                      const SizedBox(width: 4),
-                      Text(
-                        scooterNumber,
-                        style: TextStyle(
-                          color: Colors.white.withOpacity(0.8),
-                          fontSize: 15,
-                          fontWeight: FontWeight.w500,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-
-
-            // 🔹 СТОЛБЕЦ 3: Цена
-             Column(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Container(
-                    width: 100,
-                    alignment: Alignment.center,
-                    padding: EdgeInsets.all(4),
-                    decoration: BoxDecoration(
-                      color: Colors.white.withOpacity(0.3),
-                      borderRadius: BorderRadius.circular(12), // Опционально: скругление углов
-                    ),
-                    child: Text(
-                      order.status == 'Paid' ? 'ОПЛАЧЕН' : 'НЕ ОПЛАЧЕН',
-                      style: TextStyle(
-                        color: order.status == 'Paid'
-                            ? Colors.greenAccent
-                            : Colors.redAccent,
-                        fontSize: 12,
-                        fontWeight: FontWeight.bold,
-                        letterSpacing: 0.5,
-                      ),
-                    ),
-                  ),
-
-                  const SizedBox(height: 8),
-
-                  Text(
-                    price,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                    ),
-                  ),
-                ],
-              ),
-
-          ],
-        ),
-      ),
-    );
-  }
-
-  // 🔹 ФОРМАТИРОВАНИЕ ДАТЫ (с корректным сравнением)
-  String _formatDate(DateTime date) {
-    // ✅ Конвертируем в локальное время
-    final localDate = date.toLocal();
-    final now = DateTime.now();
-
-    // ✅ Сравниваем только дату (год, месяц, день), игнорируя время
-    final isToday = localDate.year == now.year &&
-        localDate.month == now.month &&
-        localDate.day == now.day;
-
-    final yesterday = now.subtract(const Duration(days: 1));
-    final isYesterday = localDate.year == yesterday.year &&
-        localDate.month == yesterday.month &&
-        localDate.day == yesterday.day;
-
-    if (isToday) {
-      return 'Сегодня, ${_formatTime(localDate)}';
-    } else if (isYesterday) {
-      return 'Вчера, ${_formatTime(localDate)}';
-    } else {
-      return '${_formatDateFull(localDate)}, ${_formatTime(localDate)}';
-    }
-  }
-
-  String _formatDateFull(DateTime date) {
-    const months = [
-      'января', 'февраля', 'марта', 'апреля', 'мая', 'июня',
-      'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'
-    ];
-    return '${date.day} ${months[date.month - 1]}';
-  }
-
-  String _formatTime(DateTime date) {
-    return '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
-  }
+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 '../../di/service_locator.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../viewmodel/order_history_bloc.dart';
+import 'order_history_detail_screen.dart';
+
+class OrderHistoryScreen extends StatelessWidget {
+  const OrderHistoryScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => getIt<OrderHistoryBloc>()..add(OrderHistoryFetchRequested()),
+      child: const OrderHistoryView(),
+    );
+  }
+}
+
+class OrderHistoryView extends StatelessWidget {
+  const OrderHistoryView({super.key});
+
+  @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),
+
+              Expanded(
+                child: BlocBuilder<OrderHistoryBloc, OrderHistoryState>(
+                  builder: (context, state) {
+                    if (state.status == OrderHistoryStatus.loading && state.orders.isEmpty) {
+                      return const Center(
+                        child: CircularProgressIndicator(color: Colors.white),
+                      );
+                    }
+
+                    if (state.status == OrderHistoryStatus.failure) {
+                      return Center(
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const Text(
+                              'Ошибка загрузки',
+                              style: TextStyle(color: Colors.white, fontSize: 16),
+                            ),
+                            const SizedBox(height: 8),
+                            Text(
+                              state.errorMessage ?? '',
+                              style: TextStyle(color: Colors.white.withOpacity(0.6), fontSize: 14),
+                              textAlign: TextAlign.center,
+                            ),
+                            const SizedBox(height: 16),
+                            ElevatedButton(
+                              onPressed: () {
+                                context.read<OrderHistoryBloc>().add(OrderHistoryFetchRequested());
+                              },
+                              child: const Text('Повторить'),
+                            ),
+                          ],
+                        ),
+                      );
+                    }
+
+                    if (state.status == OrderHistoryStatus.empty) {
+                      return const _EmptyState();
+                    }
+
+                    final groupedOrders = _groupByMonth(state.orders);
+
+                    return RefreshIndicator(
+                      onRefresh: () async {
+                        context.read<OrderHistoryBloc>().add(OrderHistoryRefreshRequested());
+                      },
+                      child: ListView.builder(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        itemCount: groupedOrders.length,
+                        itemBuilder: (context, index) {
+                          final monthKey = groupedOrders.keys.elementAt(index);
+                          final orders = groupedOrders[monthKey]!;
+
+                          return Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Padding(
+                                padding: const EdgeInsets.symmetric(vertical: 12),
+                                child: Text(
+                                  _getMonthTitle(monthKey),
+                                  style: TextStyle(
+                                    color: Colors.white.withOpacity(0.7),
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                              ),
+                              ...orders.map((order) => _OrderCard(order: order)),
+                            ],
+                          );
+                        },
+                      ),
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Map<String, List<ScooterOrder>> _groupByMonth(List<ScooterOrder> orders) {
+    final Map<String, List<ScooterOrder>> grouped = {};
+
+    for (var order in orders) {
+      final date = order.startAt ?? order.finishAt ?? DateTime.now();
+      final localDate = date.toLocal();
+      final monthKey = '${localDate.year}-${localDate.month.toString().padLeft(2, '0')}';
+
+      if (!grouped.containsKey(monthKey)) {
+        grouped[monthKey] = [];
+      }
+      grouped[monthKey]!.add(order);
+    }
+
+    final sortedKeys = grouped.keys.toList()..sort((a, b) => b.compareTo(a));
+
+    return Map.fromEntries(
+      sortedKeys.map((key) => MapEntry(key, grouped[key]!)),
+    );
+  }
+
+  String _getMonthTitle(String monthKey) {
+    final parts = monthKey.split('-');
+    final year = int.parse(parts[0]);
+    final month = int.parse(parts[1]);
+
+    const months = [
+      'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
+      'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
+    ];
+
+    return '${months[month - 1]} $year';
+  }
+}
+
+class _EmptyState extends StatelessWidget {
+  const _EmptyState();
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 40),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Image.asset(
+              'assets/history.png',
+              width: 380,
+              fit: BoxFit.contain,
+              errorBuilder: (context, error, stackTrace) {
+                return Container(
+                  width: 280,
+                  height: 280,
+                  decoration: BoxDecoration(
+                    color: Colors.white.withOpacity(0.1),
+                    borderRadius: BorderRadius.circular(20),
+                  ),
+                  child: const Icon(
+                    Icons.history_outlined,
+                    size: 120,
+                    color: Colors.white38,
+                  ),
+                );
+              },
+            ),
+
+            const SizedBox(height: 40),
+
+            const Text(
+              'У вас пока нет завершенных поездок.',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 16,
+                fontWeight: FontWeight.w500,
+                height: 1.4,
+              ),
+            ),
+
+            const SizedBox(height: 32),
+
+            GradientButton(
+              text: 'Прокатиться',
+              showArrows: true,
+              height: 56,
+              width: double.infinity,
+              fontSize: 16,
+              onTap: () {
+                context.go('/home');
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+// 🔹 КАРТОЧКА ОДНОГО ЗАКАЗА
+class _OrderCard extends StatelessWidget {
+  final ScooterOrder order;
+
+  const _OrderCard({required this.order});
+
+  @override
+  Widget build(BuildContext context) {
+    final date = _formatDate(order.startAt ?? order.finishAt ?? DateTime.now());
+    final scooterNumber = order.scooter?.title ?? '№${order.scooterId}';
+    final price = '${order.totalPrice?.toStringAsFixed(2)} BYN' ?? '${order.totalPrice?.toStringAsFixed(2) ?? '0.00'} BYN';
+
+    return GestureDetector(
+      onTap: () {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (context) => OrderHistoryDetailScreen(order: order),
+          ),
+        );
+      },
+      child: Container(
+        margin: const EdgeInsets.only(bottom: 12),
+        padding: const EdgeInsets.fromLTRB(4, 4, 16, 4),
+        decoration: BoxDecoration(
+          color: const Color(0xFF0A0F2E).withOpacity(0.7),
+          borderRadius: BorderRadius.circular(16),
+        ),
+        child: Row(
+          children: [
+            Container(
+              width: 80,
+              height: 80,
+              decoration: BoxDecoration(
+                color: Colors.white.withOpacity(0.1),
+                borderRadius: BorderRadius.circular(12),
+              ),
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(12),
+                child: Image.asset(
+                  'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19-reverse.png',
+                  fit: BoxFit.contain,
+                  errorBuilder: (context, error, stackTrace) {
+                    return const Icon(
+                      Icons.electric_scooter,
+                      color: Colors.white,
+                      size: 48,
+                    );
+                  },
+                ),
+              ),
+            ),
+
+            const SizedBox(width: 16),
+
+            // 🔹 СТОЛБЕЦ 2: Дата, время, ID самоката
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Дата и время
+                  Text(
+                    date,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  // ID самоката
+                  Row(
+                    children: [
+                      Icon(
+                        Icons.qr_code_2,
+                        color: Colors.white.withOpacity(0.6),
+                        size: 18,
+                      ),
+                      const SizedBox(width: 4),
+                      Text(
+                        scooterNumber,
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.8),
+                          fontSize: 15,
+                          fontWeight: FontWeight.w500,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+
+
+            // 🔹 СТОЛБЕЦ 3: Цена
+             Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Container(
+                    width: 100,
+                    alignment: Alignment.center,
+                    padding: EdgeInsets.all(4),
+                    decoration: BoxDecoration(
+                      color: Colors.white.withOpacity(0.3),
+                      borderRadius: BorderRadius.circular(12), // Опционально: скругление углов
+                    ),
+                    child: Text(
+                      order.status == 'Paid' ? 'ОПЛАЧЕН' : 'НЕ ОПЛАЧЕН',
+                      style: TextStyle(
+                        color: order.status == 'Paid'
+                            ? Colors.greenAccent
+                            : Colors.redAccent,
+                        fontSize: 12,
+                        fontWeight: FontWeight.bold,
+                        letterSpacing: 0.5,
+                      ),
+                    ),
+                  ),
+
+                  const SizedBox(height: 8),
+
+                  Text(
+                    price,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 18,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ],
+              ),
+
+          ],
+        ),
+      ),
+    );
+  }
+
+  // 🔹 ФОРМАТИРОВАНИЕ ДАТЫ (с корректным сравнением)
+  String _formatDate(DateTime date) {
+    // ✅ Конвертируем в локальное время
+    final localDate = date.toLocal();
+    final now = DateTime.now();
+
+    // ✅ Сравниваем только дату (год, месяц, день), игнорируя время
+    final isToday = localDate.year == now.year &&
+        localDate.month == now.month &&
+        localDate.day == now.day;
+
+    final yesterday = now.subtract(const Duration(days: 1));
+    final isYesterday = localDate.year == yesterday.year &&
+        localDate.month == yesterday.month &&
+        localDate.day == yesterday.day;
+
+    if (isToday) {
+      return 'Сегодня, ${_formatTime(localDate)}';
+    } else if (isYesterday) {
+      return 'Вчера, ${_formatTime(localDate)}';
+    } else {
+      return '${_formatDateFull(localDate)}, ${_formatTime(localDate)}';
+    }
+  }
+
+  String _formatDateFull(DateTime date) {
+    const months = [
+      'января', 'февраля', 'марта', 'апреля', 'мая', 'июня',
+      'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря'
+    ];
+    return '${date.day} ${months[date.month - 1]}';
+  }
+
+  String _formatTime(DateTime date) {
+    return '${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/payment_confirm_screen.dart b/lib/presentation/screens/payment_confirm_screen.dart
index 893b0e2..ce2161c 100644
--- a/lib/presentation/screens/payment_confirm_screen.dart
+++ b/lib/presentation/screens/payment_confirm_screen.dart
@@ -1,408 +1,408 @@
-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 '../../di/service_locator.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/usecase/add_payment_card_usecase.dart';
-import '../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/set_main_payment_card_usecase.dart';
-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';
-
-class PaymentConfirmScreen extends StatelessWidget {
-  final int orderId;
-  final List<int> photoIds;
-
-  const PaymentConfirmScreen({
-    super.key,
-    required this.orderId,
-    required this.photoIds,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return _PaymentConfirmScreenContent(orderId: orderId, photoIds: photoIds);
-  }
-}
-
-class _PaymentConfirmScreenContent extends StatelessWidget {
-  final int orderId;
-  final List<int> photoIds;
-
-  const _PaymentConfirmScreenContent({
-    required this.orderId,
-    required this.photoIds,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Stack(
-            children: [
-              Positioned(
-                bottom: 60,
-                left: 0,
-                right: 0,
-                child: Image.asset(
-                  'assets/wave.png',
-                  fit: BoxFit.fitWidth,
-                  color: Colors.white.withOpacity(0.1),
-                ),
-              ),
-
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const SizedBox(height: 16),
-                  const Padding(
-                    padding: EdgeInsets.symmetric(horizontal: 20),
-                    child: CustomAppBar(title: 'Завершение поездки'),
-                  ),
-
-                  Expanded(
-                    child: SingleChildScrollView(
-                      padding: const EdgeInsets.symmetric(horizontal: 24),
-                      child: BlocConsumer<PaymentConfirmBloc, PaymentConfirmState>(
-                        listenWhen: (previous, current) {
-                          return current.status != previous.status;
-                        },
-
-                        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();
-
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text(
-                                  state.errorMessage ?? 'Произошла ошибка при оплате',
-                                  style: const TextStyle(color: Colors.white),
-                                ),
-                                backgroundColor: Colors.redAccent.withOpacity(0.9),
-                                behavior: SnackBarBehavior.floating,
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(12),
-                                ),
-                                margin: const EdgeInsets.all(20),
-                                duration: const Duration(seconds: 3),
-                              ),
-                            );
-                          }
-                        },
-                        builder: (context, state) {
-                          final order = state.order;
-
-                          if (state.status == PaymentConfirmStatus.loading &&
-                              order == null) {
-                            return const Center(
-                              child: CircularProgressIndicator(),
-                            );
-                          }
-
-                          return Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              const SizedBox(height: 30),
-
-                              _buildInfoLabel('Самокат:'),
-                              _buildValueRow(
-                                'qr_icon.png',
-                                "${order?.scooter?.number}",
-                              ),
-
-                              const SizedBox(height: 24),
-
-                              _buildInfoLabel('Расстояние:'),
-                              _buildValueRow(
-                                'distance_icon.png',
-                                "${order?.mileage} km",
-                              ),
-
-                              const SizedBox(height: 24),
-
-                              Row(
-                                children: [
-                                  Expanded(
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        _buildInfoLabel('Стоимость поездки:'),
-                                        _buildValueRow(
-                                          'money_icon.png',
-                                          order?.totalOrderPricePrint ?? '- BYN',
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                  Expanded(
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        _buildInfoLabel('Оплачено:'),
-                                        _buildValueRow(
-                                          'money_icon.png',
-                                          order?.payTotalPricePrint ?? '0,00 BYN',
-                                        ),
-                                      ],
-                                    ),
-                                  ),
-                                ],
-                              ),
-
-                              const SizedBox(height: 40),
-
-                              // 🔹 БЛОК СУММЫ К ОПЛАТЕ
-                              Center(
-                                child: Column(
-                                  children: [
-                                    Text(
-                                      'Сумма к оплате:',
-                                      style: TextStyle(
-                                        color: Colors.white.withOpacity(0.8),
-                                        fontSize: 16,
-                                      ),
-                                    ),
-                                    const SizedBox(height: 12),
-                                    Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.center,
-                                      children: [
-                                        Image.asset(
-                                          'assets/icons/money_icon.png',
-                                          width: 40,
-                                        ),
-                                        const SizedBox(width: 12),
-                                        Text(
-                                          order?.unpayTotalPricePrint ?? '0,00 BYN',
-                                          style: const TextStyle(
-                                            color: Colors.white,
-                                            fontSize: 32,
-                                            fontWeight: FontWeight.bold,
-                                          ),
-                                        ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              ),
-
-                              const SizedBox(height: 40),
-
-                              // 🔹 КАРТА ОПЛАТЫ
-                              (state.useBalance || state.selectedCard != null)
-                                  ? Padding(padding: const EdgeInsets.symmetric(horizontal: 20),
-                                      child: PaymentOption(
-                                        title: state.useBalance ? 'Баланс' : "",
-                                        subtitle: state.useBalance
-                                            ? '${state.userBalance.toStringAsFixed(2)} BYN'
-                                            : '${state.selectedCard!.cardLastNumber}',
-                                        isSelected: true,
-                                        onTap: () async {
-                                          final result = await showModalBottomSheet<dynamic>(
-                                            context: context,
-                                            isScrollControlled: true,
-                                            backgroundColor: Colors.transparent,
-                                            builder: (innerContext) => BlocProvider(
-                                              create: (context) => PaymentMethodSheetBloc(
-                                                getIt<GetPaymentCardsUsecase>(),
-                                                getIt<SetMainPaymentCardUsecase>(),
-                                                getIt<GetProfileUseCase>(),
-                                                getIt<AddPaymentCardUsecase>(),
-                                              )..add(PaymentMethodSheetStarted()),
-                                              child: PaymentMethodSheet(
-                                                initialSelectedCard: state.useBalance ? null : state.selectedCard,
-                                              ),
-                                            ),
-                                          );
-
-                                          if (result != null) {
-                                            if (result is PaymentCard) {
-                                              context.read<PaymentConfirmBloc>().add(PaymentCardChanged(result));
-                                            } else if (result == 'balance') {
-                                              context.read<PaymentConfirmBloc>().add(SelectBalancePressed());
-                                            }
-                                          }
-                                        },
-                                      ),
-                                    )
-                                  : Padding(
-                                      padding: const EdgeInsets.symmetric(
-                                        horizontal: 20,
-                                      ),
-                                      child: Container(
-                                        height: 56,
-                                        decoration: BoxDecoration(
-                                          borderRadius: BorderRadius.circular(
-                                            24,
-                                          ),
-                                          border: Border.all(
-                                            color: Colors.white.withOpacity(
-                                              0.4,
-                                            ),
-                                            width: 1,
-                                          ),
-                                        ),
-                                        child: Material(
-                                          color: Colors.transparent,
-                                          child: InkWell(
-                                            onTap: () {
-                                              context.pushReplacement(
-                                                '/home/payment-method-sheet',
-                                              );
-
-                                            },
-                                            borderRadius: BorderRadius.circular(
-                                              24,
-                                            ),
-                                            child: Center(
-                                              child: Row(
-                                                mainAxisAlignment:
-                                                    MainAxisAlignment.center,
-                                                children: [
-                                                  const Text(
-                                                    'Способ оплаты',
-                                                    style: TextStyle(
-                                                      color: Colors.white,
-                                                      fontSize: 16,
-                                                      fontWeight:
-                                                          FontWeight.w600,
-                                                    ),
-                                                  ),
-                                                  const SizedBox(width: 8),
-                                                  Icon(
-                                                    Icons.arrow_forward_ios,
-                                                    size: 12,
-                                                    color: Colors.white
-                                                        .withOpacity(0.6),
-                                                  ),
-                                                  Icon(
-                                                    Icons.arrow_forward_ios,
-                                                    size: 12,
-                                                    color: Colors.white
-                                                        .withOpacity(0.4),
-                                                  ),
-                                                  Icon(
-                                                    Icons.arrow_forward_ios,
-                                                    size: 12,
-                                                    color: Colors.white
-                                                        .withOpacity(0.2),
-                                                  ),
-                                                ],
-                                              ),
-                                            ),
-                                          ),
-                                        ),
-                                      ),
-                                    ),
-                            ],
-                          );
-                        },
-                      ),
-                    ),
-                  ),
-
-                  Padding(
-                    padding: const EdgeInsets.all(24.0),
-                    child:
-                        BlocConsumer<PaymentConfirmBloc, PaymentConfirmState>(
-                          listener: (context, state) {
-                            if (state.status == PaymentConfirmStatus.success &&
-                                state.paymentCompleted) {
-                              context.go('/home');
-                            } else if (state.status ==
-                                PaymentConfirmStatus.failure) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(
-                                  content: Text(
-                                    state.errorMessage ?? 'Ошибка оплаты',
-                                  ),
-                                ),
-                              );
-                            }
-                          },
-                          builder: (context, state) {
-                            return GradientButton(
-                              text: state.status == PaymentConfirmStatus.loading
-                                  ? 'Обработка...'
-                                  : 'Оплатить',
-                              showArrows: true,
-                              height: 56,
-                              width: double.infinity,
-                              onTap: (state.status == PaymentConfirmStatus.loading || (!state.useBalance && state.selectedCard == null))
-                                  ? null
-                                  : () {
-                                context.read<PaymentConfirmBloc>().add(
-                                  PayRide(
-                                    cardId: state.useBalance ? null : state.selectedCard?.id,
-                                    isBalance: state.useBalance,
-                                    orderId: orderId,
-                                    photoIds: photoIds,
-                                  ),
-                                );
-                              },
-                            );
-                          },
-                        ),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  // Вспомогательный метод для подзаголовков
-  Widget _buildInfoLabel(String text) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 8),
-      child: Text(
-        text,
-        style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 15),
-      ),
-    );
-  }
-
-  // Вспомогательный метод для строк со значениями и иконками
-  Widget _buildValueRow(String iconName, String value) {
-    return Row(
-      children: [
-        Image.asset('assets/icons/$iconName', width: 24, height: 24),
-        const SizedBox(width: 12),
-        Text(
-          value,
-          style: const TextStyle(
-            color: Colors.white,
-            fontSize: 18,
-            fontWeight: FontWeight.w500,
-          ),
-        ),
-      ],
-    );
-  }
-
-  String _formatDuration(int minutes) {
-    final h = minutes ~/ 60;
-    final m = minutes % 60;
-    return '${h.toString().padLeft(2, '0')}:${m.toString().padLeft(2, '0')}';
-  }
-}
+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 '../../di/service_locator.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/add_payment_card_usecase.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+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';
+
+class PaymentConfirmScreen extends StatelessWidget {
+  final int orderId;
+  final List<int> photoIds;
+
+  const PaymentConfirmScreen({
+    super.key,
+    required this.orderId,
+    required this.photoIds,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return _PaymentConfirmScreenContent(orderId: orderId, photoIds: photoIds);
+  }
+}
+
+class _PaymentConfirmScreenContent extends StatelessWidget {
+  final int orderId;
+  final List<int> photoIds;
+
+  const _PaymentConfirmScreenContent({
+    required this.orderId,
+    required this.photoIds,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Stack(
+            children: [
+              Positioned(
+                bottom: 60,
+                left: 0,
+                right: 0,
+                child: Image.asset(
+                  'assets/wave.png',
+                  fit: BoxFit.fitWidth,
+                  color: Colors.white.withOpacity(0.1),
+                ),
+              ),
+
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(height: 16),
+                  const Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 20),
+                    child: CustomAppBar(title: 'Завершение поездки'),
+                  ),
+
+                  Expanded(
+                    child: SingleChildScrollView(
+                      padding: const EdgeInsets.symmetric(horizontal: 24),
+                      child: BlocConsumer<PaymentConfirmBloc, PaymentConfirmState>(
+                        listenWhen: (previous, current) {
+                          return current.status != previous.status;
+                        },
+
+                        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();
+
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                  state.errorMessage ?? 'Произошла ошибка при оплате',
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                                backgroundColor: Colors.redAccent.withOpacity(0.9),
+                                behavior: SnackBarBehavior.floating,
+                                shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(12),
+                                ),
+                                margin: const EdgeInsets.all(20),
+                                duration: const Duration(seconds: 3),
+                              ),
+                            );
+                          }
+                        },
+                        builder: (context, state) {
+                          final order = state.order;
+
+                          if (state.status == PaymentConfirmStatus.loading &&
+                              order == null) {
+                            return const Center(
+                              child: CircularProgressIndicator(),
+                            );
+                          }
+
+                          return Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              const SizedBox(height: 30),
+
+                              _buildInfoLabel('Самокат:'),
+                              _buildValueRow(
+                                'qr_icon.png',
+                                "${order?.scooter?.number}",
+                              ),
+
+                              const SizedBox(height: 24),
+
+                              _buildInfoLabel('Расстояние:'),
+                              _buildValueRow(
+                                'distance_icon.png',
+                                "${order?.mileage} km",
+                              ),
+
+                              const SizedBox(height: 24),
+
+                              Row(
+                                children: [
+                                  Expanded(
+                                    child: Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        _buildInfoLabel('Стоимость поездки:'),
+                                        _buildValueRow(
+                                          'money_icon.png',
+                                          order?.totalOrderPricePrint ?? '- BYN',
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                  Expanded(
+                                    child: Column(
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: [
+                                        _buildInfoLabel('Оплачено:'),
+                                        _buildValueRow(
+                                          'money_icon.png',
+                                          order?.payTotalPricePrint ?? '0,00 BYN',
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ],
+                              ),
+
+                              const SizedBox(height: 40),
+
+                              // 🔹 БЛОК СУММЫ К ОПЛАТЕ
+                              Center(
+                                child: Column(
+                                  children: [
+                                    Text(
+                                      'Сумма к оплате:',
+                                      style: TextStyle(
+                                        color: Colors.white.withOpacity(0.8),
+                                        fontSize: 16,
+                                      ),
+                                    ),
+                                    const SizedBox(height: 12),
+                                    Row(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: [
+                                        Image.asset(
+                                          'assets/icons/money_icon.png',
+                                          width: 40,
+                                        ),
+                                        const SizedBox(width: 12),
+                                        Text(
+                                          order?.unpayTotalPricePrint ?? '0,00 BYN',
+                                          style: const TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 32,
+                                            fontWeight: FontWeight.bold,
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
+                                ),
+                              ),
+
+                              const SizedBox(height: 40),
+
+                              // 🔹 КАРТА ОПЛАТЫ
+                              (state.useBalance || state.selectedCard != null)
+                                  ? Padding(padding: const EdgeInsets.symmetric(horizontal: 20),
+                                      child: PaymentOption(
+                                        title: state.useBalance ? 'Баланс' : "",
+                                        subtitle: state.useBalance
+                                            ? '${state.userBalance.toStringAsFixed(2)} BYN'
+                                            : '${state.selectedCard!.cardLastNumber}',
+                                        isSelected: true,
+                                        onTap: () async {
+                                          final result = await showModalBottomSheet<dynamic>(
+                                            context: context,
+                                            isScrollControlled: true,
+                                            backgroundColor: Colors.transparent,
+                                            builder: (innerContext) => BlocProvider(
+                                              create: (context) => PaymentMethodSheetBloc(
+                                                getIt<GetPaymentCardsUsecase>(),
+                                                getIt<SetMainPaymentCardUsecase>(),
+                                                getIt<GetProfileUseCase>(),
+                                                getIt<AddPaymentCardUsecase>(),
+                                              )..add(PaymentMethodSheetStarted()),
+                                              child: PaymentMethodSheet(
+                                                initialSelectedCard: state.useBalance ? null : state.selectedCard,
+                                              ),
+                                            ),
+                                          );
+
+                                          if (result != null) {
+                                            if (result is PaymentCard) {
+                                              context.read<PaymentConfirmBloc>().add(PaymentCardChanged(result));
+                                            } else if (result == 'balance') {
+                                              context.read<PaymentConfirmBloc>().add(SelectBalancePressed());
+                                            }
+                                          }
+                                        },
+                                      ),
+                                    )
+                                  : Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                        horizontal: 20,
+                                      ),
+                                      child: Container(
+                                        height: 56,
+                                        decoration: BoxDecoration(
+                                          borderRadius: BorderRadius.circular(
+                                            24,
+                                          ),
+                                          border: Border.all(
+                                            color: Colors.white.withOpacity(
+                                              0.4,
+                                            ),
+                                            width: 1,
+                                          ),
+                                        ),
+                                        child: Material(
+                                          color: Colors.transparent,
+                                          child: InkWell(
+                                            onTap: () {
+                                              context.pushReplacement(
+                                                '/home/payment-method-sheet',
+                                              );
+
+                                            },
+                                            borderRadius: BorderRadius.circular(
+                                              24,
+                                            ),
+                                            child: Center(
+                                              child: Row(
+                                                mainAxisAlignment:
+                                                    MainAxisAlignment.center,
+                                                children: [
+                                                  const Text(
+                                                    'Способ оплаты',
+                                                    style: TextStyle(
+                                                      color: Colors.white,
+                                                      fontSize: 16,
+                                                      fontWeight:
+                                                          FontWeight.w600,
+                                                    ),
+                                                  ),
+                                                  const SizedBox(width: 8),
+                                                  Icon(
+                                                    Icons.arrow_forward_ios,
+                                                    size: 12,
+                                                    color: Colors.white
+                                                        .withOpacity(0.6),
+                                                  ),
+                                                  Icon(
+                                                    Icons.arrow_forward_ios,
+                                                    size: 12,
+                                                    color: Colors.white
+                                                        .withOpacity(0.4),
+                                                  ),
+                                                  Icon(
+                                                    Icons.arrow_forward_ios,
+                                                    size: 12,
+                                                    color: Colors.white
+                                                        .withOpacity(0.2),
+                                                  ),
+                                                ],
+                                              ),
+                                            ),
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                            ],
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+
+                  Padding(
+                    padding: const EdgeInsets.all(24.0),
+                    child:
+                        BlocConsumer<PaymentConfirmBloc, PaymentConfirmState>(
+                          listener: (context, state) {
+                            if (state.status == PaymentConfirmStatus.success &&
+                                state.paymentCompleted) {
+                              context.go('/home');
+                            } else if (state.status ==
+                                PaymentConfirmStatus.failure) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    state.errorMessage ?? 'Ошибка оплаты',
+                                  ),
+                                ),
+                              );
+                            }
+                          },
+                          builder: (context, state) {
+                            return GradientButton(
+                              text: state.status == PaymentConfirmStatus.loading
+                                  ? 'Обработка...'
+                                  : 'Оплатить',
+                              showArrows: true,
+                              height: 56,
+                              width: double.infinity,
+                              onTap: (state.status == PaymentConfirmStatus.loading || (!state.useBalance && state.selectedCard == null))
+                                  ? null
+                                  : () {
+                                context.read<PaymentConfirmBloc>().add(
+                                  PayRide(
+                                    cardId: state.useBalance ? null : state.selectedCard?.id,
+                                    isBalance: state.useBalance,
+                                    orderId: orderId,
+                                    photoIds: photoIds,
+                                  ),
+                                );
+                              },
+                            );
+                          },
+                        ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  // Вспомогательный метод для подзаголовков
+  Widget _buildInfoLabel(String text) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: Text(
+        text,
+        style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 15),
+      ),
+    );
+  }
+
+  // Вспомогательный метод для строк со значениями и иконками
+  Widget _buildValueRow(String iconName, String value) {
+    return Row(
+      children: [
+        Image.asset('assets/icons/$iconName', width: 24, height: 24),
+        const SizedBox(width: 12),
+        Text(
+          value,
+          style: const TextStyle(
+            color: Colors.white,
+            fontSize: 18,
+            fontWeight: FontWeight.w500,
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _formatDuration(int minutes) {
+    final h = minutes ~/ 60;
+    final m = minutes % 60;
+    return '${h.toString().padLeft(2, '0')}:${m.toString().padLeft(2, '0')}';
+  }
+}
diff --git a/lib/presentation/screens/payment_methods_screen.dart b/lib/presentation/screens/payment_methods_screen.dart
index 5693a53..6c4046c 100644
--- a/lib/presentation/screens/payment_methods_screen.dart
+++ b/lib/presentation/screens/payment_methods_screen.dart
@@ -1,313 +1,313 @@
-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 '../../domain/entities/payment_card.dart';
-import '../components/custom_app_bar.dart';
-import '../event/payment_methods_event.dart';
-import '../state/payment_methods_state.dart';
-import '../viewmodel/payment_methods_bloc.dart';
-
-class PaymentMethodsScreen extends StatelessWidget {
-  const PaymentMethodsScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: BlocConsumer<PaymentMethodsBloc, PaymentMethodsState>(
-            listener: (context, state) {
-              if (state.status == PaymentMethodsStatus.failure) {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
-                );
-              }
-            },
-            builder: (context, state) {
-              final isNetworkProcessing = state.status == PaymentMethodsStatus.loading ||
-                  (state.isDeleting ?? false) ||
-                  (state.isSettingMain ?? false);
-
-              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,
-                            children: [
-                              _buildBalanceCard(context, state.balance),
-                              const SizedBox(height: 20),
-                              _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),
-                          ),
-                        ),
-                      ),
-                    ),
-                ],
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildBalanceCard(BuildContext context, double balance) {
-    return Container(
-      padding: EdgeInsets.all(20),
-      decoration: BoxDecoration(
-        gradient: AppColors.activeButtonGradient,
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Stack(
-        clipBehavior: Clip.none,
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              const Text(
-                'Баланс',
-                style: TextStyle(color: Color(0xFF0A0F2E), fontSize: 16, fontWeight: FontWeight.w600),
-              ),
-              const SizedBox(height: 8),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.baseline,
-                textBaseline: TextBaseline.alphabetic,
-                children: [
-                  Text(
-                    balance.toStringAsFixed(2),
-                    style: TextStyle(color: Color(0xFF0A0F2E), fontSize: 32, fontWeight: FontWeight.bold),
-                  ),
-                  const SizedBox(width: 4),
-                  Text(
-                    'баллов',
-                    style: TextStyle(color: const Color(0xFF0A0F2E).withOpacity(0.7), fontSize: 14),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 20),
-              _buildTopUpBalanceButton(context),
-            ],
-          ),
-          Positioned(
-            right: -30,
-            top: -50,
-            child: Image.asset('assets/icons/card-screen.png', width: 100, height: 100, fit: BoxFit.contain),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCardsList(BuildContext context, PaymentMethodsState state) {
-    return Container(
-      padding: const EdgeInsets.all(20),
-      decoration: BoxDecoration(
-        color: const Color(0xFF0A0F2E).withOpacity(0.65),
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Text(
-            'Карты',
-            style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
-          ),
-          const SizedBox(height: 16),
-
-          if (state.cards.isEmpty && state.status == PaymentMethodsStatus.success)
-            const Padding(
-              padding: EdgeInsets.symmetric(vertical: 20),
-              child: Text('У вас пока нет привязанных карт', style: TextStyle(color: Colors.white70)),
-            ),
-
-          ...state.cards.asMap().entries.map((entry) {
-            final index = entry.key;
-            final card = entry.value;
-            return Column(
-              children: [
-                _CardItem(
-                  card: card,
-                  onDelete: () => context.read<PaymentMethodsBloc>().add(PaymentMethodsDeleteCard(card.id)),
-                  onMakeMain: card.isMain
-                      ? null
-                      : () => context.read<PaymentMethodsBloc>().add(PaymentMethodsSetMainCard(card.id)),
-                ),
-                if (index < state.cards.length - 1) const SizedBox(height: 16),
-              ],
-            );
-          }).toList(),
-
-          const SizedBox(height: 20),
-          _buildAddCardButton(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildAddCardButton(BuildContext context) {
-    return Container(
-      height: 48,
-      decoration: BoxDecoration(
-        color: const Color(0xFF0A0F2E),
-        borderRadius: BorderRadius.circular(24),
-      ),
-      child: Material(
-        color: Colors.transparent,
-        child: InkWell(
-          onTap: () async {
-            context.read<PaymentMethodsBloc>().add(AddPayemntCardPressed());
-            /*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),
-            child: Row(
-              children: [
-                Icon(Icons.credit_card, color: Color(0xFF00D4AA), size: 24),
-                SizedBox(width: 12),
-                Expanded(
-                  child: Text(
-                    'Привязать карту',
-                    style: TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
-                  ),
-                ),
-                Icon(Icons.add, color: Color(0xFF00D4AA), size: 24),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTopUpBalanceButton(BuildContext context) {
-    return Container(
-      height: 48,
-      decoration: BoxDecoration(
-        color: const Color(0xFF0A0F2E),
-        borderRadius: BorderRadius.circular(24),
-      ),
-      child: Material(
-        color: Colors.transparent,
-        child: InkWell(
-          onTap: () => context.go('/home/payment-methods/top-up'),
-          borderRadius: BorderRadius.circular(24),
-          child: Padding(
-            padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Row(
-              children: [
-                Image.asset("assets/icons/money_icon.png", width: 24, height: 24),
-                SizedBox(width: 12),
-                Expanded(
-                  child: Text(
-                    'Пополнить баланс',
-                    style: TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
-                  ),
-                ),
-                Icon(Icons.add, color: Color(0xFF00D4AA), size: 24),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-
-
-
-class _CardItem extends StatelessWidget {
-  final PaymentCard card;
-  final VoidCallback onDelete;
-  final VoidCallback? onMakeMain;
-
-  const _CardItem({
-    required this.card,
-    required this.onDelete,
-    this.onMakeMain,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        Icon(Icons.credit_card, color: Color(0xFFFFFFFF), size: 40),
-        const SizedBox(width: 12),
-        Expanded(
-          child: GestureDetector(
-            onTap: onMakeMain, // Нажатие на текст карты делает её основной
-            behavior: HitTestBehavior.opaque,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'Карта ${card.cardLastNumber}',
-                  style: const TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
-                ),
-                const SizedBox(height: 4),
-                Text(
-                  card.isMain ? 'основная' : 'сделать основной',
-                  style: TextStyle(
-                    color: card.isMain ? const Color(0xFF66E3C4) : Colors.white.withOpacity(0.5),
-                    fontSize: 12,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-        GestureDetector(
-          onTap: onDelete,
-          child: const Icon(Icons.close, color: Color(0xFF00D4AA), size: 20),
-        ),
-      ],
-    );
-  }
-
-  String _getDefaultIconPath(String cardType) {
-    switch (cardType) {
-      case 'Belcard': return 'assets/icons/belcard.png';
-      case 'Visa': return 'assets/icons/visa.png';
-      case 'Maestro': return 'assets/icons/maestro.png';
-      case 'Mir': return 'assets/icons/mir.png';
-      case 'Mastercard': return 'assets/icons/mastercard.png';
-      default: return 'assets/icons/belcard.png';
-    }
-  }
+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 '../../domain/entities/payment_card.dart';
+import '../components/custom_app_bar.dart';
+import '../event/payment_methods_event.dart';
+import '../state/payment_methods_state.dart';
+import '../viewmodel/payment_methods_bloc.dart';
+
+class PaymentMethodsScreen extends StatelessWidget {
+  const PaymentMethodsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: BlocConsumer<PaymentMethodsBloc, PaymentMethodsState>(
+            listener: (context, state) {
+              if (state.status == PaymentMethodsStatus.failure) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
+                );
+              }
+            },
+            builder: (context, state) {
+              final isNetworkProcessing = state.status == PaymentMethodsStatus.loading ||
+                  (state.isDeleting ?? false) ||
+                  (state.isSettingMain ?? false);
+
+              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,
+                            children: [
+                              _buildBalanceCard(context, state.balance),
+                              const SizedBox(height: 20),
+                              _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),
+                          ),
+                        ),
+                      ),
+                    ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildBalanceCard(BuildContext context, double balance) {
+    return Container(
+      padding: EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        gradient: AppColors.activeButtonGradient,
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Stack(
+        clipBehavior: Clip.none,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const Text(
+                'Баланс',
+                style: TextStyle(color: Color(0xFF0A0F2E), fontSize: 16, fontWeight: FontWeight.w600),
+              ),
+              const SizedBox(height: 8),
+              Row(
+                crossAxisAlignment: CrossAxisAlignment.baseline,
+                textBaseline: TextBaseline.alphabetic,
+                children: [
+                  Text(
+                    balance.toStringAsFixed(2),
+                    style: TextStyle(color: Color(0xFF0A0F2E), fontSize: 32, fontWeight: FontWeight.bold),
+                  ),
+                  const SizedBox(width: 4),
+                  Text(
+                    'баллов',
+                    style: TextStyle(color: const Color(0xFF0A0F2E).withOpacity(0.7), fontSize: 14),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 20),
+              _buildTopUpBalanceButton(context),
+            ],
+          ),
+          Positioned(
+            right: -30,
+            top: -50,
+            child: Image.asset('assets/icons/card-screen.png', width: 100, height: 100, fit: BoxFit.contain),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCardsList(BuildContext context, PaymentMethodsState state) {
+    return Container(
+      padding: const EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        color: const Color(0xFF0A0F2E).withOpacity(0.65),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text(
+            'Карты',
+            style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
+          ),
+          const SizedBox(height: 16),
+
+          if (state.cards.isEmpty && state.status == PaymentMethodsStatus.success)
+            const Padding(
+              padding: EdgeInsets.symmetric(vertical: 20),
+              child: Text('У вас пока нет привязанных карт', style: TextStyle(color: Colors.white70)),
+            ),
+
+          ...state.cards.asMap().entries.map((entry) {
+            final index = entry.key;
+            final card = entry.value;
+            return Column(
+              children: [
+                _CardItem(
+                  card: card,
+                  onDelete: () => context.read<PaymentMethodsBloc>().add(PaymentMethodsDeleteCard(card.id)),
+                  onMakeMain: card.isMain
+                      ? null
+                      : () => context.read<PaymentMethodsBloc>().add(PaymentMethodsSetMainCard(card.id)),
+                ),
+                if (index < state.cards.length - 1) const SizedBox(height: 16),
+              ],
+            );
+          }).toList(),
+
+          const SizedBox(height: 20),
+          _buildAddCardButton(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildAddCardButton(BuildContext context) {
+    return Container(
+      height: 48,
+      decoration: BoxDecoration(
+        color: const Color(0xFF0A0F2E),
+        borderRadius: BorderRadius.circular(24),
+      ),
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          onTap: () async {
+            context.read<PaymentMethodsBloc>().add(AddPayemntCardPressed());
+            /*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),
+            child: Row(
+              children: [
+                Icon(Icons.credit_card, color: Color(0xFF00D4AA), size: 24),
+                SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    'Привязать карту',
+                    style: TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
+                  ),
+                ),
+                Icon(Icons.add, color: Color(0xFF00D4AA), size: 24),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTopUpBalanceButton(BuildContext context) {
+    return Container(
+      height: 48,
+      decoration: BoxDecoration(
+        color: const Color(0xFF0A0F2E),
+        borderRadius: BorderRadius.circular(24),
+      ),
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          onTap: () => context.go('/home/payment-methods/top-up'),
+          borderRadius: BorderRadius.circular(24),
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 16),
+            child: Row(
+              children: [
+                Image.asset("assets/icons/money_icon.png", width: 24, height: 24),
+                SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    'Пополнить баланс',
+                    style: TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
+                  ),
+                ),
+                Icon(Icons.add, color: Color(0xFF00D4AA), size: 24),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+
+
+
+class _CardItem extends StatelessWidget {
+  final PaymentCard card;
+  final VoidCallback onDelete;
+  final VoidCallback? onMakeMain;
+
+  const _CardItem({
+    required this.card,
+    required this.onDelete,
+    this.onMakeMain,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Icon(Icons.credit_card, color: Color(0xFFFFFFFF), size: 40),
+        const SizedBox(width: 12),
+        Expanded(
+          child: GestureDetector(
+            onTap: onMakeMain, // Нажатие на текст карты делает её основной
+            behavior: HitTestBehavior.opaque,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  'Карта ${card.cardLastNumber}',
+                  style: const TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  card.isMain ? 'основная' : 'сделать основной',
+                  style: TextStyle(
+                    color: card.isMain ? const Color(0xFF66E3C4) : Colors.white.withOpacity(0.5),
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+        GestureDetector(
+          onTap: onDelete,
+          child: const Icon(Icons.close, color: Color(0xFF00D4AA), size: 20),
+        ),
+      ],
+    );
+  }
+
+  String _getDefaultIconPath(String cardType) {
+    switch (cardType) {
+      case 'Belcard': return 'assets/icons/belcard.png';
+      case 'Visa': return 'assets/icons/visa.png';
+      case 'Maestro': return 'assets/icons/maestro.png';
+      case 'Mir': return 'assets/icons/mir.png';
+      case 'Mastercard': return 'assets/icons/mastercard.png';
+      default: return 'assets/icons/belcard.png';
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/payment_rules_screen.dart b/lib/presentation/screens/payment_rules_screen.dart
new file mode 100644
index 0000000..b6737ac
--- /dev/null
+++ b/lib/presentation/screens/payment_rules_screen.dart
@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+
+class PaymentRulesScreen extends StatelessWidget {
+  const PaymentRulesScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        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: ''),
+              ),
+
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        'Правила оплаты и безопасность платежей, конфиденциальность информации',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 18,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      _buildParagraph(
+                        'Оплата банковскими картами осуществляется через ЗАО «Альфа-Банк».',
+                      ),
+
+                      const SizedBox(height: 12),
+
+                      _buildParagraph(
+                        'К оплате принимаются карты международных платежных систем VISA, MasterCard, платежной системы БЕЛКАРТ.',
+                      ),
+
+                      const SizedBox(height: 20),
+
+                      Container(
+                        width: double.infinity,
+                        padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 20),
+                        decoration: BoxDecoration(
+                          color: Colors.white.withOpacity(0.05),
+                          borderRadius: BorderRadius.circular(12),
+                          border: Border.all(
+                            color: Colors.white.withOpacity(0.1),
+                          ),
+                        ),
+                        child: Center(
+                          child: Image.asset(
+                            'assets/payment_logo.png',
+                            fit: BoxFit.contain,
+                            errorBuilder: (context, error, stackTrace) {
+                              return const Row(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  Icon(Icons.credit_card, color: Colors.white70, size: 28),
+                                  SizedBox(width: 10),
+                                  Text(
+                                    'VISA  •  MasterCard  •  БЕЛКАРТ',
+                                    style: TextStyle(
+                                      color: Colors.white70,
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w600,
+                                      letterSpacing: 0.5,
+                                    ),
+                                  ),
+                                ],
+                              );
+                            },
+                          ),
+                        ),
+                      ),
+
+                      const SizedBox(height: 20),
+
+                      _buildParagraph(
+                        'Безопасность совершения платежа обеспечивается современными методами проверки, шифрования и передачи данных по закрытым каналам связи. Ввод данных карточки осуществляется на защищенной авторизационной странице банка. Для оплаты необходимо ввести реквизиты карточки: номер, имя держателя, срок действия и трехзначный код безопасности. Трёхзначный код безопасности (CVV2 для VISA, CVC2 для MasterCard) — это три цифры, находящиеся на обратной стороне карточки. Если карточка поддерживает технологию 3DSecure или Интернет-пароль для держателей карточек БЕЛКАРТ, Вы будете перенаправлены на страницу банка, выпустившего карточку, для ввода кода безопасности.',
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      _buildParagraph(
+                        'Предоставляемая Вами персональная информация (например: имя, адрес, телефон, e-mail, номер банковской карты и прочее) является конфиденциальной и не подлежит разглашению. Данные карточки передаются только в зашифрованном виде и не сохраняются на данном интернет-ресурсе.',
+                      ),
+
+                      const SizedBox(height: 32),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildParagraph(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Color(0xFFD1D1D6),
+        fontSize: 14,
+        height: 1.5,
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/presentation/screens/phone_login_screen.dart b/lib/presentation/screens/phone_login_screen.dart
index e6d617f..b468989 100644
--- a/lib/presentation/screens/phone_login_screen.dart
+++ b/lib/presentation/screens/phone_login_screen.dart
@@ -1,194 +1,194 @@
-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:go_router/go_router.dart';
-import '../../../core/app_colors.dart';
-import '../components/code_dots.dart';
-import '../components/gradient_button.dart';
-import '../event/verify_code_event.dart';
-import '../state/verify_code_state.dart';
-import '../viewmodel/verify_code_bloc.dart';
-import 'pin_login_screen.dart';
-
-class PhoneLoginScreen extends StatefulWidget {
-  final String phoneNumber;
-  final String tempToken;
-
-  const PhoneLoginScreen({
-    Key? key,
-    required this.phoneNumber,
-    required this.tempToken,
-  }) : super(key: key);
-
-  @override
-  State<PhoneLoginScreen> createState() => _PhoneLoginScreenState();
-}
-
-class _PhoneLoginScreenState extends State<PhoneLoginScreen> {
-  final TextEditingController codeController = TextEditingController();
-  final FocusNode codeFocusNode = FocusNode();
-  bool _isFirstTry = true;
-
-  @override
-  void initState() {
-    super.initState();
-    context.read<VerifyCodeBloc>().add(
-      VerifyCodeStarted(
-        phoneNumber: widget.phoneNumber,
-        tempToken: widget.tempToken,
-      ),
-    );
-
-    codeController.addListener(() {
-      context.read<VerifyCodeBloc>().add(CodeChanged(codeController.text));
-
-      if (codeController.text.length == 6) {
-        Future.delayed(const Duration(milliseconds: 150), () {
-          context.read<VerifyCodeBloc>().add(VerifyCodeSubmitted());
-        });
-      }
-    });
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      FocusScope.of(context).requestFocus(codeFocusNode);
-    });
-  }
-
-  void openKeyboard() {
-    if (codeFocusNode.hasFocus) {
-      codeFocusNode.unfocus();
-    }
-
-    Future.delayed(const Duration(milliseconds: 50), () {
-      FocusScope.of(context).requestFocus(codeFocusNode);
-    });
-  }
-
-  @override
-  void dispose() {
-    codeController.dispose();
-    codeFocusNode.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<VerifyCodeBloc, VerifyCodeState>(
-      listener: (context, state) {
-        if (state.isSuccess) {
-
-        } else if (state.error != null) {
-          setState(() { _isFirstTry = false; });
-          codeController.clear();
-          FocusScope.of(context).requestFocus(codeFocusNode);
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(state.error!)));
-        } else if (state.isBlocked) {
-          context.go("/block");
-        }
-
-        if (state.secondsLeft == 0 && codeFocusNode.hasFocus) {
-          codeFocusNode.unfocus();
-          codeController.clear();
-        }
-      },
-      builder: (context, state) {
-        return Scaffold(
-          resizeToAvoidBottomInset: true,
-          body: Container(
-            width: double.infinity,
-            decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-            child: SafeArea(
-              child: Stack(
-                children: [
-                  Positioned(
-                    top: 310,
-                    left: 0,
-                    right: 0,
-                    child: Image.asset("assets/wave.png", fit: BoxFit.cover),
-                  ),
-                  Column(
-                    children: [
-                      const SizedBox(height: 60),
-                      const Text(
-                        "Код отправлен на номер",
-                        style: TextStyle(
-                          fontSize: 18,
-                          color: AppColors.whiteText,
-                        ),
-                      ),
-                      const SizedBox(height: 6),
-                      Text(
-                        widget.phoneNumber,
-                        style: const TextStyle(
-                          fontSize: 20,
-                          color: AppColors.whiteText,
-                        ),
-                      ),
-                      const SizedBox(height: 35),
-                      GestureDetector(
-                        onTap: state.secondsLeft > 0 ? openKeyboard : null,
-                        child: CodeDots(code: state.code, length: 6),
-                      ),
-                      const SizedBox(height: 8),
-
-                      if (state.secondsLeft == 0)
-                        const Text(
-                          "Время действия кода истекло. Запросите новый.",
-                          style: TextStyle(
-                            color: AppColors.pinError,
-                            fontSize: 14,
-                            fontWeight: FontWeight.bold,
-                          ),
-                        )
-                      else if (!_isFirstTry)
-                        Text(
-                          "Осталось ${state.attemptsLeft} попытк${state.attemptsLeft == 1 ? 'а' : 'и'}",
-                          style: const TextStyle(
-                            color: AppColors.pinError,
-                            fontSize: 14,
-                          ),
-                        ),
-
-                      const SizedBox(height: 40),
-                      GradientButton(
-                        text: state.secondsLeft == 0
-                            ? "Отправить код повторно"
-                            : "Отправить код повторно\nчерез 00:${state.secondsLeft.toString().padLeft(2, '0')} сек.",
-                        onTap: (state.secondsLeft == 0 && !state.isSubmitting)
-                            ? () {
-                          context.read<VerifyCodeBloc>().add(
-                            ResendCodePressed(),
-                          );
-                        }
-                            : null,
-                        enabled: state.secondsLeft == 0 && !state.isSubmitting,
-                        width: 250,
-                      ),
-                      const Spacer(),
-                      SizedBox(
-                        height: 50,
-                        width: double.infinity,
-                        child: Opacity(
-                          opacity: 0.0,
-                          child: TextField(
-                            controller: codeController,
-                            focusNode: codeFocusNode,
-                            keyboardType: TextInputType.number,
-                            maxLength: 6,
-                            autofocus: true,
-                            enabled: state.secondsLeft > 0,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
+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:go_router/go_router.dart';
+import '../../../core/app_colors.dart';
+import '../components/code_dots.dart';
+import '../components/gradient_button.dart';
+import '../event/verify_code_event.dart';
+import '../state/verify_code_state.dart';
+import '../viewmodel/verify_code_bloc.dart';
+import 'pin_login_screen.dart';
+
+class PhoneLoginScreen extends StatefulWidget {
+  final String phoneNumber;
+  final String tempToken;
+
+  const PhoneLoginScreen({
+    Key? key,
+    required this.phoneNumber,
+    required this.tempToken,
+  }) : super(key: key);
+
+  @override
+  State<PhoneLoginScreen> createState() => _PhoneLoginScreenState();
+}
+
+class _PhoneLoginScreenState extends State<PhoneLoginScreen> {
+  final TextEditingController codeController = TextEditingController();
+  final FocusNode codeFocusNode = FocusNode();
+  bool _isFirstTry = true;
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<VerifyCodeBloc>().add(
+      VerifyCodeStarted(
+        phoneNumber: widget.phoneNumber,
+        tempToken: widget.tempToken,
+      ),
+    );
+
+    codeController.addListener(() {
+      context.read<VerifyCodeBloc>().add(CodeChanged(codeController.text));
+
+      if (codeController.text.length == 6) {
+        Future.delayed(const Duration(milliseconds: 150), () {
+          context.read<VerifyCodeBloc>().add(VerifyCodeSubmitted());
+        });
+      }
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      FocusScope.of(context).requestFocus(codeFocusNode);
+    });
+  }
+
+  void openKeyboard() {
+    if (codeFocusNode.hasFocus) {
+      codeFocusNode.unfocus();
+    }
+
+    Future.delayed(const Duration(milliseconds: 50), () {
+      FocusScope.of(context).requestFocus(codeFocusNode);
+    });
+  }
+
+  @override
+  void dispose() {
+    codeController.dispose();
+    codeFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocConsumer<VerifyCodeBloc, VerifyCodeState>(
+      listener: (context, state) {
+        if (state.isSuccess) {
+
+        } else if (state.error != null) {
+          setState(() { _isFirstTry = false; });
+          codeController.clear();
+          FocusScope.of(context).requestFocus(codeFocusNode);
+          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(state.error!)));
+        } else if (state.isBlocked) {
+          context.go("/block");
+        }
+
+        if (state.secondsLeft == 0 && codeFocusNode.hasFocus) {
+          codeFocusNode.unfocus();
+          codeController.clear();
+        }
+      },
+      builder: (context, state) {
+        return Scaffold(
+          resizeToAvoidBottomInset: true,
+          body: Container(
+            width: double.infinity,
+            decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+            child: SafeArea(
+              child: Stack(
+                children: [
+                  Positioned(
+                    top: 310,
+                    left: 0,
+                    right: 0,
+                    child: Image.asset("assets/wave.png", fit: BoxFit.cover),
+                  ),
+                  Column(
+                    children: [
+                      const SizedBox(height: 60),
+                      const Text(
+                        "Код отправлен на номер",
+                        style: TextStyle(
+                          fontSize: 18,
+                          color: AppColors.whiteText,
+                        ),
+                      ),
+                      const SizedBox(height: 6),
+                      Text(
+                        widget.phoneNumber,
+                        style: const TextStyle(
+                          fontSize: 20,
+                          color: AppColors.whiteText,
+                        ),
+                      ),
+                      const SizedBox(height: 35),
+                      GestureDetector(
+                        onTap: state.secondsLeft > 0 ? openKeyboard : null,
+                        child: CodeDots(code: state.code, length: 6),
+                      ),
+                      const SizedBox(height: 8),
+
+                      if (state.secondsLeft == 0)
+                        const Text(
+                          "Время действия кода истекло. Запросите новый.",
+                          style: TextStyle(
+                            color: AppColors.pinError,
+                            fontSize: 14,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        )
+                      else if (!_isFirstTry)
+                        Text(
+                          "Осталось ${state.attemptsLeft} попытк${state.attemptsLeft == 1 ? 'а' : 'и'}",
+                          style: const TextStyle(
+                            color: AppColors.pinError,
+                            fontSize: 14,
+                          ),
+                        ),
+
+                      const SizedBox(height: 40),
+                      GradientButton(
+                        text: state.secondsLeft == 0
+                            ? "Отправить код повторно"
+                            : "Отправить код повторно\nчерез 00:${state.secondsLeft.toString().padLeft(2, '0')} сек.",
+                        onTap: (state.secondsLeft == 0 && !state.isSubmitting)
+                            ? () {
+                          context.read<VerifyCodeBloc>().add(
+                            ResendCodePressed(),
+                          );
+                        }
+                            : null,
+                        enabled: state.secondsLeft == 0 && !state.isSubmitting,
+                        width: 250,
+                      ),
+                      const Spacer(),
+                      SizedBox(
+                        height: 50,
+                        width: double.infinity,
+                        child: Opacity(
+                          opacity: 0.0,
+                          child: TextField(
+                            controller: codeController,
+                            focusNode: codeFocusNode,
+                            keyboardType: TextInputType.number,
+                            maxLength: 6,
+                            autofocus: true,
+                            enabled: state.secondsLeft > 0,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/presentation/screens/phone_screen.dart b/lib/presentation/screens/phone_screen.dart
index ffafc91..eee2273 100644
--- a/lib/presentation/screens/phone_screen.dart
+++ b/lib/presentation/screens/phone_screen.dart
@@ -1,284 +1,288 @@
-import 'package:be_happy/presentation/event/spalsh_event.dart';
-import 'package:be_happy/presentation/state/splash_state.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-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/gradient_button.dart';
-import '../event/auth_event.dart';
-import '../state/auth_state.dart';
-import '../viewmodel/auth_bloc.dart';
-import 'phone_login_screen.dart';
-
-class PhoneScreen extends StatefulWidget {
-  const PhoneScreen({Key? key}) : super(key: key);
-
-  @override
-  State<PhoneScreen> createState() => _PhoneScreenState();
-}
-
-class _PhoneScreenState extends State<PhoneScreen> {
-  final TextEditingController _phoneController = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-    // Вызываем диалог сразу после отрисовки первого кадра экрана
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _showTestModeDialog();
-    });
-  }
-
-  // Метод для отображения диалогового окна
-  void _showTestModeDialog() {
-    showDialog(
-      context: context,
-      barrierDismissible: false, // Запрещает закрывать окно кликом по фону
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text(
-            'Внимание!',
-            style: TextStyle(fontWeight: FontWeight.bold),
-          ),
-          content: const Text('Приложение находится в тестовом режиме!'),
-          actions: [
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop(); // Закрывает диалоговое окно
-              },
-              child: const Text(
-                'Продолжить',
-                style: TextStyle(color: Colors.blueAccent),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    _phoneController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<PhoneAuthBloc, PhoneAuthState>(
-      listener: (context, state) {
-        if (state.isSuccess) {
-          context.go("/verify?phone=+375${state.phone}");
-          context.read<SplashBloc>().add(AuthStarted());
-        } else if (state.error != null) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(state.error!)),
-          );
-        }
-      },
-      builder: (context, state) {
-        final isAdult = state.isAdult ?? false;
-        final privacyAccepted = state.privacyAccepted ?? false;
-
-        return Scaffold(
-          backgroundColor: Colors.transparent,
-          resizeToAvoidBottomInset: false,
-          body: Container(
-            decoration: const BoxDecoration(
-              gradient: AppColors.phoneScreenBg,
-            ),
-            child: SafeArea(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  const SizedBox(height: 30),
-
-                  Image.asset(
-                    'assets/wave.png',
-                    width: double.infinity,
-                    fit: BoxFit.cover,
-                  ),
-
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 24),
-                      child: Column(
-                        children: [
-                          const SizedBox(height: 20),
-
-                          const Text(
-                            'Введите номер телефона',
-                            style: TextStyle(
-                              color: AppColors.whiteText,
-                              fontSize: 20,
-                            ),
-                          ),
-
-                          const SizedBox(height: 40),
-
-                          TextField(
-                            controller: _phoneController,
-                            keyboardType: TextInputType.phone,
-                            style: const TextStyle(color: AppColors.whiteText),
-                            decoration: InputDecoration(
-                              filled: true,
-                              fillColor: AppColors.disabledButtonColor,
-                              prefixText: '+375 ',
-                              prefixStyle: const TextStyle(
-                                color: AppColors.whiteText,
-                                fontSize: 16,
-                              ),
-                              hintText: 'Номер телефона',
-                              hintStyle: const TextStyle(color: AppColors.hint),
-                              suffixIcon: _phoneController.text.isNotEmpty
-                                  ? IconButton(
-                                icon: const Icon(Icons.clear,
-                                    color: AppColors.whiteText),
-                                onPressed: () {
-                                  _phoneController.clear();
-                                  context.read<PhoneAuthBloc>().add(PhoneChanged(""));
-                                },
-                              )
-                                  : null,
-                              border: OutlineInputBorder(
-                                borderRadius: BorderRadius.circular(12),
-                                borderSide: BorderSide.none,
-                              ),
-                            ),
-                            onChanged: (value) {
-                              context.read<PhoneAuthBloc>().add(PhoneChanged(value));
-                            },
-                          ),
-
-                          const SizedBox(height: 24),
-
-                          Row(
-                            children: [
-                              AppCheckbox(
-                                value: isAdult,
-                                onChanged: (bool? value) {
-                                  if (value != null) {
-                                    context.read<PhoneAuthBloc>().add(IsAdultChanged(value));
-                                  }
-                                },
-                                isError: state.error != null && !isAdult,
-                              ),
-                              const SizedBox(width: 12),
-                              Flexible(
-                                child: Text.rich(
-                                  TextSpan(
-                                    text: 'Подтверждаю, что мне исполнилось 18 лет и я принял ',
-                                    style: const TextStyle(
-                                      color: AppColors.white70,
-                                      fontSize: 12,
-                                    ),
-                                    children: [
-                                      WidgetSpan(
-                                        child: ClickableText(
-                                          text: 'Условия использования сервиса',
-                                          onTap: () => context.push('/license-agreement'),
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-
-                          const SizedBox(height: 14),
-
-                          Row(
-                            children: [
-                              AppCheckbox(
-                                value: privacyAccepted,
-                                onChanged: (bool? value) {
-                                  if (value != null) {
-                                    context.read<PhoneAuthBloc>().add(PrivacyAcceptedChanged(value));
-                                  }
-                                },
-                                isError: state.error != null && !privacyAccepted,
-                              ),
-                              const SizedBox(width: 12),
-                              Expanded(
-                                child: Text.rich(
-                                  TextSpan(
-                                    text: 'Подтверждаю, что я ознакомился с ',
-                                    style: const TextStyle(
-                                      color: AppColors.white70,
-                                      fontSize: 12,
-                                    ),
-                                    children: [
-                                      WidgetSpan(
-                                        child: ClickableText(
-                                          text: 'Политикой обработки персональных данных',
-                                          onTap: () => context.push('/privacy-policy'),
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-
-                          const SizedBox(height: 47),
-
-                          GradientButton(
-                            text: "Получить код",
-                            enabled: state.phone.isNotEmpty &&
-                                isAdult &&
-                                privacyAccepted &&
-                                !state.isSubmitting,
-                            onTap: state.isSubmitting
-                                ? null
-                                : () {
-                              context.read<PhoneAuthBloc>().add(SubmitPhonePressed());
-                            },
-                            showArrows: true,
-                            height: 50,
-                            width: 340,
-                            fontSize: 14,
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
-
-class ClickableText extends StatelessWidget {
-  final String text;
-  final VoidCallback onTap;
-
-  const ClickableText({
-    super.key,
-    required this.text,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      child: Text(
-        text,
-        style: const TextStyle(
-            color: Colors.blueAccent,
-            decorationColor: Colors.blueAccent,
-            decoration: TextDecoration.underline,
-            fontSize: 12
-        ),
-      ),
-    );
-  }
+import 'package:be_happy/presentation/event/spalsh_event.dart';
+import 'package:be_happy/presentation/state/splash_state.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+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/gradient_button.dart';
+import '../event/auth_event.dart';
+import '../state/auth_state.dart';
+import '../viewmodel/auth_bloc.dart';
+import 'phone_login_screen.dart';
+
+class PhoneScreen extends StatefulWidget {
+  const PhoneScreen({Key? key}) : super(key: key);
+
+  @override
+  State<PhoneScreen> createState() => _PhoneScreenState();
+}
+
+class _PhoneScreenState extends State<PhoneScreen> {
+  final TextEditingController _phoneController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _showTestModeDialog();
+    });
+  }
+
+  void _showTestModeDialog() {
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text(
+            'Внимание!',
+            style: TextStyle(fontWeight: FontWeight.bold),
+          ),
+          content: const Text('Приложение находится в тестовом режиме!'),
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text(
+                'Продолжить',
+                style: TextStyle(color: Colors.blueAccent),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _phoneController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () {
+        FocusManager.instance.primaryFocus?.unfocus();
+      },
+      behavior: HitTestBehavior.opaque,
+      child: BlocConsumer<PhoneAuthBloc, PhoneAuthState>(
+        listener: (context, state) {
+          if (state.isSuccess) {
+            context.go("/verify?phone=+375${state.phone}");
+            context.read<SplashBloc>().add(AuthStarted());
+          } else if (state.error != null) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(state.error!)),
+            );
+          }
+        },
+        builder: (context, state) {
+          final isAdult = state.isAdult ?? false;
+          final privacyAccepted = state.privacyAccepted ?? false;
+
+          return Scaffold(
+            backgroundColor: Colors.transparent,
+            resizeToAvoidBottomInset: false,
+            body: Container(
+              decoration: const BoxDecoration(
+                gradient: AppColors.phoneScreenBg,
+              ),
+              child: SafeArea(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const SizedBox(height: 30),
+
+                    Image.asset(
+                      'assets/wave.png',
+                      width: double.infinity,
+                      fit: BoxFit.cover,
+                    ),
+
+                    Expanded(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 24),
+                        child: Column(
+                          children: [
+                            const SizedBox(height: 20),
+
+                            const Text(
+                              'Введите номер телефона',
+                              style: TextStyle(
+                                color: AppColors.whiteText,
+                                fontSize: 20,
+                              ),
+                            ),
+
+                            const SizedBox(height: 40),
+
+                            TextField(
+                              controller: _phoneController,
+                              keyboardType: TextInputType.phone,
+                              style: const TextStyle(color: AppColors.whiteText),
+                              decoration: InputDecoration(
+                                filled: true,
+                                fillColor: AppColors.disabledButtonColor,
+                                prefixText: '+375 ',
+                                prefixStyle: const TextStyle(
+                                  color: AppColors.whiteText,
+                                  fontSize: 16,
+                                ),
+                                hintText: 'Номер телефона',
+                                hintStyle: const TextStyle(color: AppColors.hint),
+                                suffixIcon: _phoneController.text.isNotEmpty
+                                    ? IconButton(
+                                  icon: const Icon(Icons.clear,
+                                      color: AppColors.whiteText),
+                                  onPressed: () {
+                                    _phoneController.clear();
+                                    context.read<PhoneAuthBloc>().add(PhoneChanged(""));
+                                  },
+                                )
+                                    : null,
+                                border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(12),
+                                  borderSide: BorderSide.none,
+                                ),
+                              ),
+                              onChanged: (value) {
+                                context.read<PhoneAuthBloc>().add(PhoneChanged(value));
+                              },
+                            ),
+
+                            const SizedBox(height: 24),
+
+                            Row(
+                              children: [
+                                AppCheckbox(
+                                  value: isAdult,
+                                  onChanged: (bool? value) {
+                                    if (value != null) {
+                                      context.read<PhoneAuthBloc>().add(IsAdultChanged(value));
+                                    }
+                                  },
+                                  isError: state.error != null && !isAdult,
+                                ),
+                                const SizedBox(width: 12),
+                                Flexible(
+                                  child: Text.rich(
+                                    TextSpan(
+                                      text: 'Подтверждаю, что мне исполнилось 18 лет и я принял ',
+                                      style: const TextStyle(
+                                        color: AppColors.white70,
+                                        fontSize: 12,
+                                      ),
+                                      children: [
+                                        WidgetSpan(
+                                          child: ClickableText(
+                                            text: 'Условия использования сервиса',
+                                            onTap: () => context.push('/license-agreement'),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+
+                            const SizedBox(height: 14),
+
+                            Row(
+                              children: [
+                                AppCheckbox(
+                                  value: privacyAccepted,
+                                  onChanged: (bool? value) {
+                                    if (value != null) {
+                                      context.read<PhoneAuthBloc>().add(PrivacyAcceptedChanged(value));
+                                    }
+                                  },
+                                  isError: state.error != null && !privacyAccepted,
+                                ),
+                                const SizedBox(width: 12),
+                                Expanded(
+                                  child: Text.rich(
+                                    TextSpan(
+                                      text: 'Подтверждаю, что я ознакомился с ',
+                                      style: const TextStyle(
+                                        color: AppColors.white70,
+                                        fontSize: 12,
+                                      ),
+                                      children: [
+                                        WidgetSpan(
+                                          child: ClickableText(
+                                            text: 'Политикой обработки персональных данных',
+                                            onTap: () => context.push('/privacy-policy'),
+                                          ),
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+
+                            const SizedBox(height: 47),
+
+                            GradientButton(
+                              text: "Получить код",
+                              enabled: state.phone.isNotEmpty &&
+                                  isAdult &&
+                                  privacyAccepted &&
+                                  !state.isSubmitting,
+                              onTap: state.isSubmitting
+                                  ? null
+                                  : () {
+                                context.read<PhoneAuthBloc>().add(SubmitPhonePressed());
+                              },
+                              showArrows: true,
+                              height: 50,
+                              width: 340,
+                              fontSize: 14,
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class ClickableText extends StatelessWidget {
+  final String text;
+  final VoidCallback onTap;
+
+  const ClickableText({
+    super.key,
+    required this.text,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      child: Text(
+        text,
+        style: const TextStyle(
+            color: Colors.blueAccent,
+            decorationColor: Colors.blueAccent,
+            decoration: TextDecoration.underline,
+            fontSize: 12
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/pin_login_screen.dart b/lib/presentation/screens/pin_login_screen.dart
index e532850..e6aed5d 100644
--- a/lib/presentation/screens/pin_login_screen.dart
+++ b/lib/presentation/screens/pin_login_screen.dart
@@ -1,180 +1,180 @@
-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/code_dots.dart';
-import '../event/map_event.dart';
-import '../event/spalsh_event.dart';
-import '../viewmodel/map_bloc.dart';
-import '../viewmodel/pin_bloc.dart';
-import '../event/pin_event.dart';
-import '../state/pin_state.dart';
-import '../viewmodel/splash_bloc.dart';
-
-class PinLoginScreen extends StatefulWidget {
-  const PinLoginScreen({super.key});
-
-  @override
-  State<PinLoginScreen> createState() => _PinLoginScreenState();
-}
-
-class _PinLoginScreenState extends State<PinLoginScreen> {
-  final TextEditingController controller = TextEditingController();
-  final FocusNode focusNode = FocusNode();
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      focusNode.requestFocus();
-    });
-    controller.addListener(_onTextChanged);
-  }
-
-  void _onTextChanged() {
-    final text = controller.text;
-    context.read<PinBloc>().add(PinDigitChanged(text));
-
-    if (text.length == 6) {
-      context.read<PinBloc>().add(PinSubmitted(text));
-    }
-  }
-
-  @override
-  void dispose() {
-    controller.dispose();
-    focusNode.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocListener<PinBloc, PinState>(
-      listener: (context, state) {
-        if (state is PinSuccess) {
-          context.read<SplashBloc>().add(PinVerificationSuccess());
-          context.go("/home");
-        }
-        if (state.error != null) {
-          controller.clear();
-          focusNode.requestFocus();
-        }
-      },
-      child: Scaffold(
-        body: GestureDetector(
-          onTap: () => focusNode.requestFocus(),
-          child: Container(
-            decoration: const BoxDecoration(
-              gradient: AppColors.phoneScreenBg,
-            ),
-            child: SafeArea(
-              child: Stack(
-                children: [
-                  Positioned(
-                    top: 310, left: 0, right: 0,
-                    child: Image.asset("assets/wave.png", fit: BoxFit.cover),
-                  ),
-                  BlocBuilder<PinBloc, PinState>(
-                    builder: (context, state) {
-                      final title = state is PinCreateInProgress
-                          ? "Создайте PIN-код"
-                          : "Введите PIN-код";
-
-                      final subtitle = state is PinCreateInProgress
-                          ? "Запомните PIN-код"
-                          : "Введите ваш пароль для входа";
-
-                      if (state is PinLoading) {
-                        return const Center(child: CircularProgressIndicator());
-                      }
-
-                      return Column(
-                        children: [
-                          const SizedBox(height: 60),
-                          Text(
-                            title,
-                            style: const TextStyle(
-                              color: AppColors.whiteText,
-                              fontSize: 20,
-                            ),
-                          ),
-                          const SizedBox(height: 35),
-
-                          Stack(
-                            alignment: Alignment.center,
-                            children: [
-                              CodeDots(
-                                code: state.pin,
-                                length: 6,
-                              ),
-                              SizedBox(
-                                width: 200,
-                                height: 50,
-                                child: TextField(
-                                  controller: controller,
-                                  focusNode: focusNode,
-                                  keyboardType: TextInputType.number,
-                                  maxLength: 6,
-                                  showCursor: false,
-                                  decoration: const InputDecoration(
-                                    border: InputBorder.none,
-                                    counterText: "",
-                                  ),
-                                  style: const TextStyle(color: Colors.transparent),
-                                ),
-                              ),
-                            ],
-                          ),
-
-                          const SizedBox(height: 12),
-
-                          // Блок ошибки
-                          if (state.error != null)
-                            Text(
-                              state.error!,
-                              style: const TextStyle(
-                                color: AppColors.pinError,
-                                fontSize: 14,
-                              ),
-                            ),
-
-                          const SizedBox(height: 40),
-
-                          Text(
-                            subtitle,
-                            style: const TextStyle(color: AppColors.white70),
-                          ),
-
-                          const SizedBox(height: 20),
-
-                          if (state is! PinCreateInProgress)
-                            TextButton(
-                              onPressed: () {
-                                context.read<MapBloc>().add(LogoutPressed());
-                                context.read<SplashBloc>().add(AuthCheckRequested());
-                              },
-                              child: const Text(
-                                "Забыли PIN-код?",
-                                style: TextStyle(
-                                  color: AppColors.whiteText,
-                                  decoration: TextDecoration.underline, 
-                                  fontSize: 14,
-                                ),
-                              ),
-                            ),
-
-                          const SizedBox(height: 40),
-
-                        ],
-                      );
-                    },
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
+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/code_dots.dart';
+import '../event/map_event.dart';
+import '../event/spalsh_event.dart';
+import '../viewmodel/map_bloc.dart';
+import '../viewmodel/pin_bloc.dart';
+import '../event/pin_event.dart';
+import '../state/pin_state.dart';
+import '../viewmodel/splash_bloc.dart';
+
+class PinLoginScreen extends StatefulWidget {
+  const PinLoginScreen({super.key});
+
+  @override
+  State<PinLoginScreen> createState() => _PinLoginScreenState();
+}
+
+class _PinLoginScreenState extends State<PinLoginScreen> {
+  final TextEditingController controller = TextEditingController();
+  final FocusNode focusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      focusNode.requestFocus();
+    });
+    controller.addListener(_onTextChanged);
+  }
+
+  void _onTextChanged() {
+    final text = controller.text;
+    context.read<PinBloc>().add(PinDigitChanged(text));
+
+    if (text.length == 6) {
+      context.read<PinBloc>().add(PinSubmitted(text));
+    }
+  }
+
+  @override
+  void dispose() {
+    controller.dispose();
+    focusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<PinBloc, PinState>(
+      listener: (context, state) {
+        if (state is PinSuccess) {
+          context.read<SplashBloc>().add(PinVerificationSuccess());
+          context.go("/home");
+        }
+        if (state.error != null) {
+          controller.clear();
+          focusNode.requestFocus();
+        }
+      },
+      child: Scaffold(
+        body: GestureDetector(
+          onTap: () => focusNode.requestFocus(),
+          child: Container(
+            decoration: const BoxDecoration(
+              gradient: AppColors.phoneScreenBg,
+            ),
+            child: SafeArea(
+              child: Stack(
+                children: [
+                  Positioned(
+                    top: 310, left: 0, right: 0,
+                    child: Image.asset("assets/wave.png", fit: BoxFit.cover),
+                  ),
+                  BlocBuilder<PinBloc, PinState>(
+                    builder: (context, state) {
+                      final title = state is PinCreateInProgress
+                          ? "Создайте PIN-код"
+                          : "Введите PIN-код";
+
+                      final subtitle = state is PinCreateInProgress
+                          ? "Запомните PIN-код"
+                          : "Введите ваш пароль для входа";
+
+                      if (state is PinLoading) {
+                        return const Center(child: CircularProgressIndicator());
+                      }
+
+                      return Column(
+                        children: [
+                          const SizedBox(height: 60),
+                          Text(
+                            title,
+                            style: const TextStyle(
+                              color: AppColors.whiteText,
+                              fontSize: 20,
+                            ),
+                          ),
+                          const SizedBox(height: 35),
+
+                          Stack(
+                            alignment: Alignment.center,
+                            children: [
+                              CodeDots(
+                                code: state.pin,
+                                length: 6,
+                              ),
+                              SizedBox(
+                                width: 200,
+                                height: 50,
+                                child: TextField(
+                                  controller: controller,
+                                  focusNode: focusNode,
+                                  keyboardType: TextInputType.number,
+                                  maxLength: 6,
+                                  showCursor: false,
+                                  decoration: const InputDecoration(
+                                    border: InputBorder.none,
+                                    counterText: "",
+                                  ),
+                                  style: const TextStyle(color: Colors.transparent),
+                                ),
+                              ),
+                            ],
+                          ),
+
+                          const SizedBox(height: 12),
+
+                          // Блок ошибки
+                          if (state.error != null)
+                            Text(
+                              state.error!,
+                              style: const TextStyle(
+                                color: AppColors.pinError,
+                                fontSize: 14,
+                              ),
+                            ),
+
+                          const SizedBox(height: 40),
+
+                          Text(
+                            subtitle,
+                            style: const TextStyle(color: AppColors.white70),
+                          ),
+
+                          const SizedBox(height: 20),
+
+                          if (state is! PinCreateInProgress)
+                            TextButton(
+                              onPressed: () {
+                                context.read<MapBloc>().add(LogoutPressed());
+                                context.read<SplashBloc>().add(AuthCheckRequested());
+                              },
+                              child: const Text(
+                                "Забыли PIN-код?",
+                                style: TextStyle(
+                                  color: AppColors.whiteText,
+                                  decoration: TextDecoration.underline, 
+                                  fontSize: 14,
+                                ),
+                              ),
+                            ),
+
+                          const SizedBox(height: 40),
+
+                        ],
+                      );
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/privacy_policy_screen.dart b/lib/presentation/screens/privacy_policy_screen.dart
index 18838e0..8dbd68e 100644
--- a/lib/presentation/screens/privacy_policy_screen.dart
+++ b/lib/presentation/screens/privacy_policy_screen.dart
@@ -1,171 +1,171 @@
-import 'package:flutter/material.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-
-class PrivacyPolicyScreen extends StatelessWidget {
-  const PrivacyPolicyScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        width: double.infinity,
-        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: ''),
-              ),
-
-              Expanded(
-                child: SingleChildScrollView(
-                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        'Политика конфиденциальности',
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontSize: 18
-                        ),
-                      ),
-
-                      const SizedBox(height: 16),
-
-                      _buildParagraph(
-                        'Настоящая Политика конфиденциальности (далее - Политика) действует в отношении всей информации, которую Общество с ограниченной ответственностью “БИХЕППИБЕЛ”, зарегистрированное по адресу: Республика Беларусь, 210017  Витебская область, Октябрьский район, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А УНП: 392050943 Регистрационный номер: 392026683, (далее – Компания), получает о Пользователе в процессе регистрации, авторизации и иного использования Сайта https://behappybel.by, (далее - Сайта), Приложения Be Happy, Сервиса Be Happy в соответствии с размещенными на Сайте и в Приложении Be Happy Пользовательским соглашением и Договором присоединения.\n\n'
-                        'Выраженное в соответствии с Политикой согласие Пользователя на обработку предоставляемых им Компании персональных данных и иной информации, считается, одновременно, предоставленным Пользователем указанным в Политике третьим лицам, привлекаемым Компанией для содействия в исполнении Пользовательского соглашения и Договора аренды.\n\n'
-                        'Использование Сайта, Приложения Be Happy, Сервиса Be Happy (в том числе, осуществление Пользователем регистрации, авторизации) означает безоговорочное согласие Пользователя с Политикой и всеми указанными в ней условиями обработки его персональных данных и иной информации; в случае несогласия с Политикой и всеми ее условиями Пользователь должен воздержаться от использования Сайта, Приложения Be Happy, Сервиса Be Happy.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('1. Персональные данные и иная информация Пользователя, которую получает и обрабатывает Компания\n'),
-                      _buildParagraph(
-                        '1.1. При регистрации, авторизации Пользователя, а также при использовании Сайта, Приложения Be Happy, Сервиса Be Happy, осуществлении оплат, проведении опросов, рассылке информационных и рекламных сообщений и во всех иных случаях, предусмотренных Пользовательским соглашением и Договором присоединения, Компания может запросить у Пользователя (п.1.1.1. Политики) и/или получить автоматически (п.1.1.2. Политики) следующую информацию о Пользователе:\n\n'
-                        '1.1.1. имя, номер мобильного телефона, адрес электронной почты, информацию о логине и пароле для доступа к отдельным функциям Сайта, Приложения Be Happy, Сервиса Be Happy, историю пользования Сервисом Be Happy (информацию о количестве, стоимости, времени и порядке произведенных Пользователями заказов на услуги Сервиса Be Happy и их оплате, в том числе данные о банковском счете и/или счете банковской карты), информацию об участии в рекламных акциях, информацию о подписке на информационную рассылку или материалы службы поддержки), реквизиты банка для возврата денежных средств, а также иные данные и информация;\n\n'
-                        '1.1.2. информация, которая автоматически передается Компании в процессе использования Сайта, Приложения Be Happy, Сервиса Be Happy, с помощью установленного на устройстве Пользователя программного обеспечения, в том числе IP-адрес, информация из cookie и tracking bugs, информация о стране и (или) городе нахождения Пользователя, информация об Интернет-браузере Пользователя (или иной программе, с помощью которой осуществляется доступ к Сайту, Приложению Be Happy, Сервису Be Happy), время доступа, адрес запрашиваемой страницы об устройствах Пользователя, с помощью которых осуществляется доступ к Сайту, Приложению Be Happy, Сервису Be Happy.\n\n'
-                        '1.2. Настоящая Политика применима только к Сайту, Приложению Be Happy, Сервису Be Happy. Компания не контролирует и не несет ответственность за сайты и программное обеспечение третьих лиц, на которые Пользователь может перейти по ссылкам, доступным на Сайте, в Приложении Be Happy. На иных сайтах третьих лиц у Пользователя может собираться или запрашиваться иная информация, а также могут совершаться иные действия, за которые Компания не несет ответственности.\n\n'
-                        '1.3. Компания исходит из того, что Пользователь является совершеннолетним дееспособным лицом, соответствующим требованиям Пользовательского соглашения и Договора присоединения, предоставляет достоверную и достаточную информацию и поддерживает эту информацию в актуальном состоянии. Компания вправе осуществить проверку предоставленной Пользователем информации в соответствии с положениями Пользовательского соглашения и Договора присоединения. В случае предоставления Пользователем недостоверной информации, Компания имеет право приостановить либо отменить регистрацию и/или отказать Пользователю в предоставлении доступа к Сайту, Приложению Be Happy, Сервису Be Happy. За предоставление недостоверной информации и возникшие вследствие этого негативные последствия Компания и/или иные третьи лица ответственности не несут. Если использование Сайта, Приложения Be Happy, Сервиса Be Happy осуществило несовершеннолетнее и/или недееспособное лицо, то ответственность за такое несанкционированное Компанией использование несут родители, усыновители и иные законные представители несовершеннолетнего и/или недееспособного лица.\n\n'
-                        '1.4 Пользователь дает свое согласие на осуществление Арендодателем записи разговоров Пользователя со Службой поддержки и предоставление такой записи третьим лицам.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('2. Цели сбора и обработки данных и иной информации Пользователя\n'),
-                      _buildParagraph(
-                        '2.1. Компания использует данные и иную информацию Пользователя для целей заключения и исполнения Пользовательского соглашения, заключения и исполнения Договора присоединения, оказания дополнительных услуг, повышения качества сервиса, участия Пользователя в проводимых Компанией акциях, опросах, исследованиях (включая, но не ограничиваясь проведением опросов, исследований посредством электронной, телефонной и сотовой связи), принятия решений или совершения иных действий, порождающих юридические последствия в отношении Пользователя или других лиц, представления Пользователю информации об оказываемых Компанией услугах, предоставления Компанией консультационных услуг. Указанные цели использования персональных данных распространяются на всю информацию, указанную в пункте 1.1 Политики.\n\n'
-                        '2.2. Цели сбора и обработки персональных данных включают, без ограничений, следующие:\n\n'
-                        '2.2.1. регистрацию, идентификацию и авторизацию Пользователя в рамках Сервиса Be Happy;\n'
-                        '2.2.2. заключение и исполнение Пользовательского соглашения и Договора присоединения;\n'
-                        '2.2.3. предоставление Пользователю Сервиса Be Happy, а также любого дополнительного функционала в рамках Сервиса Be Happy;\n'
-                        '2.2.4. обработка запросов Пользователей Компанией в рамках Сервиса Be Happy;\n'
-                        '2.2.5. анализ и исследования возможностей улучшения Сервиса Be Happy;\n'
-                        '2.2.6. рассылка новостей и информации о продуктах, услугах, специальных предложениях, связанных с Сервисом Be Happy;\n'
-                        '2.2.7. рассылка служебных сообщений (например, для информирования о статусе аренды самоката, восстановления/изменения логина и пароля Пользователя и пр.);\n'
-                        '2.2.8. предотвращение и выявление мошенничества и незаконного использования Сервиса Be Happy;\n'
-                        '2.2.9. проведение статистических и иных исследований на основе обезличенных данных.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('3. Условия, способы и порядок обработки персональных данных и иной персональной информации Пользователя\n'),
-                      _buildParagraph(
-                        '3.1. Компания использует персональные данные и иную информацию Пользователя только для целей, указанных в Политике и в соответствии с Политикой.\n\n'
-                        '3.2. В отношении персональных данных и иной информации Пользователя Компанией соблюдается конфиденциальность.\n\n'
-                        '3.3. Компания не будет раскрывать третьим лицам, распространять, продавать или иным образом распоряжаться полученными персональными данными и иной информацией, кроме как для целей, способами и в пределах, предусмотренных настоящей Политикой.\n\n'
-                        '3.4. Обработка персональных и иных данных Пользователя осуществляется Компанией в объеме, который необходим для достижения каждой из целей, указанных в разделе 2 Политики, следующими возможными способами: сбор, запись (в том числе на электронные носители), систематизация, накопление, хранение, составление перечней, маркировка, уточнение (обновление, изменение), извлечение, использование, передача (распространение, предоставление, доступ), обезличивание, блокирование, удаление, уничтожение, трансграничная передача персональных данных, получение изображения путем фотографирования, а также осуществление любых иных действий с персональными данными Пользователя с учетом применимого права. Компания вправе осуществлять обработку персональных и иных данных Пользователя как с использованием автоматизированных средств обработки персональных данных Пользователя, так и без использования средств автоматизации.\n\n'
-                        '3.5. Компания вправе передавать предоставленные ей Пользователем персональные данные для их обработки (давать поручение на обработку) (в объеме, необходимом для выполнения Компанией своих обязательств) третьим лицам, в том числе, организациям, которые привлекаются Компанией для осуществления информационной отправки сообщений посредством электронной почты/операторов мобильной связи, осуществляют списание/зачисление денежных средств с/на банковской(-ую) карты(- у)/расчетный счет - кредитным организациям (банкам), платежным системам, операторам мобильной связи, курьерским службам, организациями почтовой связи, включая трансграничную передачу персональных данных Пользователя в письменной либо электронной форме, в случаях и в порядке, предусмотренном соответствующими договорами с указанными третьими лицами, правилами Компании, применимым правом.\n\n'
-                        '3.6. Компания также вправе передавать предоставленные ей Пользователем персональные данные государственным органам, суду, иным уполномоченным органам и организациям, в случаях и в порядке, когда это требуется в соответствии с применяемым к Политике правом.\n\n'
-                        '3.7. Компания гарантирует добросовестную и законную обработку персональных и иных данных Пользователя в соответствии с предусмотренными в разделе 2 Политики целями.\n\n'
-                        '3.8. Компания гарантирует незамедлительное обновление данных Пользователя в случае предоставления им обновленных данных.\n\n'
-                        '3.9. Согласие на обработку персональных данных и иных данных дается Пользователем на бессрочной основе, либо до истечения сроков хранения соответствующей информации или документов, содержащих вышеуказанную информацию, определяемых в соответствии с применимым к Политике правом. По истечении указанного срока персональные данные подлежат уничтожению Компанией.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('4. Изменение или удаление информации Пользователем. Отзыв согласия на обработку персональных данных\n\n'),
-                      _buildParagraph(
-                        '4.1. Пользователь может в любой момент изменить (обновить, дополнить) предоставленные им персональные данные и иную информацию обратившись к Компании, например, через службу поддержки или с использованием контактов, указанных на Сайте, в Приложении Be Happy с запросом об изменении (обновлении, дополнении) предоставленной им ранее информации (Компания изменяет (обновляет, дополняет) предоставленную Пользователем информацию только после проведения применяемой в Компании на момент соответствующего обращения процедурой идентификации Пользователя).\n\n'
-                        '4.2. Пользователь вправе отозвать свое согласие на обработку персональных данных путем направления соответствующего письменного уведомления Компании не менее чем за 30 (тридцать календарных) дней до момента отзыва согласия, при этом Пользователь признает и понимает, что доступ к пользованию Сервисами Сайта и Приложения Be Happy, Сервису Be Happy не будет предоставляться Компанией с того момента, когда Компания лишилась возможности обрабатывать персональные данные Пользователя.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('5. Защита информации Пользователей\n'),
-                      _buildParagraph(
-                        '5.1. Компания обеспечивает принятие необходимых и достаточных организационных и технических мер для защиты персональных данных и иной информации Пользователей от неправомерного или случайного доступа, уничтожения, изменения, блокирования, копирования, распространения, а также от иных неправомерных действий с ней третьих лиц.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('6. Файлы cookies и tracking bugs\n'),
-                      _buildParagraph(
-                        '6.1. Для улучшения качества предоставления Сервиса Be Happy Компания может использовать (временные и постоянные) cookie-файлы, tracking bugs и/или другие технологии сбора не носящих личный характер данных (например, IP-адрес, тип браузера и данные о провайдере службы Интернет (ISP), а также (для Пользователей, которые пользуются услугами Компании через мобильное устройство), уникальный идентификатор устройства, данные об операционной системе и координаты с целью учёта количества Пользователей и их поведения при пользовании Сервисом Be Happy. Для повышения удобства Пользователей Компания вправе собирать и обрабатывать информацию об общем количестве операций, страниц, просмотренных Пользователем, ссылающихся/исходных страниц, типе платформы, дате/времени фиксирования информации, количестве и месте просмотров данной страницы, просмотра страницы и использованных (поисковых) слов.\n\n'
-                        '6.2. Информация о cookies и tracking bugs:\n\n'
-                        '6.2.1.Файл «cookie» - небольшой текстовый файл, отправляемый на браузер устройства Пользователя с используемого Компанией сервера. Cookies содержат информацию, которая позже может быть использована Компанией. Браузер будет хранить эту информацию и передавать ее обратно с каждым запросом Пользователя Компании. Одни значения cookies могут храниться только в течение одной сессии и удаляются после закрытия браузера. Другие, установленные на некоторый период времени, записываются в специальный файл на жестком диске и хранятся на устройстве Пользователя. Cookies используются для идентификации, отслеживания сессий (поддержания состояния) и сохранения информации о Пользователе, включая предпочтения при пользовании Сервисом Be Happy. Используемые Компанией сookies собирают только анонимные данные.\n\n'
-                        '6.2.2. Файл tracking bugs - это графические объекты, встроенные в веб-страницы или в сообщения e-mail. Tracking bugs используются с различными целями включные отчёты о количестве Пользователей. Используемые Компанией tracking bugs собирают только анонимные данные.\n\n'
-                        '6.3. Компания может использовать cookies и tracking bugs в целях контроля использования Сервиса Be Happy,сбора информации неличного характера о Пользователе, сохранения предпочтений и другой информации на устройстве Пользователя для того, чтобы сэкономить время Пользователя, необходимое для многократного введения в формах Сайта, Приложения Be Happy одной и той же информации, а также в целях отображения содержания в ходе последующих посещений Пользователем Сайта, Приложения Be Happy. Информация, полученная посредством cookies и tracking bugs, также может использоваться Компанией для статистических исследований, направленных на корректировку содержания Сайта, Приложения Be Happy в соответствии с предпочтениями Пользователя.\n\n'
-                        '6.4. Компания может предоставить Пользователю возможность изменить настройки приема файлов cookies и tracking bugs в настройках своего браузера или отключить их полностью, однако в таком случае некоторые функции Сервиса Be Happy могут работать некорректно.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('7. Внесение изменений в Политику. Согласие Пользователя с Политикой\n'),
-                      _buildParagraph(
-                        '7.1. Пользователь признает и соглашается, что регистрация Пользователя на Сайте, в Приложении Be Happy и последующее использование Сервиса Be Happy, любых его служб, функционала означает безоговорочное согласие Пользователя со всеми пунктами настоящей Политики и безоговорочное принятие ее условий.\n\n'
-                        '7.2. Продолжение Пользователем использования Сервиса Be Happy после любых изменений и/или дополнений Политики означает его согласие с такими изменениями и/или дополнениями.\n\n'
-                        '7.3. Пользователь обязуется регулярно знакомиться с содержанием Политики в целях своевременного ознакомления с ее изменениями/дополнениями.\n\n'
-                        '7.4. Компания оставляет за собой право по своему усмотрению изменять и (или) дополнять Политику в любое время без предварительного и (или) последующего уведомления Пользователя. Новая редакция Политики вступает в силу с момента ее размещения на Сайте и/или в Приложении Be Happy, если иное не предусмотрено новой редакцией Политики. Действующая редакция Политики всегда доступна на Сайте и/или в Приложении Be Happy.\n\n'
-                        'Уважаемый Пользователь, если Вы не согласны с положениями Политики, откажитесь от использования Сайта, Приложения Be Happy, Сервиса Be Happy.',
-                      ),
-
-                      const SizedBox(height: 24),
-
-                      _buildSectionHeader('8. Заключительные положения\n'),
-                      _buildParagraph(
-                        '8.1. К Политике и возникающими в связи с применением Политики отношениям между Пользователями и Компанией подлежит применению право Республики Беларусь.\n\n'
-                        '8.2. Все возможные споры по поводу настоящей Политики конфиденциальности и отношений между пользователем и Сервисом будут разрешаться по нормам белорусского права в суде по месту нахождения Администрации сайта, если иное прямо не предусмотрено законодательством РБ.\n\n'
-                        '8.3. Соглашаясь с условиями Политики, Пользователь дает согласие на обработку персональных и иных данных своей волей и в своем интересе.\n\n'
-                        '8.4. Отказ от предоставления персональных данных и иной необходимой для использования Сайта, Приложения Be Happy, Сервиса Be Happy информации влечет невозможность для Компании предоставлять Пользователю Сервиса Be Happy.',
-                      ),
-
-                      const SizedBox(height: 32),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildParagraph(String text) {
-    return Text(
-      text,
-      style: const TextStyle(
-        color: Color(0xFFD1D1D6), 
-        fontSize: 14,
-        height: 1.5,
-      ),
-    );
-  }
-
-  Widget _buildSectionHeader(String text) {
-    return Text(
-      text,
-      style: const TextStyle(
-        color: Colors.white,
-        fontSize: 16,
-        fontWeight: FontWeight.bold,
-        height: 1.4,
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+
+class PrivacyPolicyScreen extends StatelessWidget {
+  const PrivacyPolicyScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        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: ''),
+              ),
+
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        'Политика конфиденциальности',
+                        style: const TextStyle(
+                          color: Colors.white,
+                          fontSize: 18
+                        ),
+                      ),
+
+                      const SizedBox(height: 16),
+
+                      _buildParagraph(
+                        'Настоящая Политика конфиденциальности (далее - Политика) действует в отношении всей информации, которую Общество с ограниченной ответственностью “БИХЕППИБЕЛ”, зарегистрированное по адресу: Республика Беларусь, 210017  Витебская область, Октябрьский район, г. Витебск, ул. Гагарина, дом 105, корп. Б, оф. 11А УНП: 392050943 Регистрационный номер: 392026683, (далее – Компания), получает о Пользователе в процессе регистрации, авторизации и иного использования Сайта https://behappybel.by, (далее - Сайта), Приложения Be Happy, Сервиса Be Happy в соответствии с размещенными на Сайте и в Приложении Be Happy Пользовательским соглашением и Договором присоединения.\n\n'
+                        'Выраженное в соответствии с Политикой согласие Пользователя на обработку предоставляемых им Компании персональных данных и иной информации, считается, одновременно, предоставленным Пользователем указанным в Политике третьим лицам, привлекаемым Компанией для содействия в исполнении Пользовательского соглашения и Договора аренды.\n\n'
+                        'Использование Сайта, Приложения Be Happy, Сервиса Be Happy (в том числе, осуществление Пользователем регистрации, авторизации) означает безоговорочное согласие Пользователя с Политикой и всеми указанными в ней условиями обработки его персональных данных и иной информации; в случае несогласия с Политикой и всеми ее условиями Пользователь должен воздержаться от использования Сайта, Приложения Be Happy, Сервиса Be Happy.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('1. Персональные данные и иная информация Пользователя, которую получает и обрабатывает Компания\n'),
+                      _buildParagraph(
+                        '1.1. При регистрации, авторизации Пользователя, а также при использовании Сайта, Приложения Be Happy, Сервиса Be Happy, осуществлении оплат, проведении опросов, рассылке информационных и рекламных сообщений и во всех иных случаях, предусмотренных Пользовательским соглашением и Договором присоединения, Компания может запросить у Пользователя (п.1.1.1. Политики) и/или получить автоматически (п.1.1.2. Политики) следующую информацию о Пользователе:\n\n'
+                        '1.1.1. имя, номер мобильного телефона, адрес электронной почты, информацию о логине и пароле для доступа к отдельным функциям Сайта, Приложения Be Happy, Сервиса Be Happy, историю пользования Сервисом Be Happy (информацию о количестве, стоимости, времени и порядке произведенных Пользователями заказов на услуги Сервиса Be Happy и их оплате, в том числе данные о банковском счете и/или счете банковской карты), информацию об участии в рекламных акциях, информацию о подписке на информационную рассылку или материалы службы поддержки), реквизиты банка для возврата денежных средств, а также иные данные и информация;\n\n'
+                        '1.1.2. информация, которая автоматически передается Компании в процессе использования Сайта, Приложения Be Happy, Сервиса Be Happy, с помощью установленного на устройстве Пользователя программного обеспечения, в том числе IP-адрес, информация из cookie и tracking bugs, информация о стране и (или) городе нахождения Пользователя, информация об Интернет-браузере Пользователя (или иной программе, с помощью которой осуществляется доступ к Сайту, Приложению Be Happy, Сервису Be Happy), время доступа, адрес запрашиваемой страницы об устройствах Пользователя, с помощью которых осуществляется доступ к Сайту, Приложению Be Happy, Сервису Be Happy.\n\n'
+                        '1.2. Настоящая Политика применима только к Сайту, Приложению Be Happy, Сервису Be Happy. Компания не контролирует и не несет ответственность за сайты и программное обеспечение третьих лиц, на которые Пользователь может перейти по ссылкам, доступным на Сайте, в Приложении Be Happy. На иных сайтах третьих лиц у Пользователя может собираться или запрашиваться иная информация, а также могут совершаться иные действия, за которые Компания не несет ответственности.\n\n'
+                        '1.3. Компания исходит из того, что Пользователь является совершеннолетним дееспособным лицом, соответствующим требованиям Пользовательского соглашения и Договора присоединения, предоставляет достоверную и достаточную информацию и поддерживает эту информацию в актуальном состоянии. Компания вправе осуществить проверку предоставленной Пользователем информации в соответствии с положениями Пользовательского соглашения и Договора присоединения. В случае предоставления Пользователем недостоверной информации, Компания имеет право приостановить либо отменить регистрацию и/или отказать Пользователю в предоставлении доступа к Сайту, Приложению Be Happy, Сервису Be Happy. За предоставление недостоверной информации и возникшие вследствие этого негативные последствия Компания и/или иные третьи лица ответственности не несут. Если использование Сайта, Приложения Be Happy, Сервиса Be Happy осуществило несовершеннолетнее и/или недееспособное лицо, то ответственность за такое несанкционированное Компанией использование несут родители, усыновители и иные законные представители несовершеннолетнего и/или недееспособного лица.\n\n'
+                        '1.4 Пользователь дает свое согласие на осуществление Арендодателем записи разговоров Пользователя со Службой поддержки и предоставление такой записи третьим лицам.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('2. Цели сбора и обработки данных и иной информации Пользователя\n'),
+                      _buildParagraph(
+                        '2.1. Компания использует данные и иную информацию Пользователя для целей заключения и исполнения Пользовательского соглашения, заключения и исполнения Договора присоединения, оказания дополнительных услуг, повышения качества сервиса, участия Пользователя в проводимых Компанией акциях, опросах, исследованиях (включая, но не ограничиваясь проведением опросов, исследований посредством электронной, телефонной и сотовой связи), принятия решений или совершения иных действий, порождающих юридические последствия в отношении Пользователя или других лиц, представления Пользователю информации об оказываемых Компанией услугах, предоставления Компанией консультационных услуг. Указанные цели использования персональных данных распространяются на всю информацию, указанную в пункте 1.1 Политики.\n\n'
+                        '2.2. Цели сбора и обработки персональных данных включают, без ограничений, следующие:\n\n'
+                        '2.2.1. регистрацию, идентификацию и авторизацию Пользователя в рамках Сервиса Be Happy;\n'
+                        '2.2.2. заключение и исполнение Пользовательского соглашения и Договора присоединения;\n'
+                        '2.2.3. предоставление Пользователю Сервиса Be Happy, а также любого дополнительного функционала в рамках Сервиса Be Happy;\n'
+                        '2.2.4. обработка запросов Пользователей Компанией в рамках Сервиса Be Happy;\n'
+                        '2.2.5. анализ и исследования возможностей улучшения Сервиса Be Happy;\n'
+                        '2.2.6. рассылка новостей и информации о продуктах, услугах, специальных предложениях, связанных с Сервисом Be Happy;\n'
+                        '2.2.7. рассылка служебных сообщений (например, для информирования о статусе аренды самоката, восстановления/изменения логина и пароля Пользователя и пр.);\n'
+                        '2.2.8. предотвращение и выявление мошенничества и незаконного использования Сервиса Be Happy;\n'
+                        '2.2.9. проведение статистических и иных исследований на основе обезличенных данных.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('3. Условия, способы и порядок обработки персональных данных и иной персональной информации Пользователя\n'),
+                      _buildParagraph(
+                        '3.1. Компания использует персональные данные и иную информацию Пользователя только для целей, указанных в Политике и в соответствии с Политикой.\n\n'
+                        '3.2. В отношении персональных данных и иной информации Пользователя Компанией соблюдается конфиденциальность.\n\n'
+                        '3.3. Компания не будет раскрывать третьим лицам, распространять, продавать или иным образом распоряжаться полученными персональными данными и иной информацией, кроме как для целей, способами и в пределах, предусмотренных настоящей Политикой.\n\n'
+                        '3.4. Обработка персональных и иных данных Пользователя осуществляется Компанией в объеме, который необходим для достижения каждой из целей, указанных в разделе 2 Политики, следующими возможными способами: сбор, запись (в том числе на электронные носители), систематизация, накопление, хранение, составление перечней, маркировка, уточнение (обновление, изменение), извлечение, использование, передача (распространение, предоставление, доступ), обезличивание, блокирование, удаление, уничтожение, трансграничная передача персональных данных, получение изображения путем фотографирования, а также осуществление любых иных действий с персональными данными Пользователя с учетом применимого права. Компания вправе осуществлять обработку персональных и иных данных Пользователя как с использованием автоматизированных средств обработки персональных данных Пользователя, так и без использования средств автоматизации.\n\n'
+                        '3.5. Компания вправе передавать предоставленные ей Пользователем персональные данные для их обработки (давать поручение на обработку) (в объеме, необходимом для выполнения Компанией своих обязательств) третьим лицам, в том числе, организациям, которые привлекаются Компанией для осуществления информационной отправки сообщений посредством электронной почты/операторов мобильной связи, осуществляют списание/зачисление денежных средств с/на банковской(-ую) карты(- у)/расчетный счет - кредитным организациям (банкам), платежным системам, операторам мобильной связи, курьерским службам, организациями почтовой связи, включая трансграничную передачу персональных данных Пользователя в письменной либо электронной форме, в случаях и в порядке, предусмотренном соответствующими договорами с указанными третьими лицами, правилами Компании, применимым правом.\n\n'
+                        '3.6. Компания также вправе передавать предоставленные ей Пользователем персональные данные государственным органам, суду, иным уполномоченным органам и организациям, в случаях и в порядке, когда это требуется в соответствии с применяемым к Политике правом.\n\n'
+                        '3.7. Компания гарантирует добросовестную и законную обработку персональных и иных данных Пользователя в соответствии с предусмотренными в разделе 2 Политики целями.\n\n'
+                        '3.8. Компания гарантирует незамедлительное обновление данных Пользователя в случае предоставления им обновленных данных.\n\n'
+                        '3.9. Согласие на обработку персональных данных и иных данных дается Пользователем на бессрочной основе, либо до истечения сроков хранения соответствующей информации или документов, содержащих вышеуказанную информацию, определяемых в соответствии с применимым к Политике правом. По истечении указанного срока персональные данные подлежат уничтожению Компанией.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('4. Изменение или удаление информации Пользователем. Отзыв согласия на обработку персональных данных\n\n'),
+                      _buildParagraph(
+                        '4.1. Пользователь может в любой момент изменить (обновить, дополнить) предоставленные им персональные данные и иную информацию обратившись к Компании, например, через службу поддержки или с использованием контактов, указанных на Сайте, в Приложении Be Happy с запросом об изменении (обновлении, дополнении) предоставленной им ранее информации (Компания изменяет (обновляет, дополняет) предоставленную Пользователем информацию только после проведения применяемой в Компании на момент соответствующего обращения процедурой идентификации Пользователя).\n\n'
+                        '4.2. Пользователь вправе отозвать свое согласие на обработку персональных данных путем направления соответствующего письменного уведомления Компании не менее чем за 30 (тридцать календарных) дней до момента отзыва согласия, при этом Пользователь признает и понимает, что доступ к пользованию Сервисами Сайта и Приложения Be Happy, Сервису Be Happy не будет предоставляться Компанией с того момента, когда Компания лишилась возможности обрабатывать персональные данные Пользователя.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('5. Защита информации Пользователей\n'),
+                      _buildParagraph(
+                        '5.1. Компания обеспечивает принятие необходимых и достаточных организационных и технических мер для защиты персональных данных и иной информации Пользователей от неправомерного или случайного доступа, уничтожения, изменения, блокирования, копирования, распространения, а также от иных неправомерных действий с ней третьих лиц.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('6. Файлы cookies и tracking bugs\n'),
+                      _buildParagraph(
+                        '6.1. Для улучшения качества предоставления Сервиса Be Happy Компания может использовать (временные и постоянные) cookie-файлы, tracking bugs и/или другие технологии сбора не носящих личный характер данных (например, IP-адрес, тип браузера и данные о провайдере службы Интернет (ISP), а также (для Пользователей, которые пользуются услугами Компании через мобильное устройство), уникальный идентификатор устройства, данные об операционной системе и координаты с целью учёта количества Пользователей и их поведения при пользовании Сервисом Be Happy. Для повышения удобства Пользователей Компания вправе собирать и обрабатывать информацию об общем количестве операций, страниц, просмотренных Пользователем, ссылающихся/исходных страниц, типе платформы, дате/времени фиксирования информации, количестве и месте просмотров данной страницы, просмотра страницы и использованных (поисковых) слов.\n\n'
+                        '6.2. Информация о cookies и tracking bugs:\n\n'
+                        '6.2.1.Файл «cookie» - небольшой текстовый файл, отправляемый на браузер устройства Пользователя с используемого Компанией сервера. Cookies содержат информацию, которая позже может быть использована Компанией. Браузер будет хранить эту информацию и передавать ее обратно с каждым запросом Пользователя Компании. Одни значения cookies могут храниться только в течение одной сессии и удаляются после закрытия браузера. Другие, установленные на некоторый период времени, записываются в специальный файл на жестком диске и хранятся на устройстве Пользователя. Cookies используются для идентификации, отслеживания сессий (поддержания состояния) и сохранения информации о Пользователе, включая предпочтения при пользовании Сервисом Be Happy. Используемые Компанией сookies собирают только анонимные данные.\n\n'
+                        '6.2.2. Файл tracking bugs - это графические объекты, встроенные в веб-страницы или в сообщения e-mail. Tracking bugs используются с различными целями включные отчёты о количестве Пользователей. Используемые Компанией tracking bugs собирают только анонимные данные.\n\n'
+                        '6.3. Компания может использовать cookies и tracking bugs в целях контроля использования Сервиса Be Happy,сбора информации неличного характера о Пользователе, сохранения предпочтений и другой информации на устройстве Пользователя для того, чтобы сэкономить время Пользователя, необходимое для многократного введения в формах Сайта, Приложения Be Happy одной и той же информации, а также в целях отображения содержания в ходе последующих посещений Пользователем Сайта, Приложения Be Happy. Информация, полученная посредством cookies и tracking bugs, также может использоваться Компанией для статистических исследований, направленных на корректировку содержания Сайта, Приложения Be Happy в соответствии с предпочтениями Пользователя.\n\n'
+                        '6.4. Компания может предоставить Пользователю возможность изменить настройки приема файлов cookies и tracking bugs в настройках своего браузера или отключить их полностью, однако в таком случае некоторые функции Сервиса Be Happy могут работать некорректно.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('7. Внесение изменений в Политику. Согласие Пользователя с Политикой\n'),
+                      _buildParagraph(
+                        '7.1. Пользователь признает и соглашается, что регистрация Пользователя на Сайте, в Приложении Be Happy и последующее использование Сервиса Be Happy, любых его служб, функционала означает безоговорочное согласие Пользователя со всеми пунктами настоящей Политики и безоговорочное принятие ее условий.\n\n'
+                        '7.2. Продолжение Пользователем использования Сервиса Be Happy после любых изменений и/или дополнений Политики означает его согласие с такими изменениями и/или дополнениями.\n\n'
+                        '7.3. Пользователь обязуется регулярно знакомиться с содержанием Политики в целях своевременного ознакомления с ее изменениями/дополнениями.\n\n'
+                        '7.4. Компания оставляет за собой право по своему усмотрению изменять и (или) дополнять Политику в любое время без предварительного и (или) последующего уведомления Пользователя. Новая редакция Политики вступает в силу с момента ее размещения на Сайте и/или в Приложении Be Happy, если иное не предусмотрено новой редакцией Политики. Действующая редакция Политики всегда доступна на Сайте и/или в Приложении Be Happy.\n\n'
+                        'Уважаемый Пользователь, если Вы не согласны с положениями Политики, откажитесь от использования Сайта, Приложения Be Happy, Сервиса Be Happy.',
+                      ),
+
+                      const SizedBox(height: 24),
+
+                      _buildSectionHeader('8. Заключительные положения\n'),
+                      _buildParagraph(
+                        '8.1. К Политике и возникающими в связи с применением Политики отношениям между Пользователями и Компанией подлежит применению право Республики Беларусь.\n\n'
+                        '8.2. Все возможные споры по поводу настоящей Политики конфиденциальности и отношений между пользователем и Сервисом будут разрешаться по нормам белорусского права в суде по месту нахождения Администрации сайта, если иное прямо не предусмотрено законодательством РБ.\n\n'
+                        '8.3. Соглашаясь с условиями Политики, Пользователь дает согласие на обработку персональных и иных данных своей волей и в своем интересе.\n\n'
+                        '8.4. Отказ от предоставления персональных данных и иной необходимой для использования Сайта, Приложения Be Happy, Сервиса Be Happy информации влечет невозможность для Компании предоставлять Пользователю Сервиса Be Happy.',
+                      ),
+
+                      const SizedBox(height: 32),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildParagraph(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Color(0xFFD1D1D6), 
+        fontSize: 14,
+        height: 1.5,
+      ),
+    );
+  }
+
+  Widget _buildSectionHeader(String text) {
+    return Text(
+      text,
+      style: const TextStyle(
+        color: Colors.white,
+        fontSize: 16,
+        fontWeight: FontWeight.bold,
+        height: 1.4,
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/profile_screen.dart b/lib/presentation/screens/profile_screen.dart
index 916b3fd..52504ea 100644
--- a/lib/presentation/screens/profile_screen.dart
+++ b/lib/presentation/screens/profile_screen.dart
@@ -1,373 +1,373 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:image_picker/image_picker.dart';
-import 'dart:io';
-import '../../core/app_colors.dart';
-import '../../domain/entities/user_profile.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../viewmodel/profile_bloc.dart';
-import 'edit_profile_screen.dart';
-
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../state/profile_state.dart';
-import '../event/profile_event.dart';
-
-class ProfileScreen extends StatefulWidget {
-  const ProfileScreen({super.key});
-
-  @override
-  State<ProfileScreen> createState() => _ProfileScreenState();
-}
-
-class _ProfileScreenState extends State<ProfileScreen> {
-  bool notificationsEnabled = false;
-  XFile? _avatarImage;
-
-  Future<void> _pickImage() async {
-    try {
-      final pickedImage = await ImagePicker().pickImage(
-        source: ImageSource.gallery,
-      );
-
-      if (pickedImage == null) return;
-
-      context.read<ProfileBloc>().add(
-        ProfilePhotoUpdated(File(pickedImage.path)),
-      );
-
-    } catch (e) {
-      print("Error picking or uploading image: $e");
-    }
-  }
-
-  Future<void> _openEditProfile(UserProfile profile) async {
-    context.go("/home/profile/edit"); 
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(
-          gradient: AppColors.phoneScreenBg,
-        ),
-        child: SafeArea(
-          child: BlocBuilder<ProfileBloc, ProfileState>(
-            builder: (context, state) {
-              if (state.isLoading) {
-                return const Center(
-                  child: CircularProgressIndicator(color: Colors.white),
-                );
-              }
-
-              if (state.error != null) {
-                return Center(
-                  child: Text(
-                    state.error!,
-                    style: const TextStyle(color: Colors.white),
-                  ),
-                );
-              }
-
-              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,
-                                    ),
-                                  )
-                                      : null,
-                                ),
-
-                                GestureDetector(
-                                  onTap: _pickImage,
-                                  child: Container(
-                                    child: Image.asset(
-                                      'assets/icons/edit.png',
-                                      width: 24,
-                                      height: 24,
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-
-                            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),
-                            // ),
-                          ],
-                        ),
-                      ),
-                    ),
-                  );
-                },
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _ProfileInfoRow extends StatelessWidget {
-  final IconData icon;
-  final String value;
-  final Widget? trailing;
-
-  const _ProfileInfoRow({
-    required this.icon,
-    required this.value,
-    this.trailing,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 10),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          Icon(icon, size: 20, color: Colors.white),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Text(
-              value,
-              style: const TextStyle(
-                color: Colors.white,
-                fontSize: 14,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          if (trailing != null) ...[const SizedBox(width: 8), trailing!],
-        ],
-      ),
-    );
-  }
-}
-
-class _ProfileInfoBlock extends StatelessWidget {
-  final UserProfile profile;
-  final VoidCallback onEditTap;
-
-  const _ProfileInfoBlock({required this.profile, required this.onEditTap});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Color(0xFF141530),
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Text(
-            'Личные данные',
-            style: TextStyle(
-              color: Colors.white,
-              fontSize: 16,
-              fontWeight: FontWeight.w600,
-            ),
-          ),
-
-          const SizedBox(height: 16),
-
-          _ProfileInfoRow(icon: Icons.person, value: profile.name),
-          _ProfileInfoRow(icon: Icons.calendar_today, value: profile.birthDate),
-          _ProfileInfoRow(
-            icon: Icons.phone,
-            value: profile.phone,
-            trailing: const Icon(Icons.lock, color: Colors.white70, size: 16),
-          ),
-          _ProfileInfoRow(icon: Icons.email, value: profile.email),
-
-          const SizedBox(height: 8),
-
-          Align(
-            alignment: Alignment.center,
-            child: OutlinedButton(
-              onPressed: onEditTap,
-              style: OutlinedButton.styleFrom(
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(24),
-                ),
-                side: BorderSide(color: AppColors.smsDigit.withOpacity(0.3)),
-                padding: const EdgeInsets.symmetric(
-                  horizontal: 16,
-                  vertical: 8,
-                ),
-              ),
-              child: Row(
-                mainAxisSize: MainAxisSize.max,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Text(
-                    'Редактировать',
-                    style: TextStyle(color: Colors.white, fontSize: 14),
-                  ),
-                  const SizedBox(width: 4),
-                  Icon(Icons.edit, size: 16, color: AppColors.smsDigit),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _SettingsRow extends StatelessWidget {
-  final String title;
-  final String? value;
-  final Widget? trailing;
-  final VoidCallback? onTap;
-
-  const _SettingsRow({
-    required this.title,
-    this.value,
-    this.trailing,
-    this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      borderRadius: BorderRadius.circular(12),
-      child: SizedBox(
-        height: 48,
-        child: Row(
-          children: [
-            Expanded(
-              child: Text(
-                title,
-                style: const TextStyle(color: Colors.white, fontSize: 14),
-              ),
-            ),
-
-            if (value != null)
-              Text(
-                value!,
-                style: const TextStyle(color: AppColors.white70, fontSize: 13),
-              ),
-
-            if (trailing != null) ...[const SizedBox(width: 8), trailing!],
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _SettingsBlock extends StatelessWidget {
-  final bool notificationsEnabled;
-  final ValueChanged<bool> onNotificationsChanged;
-
-  const _SettingsBlock({
-    required this.notificationsEnabled,
-    required this.onNotificationsChanged,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Color(0xFF141530),
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const Text(
-            'Настройки',
-            style: TextStyle(
-              color: Colors.white,
-              fontSize: 16,
-              fontWeight: FontWeight.w600,
-            ),
-          ),
-
-          const SizedBox(height: 16),
-
-          _SettingsRow(
-            title: 'Уведомления',
-            trailing: Transform.scale(
-              scale: 0.8,
-              child: Switch(
-                value: notificationsEnabled,
-                onChanged: onNotificationsChanged,
-                activeColor: AppColors.checkboxFill,
-              ),
-            ),
-          ),
-
-          _SettingsRow(
-            title: 'Тема приложения',
-            value: 'Системная',
-            trailing: const Icon(Icons.chevron_right, color: Colors.white70),
-            onTap: () {},
-          ),
-
-          _SettingsRow(
-            title: 'Язык',
-            value: 'Русский',
-            trailing: const Icon(Icons.chevron_right, color: Colors.white70),
-            onTap: () {},
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import 'dart:io';
+import '../../core/app_colors.dart';
+import '../../domain/entities/user_profile.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../viewmodel/profile_bloc.dart';
+import 'edit_profile_screen.dart';
+
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../state/profile_state.dart';
+import '../event/profile_event.dart';
+
+class ProfileScreen extends StatefulWidget {
+  const ProfileScreen({super.key});
+
+  @override
+  State<ProfileScreen> createState() => _ProfileScreenState();
+}
+
+class _ProfileScreenState extends State<ProfileScreen> {
+  bool notificationsEnabled = false;
+  XFile? _avatarImage;
+
+  Future<void> _pickImage() async {
+    try {
+      final pickedImage = await ImagePicker().pickImage(
+        source: ImageSource.gallery,
+      );
+
+      if (pickedImage == null) return;
+
+      context.read<ProfileBloc>().add(
+        ProfilePhotoUpdated(File(pickedImage.path)),
+      );
+
+    } catch (e) {
+      print("Error picking or uploading image: $e");
+    }
+  }
+
+  Future<void> _openEditProfile(UserProfile profile) async {
+    context.go("/home/profile/edit"); 
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(
+          gradient: AppColors.phoneScreenBg,
+        ),
+        child: SafeArea(
+          child: BlocBuilder<ProfileBloc, ProfileState>(
+            builder: (context, state) {
+              if (state.isLoading) {
+                return const Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                );
+              }
+
+              if (state.error != null) {
+                return Center(
+                  child: Text(
+                    state.error!,
+                    style: const TextStyle(color: Colors.white),
+                  ),
+                );
+              }
+
+              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,
+                                    ),
+                                  )
+                                      : null,
+                                ),
+
+                                GestureDetector(
+                                  onTap: _pickImage,
+                                  child: Container(
+                                    child: Image.asset(
+                                      'assets/icons/edit.png',
+                                      width: 24,
+                                      height: 24,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+
+                            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),
+                            // ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ProfileInfoRow extends StatelessWidget {
+  final IconData icon;
+  final String value;
+  final Widget? trailing;
+
+  const _ProfileInfoRow({
+    required this.icon,
+    required this.value,
+    this.trailing,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 10),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Icon(icon, size: 20, color: Colors.white),
+          const SizedBox(width: 12),
+          Expanded(
+            child: Text(
+              value,
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 14,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          if (trailing != null) ...[const SizedBox(width: 8), trailing!],
+        ],
+      ),
+    );
+  }
+}
+
+class _ProfileInfoBlock extends StatelessWidget {
+  final UserProfile profile;
+  final VoidCallback onEditTap;
+
+  const _ProfileInfoBlock({required this.profile, required this.onEditTap});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Color(0xFF141530),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text(
+            'Личные данные',
+            style: TextStyle(
+              color: Colors.white,
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+
+          const SizedBox(height: 16),
+
+          _ProfileInfoRow(icon: Icons.person, value: profile.name),
+          _ProfileInfoRow(icon: Icons.calendar_today, value: profile.birthDate),
+          _ProfileInfoRow(
+            icon: Icons.phone,
+            value: profile.phone,
+            trailing: const Icon(Icons.lock, color: Colors.white70, size: 16),
+          ),
+          _ProfileInfoRow(icon: Icons.email, value: profile.email),
+
+          const SizedBox(height: 8),
+
+          Align(
+            alignment: Alignment.center,
+            child: OutlinedButton(
+              onPressed: onEditTap,
+              style: OutlinedButton.styleFrom(
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(24),
+                ),
+                side: BorderSide(color: AppColors.smsDigit.withOpacity(0.3)),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 8,
+                ),
+              ),
+              child: Row(
+                mainAxisSize: MainAxisSize.max,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    'Редактировать',
+                    style: TextStyle(color: Colors.white, fontSize: 14),
+                  ),
+                  const SizedBox(width: 4),
+                  Icon(Icons.edit, size: 16, color: AppColors.smsDigit),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _SettingsRow extends StatelessWidget {
+  final String title;
+  final String? value;
+  final Widget? trailing;
+  final VoidCallback? onTap;
+
+  const _SettingsRow({
+    required this.title,
+    this.value,
+    this.trailing,
+    this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: SizedBox(
+        height: 48,
+        child: Row(
+          children: [
+            Expanded(
+              child: Text(
+                title,
+                style: const TextStyle(color: Colors.white, fontSize: 14),
+              ),
+            ),
+
+            if (value != null)
+              Text(
+                value!,
+                style: const TextStyle(color: AppColors.white70, fontSize: 13),
+              ),
+
+            if (trailing != null) ...[const SizedBox(width: 8), trailing!],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _SettingsBlock extends StatelessWidget {
+  final bool notificationsEnabled;
+  final ValueChanged<bool> onNotificationsChanged;
+
+  const _SettingsBlock({
+    required this.notificationsEnabled,
+    required this.onNotificationsChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Color(0xFF141530),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const Text(
+            'Настройки',
+            style: TextStyle(
+              color: Colors.white,
+              fontSize: 16,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+
+          const SizedBox(height: 16),
+
+          _SettingsRow(
+            title: 'Уведомления',
+            trailing: Transform.scale(
+              scale: 0.8,
+              child: Switch(
+                value: notificationsEnabled,
+                onChanged: onNotificationsChanged,
+                activeColor: AppColors.checkboxFill,
+              ),
+            ),
+          ),
+
+          _SettingsRow(
+            title: 'Тема приложения',
+            value: 'Системная',
+            trailing: const Icon(Icons.chevron_right, color: Colors.white70),
+            onTap: () {},
+          ),
+
+          _SettingsRow(
+            title: 'Язык',
+            value: 'Русский',
+            trailing: const Icon(Icons.chevron_right, color: Colors.white70),
+            onTap: () {},
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/promo_code_screen.dart b/lib/presentation/screens/promo_code_screen.dart
index 7cccae9..ce11aab 100644
--- a/lib/presentation/screens/promo_code_screen.dart
+++ b/lib/presentation/screens/promo_code_screen.dart
@@ -1,186 +1,186 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../core/app_colors.dart';
-import '../../di/service_locator.dart';
-import '../../domain/usecase/apply_promo_code_usecase.dart';
-import '../components/custom_app_bar.dart';
-import '../event/promo_code_event.dart';
-import '../state/promo_code_state.dart';
-import '../viewmodel/promo_code_bloc.dart';
-
-class PromoCodeScreen extends StatelessWidget {
-  const PromoCodeScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => PromoCodeBloc(getIt<ApplyPromoCodeUsecase>()),
-      child: const _PromoCodeScreenContent(),
-    );
-  }
-}
-
-class _PromoCodeScreenContent extends StatefulWidget {
-  const _PromoCodeScreenContent();
-
-  @override
-  State<_PromoCodeScreenContent> createState() => _PromoCodeScreenContentState();
-}
-
-class _PromoCodeScreenContentState extends State<_PromoCodeScreenContent> {
-  final TextEditingController promoController = TextEditingController();
-
-  @override
-  void dispose() {
-    promoController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Column(
-            children: [
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 16),
-                      CustomAppBar(title: 'Промокоды'),
-                      const SizedBox(height: 32),
-
-                      // 🔹 LISTENER: Только сайд-эффекты (SnackBar, навигация)
-                      BlocListener<PromoCodeBloc, PromoCodeState>(
-                        listener: (context, state) {
-                          if (state.status == PromoCodeStatus.success) {
-                            promoController.clear();
-                            Future.delayed(const Duration(milliseconds: 800), () {
-                              if (mounted) Navigator.pop(context);
-                            });
-                          }
-                        },
-                        child: BlocBuilder<PromoCodeBloc, PromoCodeState>(
-                          builder: (context, state) {
-                            final bool hasError = state.status == PromoCodeStatus.failure;
-                            final bool isLoading = state.status == PromoCodeStatus.loading;
-
-                            return Container(
-                              padding: const EdgeInsets.all(25),
-                              decoration: BoxDecoration(
-                                color: const Color(0xFF141530),
-                                borderRadius: BorderRadius.circular(16),
-                              ),
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  const Text(
-                                    'У вас есть промокод?',
-                                    style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
-                                  ),
-                                  const SizedBox(height: 24),
-                                  const Text(
-                                    'Введите промокод и получите скидку на поездку',
-                                    style: TextStyle(color: AppColors.white70, fontSize: 16),
-                                  ),
-                                  const SizedBox(height: 20),
-
-                                  TextField(
-                                    controller: promoController,
-                                    enabled: !isLoading,
-                                    style: TextStyle(color: hasError ? Colors.red : Colors.white),
-                                    decoration: InputDecoration(
-                                      hintText: 'Введите промокод',
-                                      hintStyle: const TextStyle(color: AppColors.white70),
-                                      filled: true,
-                                      fillColor: Colors.white.withOpacity(0.1),
-                                      border: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(24),
-                                        borderSide: BorderSide.none,
-                                      ),
-                                      enabledBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(24),
-                                        borderSide: BorderSide.none,
-                                      ),
-                                      focusedBorder: OutlineInputBorder(
-                                        borderRadius: BorderRadius.circular(24),
-                                        borderSide: BorderSide(
-                                          color: hasError ? Colors.red : AppColors.smsDigit,
-                                          width: 1.5,
-                                        ),
-                                      ),
-                                      // ✅ Явно убираем ошибку при успехе
-                                      errorText: hasError ? 'Неверный промокод' : null,
-                                    ),
-                                    onSubmitted: (_) => _submit(context),
-                                  ),
-                                  const SizedBox(height: 20),
-
-                                  Row(
-                                    children: [
-                                      Expanded(
-                                        child: OutlinedButton(
-                                          onPressed: isLoading ? null : () => Navigator.pop(context),
-                                          style: OutlinedButton.styleFrom(
-                                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
-                                            side: BorderSide(color: AppColors.white70.withOpacity(0.4)),
-                                            padding: const EdgeInsets.symmetric(vertical: 12),
-                                          ),
-                                          child: const Text('Отмена', style: TextStyle(color: AppColors.white70)),
-                                        ),
-                                      ),
-                                      const SizedBox(width: 22),
-                                      Expanded(
-                                        child: ElevatedButton(
-                                          onPressed: isLoading ? null : () => _submit(context),
-                                          style: ElevatedButton.styleFrom(
-                                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
-                                            backgroundColor: AppColors.activeButtonGradient.colors[0],
-                                            padding: const EdgeInsets.symmetric(vertical: 12),
-                                          ),
-                                          child: isLoading
-                                              ? const SizedBox(
-                                            width: 20,
-                                            height: 20,
-                                            child: CircularProgressIndicator(color: AppColors.activeButtonText, strokeWidth: 2),
-                                          )
-                                              : const Text('Активировать', style: TextStyle(color: AppColors.activeButtonText)),
-                                        ),
-                                      ),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            );
-                          },
-                        ),
-                      ),
-                      const Spacer(),
-                    ],
-                  ),
-                ),
-              ),
-              Image.asset(
-                'assets/promo_bottom.png',
-                width: double.infinity,
-                fit: BoxFit.contain,
-                alignment: Alignment.center,
-              ),
-              const SizedBox(height: 80),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  void _submit(BuildContext context) {
-    final code = promoController.text.trim();
-    if (code.isEmpty) return;
-    context.read<PromoCodeBloc>().add(PromoCodeApplyRequested(code));
-  }
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../core/app_colors.dart';
+import '../../di/service_locator.dart';
+import '../../domain/usecase/apply_promo_code_usecase.dart';
+import '../components/custom_app_bar.dart';
+import '../event/promo_code_event.dart';
+import '../state/promo_code_state.dart';
+import '../viewmodel/promo_code_bloc.dart';
+
+class PromoCodeScreen extends StatelessWidget {
+  const PromoCodeScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => PromoCodeBloc(getIt<ApplyPromoCodeUsecase>()),
+      child: const _PromoCodeScreenContent(),
+    );
+  }
+}
+
+class _PromoCodeScreenContent extends StatefulWidget {
+  const _PromoCodeScreenContent();
+
+  @override
+  State<_PromoCodeScreenContent> createState() => _PromoCodeScreenContentState();
+}
+
+class _PromoCodeScreenContentState extends State<_PromoCodeScreenContent> {
+  final TextEditingController promoController = TextEditingController();
+
+  @override
+  void dispose() {
+    promoController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Column(
+            children: [
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Column(
+                    children: [
+                      const SizedBox(height: 16),
+                      CustomAppBar(title: 'Промокоды'),
+                      const SizedBox(height: 32),
+
+                      // 🔹 LISTENER: Только сайд-эффекты (SnackBar, навигация)
+                      BlocListener<PromoCodeBloc, PromoCodeState>(
+                        listener: (context, state) {
+                          if (state.status == PromoCodeStatus.success) {
+                            promoController.clear();
+                            Future.delayed(const Duration(milliseconds: 800), () {
+                              if (mounted) Navigator.pop(context);
+                            });
+                          }
+                        },
+                        child: BlocBuilder<PromoCodeBloc, PromoCodeState>(
+                          builder: (context, state) {
+                            final bool hasError = state.status == PromoCodeStatus.failure;
+                            final bool isLoading = state.status == PromoCodeStatus.loading;
+
+                            return Container(
+                              padding: const EdgeInsets.all(25),
+                              decoration: BoxDecoration(
+                                color: const Color(0xFF141530),
+                                borderRadius: BorderRadius.circular(16),
+                              ),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  const Text(
+                                    'У вас есть промокод?',
+                                    style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
+                                  ),
+                                  const SizedBox(height: 24),
+                                  const Text(
+                                    'Введите промокод и получите скидку на поездку',
+                                    style: TextStyle(color: AppColors.white70, fontSize: 16),
+                                  ),
+                                  const SizedBox(height: 20),
+
+                                  TextField(
+                                    controller: promoController,
+                                    enabled: !isLoading,
+                                    style: TextStyle(color: hasError ? Colors.red : Colors.white),
+                                    decoration: InputDecoration(
+                                      hintText: 'Введите промокод',
+                                      hintStyle: const TextStyle(color: AppColors.white70),
+                                      filled: true,
+                                      fillColor: Colors.white.withOpacity(0.1),
+                                      border: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(24),
+                                        borderSide: BorderSide.none,
+                                      ),
+                                      enabledBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(24),
+                                        borderSide: BorderSide.none,
+                                      ),
+                                      focusedBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(24),
+                                        borderSide: BorderSide(
+                                          color: hasError ? Colors.red : AppColors.smsDigit,
+                                          width: 1.5,
+                                        ),
+                                      ),
+                                      // ✅ Явно убираем ошибку при успехе
+                                      errorText: hasError ? 'Неверный промокод' : null,
+                                    ),
+                                    onSubmitted: (_) => _submit(context),
+                                  ),
+                                  const SizedBox(height: 20),
+
+                                  Row(
+                                    children: [
+                                      Expanded(
+                                        child: OutlinedButton(
+                                          onPressed: isLoading ? null : () => Navigator.pop(context),
+                                          style: OutlinedButton.styleFrom(
+                                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
+                                            side: BorderSide(color: AppColors.white70.withOpacity(0.4)),
+                                            padding: const EdgeInsets.symmetric(vertical: 12),
+                                          ),
+                                          child: const Text('Отмена', style: TextStyle(color: AppColors.white70)),
+                                        ),
+                                      ),
+                                      const SizedBox(width: 22),
+                                      Expanded(
+                                        child: ElevatedButton(
+                                          onPressed: isLoading ? null : () => _submit(context),
+                                          style: ElevatedButton.styleFrom(
+                                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
+                                            backgroundColor: AppColors.activeButtonGradient.colors[0],
+                                            padding: const EdgeInsets.symmetric(vertical: 12),
+                                          ),
+                                          child: isLoading
+                                              ? const SizedBox(
+                                            width: 20,
+                                            height: 20,
+                                            child: CircularProgressIndicator(color: AppColors.activeButtonText, strokeWidth: 2),
+                                          )
+                                              : const Text('Активировать', style: TextStyle(color: AppColors.activeButtonText)),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                      const Spacer(),
+                    ],
+                  ),
+                ),
+              ),
+              Image.asset(
+                'assets/promo_bottom.png',
+                width: double.infinity,
+                fit: BoxFit.contain,
+                alignment: Alignment.center,
+              ),
+              const SizedBox(height: 80),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _submit(BuildContext context) {
+    final code = promoController.text.trim();
+    if (code.isEmpty) return;
+    context.read<PromoCodeBloc>().add(PromoCodeApplyRequested(code));
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/qr_scan_info_screen.dart b/lib/presentation/screens/qr_scan_info_screen.dart
index 21868a6..67431d8 100644
--- a/lib/presentation/screens/qr_scan_info_screen.dart
+++ b/lib/presentation/screens/qr_scan_info_screen.dart
@@ -1,113 +1,113 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-
-class QRScanInfoScreen extends StatelessWidget {
-  const QRScanInfoScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        width: double.infinity,
-        decoration: const BoxDecoration(
-          gradient: AppColors.phoneScreenBg,
-        ),
-        child: SafeArea(
-          child: Column(
-            children: [
-              const SizedBox(height: 16),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-                child: CustomAppBar(title: "Сканирование QR-кода"),
-              ),
-
-              Expanded(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 30),
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 40),
-                      const Text(
-                        "Наведите рамку сканера на QR-код -\nномер будет распознан автоматически",
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                          color: AppColors.whiteText,
-                          fontSize: 16,
-                          height: 1.4,
-                        ),
-                      ),
-                      const Spacer(),
-                      Image.asset(
-                        "assets/qr_phone_img.png",
-                        height: 300,
-                        fit: BoxFit.contain,
-                      ),
-                      const Spacer(),
-
-                      Container(
-                        width: double.infinity,
-                        height: 56,
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(30),
-                          gradient: const LinearGradient(
-                            colors: [Color(0xFF8EFEB5), Color(0xFF86FEF1)],
-                          ),
-                        ),
-                        child: ElevatedButton(
-                          onPressed: () {
-                            context.push("/home/qr-info/qr-scan");
-                          },
-                          style: ElevatedButton.styleFrom(
-                            backgroundColor: Colors.transparent,
-                            shadowColor: Colors.transparent,
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(30),
-                            ),
-                          ),
-                          child: const Text(
-                            "Продолжить",
-                            style: TextStyle(
-                              color: Color(0xFF1D273A),
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 16),
-
-                      // Кнопка "Ввести номер вручную"
-                      SizedBox(
-                        width: double.infinity,
-                        height: 56,
-                        child: OutlinedButton(
-                          onPressed: () => context.push("/home/qr-info/qr-input"),
-                          style: OutlinedButton.styleFrom(
-                            side: const BorderSide(color: Colors.white70),
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(30),
-                            ),
-                          ),
-                          child: const Text(
-                            "Ввести номер вручную",
-                            style: TextStyle(
-                              color: AppColors.whiteText,
-                              fontSize: 16,
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 40),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+
+class QRScanInfoScreen extends StatelessWidget {
+  const QRScanInfoScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        decoration: const BoxDecoration(
+          gradient: AppColors.phoneScreenBg,
+        ),
+        child: SafeArea(
+          child: Column(
+            children: [
+              const SizedBox(height: 16),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: CustomAppBar(title: "Сканирование QR-кода"),
+              ),
+
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 30),
+                  child: Column(
+                    children: [
+                      const SizedBox(height: 40),
+                      const Text(
+                        "Наведите рамку сканера на QR-код -\nномер будет распознан автоматически",
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          color: AppColors.whiteText,
+                          fontSize: 16,
+                          height: 1.4,
+                        ),
+                      ),
+                      const Spacer(),
+                      Image.asset(
+                        "assets/qr_phone_img.png",
+                        height: 300,
+                        fit: BoxFit.contain,
+                      ),
+                      const Spacer(),
+
+                      Container(
+                        width: double.infinity,
+                        height: 56,
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(30),
+                          gradient: const LinearGradient(
+                            colors: [Color(0xFF8EFEB5), Color(0xFF86FEF1)],
+                          ),
+                        ),
+                        child: ElevatedButton(
+                          onPressed: () {
+                            context.push("/home/qr-info/qr-scan");
+                          },
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Colors.transparent,
+                            shadowColor: Colors.transparent,
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(30),
+                            ),
+                          ),
+                          child: const Text(
+                            "Продолжить",
+                            style: TextStyle(
+                              color: Color(0xFF1D273A),
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+
+                      // Кнопка "Ввести номер вручную"
+                      SizedBox(
+                        width: double.infinity,
+                        height: 56,
+                        child: OutlinedButton(
+                          onPressed: () => context.push("/home/qr-info/qr-input"),
+                          style: OutlinedButton.styleFrom(
+                            side: const BorderSide(color: Colors.white70),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(30),
+                            ),
+                          ),
+                          child: const Text(
+                            "Ввести номер вручную",
+                            style: TextStyle(
+                              color: AppColors.whiteText,
+                              fontSize: 16,
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 40),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/qr_scan_screen.dart b/lib/presentation/screens/qr_scan_screen.dart
index 11ae6fa..b8ee349 100644
--- a/lib/presentation/screens/qr_scan_screen.dart
+++ b/lib/presentation/screens/qr_scan_screen.dart
@@ -1,221 +1,249 @@
-import 'dart:ui' as ui;
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/scooter.dart';
-import 'package:flutter/material.dart';
-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 {
-  const QrScanScreen({super.key});
-
-  @override
-  State<QrScanScreen> createState() => _QrScanScreenState();
-}
-
-class _QrScanScreenState extends State<QrScanScreen> {
-  final MobileScannerController _controller = MobileScannerController();
-  String? _scannedData;
-  String? _scooterTitle;
-  bool _torchOn = false;
-  bool _isLoading = false;
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-  bool _isProcessing = false;
-
-  void _handleScannedData(String rawValue) async {
-    if (_isProcessing || _isLoading) return;
-
-    final uri = Uri.tryParse(rawValue);
-    if (uri == null || uri.host != 'behappybel.by') return;
-
-    final title = uri.pathSegments.last;
-    print("TITLE IS: $title");
-    if (title.isEmpty) return;
-
-    setState(() {
-      _isProcessing = true;
-      _isLoading = true;
-    });
-
-    await _controller.stop();
-
-    try {
-      final getScooterByTitleUsecase = getIt<GetScooterByTitleUsecase>();
-      print("UseCase успешно получен из DI");
-      final result = await getScooterByTitleUsecase(title);
-      print("UseCase успешно выполнен");
-
-
-      if (mounted) {
-        setState(() => _isLoading = false);
-
-        switch (result) {
-          case Success<Scooter?>():
-            final scooter = result.data;
-            if (scooter != null) {
-              context.pop();
-              context.push('/home/scooter/${scooter.id}');
-
-            } else {
-              _showErrorAndRestart('Самокат не найден');
-            }
-          case Failure<Scooter?>():
-            _showErrorAndRestart('Ошибка при поиске самоката');
-        }
-      }
-    } catch (e) {
-      print("Ошибка DI: $e");
-    }
-  }
-
-  void _showErrorAndRestart(String message) {
-    ScaffoldMessenger.of(context).showSnackBar(
-      SnackBar(content: Text(message)),
-    );
-
-    Future.delayed(const Duration(seconds: 2), () {
-      if (mounted) {
-        setState(() {
-          _isProcessing = false;
-          _scannedData = null;
-        });
-        _controller.start();
-      }
-    });
-  }
-
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.black,
-      body: Stack(
-        children: [
-          MobileScanner(
-            controller: _controller,
-            onDetect: (capture) {
-              if (_isProcessing) return;
-              for (final barcode in capture.barcodes) {
-                final String? rawValue = barcode.rawValue;
-                if (rawValue != null) {
-                  _handleScannedData(rawValue);
-                  break;
-                }
-              }
-            },
-          ),
-
-          ColorFiltered(
-            colorFilter: ColorFilter.mode(
-              Colors.black.withOpacity(0.7),
-              BlendMode.srcOut,
-            ),
-            child: Stack(
-              children: [
-                Container(
-                  decoration: const BoxDecoration(
-                    color: Colors.black,
-                    backgroundBlendMode: BlendMode.dstOut,
-                  ),
-                ),
-                Center(
-                  child: Container(
-                    width: 280,
-                    height: 280,
-                    decoration: BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: BorderRadius.circular(0),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-
-          Center(
-            child: Container(
-              width: 280,
-              height: 280,
-              decoration: BoxDecoration(
-                border: Border.all(color: const Color(0xFF6EE7B7), width: 3),
-              ),
-            ),
-          ),
-
-          // ✅ ИЗМЕНЕНО: прижимаем аппбар к левому краю
-          SafeArea(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start, // ✅ Выравнивание по левому краю
-                children: [
-                  const SizedBox(height: 16),
-                  CustomAppBar(title: "Сканирование QR-кода"),
-                  const SizedBox(height: 60),
-                  const Text(
-                    'Наведите рамку на QR-код — номер будет распознан автоматически',
-                    textAlign: TextAlign.center, 
-                    style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                      shadows: [
-                        Shadow(blurRadius: 4, color: Colors.black),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-            ),
-
-          SafeArea(
-            child: Align(
-              alignment: Alignment.bottomCenter,
-              child: Padding(
-                padding: const EdgeInsets.all(20),
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: GradientButton(
-                        text: 'Ввести номер вручную',
-                        onTap: () {
-                          context.push('/home/qr-info/qr-input');
-                        },
-                        width: double.infinity,
-                        height: 56,
-                        fontSize: 16,
-                        showArrows: true,
-                      ),
-                    ),
-                    const SizedBox(width: 12),
-                    CircleAvatar(
-                      backgroundColor: Colors.black.withOpacity(0.5),
-                      child: IconButton(
-                        onPressed: () async {
-                          final newState = !_torchOn;
-                          await _controller.toggleTorch();
-                          setState(() => _torchOn = newState);
-                        },
-                        icon: Icon(
-                          _torchOn ? Icons.flashlight_on : Icons.flashlight_off,
-                          color: Colors.white,
-                          size: 24,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+import 'dart:ui' as ui;
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/scooter.dart';
+import 'package:be_happy/domain/usecase/get_address_by_point_usecase.dart';
+import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
+import 'package:flutter/material.dart';
+import 'package:geolocator/geolocator.dart';
+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';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+
+class QrScanScreen extends StatefulWidget {
+  const QrScanScreen({super.key});
+
+  @override
+  State<QrScanScreen> createState() => _QrScanScreenState();
+}
+
+class _QrScanScreenState extends State<QrScanScreen> {
+  final MobileScannerController _controller = MobileScannerController();
+  String? _scannedData;
+  String? _scooterTitle;
+  bool _torchOn = false;
+  bool _isLoading = false;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+  bool _isProcessing = false;
+
+  void _handleScannedData(String rawValue) async {
+    if (_isProcessing || _isLoading) return;
+
+    final uri = Uri.tryParse(rawValue);
+    if (uri == null || uri.host != 'behappybel.by') return;
+
+    final title = uri.pathSegments.last;
+    print("TITLE IS: $title");
+    if (title.isEmpty) return;
+
+    setState(() {
+      _isProcessing = true;
+      _isLoading = true;
+    });
+
+    await _controller.stop();
+
+    try {
+      final getScooterByTitleUsecase = getIt<GetScooterByTitleUsecase>();
+      final getAddressByPointUsecase = getIt<GetAddressByPointUsecase>();
+      final getPedestrianRoutesUsecase = getIt<GetPedestrianRoutesUsecase>();
+      final result = await getScooterByTitleUsecase(title);
+
+
+      if (mounted) {
+        setState(() => _isLoading = false);
+
+        switch (result) {
+          case Success<Scooter?>():
+            final scooter = result.data;
+
+            final String currentAddress = await getAddressByPointUsecase(
+              scooter!.longitude,
+              scooter.latitude,
+            );
+
+            final position = await Geolocator.getCurrentPosition(
+              desiredAccuracy: LocationAccuracy.high,
+            );
+
+            final routes = await getPedestrianRoutesUsecase(
+              Point(latitude: position.latitude, longitude: position.longitude),
+              Point(latitude: scooter.longitude, longitude: scooter.latitude),
+            );
+
+            final distance =
+                routes?.firstOrNull?.metadata.weight.walkingDistance.value;
+            print("Distance is: $distance");
+            final time = routes?.firstOrNull?.metadata.weight.time.value;
+
+            scooter.timeToTravel = time;
+            scooter.distance = distance;
+
+            if (scooter != null) {
+              context.pop();
+              context.push('/home/scooter/${scooter.id}', extra: [currentAddress, distance]);
+
+            } else {
+              _showErrorAndRestart('Самокат не найден');
+            }
+          case Failure<Scooter?>():
+            _showErrorAndRestart('Ошибка при поиске самоката');
+        }
+      }
+    } catch (e) {
+      print("Ошибка DI: $e");
+    }
+  }
+
+  void _showErrorAndRestart(String message) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(message)),
+    );
+
+    Future.delayed(const Duration(seconds: 2), () {
+      if (mounted) {
+        setState(() {
+          _isProcessing = false;
+          _scannedData = null;
+        });
+        _controller.start();
+      }
+    });
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.black,
+      body: Stack(
+        children: [
+          MobileScanner(
+            controller: _controller,
+            onDetect: (capture) {
+              if (_isProcessing) return;
+              for (final barcode in capture.barcodes) {
+                final String? rawValue = barcode.rawValue;
+                if (rawValue != null) {
+                  _handleScannedData(rawValue);
+                  break;
+                }
+              }
+            },
+          ),
+
+          ColorFiltered(
+            colorFilter: ColorFilter.mode(
+              Colors.black.withOpacity(0.7),
+              BlendMode.srcOut,
+            ),
+            child: Stack(
+              children: [
+                Container(
+                  decoration: const BoxDecoration(
+                    color: Colors.black,
+                    backgroundBlendMode: BlendMode.dstOut,
+                  ),
+                ),
+                Center(
+                  child: Container(
+                    width: 280,
+                    height: 280,
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.circular(0),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          Center(
+            child: Container(
+              width: 280,
+              height: 280,
+              decoration: BoxDecoration(
+                border: Border.all(color: const Color(0xFF6EE7B7), width: 3),
+              ),
+            ),
+          ),
+
+          // ✅ ИЗМЕНЕНО: прижимаем аппбар к левому краю
+          SafeArea(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start, // ✅ Выравнивание по левому краю
+                children: [
+                  const SizedBox(height: 16),
+                  CustomAppBar(title: "Сканирование QR-кода"),
+                  const SizedBox(height: 60),
+                  const Text(
+                    'Наведите рамку на QR-код — номер будет распознан автоматически',
+                    textAlign: TextAlign.center, 
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                      shadows: [
+                        Shadow(blurRadius: 4, color: Colors.black),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+
+          SafeArea(
+            child: Align(
+              alignment: Alignment.bottomCenter,
+              child: Padding(
+                padding: const EdgeInsets.all(20),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: GradientButton(
+                        text: 'Ввести номер вручную',
+                        onTap: () {
+                          context.push('/home/qr-info/qr-input');
+                        },
+                        width: double.infinity,
+                        height: 56,
+                        fontSize: 16,
+                        showArrows: true,
+                      ),
+                    ),
+                    const SizedBox(width: 12),
+                    CircleAvatar(
+                      backgroundColor: Colors.black.withOpacity(0.5),
+                      child: IconButton(
+                        onPressed: () async {
+                          final newState = !_torchOn;
+                          await _controller.toggleTorch();
+                          setState(() => _torchOn = newState);
+                        },
+                        icon: Icon(
+                          _torchOn ? Icons.flashlight_on : Icons.flashlight_off,
+                          color: Colors.white,
+                          size: 24,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/scooter_code_input_screen.dart b/lib/presentation/screens/scooter_code_input_screen.dart
index 083b059..16722ea 100644
--- a/lib/presentation/screens/scooter_code_input_screen.dart
+++ b/lib/presentation/screens/scooter_code_input_screen.dart
@@ -1,141 +1,141 @@
-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/code_dots.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../event/scooter_code_event.dart';
-import '../state/scooter_code_state.dart';
-import '../viewmodel/pin_bloc.dart';
-import '../event/pin_event.dart';
-import '../state/pin_state.dart';
-import '../viewmodel/scooter_code_bloc.dart';
-
-class ScooterCodeInputScreen extends StatefulWidget {
-  const ScooterCodeInputScreen({super.key});
-
-  @override
-  State<ScooterCodeInputScreen> createState() => _ScooterCodeInputScreenState();
-}
-
-class _ScooterCodeInputScreenState extends State<ScooterCodeInputScreen> {
-  final TextEditingController controller = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-    controller.addListener(_onTextChanged);
-  }
-
-  void _onTextChanged() {
-    context.read<ScooterCodeBloc>().add(ScooterCodeChanged(controller.text));
-  }
-
-  @override
-  void dispose() {
-    controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocListener<ScooterCodeBloc, ScooterCodeState>(
-      listener: (context, state) {
-        if (state is ScooterCodeSuccess) {
-          context.go("/home/scooter/${state.scooter.id}");
-        }
-        if (state is ScooterCodeFailure) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text(state.error ?? "Ошибка")),
-          );
-        }
-      },
-      child: Scaffold(
-          resizeToAvoidBottomInset: false,
-          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: CustomAppBar(title: "Ввод QR-кода"),
-      ),
-      Expanded(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 24),
-          child: BlocBuilder<ScooterCodeBloc, ScooterCodeState>(
-            builder: (context, state) {
-              final bool isCodeValid = state.code.length >= 5 && state.code.length <= 7;
-
-              return Column(
-                children: [
-                  const SizedBox(height: 60),
-                  const Text(
-                    "Введите номер, расположенный\nпод QR-кодом",
-                    textAlign: TextAlign.center,
-                    style: TextStyle(
-                      color: AppColors.whiteText,
-                      fontSize: 16,
-                      height: 1.4,
-                    ),
-                  ),
-
-                  const SizedBox(height: 80),
-
-                  TextField(
-                    controller: controller,
-                    keyboardType: TextInputType.text,
-                    maxLength: 7,
-                    textAlign: TextAlign.left,
-                    style: const TextStyle(color: Colors.white, fontSize: 18),
-                    decoration: InputDecoration(
-                      hintText: "Ввести номер",
-                      hintStyle: const TextStyle(color: AppColors.hint),
-                      counterText: "",
-                      filled: true,
-                      fillColor: Colors.white.withOpacity(0.1),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(24),
-                        borderSide: BorderSide.none,
-                      ),
-                    ),
-                  ),
-
-                  if (state is ScooterCodeLoading)
-                    const Padding(
-                      padding: EdgeInsets.only(top: 20),
-                      child: CircularProgressIndicator(color: Colors.white),
-                    ),
-
-                  const Spacer(),
-
-                  GradientButton(
-                    text: "Подтвердить",
-                    enabled: isCodeValid && state is! ScooterCodeLoading,
-                    onTap: () {
-                      context.read<ScooterCodeBloc>().add(
-                          ScooterCodeSubmitted(state.code),
-                      );
-                    },
-                    showArrows: true,
-                    height: 56,
-                    width: double.infinity,
-                  ),
-                  const SizedBox(height: 40),
-                ],
-              );
-            },
-          ),
-        ),
-      ),
-      ],
-    ),
-    ),
-    ),
-    ),
-    );
-  }
+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/code_dots.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../event/scooter_code_event.dart';
+import '../state/scooter_code_state.dart';
+import '../viewmodel/pin_bloc.dart';
+import '../event/pin_event.dart';
+import '../state/pin_state.dart';
+import '../viewmodel/scooter_code_bloc.dart';
+
+class ScooterCodeInputScreen extends StatefulWidget {
+  const ScooterCodeInputScreen({super.key});
+
+  @override
+  State<ScooterCodeInputScreen> createState() => _ScooterCodeInputScreenState();
+}
+
+class _ScooterCodeInputScreenState extends State<ScooterCodeInputScreen> {
+  final TextEditingController controller = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    controller.addListener(_onTextChanged);
+  }
+
+  void _onTextChanged() {
+    context.read<ScooterCodeBloc>().add(ScooterCodeChanged(controller.text));
+  }
+
+  @override
+  void dispose() {
+    controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<ScooterCodeBloc, ScooterCodeState>(
+      listener: (context, state) {
+        if (state is ScooterCodeSuccess) {
+          context.go("/home/scooter/${state.scooter.id}", extra: [state.address, state.distance]);
+        }
+        if (state is ScooterCodeFailure) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(state.error ?? "Ошибка")),
+          );
+        }
+      },
+      child: Scaffold(
+          resizeToAvoidBottomInset: false,
+          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: CustomAppBar(title: "Ввод QR-кода"),
+      ),
+      Expanded(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 24),
+          child: BlocBuilder<ScooterCodeBloc, ScooterCodeState>(
+            builder: (context, state) {
+              final bool isCodeValid = state.code.length >= 5 && state.code.length <= 7;
+
+              return Column(
+                children: [
+                  const SizedBox(height: 60),
+                  const Text(
+                    "Введите номер, расположенный\nпод QR-кодом",
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      color: AppColors.whiteText,
+                      fontSize: 16,
+                      height: 1.4,
+                    ),
+                  ),
+
+                  const SizedBox(height: 80),
+
+                  TextField(
+                    controller: controller,
+                    keyboardType: TextInputType.text,
+                    maxLength: 7,
+                    textAlign: TextAlign.left,
+                    style: const TextStyle(color: Colors.white, fontSize: 18),
+                    decoration: InputDecoration(
+                      hintText: "Ввести номер",
+                      hintStyle: const TextStyle(color: AppColors.hint),
+                      counterText: "",
+                      filled: true,
+                      fillColor: Colors.white.withOpacity(0.1),
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(24),
+                        borderSide: BorderSide.none,
+                      ),
+                    ),
+                  ),
+
+                  if (state is ScooterCodeLoading)
+                    const Padding(
+                      padding: EdgeInsets.only(top: 20),
+                      child: CircularProgressIndicator(color: Colors.white),
+                    ),
+
+                  const Spacer(),
+
+                  GradientButton(
+                    text: "Подтвердить",
+                    enabled: isCodeValid && state is! ScooterCodeLoading,
+                    onTap: () {
+                      context.read<ScooterCodeBloc>().add(
+                          ScooterCodeSubmitted(state.code),
+                      );
+                    },
+                    showArrows: true,
+                    height: 56,
+                    width: double.infinity,
+                  ),
+                  const SizedBox(height: 40),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+      ],
+    ),
+    ),
+    ),
+    ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/scooter_detail_screen.dart b/lib/presentation/screens/scooter_detail_screen.dart
index ec8df7e..28defdd 100644
--- a/lib/presentation/screens/scooter_detail_screen.dart
+++ b/lib/presentation/screens/scooter_detail_screen.dart
@@ -1,118 +1,118 @@
-import 'package:be_happy/presentation/event/scooter_detail_event.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../components/scooter/battery_indicator.dart';
-import '../components/scooter/scooter_info_section.dart';
-import '../components/scooter/slide_to_reserve_button.dart';
-import '../components/sheet/tariff_sheet.dart';
-import '../state/scooter_detail_state.dart';
-import '../viewmodel/scooter_detail_bloc.dart';
-
-class ScooterDetailScreen extends StatelessWidget {
-  final String address;
-  final double distance;
-  const ScooterDetailScreen({super.key, required this.address, required this.distance});
-
-  @override
-  Widget build(BuildContext context) {
-    final id = GoRouterState.of(context).pathParameters['id'];
-    context.read<ScooterDetailBloc>().add(LoadScooterDetails(int.parse(id!)));
-    return Scaffold(
-      body: BlocBuilder<ScooterDetailBloc, ScooterDetailState>(
-        builder: (context, state) {
-          if (state.status == ScooterStatus.loading) {
-            return const Center(child: CircularProgressIndicator(color: Colors.white));
-          }
-
-          if (state.status == ScooterStatus.failure) {
-            return Center(
-              child: Text(
-                state.errorMessage ?? 'Ошибка',
-                style: const TextStyle(color: Colors.white),
-              ),
-            );
-          }
-
-          final scooter = state.scooter;
-
-          return Stack(
-            children: [
-              Container(
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: [Color(0xFF1B2A4A), Color(0xFF0F1E3A)],
-                  ),
-                ),
-              ),
-
-              Positioned(
-                top: 0,
-                bottom: -270,
-                right: -200,
-                child: Opacity(
-                  opacity: 0.3,
-                  child: SizedBox(
-                    width: 400,
-                    height: 500,
-                    child: Image.asset(
-                      'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19.png',
-                      fit: BoxFit.contain,
-                    ),
-                  ),
-                ),
-              ),
-
-              SafeArea(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 24),
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 16),
-                      CustomAppBar(
-                        title: scooter?.title != null ? 'Самокат ${scooter!.title}' : 'Самокат',
-                      ),
-                      const SizedBox(height: 24),
-
-                      BatteryIndicator(percent: (scooter?.batteryLevel ?? 0) / 100),
-
-                      const SizedBox(height: 24),
-                      Expanded(
-                        child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Expanded(child: ScooterInfoSection(distance: distance, location: address, batteryLevel: scooter?.batteryLevel ?? 0,)),
-                            const SizedBox(width: 20),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(height: 14),
-
-
-                      GradientButton(
-                        text: "Забронировать",
-                        showArrows: true,
-                        height: 52,
-                        width: double.infinity,
-                        fontSize: 16,
-                        onTap: () {
-                          context.pop();
-                          context.pushReplacement('/home/tarif-sheet', extra: scooter);
-                        },
-                      ),
-                      const SizedBox(height: 30)
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          );
-        },
-      ),
-    );
-  }
-}
+import 'package:be_happy/presentation/event/scooter_detail_event.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../components/scooter/battery_indicator.dart';
+import '../components/scooter/scooter_info_section.dart';
+import '../components/scooter/slide_to_reserve_button.dart';
+import '../components/sheet/tariff_sheet.dart';
+import '../state/scooter_detail_state.dart';
+import '../viewmodel/scooter_detail_bloc.dart';
+
+class ScooterDetailScreen extends StatelessWidget {
+  final String address;
+  final double distance;
+  const ScooterDetailScreen({super.key, required this.address, required this.distance});
+
+  @override
+  Widget build(BuildContext context) {
+    final id = GoRouterState.of(context).pathParameters['id'];
+    context.read<ScooterDetailBloc>().add(LoadScooterDetails(int.parse(id!)));
+    return Scaffold(
+      body: BlocBuilder<ScooterDetailBloc, ScooterDetailState>(
+        builder: (context, state) {
+          if (state.status == ScooterStatus.loading) {
+            return const Center(child: CircularProgressIndicator(color: Colors.white));
+          }
+
+          if (state.status == ScooterStatus.failure) {
+            return Center(
+              child: Text(
+                state.errorMessage ?? 'Ошибка',
+                style: const TextStyle(color: Colors.white),
+              ),
+            );
+          }
+
+          final scooter = state.scooter;
+
+          return Stack(
+            children: [
+              Container(
+                decoration: const BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    colors: [Color(0xFF1B2A4A), Color(0xFF0F1E3A)],
+                  ),
+                ),
+              ),
+
+              Positioned(
+                top: 0,
+                bottom: -270,
+                right: -200,
+                child: Opacity(
+                  opacity: 0.3,
+                  child: SizedBox(
+                    width: 400,
+                    height: 500,
+                    child: Image.asset(
+                      'assets/icons/e6a5dcb6a3e2ec2362c25ea49509ab10d2312b19.png',
+                      fit: BoxFit.contain,
+                    ),
+                  ),
+                ),
+              ),
+
+              SafeArea(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  child: Column(
+                    children: [
+                      const SizedBox(height: 16),
+                      CustomAppBar(
+                        title: scooter?.title != null ? 'Самокат ${scooter!.title}' : 'Самокат',
+                      ),
+                      const SizedBox(height: 24),
+
+                      BatteryIndicator(percent: (scooter?.batteryLevel ?? 0) / 100),
+
+                      const SizedBox(height: 24),
+                      Expanded(
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Expanded(child: ScooterInfoSection(distance: distance, location: address, batteryLevel: scooter?.batteryLevel ?? 0,)),
+                            const SizedBox(width: 20),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 14),
+
+
+                      GradientButton(
+                        text: "Забронировать",
+                        showArrows: true,
+                        height: 52,
+                        width: double.infinity,
+                        fontSize: 16,
+                        onTap: () {
+                          context.pop();
+                          context.pushReplacement('/home/tarif-sheet', extra: scooter);
+                        },
+                      ),
+                      const SizedBox(height: 30)
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/send_photo_screen.dart b/lib/presentation/screens/send_photo_screen.dart
index d0eba69..e5020db 100644
--- a/lib/presentation/screens/send_photo_screen.dart
+++ b/lib/presentation/screens/send_photo_screen.dart
@@ -1,311 +1,311 @@
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-import 'package:image_picker/image_picker.dart';
-import '../../core/app_colors.dart';
-import '../../domain/usecase/finish_ride_usecase.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../viewmodel/send_photo_bloc.dart';
-import '../event/send_photo_event.dart';
-import '../state/send_photo_state.dart';
-import '../../domain/usecase/upload_scooter_photos_usecase.dart';
-import '../../di/service_locator.dart' as di;
-
-class SendPhotoScreen extends StatelessWidget {
-  final int orderId;
-  const SendPhotoScreen({super.key, required this.orderId});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => SendPhotoBloc(
-        di.getIt<UploadScooterPhotosUsecase>(),
-        di.getIt<FinishRideUsecase>(),
-      ),
-      child: SendPhotoView(orderId: orderId),
-    );
-  }
-}
-
-class SendPhotoView extends StatefulWidget {
-  final int orderId;
-  const SendPhotoView({super.key, required this.orderId});
-
-  @override
-  State<SendPhotoView> createState() => _SendPhotoViewState();
-}
-
-class _SendPhotoViewState extends State<SendPhotoView> {
-  final ImagePicker _imagePicker = ImagePicker();
-
-  // Метод для выбора фото (добавляет к существующим)
-  Future<void> _pickImage() async {
-    await showModalBottomSheet(
-      context: context,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
-      ),
-      builder: (BuildContext context) {
-        return SafeArea(
-          child: Wrap(
-            children: [
-              ListTile(
-                leading: const Icon(Icons.camera_alt),
-                title: const Text('Сделать фото'),
-                onTap: () {
-                  Navigator.pop(context);
-                  _getImage(ImageSource.camera);
-                },
-              ),
-              // ListTile(
-              //   leading: const Icon(Icons.photo_library),
-              //   title: const Text('Выбрать из галереи'),
-              //   onTap: () {
-              //     Navigator.pop(context);
-              //     _getImage(ImageSource.gallery);
-              //   },
-              // ),
-              ListTile(
-                leading: const Icon(Icons.cancel),
-                title: const Text('Отмена'),
-                onTap: () {
-                  Navigator.pop(context);
-                },
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  // ✅ Метод для получения изображения из выбранного источника
-  Future<void> _getImage(ImageSource source) async {
-    final XFile? pickedFile = await _imagePicker.pickImage(
-      source: source,
-      imageQuality: 80,
-    );
-
-    if (pickedFile != null && mounted) {
-      final currentImages = context.read<SendPhotoBloc>().state.selectedImages;
-      context.read<SendPhotoBloc>().add(
-        PhotoSelected([...currentImages, pickedFile.path]),
-      );
-    }
-  }
-
-  // Метод для удаления конкретного фото
-  void _removeImage(String path) {
-    final currentImages = context.read<SendPhotoBloc>().state.selectedImages;
-    final updatedList = currentImages.where((p) => p != path).toList();
-    context.read<SendPhotoBloc>().add(PhotoSelected(updatedList));
-  }
-
-  // ✅ Динамический заголовок в зависимости от количества фото
-  String _getTopText(int photoCount) {
-    if (photoCount == 0) {
-      return 'Для завершения аренды\nсфотографируйте самокат';
-    } else if (photoCount == 1) {
-      return 'Сделайте фото руля самоката';
-    } else {
-      return 'Отправьте фото на проверку';
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        width: double.infinity,
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        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(
-                  _getTopText(context.select((SendPhotoBloc bloc) => bloc.state.selectedImages.length)),
-                  textAlign: TextAlign.center,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                    height: 1.4,
-                  ),
-                ),
-              ),
-
-              // Основной контент центрируем
-              Expanded(
-                child: Center(
-                  child: SingleChildScrollView(
-                    padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
-                    child: Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        BlocBuilder<SendPhotoBloc, SendPhotoState>(
-                          builder: (context, state) {
-                            final photoCount = state.selectedImages.length;
-
-                            return Wrap(
-                              spacing: 16,
-                              runSpacing: 16,
-                              alignment: WrapAlignment.center,
-                              crossAxisAlignment: WrapCrossAlignment.center,
-                              children: [
-                                // Список выбранных фото
-                                ...state.selectedImages.map((path) => _buildPhotoThumbnail(path)),
-
-                                const SizedBox(height: 35),
-
-                                // Кнопка "Добавить", если фото меньше лимита (например, 5)
-                                if (photoCount < 2)
-                                  GestureDetector(
-                                    onTap: _pickImage,
-                                    child: _buildAddButton(),
-                                  ),
-                              ],
-                            );
-                          },
-                        ),
-                        const SizedBox(height: 200),
-
-                        // Кнопка отправки
-                        BlocConsumer<SendPhotoBloc, SendPhotoState>(
-                          listener: (context, state) {
-                            if (state.status == SendPhotoStatus.success) {
-                              context.go('/home/checkout/${widget.orderId}', extra: state.recievedPhotoIds);
-                            } else if (state.status == SendPhotoStatus.failure) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
-                              );
-                            }
-                          },
-                          builder: (context, state) {
-                            final photoCount = state.selectedImages.length;
-                            final isEnabled = photoCount >= 2;
-
-                            return GradientButton(
-                              text: 'Отправить',
-                              onTap: isEnabled
-                                  ? () => context.read<SendPhotoBloc>().add(PhotoUploadSubmitted(widget.orderId))
-                                  : null,
-                              enabled: isEnabled,
-                              showArrows: true,
-                              height: 56,
-                              width: double.infinity,
-                              fontSize: 16,
-                            );
-                          },
-                        ),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  // миниатюра с крестиком
-  Widget _buildPhotoThumbnail(String path) {
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Container(
-          width: 96,
-          height: 96,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(16),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black.withOpacity(0.1),
-                blurRadius: 8,
-                offset: const Offset(0, 4),
-              )
-            ],
-          ),
-          child: ClipRRect(
-            borderRadius: BorderRadius.circular(16),
-            child: Image.file(
-              File(path),
-              fit: BoxFit.cover,
-            ),
-          ),
-        ),
-        // Кнопка удаления (крестик)
-        Positioned(
-          top: -8,
-          right: -8,
-          child: GestureDetector(
-            onTap: () => _removeImage(path),
-            child: Container(
-              padding: const EdgeInsets.all(4),
-              decoration: BoxDecoration(
-                color: Color(0xFF75FBF0),
-                shape: BoxShape.circle,
-              ),
-              child: const Icon(
-                Icons.close,
-                size: 16,
-                color: Color(0xFF242F51),
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  // Виджет кнопки добавления
-  Widget _buildAddButton() {
-    return Container(
-      width: 96,
-      height: 96,
-      decoration: BoxDecoration(
-        shape: BoxShape.circle,
-        gradient: const LinearGradient(
-          colors: [
-            Color(0xFF242F51), // полупрозрачный белый
-            Color(0xFF242F51), // ещё более прозрачный
-          ],
-          begin: Alignment.topCenter,
-          end: Alignment.bottomCenter,
-        ),
-        boxShadow: [
-          // Глубокое свечение
-          BoxShadow(
-            color: Color(0xFF8BFFAA).withOpacity(0.5),
-            blurRadius: 50,
-            spreadRadius: 6,
-            offset: Offset.zero,
-          ),
-          // Внутреннее свечение (для объёма)
-          BoxShadow(
-            color: Color(0xFF8BFFAA).withOpacity(0.2),
-            blurRadius: 10,
-            spreadRadius: -2,
-            offset: Offset.zero,
-          ),
-        ],
-      ),
-      child: const Center(
-        child: Icon(
-          Icons.add,
-          size: 32,
-          color: Colors.white,
-        ),
-      ),
-    );
-  }
-}
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'package:image_picker/image_picker.dart';
+import '../../core/app_colors.dart';
+import '../../domain/usecase/finish_ride_usecase.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../viewmodel/send_photo_bloc.dart';
+import '../event/send_photo_event.dart';
+import '../state/send_photo_state.dart';
+import '../../domain/usecase/upload_scooter_photos_usecase.dart';
+import '../../di/service_locator.dart' as di;
+
+class SendPhotoScreen extends StatelessWidget {
+  final int orderId;
+  const SendPhotoScreen({super.key, required this.orderId});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => SendPhotoBloc(
+        di.getIt<UploadScooterPhotosUsecase>(),
+        di.getIt<FinishRideUsecase>(),
+      ),
+      child: SendPhotoView(orderId: orderId),
+    );
+  }
+}
+
+class SendPhotoView extends StatefulWidget {
+  final int orderId;
+  const SendPhotoView({super.key, required this.orderId});
+
+  @override
+  State<SendPhotoView> createState() => _SendPhotoViewState();
+}
+
+class _SendPhotoViewState extends State<SendPhotoView> {
+  final ImagePicker _imagePicker = ImagePicker();
+
+  // Метод для выбора фото (добавляет к существующим)
+  Future<void> _pickImage() async {
+    await showModalBottomSheet(
+      context: context,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      ),
+      builder: (BuildContext context) {
+        return SafeArea(
+          child: Wrap(
+            children: [
+              ListTile(
+                leading: const Icon(Icons.camera_alt),
+                title: const Text('Сделать фото'),
+                onTap: () {
+                  Navigator.pop(context);
+                  _getImage(ImageSource.camera);
+                },
+              ),
+              // ListTile(
+              //   leading: const Icon(Icons.photo_library),
+              //   title: const Text('Выбрать из галереи'),
+              //   onTap: () {
+              //     Navigator.pop(context);
+              //     _getImage(ImageSource.gallery);
+              //   },
+              // ),
+              ListTile(
+                leading: const Icon(Icons.cancel),
+                title: const Text('Отмена'),
+                onTap: () {
+                  Navigator.pop(context);
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  // ✅ Метод для получения изображения из выбранного источника
+  Future<void> _getImage(ImageSource source) async {
+    final XFile? pickedFile = await _imagePicker.pickImage(
+      source: source,
+      imageQuality: 80,
+    );
+
+    if (pickedFile != null && mounted) {
+      final currentImages = context.read<SendPhotoBloc>().state.selectedImages;
+      context.read<SendPhotoBloc>().add(
+        PhotoSelected([...currentImages, pickedFile.path]),
+      );
+    }
+  }
+
+  // Метод для удаления конкретного фото
+  void _removeImage(String path) {
+    final currentImages = context.read<SendPhotoBloc>().state.selectedImages;
+    final updatedList = currentImages.where((p) => p != path).toList();
+    context.read<SendPhotoBloc>().add(PhotoSelected(updatedList));
+  }
+
+  // ✅ Динамический заголовок в зависимости от количества фото
+  String _getTopText(int photoCount) {
+    if (photoCount == 0) {
+      return 'Для завершения аренды\nсфотографируйте самокат';
+    } else if (photoCount == 1) {
+      return 'Сделайте фото руля самоката';
+    } else {
+      return 'Отправьте фото на проверку';
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        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(
+                  _getTopText(context.select((SendPhotoBloc bloc) => bloc.state.selectedImages.length)),
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontSize: 20,
+                    fontWeight: FontWeight.bold,
+                    height: 1.4,
+                  ),
+                ),
+              ),
+
+              // Основной контент центрируем
+              Expanded(
+                child: Center(
+                  child: SingleChildScrollView(
+                    padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        BlocBuilder<SendPhotoBloc, SendPhotoState>(
+                          builder: (context, state) {
+                            final photoCount = state.selectedImages.length;
+
+                            return Wrap(
+                              spacing: 16,
+                              runSpacing: 16,
+                              alignment: WrapAlignment.center,
+                              crossAxisAlignment: WrapCrossAlignment.center,
+                              children: [
+                                // Список выбранных фото
+                                ...state.selectedImages.map((path) => _buildPhotoThumbnail(path)),
+
+                                const SizedBox(height: 35),
+
+                                // Кнопка "Добавить", если фото меньше лимита (например, 5)
+                                if (photoCount < 2)
+                                  GestureDetector(
+                                    onTap: _pickImage,
+                                    child: _buildAddButton(),
+                                  ),
+                              ],
+                            );
+                          },
+                        ),
+                        const SizedBox(height: 200),
+
+                        // Кнопка отправки
+                        BlocConsumer<SendPhotoBloc, SendPhotoState>(
+                          listener: (context, state) {
+                            if (state.status == SendPhotoStatus.success) {
+                              context.go('/home/checkout/${widget.orderId}', extra: state.recievedPhotoIds);
+                            } else if (state.status == SendPhotoStatus.failure) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
+                              );
+                            }
+                          },
+                          builder: (context, state) {
+                            final photoCount = state.selectedImages.length;
+                            final isEnabled = photoCount >= 2;
+
+                            return GradientButton(
+                              text: 'Отправить',
+                              onTap: isEnabled
+                                  ? () => context.read<SendPhotoBloc>().add(PhotoUploadSubmitted(widget.orderId))
+                                  : null,
+                              enabled: isEnabled,
+                              showArrows: true,
+                              height: 56,
+                              width: double.infinity,
+                              fontSize: 16,
+                            );
+                          },
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  // миниатюра с крестиком
+  Widget _buildPhotoThumbnail(String path) {
+    return Stack(
+      clipBehavior: Clip.none,
+      children: [
+        Container(
+          width: 96,
+          height: 96,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(16),
+            boxShadow: [
+              BoxShadow(
+                color: Colors.black.withOpacity(0.1),
+                blurRadius: 8,
+                offset: const Offset(0, 4),
+              )
+            ],
+          ),
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(16),
+            child: Image.file(
+              File(path),
+              fit: BoxFit.cover,
+            ),
+          ),
+        ),
+        // Кнопка удаления (крестик)
+        Positioned(
+          top: -8,
+          right: -8,
+          child: GestureDetector(
+            onTap: () => _removeImage(path),
+            child: Container(
+              padding: const EdgeInsets.all(4),
+              decoration: BoxDecoration(
+                color: Color(0xFF75FBF0),
+                shape: BoxShape.circle,
+              ),
+              child: const Icon(
+                Icons.close,
+                size: 16,
+                color: Color(0xFF242F51),
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  // Виджет кнопки добавления
+  Widget _buildAddButton() {
+    return Container(
+      width: 96,
+      height: 96,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        gradient: const LinearGradient(
+          colors: [
+            Color(0xFF242F51), // полупрозрачный белый
+            Color(0xFF242F51), // ещё более прозрачный
+          ],
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+        ),
+        boxShadow: [
+          // Глубокое свечение
+          BoxShadow(
+            color: Color(0xFF8BFFAA).withOpacity(0.5),
+            blurRadius: 50,
+            spreadRadius: 6,
+            offset: Offset.zero,
+          ),
+          // Внутреннее свечение (для объёма)
+          BoxShadow(
+            color: Color(0xFF8BFFAA).withOpacity(0.2),
+            blurRadius: 10,
+            spreadRadius: -2,
+            offset: Offset.zero,
+          ),
+        ],
+      ),
+      child: const Center(
+        child: Icon(
+          Icons.add,
+          size: 32,
+          color: Colors.white,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/splash_screen.dart b/lib/presentation/screens/splash_screen.dart
index 695b783..2de37d9 100644
--- a/lib/presentation/screens/splash_screen.dart
+++ b/lib/presentation/screens/splash_screen.dart
@@ -1,178 +1,178 @@
-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';
-
-class SplashScreen extends StatefulWidget {
-  const SplashScreen({super.key});
-
-  @override
-  State<SplashScreen> createState() => _SplashScreenState();
-}
-
-class _SplashScreenState extends State<SplashScreen>
-    with SingleTickerProviderStateMixin {
-  late final AnimationController _controller;
-
-  // Фаза 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: 3000),
-    );
-
-    _fillProgress = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(
-        parent: _controller,
-        curve: const Interval(0.0, 0.5, curve: Curves.easeInOut),
-      ),
-    );
-
-    _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
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final double screenWidth = MediaQuery.of(context).size.width;
-    final double endTranslation = screenWidth / 2 + logoSize;
-
-    return Scaffold(
-      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, child) {
-                final double translationX = _rollTranslation.value * endTranslation;
-
-                return Transform(
-                  transform: Matrix4.translationValues(translationX, 0, 0)
-                    ..rotateZ(_rollRotation.value),
-                  alignment: Alignment.center,
-                  // Используем 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,
-                    ),
-                  ),
-                );
-              },
-            ),
-          ),
-
-          // 5. Версия приложения
-          Positioned(
-            left: 0,
-            right: 0,
-            bottom: 24,
-            child: Text(
-              'Версия приложения 1.0',
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                color: Colors.white.withOpacity(0.6),
-                fontSize: 12,
-                fontWeight: FontWeight.w300,
-                letterSpacing: 0.5,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+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';
+
+class SplashScreen extends StatefulWidget {
+  const SplashScreen({super.key});
+
+  @override
+  State<SplashScreen> createState() => _SplashScreenState();
+}
+
+class _SplashScreenState extends State<SplashScreen>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+
+  // Фаза 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: 3000),
+    );
+
+    _fillProgress = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.0, 0.5, curve: Curves.easeInOut),
+      ),
+    );
+
+    _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
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double screenWidth = MediaQuery.of(context).size.width;
+    final double endTranslation = screenWidth / 2 + logoSize;
+
+    return Scaffold(
+      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, child) {
+                final double translationX = _rollTranslation.value * endTranslation;
+
+                return Transform(
+                  transform: Matrix4.translationValues(translationX, 0, 0)
+                    ..rotateZ(_rollRotation.value),
+                  alignment: Alignment.center,
+                  // Используем 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,
+                    ),
+                  ),
+                );
+              },
+            ),
+          ),
+
+          // 5. Версия приложения
+          Positioned(
+            left: 0,
+            right: 0,
+            bottom: 24,
+            child: Text(
+              'Версия приложения 1.0',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Colors.white.withOpacity(0.6),
+                fontSize: 12,
+                fontWeight: FontWeight.w300,
+                letterSpacing: 0.5,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/subscription_details_screen.dart b/lib/presentation/screens/subscription_details_screen.dart
index ac322ba..db5ccfb 100644
--- a/lib/presentation/screens/subscription_details_screen.dart
+++ b/lib/presentation/screens/subscription_details_screen.dart
@@ -1,344 +1,344 @@
-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 '../../di/service_locator.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/usecase/add_payment_card_usecase.dart';
-import '../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/set_main_payment_card_usecase.dart';
-import '../components/app_checkbox.dart';
-import '../components/custom_app_bar.dart';
-import '../components/gradient_button.dart';
-import '../components/payment_option.dart';
-import '../components/period_selector.dart';
-import '../components/content_parser.dart'; // ✅ Парсер контента
-import '../components/sheet/payment_method_sheet.dart';
-import '../event/payment_method_sheet_event.dart';
-import '../event/subscription_details_event.dart';
-import '../state/susbcription_details_state.dart';
-import '../viewmodel/payment_method_sheet_bloc.dart';
-import '../viewmodel/susbcription_details_bloc.dart';
-
-class SubscriptionDetailsScreen extends StatelessWidget {
-  final int subscriptionId;
-
-  const SubscriptionDetailsScreen({super.key, required this.subscriptionId});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      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);
-                    }
-                  },
-                  builder: (context, state) {
-                    String title = "Загрузка...";
-                    if (state is DetailsContentState) {
-                      title = state.subscription.title;
-                    }
-                    return CustomAppBar(title: title);
-                  },
-                ),
-              ),
-              const SizedBox(height: 20),
-
-              Expanded(
-                child: Stack(
-                  children: [
-                    Positioned(
-                      bottom: 0,
-                      left: 0,
-                      right: 0,
-                      child: Opacity(
-                        opacity: 0.5,
-                        child: Image.asset('assets/wave.png'),
-                      ),
-                    ),
-                    BlocBuilder<
-                        SubscriptionDetailsBloc,
-                        SubscriptionDetailsState
-                    >(
-                      builder: (context, state) {
-                        if (state is DetailsLoading) {
-                          return const Center(
-                            child: CircularProgressIndicator(
-                              color: Color(0xFF80FFD1),
-                            ),
-                          );
-                        }
-                        if (state is DetailsError) {
-                          return Center(
-                            child: Text(
-                              state.message,
-                              style: const TextStyle(color: Colors.white),
-                            ),
-                          );
-                        }
-                        if (state is DetailsContentState) {
-                          return _buildContent(context, state);
-                        }
-                        return const SizedBox();
-                      },
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildContent(BuildContext context, DetailsContentState state) {
-    final bool isAvailableForPurchase = state.subscription.isActive;
-
-    return SingleChildScrollView(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            mainAxisSize: MainAxisSize.min,
-            children: ContentParser.parseContent(
-              textJson: state.subscription.fullDescriptionJson,
-              text: state.subscription.fullDescription,
-            ),
-          ),
-
-          if (isAvailableForPurchase) ...[
-            const SizedBox(height: 30),
-            _ActionCard(state: state),
-            const SizedBox(height: 24),
-            const Text(
-              'Способ оплаты',
-              style: TextStyle(color: Colors.white70, fontSize: 14),
-            ),
-            const SizedBox(height: 12),
-            _buildCardSelector(state, context),
-
-            const SizedBox(height: 30),
-            GradientButton(
-              text: state.isAlreadyPurchased ? 'Продлить' : 'Активировать',
-              onTap: () {
-                context.read<SubscriptionDetailsBloc>().add(
-                  ActivateSubscriptionPressed(),
-                );
-              },
-              enabled: state.isAgreed && state.selectedCard != null,
-              width: double.infinity,
-              height: 56,
-              fontSize: 16,
-              showArrows: true,
-            ),
-          ],
-          const SizedBox(height: 20),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCardSelector(DetailsContentState state, BuildContext context) {
-    if (state.selectedCard != null) {
-      return PaymentOption(
-        title: "Карта",
-        subtitle: state.selectedCard.cardLastNumber,
-        isSelected: true,
-        onTap: () async {
-          final selectedCard = await showModalBottomSheet<PaymentCard>(
-            context: context,
-            isScrollControlled: true,
-            backgroundColor: Colors.transparent,
-            builder: (innerContext) => BlocProvider(
-              create: (context) => PaymentMethodSheetBloc(
-                getIt<GetPaymentCardsUsecase>(),
-                getIt<SetMainPaymentCardUsecase>(),
-                getIt<GetProfileUseCase>(),
-                getIt<AddPaymentCardUsecase>(),
-              )..add(PaymentMethodSheetStarted()),
-              child: const PaymentMethodSheet(showBalance: false),
-            ),
-          );
-
-          if (selectedCard != null && context.mounted) {
-            context.read<SubscriptionDetailsBloc>().add(SelectCardEvent(selectedCard));
-          }
-        },
-      );
-    }
-
-    return Container(
-      height: 56,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(24),
-        border: Border.all(
-          color: Colors.white.withOpacity(0.4),
-          width: 1,
-        ),
-      ),
-      child: Material(
-        color: Colors.transparent,
-        child: InkWell(
-          onTap: () {
-            context.pushReplacement('/home/payment-method-sheet');
-          },
-          borderRadius: BorderRadius.circular(24),
-          child: Center(
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                const Text(
-                  'Добавить способ оплаты',
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontSize: 16,
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-                const SizedBox(width: 8),
-                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
-                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.4)),
-                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.2)),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-
-
-class _ActionCard extends StatelessWidget {
-  final DetailsContentState state;
-
-  const _ActionCard({required this.state});
-
-  @override
-  Widget build(BuildContext context) {
-    final List<String> periodTitles = state.subscription.options
-        .map((e) => e.title)
-        .toList();
-
-    final int selectedIndex = state.subscription.options.indexOf(
-      state.selectedPeriod,
-    );
-
-    return Container(
-      padding: const EdgeInsets.all(24),
-      decoration: BoxDecoration(
-        color: const Color(0xFF131B47),
-        borderRadius: BorderRadius.circular(30),
-        border: Border.all(color: Colors.white.withOpacity(0.1)),
-      ),
-      child: Column(
-        children: [
-          const Text(
-            "Выберите период действия",
-            style: TextStyle(color: Colors.white, fontWeight: FontWeight.w500),
-          ),
-          const SizedBox(height: 20),
-
-          PeriodSelector(
-            periods: periodTitles,
-            currentIndex: selectedIndex != -1 ? selectedIndex : 0,
-            onSelect: (index) {
-              final selectedOption = state.subscription.options[index];
-              context.read<SubscriptionDetailsBloc>().add(
-                SelectPeriodEvent(selectedOption),
-              );
-            },
-          ),
-
-          const SizedBox(height: 30),
-
-          _PriceRow(price: state.selectedPeriod.pricePrint),
-
-          const SizedBox(height: 20),
-
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              AppCheckbox(
-                value: state.isAgreed,
-                onChanged: (bool? value) {
-                  if (value != null) {
-                    context.read<SubscriptionDetailsBloc>().add(
-                      ToggleAgreementEvent(value),
-                    );
-                  }
-                },
-              ),
-              const SizedBox(width: 12),
-              const Flexible(
-                child: Text(
-                  'Я подтверждаю, что ознакомился со всеми условиями предоставления подписки и принимаю их безоговорочно',
-                  style: TextStyle(color: Colors.white70, fontSize: 12),
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-}
-
-class _PriceRow extends StatelessWidget {
-  final String price;
-
-  const _PriceRow({required this.price});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: Colors.white.withOpacity(0.05),
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Image.asset("assets/icons/money_icon.png", width: 72, height: 72),
-          const SizedBox(width: 15),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text("Стоимость:", style: TextStyle(color: Color(0xFF80FFD1))),
-              Text(
-                price,
-                style: const TextStyle(
-                  color: Color(0xFF80FFD1),
-                  fontSize: 22,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
+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 '../../di/service_locator.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/add_payment_card_usecase.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../components/app_checkbox.dart';
+import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
+import '../components/payment_option.dart';
+import '../components/period_selector.dart';
+import '../components/content_parser.dart'; // ✅ Парсер контента
+import '../components/sheet/payment_method_sheet.dart';
+import '../event/payment_method_sheet_event.dart';
+import '../event/subscription_details_event.dart';
+import '../state/susbcription_details_state.dart';
+import '../viewmodel/payment_method_sheet_bloc.dart';
+import '../viewmodel/susbcription_details_bloc.dart';
+
+class SubscriptionDetailsScreen extends StatelessWidget {
+  final int subscriptionId;
+
+  const SubscriptionDetailsScreen({super.key, required this.subscriptionId});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      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);
+                    }
+                  },
+                  builder: (context, state) {
+                    String title = "Загрузка...";
+                    if (state is DetailsContentState) {
+                      title = state.subscription.title;
+                    }
+                    return CustomAppBar(title: title);
+                  },
+                ),
+              ),
+              const SizedBox(height: 20),
+
+              Expanded(
+                child: Stack(
+                  children: [
+                    Positioned(
+                      bottom: 0,
+                      left: 0,
+                      right: 0,
+                      child: Opacity(
+                        opacity: 0.5,
+                        child: Image.asset('assets/wave.png'),
+                      ),
+                    ),
+                    BlocBuilder<
+                        SubscriptionDetailsBloc,
+                        SubscriptionDetailsState
+                    >(
+                      builder: (context, state) {
+                        if (state is DetailsLoading) {
+                          return const Center(
+                            child: CircularProgressIndicator(
+                              color: Color(0xFF80FFD1),
+                            ),
+                          );
+                        }
+                        if (state is DetailsError) {
+                          return Center(
+                            child: Text(
+                              state.message,
+                              style: const TextStyle(color: Colors.white),
+                            ),
+                          );
+                        }
+                        if (state is DetailsContentState) {
+                          return _buildContent(context, state);
+                        }
+                        return const SizedBox();
+                      },
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildContent(BuildContext context, DetailsContentState state) {
+    final bool isAvailableForPurchase = state.subscription.isActive;
+
+    return SingleChildScrollView(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            mainAxisSize: MainAxisSize.min,
+            children: ContentParser.parseContent(
+              textJson: state.subscription.fullDescriptionJson,
+              text: state.subscription.fullDescription,
+            ),
+          ),
+
+          if (isAvailableForPurchase) ...[
+            const SizedBox(height: 30),
+            _ActionCard(state: state),
+            const SizedBox(height: 24),
+            const Text(
+              'Способ оплаты',
+              style: TextStyle(color: Colors.white70, fontSize: 14),
+            ),
+            const SizedBox(height: 12),
+            _buildCardSelector(state, context),
+
+            const SizedBox(height: 30),
+            GradientButton(
+              text: state.isAlreadyPurchased ? 'Продлить' : 'Активировать',
+              onTap: () {
+                context.read<SubscriptionDetailsBloc>().add(
+                  ActivateSubscriptionPressed(),
+                );
+              },
+              enabled: state.isAgreed && state.selectedCard != null,
+              width: double.infinity,
+              height: 56,
+              fontSize: 16,
+              showArrows: true,
+            ),
+          ],
+          const SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCardSelector(DetailsContentState state, BuildContext context) {
+    if (state.selectedCard != null) {
+      return PaymentOption(
+        title: "Карта",
+        subtitle: state.selectedCard.cardLastNumber,
+        isSelected: true,
+        onTap: () async {
+          final selectedCard = await showModalBottomSheet<PaymentCard>(
+            context: context,
+            isScrollControlled: true,
+            backgroundColor: Colors.transparent,
+            builder: (innerContext) => BlocProvider(
+              create: (context) => PaymentMethodSheetBloc(
+                getIt<GetPaymentCardsUsecase>(),
+                getIt<SetMainPaymentCardUsecase>(),
+                getIt<GetProfileUseCase>(),
+                getIt<AddPaymentCardUsecase>(),
+              )..add(PaymentMethodSheetStarted()),
+              child: const PaymentMethodSheet(showBalance: false),
+            ),
+          );
+
+          if (selectedCard != null && context.mounted) {
+            context.read<SubscriptionDetailsBloc>().add(SelectCardEvent(selectedCard));
+          }
+        },
+      );
+    }
+
+    return Container(
+      height: 56,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(24),
+        border: Border.all(
+          color: Colors.white.withOpacity(0.4),
+          width: 1,
+        ),
+      ),
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          onTap: () {
+            context.pushReplacement('/home/payment-method-sheet');
+          },
+          borderRadius: BorderRadius.circular(24),
+          child: Center(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Text(
+                  'Добавить способ оплаты',
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(width: 8),
+                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
+                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.4)),
+                Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.2)),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+
+
+class _ActionCard extends StatelessWidget {
+  final DetailsContentState state;
+
+  const _ActionCard({required this.state});
+
+  @override
+  Widget build(BuildContext context) {
+    final List<String> periodTitles = state.subscription.options
+        .map((e) => e.title)
+        .toList();
+
+    final int selectedIndex = state.subscription.options.indexOf(
+      state.selectedPeriod,
+    );
+
+    return Container(
+      padding: const EdgeInsets.all(24),
+      decoration: BoxDecoration(
+        color: const Color(0xFF131B47),
+        borderRadius: BorderRadius.circular(30),
+        border: Border.all(color: Colors.white.withOpacity(0.1)),
+      ),
+      child: Column(
+        children: [
+          const Text(
+            "Выберите период действия",
+            style: TextStyle(color: Colors.white, fontWeight: FontWeight.w500),
+          ),
+          const SizedBox(height: 20),
+
+          PeriodSelector(
+            periods: periodTitles,
+            currentIndex: selectedIndex != -1 ? selectedIndex : 0,
+            onSelect: (index) {
+              final selectedOption = state.subscription.options[index];
+              context.read<SubscriptionDetailsBloc>().add(
+                SelectPeriodEvent(selectedOption),
+              );
+            },
+          ),
+
+          const SizedBox(height: 30),
+
+          _PriceRow(price: state.selectedPeriod.pricePrint),
+
+          const SizedBox(height: 20),
+
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              AppCheckbox(
+                value: state.isAgreed,
+                onChanged: (bool? value) {
+                  if (value != null) {
+                    context.read<SubscriptionDetailsBloc>().add(
+                      ToggleAgreementEvent(value),
+                    );
+                  }
+                },
+              ),
+              const SizedBox(width: 12),
+              const Flexible(
+                child: Text(
+                  'Я подтверждаю, что ознакомился со всеми условиями предоставления подписки и принимаю их безоговорочно',
+                  style: TextStyle(color: Colors.white70, fontSize: 12),
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+}
+
+class _PriceRow extends StatelessWidget {
+  final String price;
+
+  const _PriceRow({required this.price});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: Colors.white.withOpacity(0.05),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Image.asset("assets/icons/money_icon.png", width: 72, height: 72),
+          const SizedBox(width: 15),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text("Стоимость:", style: TextStyle(color: Color(0xFF80FFD1))),
+              Text(
+                price,
+                style: const TextStyle(
+                  color: Color(0xFF80FFD1),
+                  fontSize: 22,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/subscription_list_screen.dart b/lib/presentation/screens/subscription_list_screen.dart
index d290a96..c521d42 100644
--- a/lib/presentation/screens/subscription_list_screen.dart
+++ b/lib/presentation/screens/subscription_list_screen.dart
@@ -1,96 +1,96 @@
-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';
-
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-import '../components/subscription_card.dart';
-import '../state/subscription_list_state.dart';
-import '../viewmodel/subscription_list_bloc.dart';
-
-class SubscriptionsListScreen extends StatelessWidget {
-  const SubscriptionsListScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      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: CustomAppBar(title: 'Абонементы'),
-              ),
-
-              Expanded(
-                child: Stack(
-                  children: [
-                    Positioned(
-                      bottom: 0,
-                      left: 0,
-                      right: 0,
-                      child: Opacity(
-                        opacity: 0.5,
-                        child: Image.asset('assets/wave.png'),
-                      ),
-                    ),
-                    BlocBuilder<SubscriptionListBloc, SubscriptionState>(
-                      builder: (context, state) {
-                        if (state is SubscriptionsLoading) {
-                          return const Center(child: CircularProgressIndicator());
-                        } else if (state is SubscriptionsLoaded) {
-                          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 isPurchased = subscription.isCurrent;
-
-                              final clientSub = clientSubsMap[subscription.id];
-                              final DateTime? expirationDate = isPurchased ? clientSub?.expiredAt : null;
-
-                              return SizedBox(
-                                height: 230, //
-                                child: SubscriptionCard(
-                                  subscription: subscription,
-                                  isActive: isPurchased,
-                                  expiredAt: expirationDate,
-                                  onRefresh: () {
-                                    context.read<SubscriptionListBloc>().add(LoadSubscriptionsEvent());
-                                  },
-                                ),
-                              );
-                            },
-                          );
-                        } else if (state is SubscriptionsError) {
-                          return Center(
-                            child: Text(
-                              state.message,
-                              style: const TextStyle(color: Colors.red),
-                            ),
-                          );
-                        }
-                        return const SizedBox();
-                      },
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
+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';
+
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+import '../components/subscription_card.dart';
+import '../state/subscription_list_state.dart';
+import '../viewmodel/subscription_list_bloc.dart';
+
+class SubscriptionsListScreen extends StatelessWidget {
+  const SubscriptionsListScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      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: CustomAppBar(title: 'Абонементы'),
+              ),
+
+              Expanded(
+                child: Stack(
+                  children: [
+                    Positioned(
+                      bottom: 0,
+                      left: 0,
+                      right: 0,
+                      child: Opacity(
+                        opacity: 0.5,
+                        child: Image.asset('assets/wave.png'),
+                      ),
+                    ),
+                    BlocBuilder<SubscriptionListBloc, SubscriptionState>(
+                      builder: (context, state) {
+                        if (state is SubscriptionsLoading) {
+                          return const Center(child: CircularProgressIndicator());
+                        } else if (state is SubscriptionsLoaded) {
+                          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 isPurchased = subscription.isCurrent;
+
+                              final clientSub = clientSubsMap[subscription.id];
+                              final DateTime? expirationDate = isPurchased ? clientSub?.expiredAt : null;
+
+                              return SizedBox(
+                                height: 230, //
+                                child: SubscriptionCard(
+                                  subscription: subscription,
+                                  isActive: isPurchased,
+                                  expiredAt: expirationDate,
+                                  onRefresh: () {
+                                    context.read<SubscriptionListBloc>().add(LoadSubscriptionsEvent());
+                                  },
+                                ),
+                              );
+                            },
+                          );
+                        } else if (state is SubscriptionsError) {
+                          return Center(
+                            child: Text(
+                              state.message,
+                              style: const TextStyle(color: Colors.red),
+                            ),
+                          );
+                        }
+                        return const SizedBox();
+                      },
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/screens/support_screen.dart b/lib/presentation/screens/support_screen.dart
index f18b592..3bd6193 100644
--- a/lib/presentation/screens/support_screen.dart
+++ b/lib/presentation/screens/support_screen.dart
@@ -1,71 +1,71 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-import '../../core/app_colors.dart';
-import '../components/custom_app_bar.dart';
-import '../components/link_row.dart';
-
-class SupportScreen extends StatelessWidget {
-  const SupportScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20),
-            child: Column(
-              children: [
-                // ✅ Используем общий AppBar
-                const SizedBox(height: 16),
-                CustomAppBar(title: 'Техподдержка'),
-                const SizedBox(height: 32),
-
-                // Список ссылок
-                LinkRow(
-                  icon: 'assets/icons/telegram.png',
-                  title: 'Telegram',
-                  onTap: () => openLink('https://t.me/...'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-                LinkRow(
-                  icon: 'assets/icons/whatsapp.png',
-                  title: 'WhatsApp',
-                  onTap: () => openLink('https://wa.me/...'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-                LinkRow(
-                  icon: 'assets/icons/viber.png',
-                  title: 'Viber',
-                  onTap: () => openLink('viber://chat?number=...'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-                LinkRow(
-                  icon: 'assets/icons/call.png',
-                  title: 'Позвонить',
-                  onTap: () => openLink('tel:+375257110909'),
-                ),
-                const Divider(height: 1, color: Colors.white24),
-                const SizedBox(height: 12),
-
-                const Spacer(), // Отодвигаем картинку вниз
-
-                // Нижняя картинка
-                Image.asset(
-                  'assets/support_bottom.png',
-                  width: double.infinity,
-                  fit: BoxFit.contain,
-                ),
-                const SizedBox(height: 20),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+import '../../core/app_colors.dart';
+import '../components/custom_app_bar.dart';
+import '../components/link_row.dart';
+
+class SupportScreen extends StatelessWidget {
+  const SupportScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20),
+            child: Column(
+              children: [
+                // ✅ Используем общий AppBar
+                const SizedBox(height: 16),
+                CustomAppBar(title: 'Техподдержка'),
+                const SizedBox(height: 32),
+
+                // Список ссылок
+                LinkRow(
+                  icon: 'assets/icons/telegram.png',
+                  title: 'Telegram',
+                  onTap: () => openLink('https://t.me/...'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+                LinkRow(
+                  icon: 'assets/icons/whatsapp.png',
+                  title: 'WhatsApp',
+                  onTap: () => openLink('https://wa.me/...'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+                LinkRow(
+                  icon: 'assets/icons/viber.png',
+                  title: 'Viber',
+                  onTap: () => openLink('viber://chat?number=...'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+                LinkRow(
+                  icon: 'assets/icons/call.png',
+                  title: 'Позвонить',
+                  onTap: () => openLink('tel:+375257110909'),
+                ),
+                const Divider(height: 1, color: Colors.white24),
+                const SizedBox(height: 12),
+
+                const Spacer(), // Отодвигаем картинку вниз
+
+                // Нижняя картинка
+                Image.asset(
+                  'assets/support_bottom.png',
+                  width: double.infinity,
+                  fit: BoxFit.contain,
+                ),
+                const SizedBox(height: 20),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/screens/tech_works_screen.dart b/lib/presentation/screens/tech_works_screen.dart
new file mode 100644
index 0000000..4f9685d
--- /dev/null
+++ b/lib/presentation/screens/tech_works_screen.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+class TechWorksScreen extends StatelessWidget {
+  const TechWorksScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        width: double.infinity,
+        height: double.infinity,
+        decoration: const BoxDecoration(
+          gradient: LinearGradient(
+            begin: Alignment.topCenter,
+            end: Alignment.bottomCenter,
+            colors: [
+              Color(0xFF223252),
+              Color(0xFF0D1220),
+            ],
+          ),
+        ),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20.0),
+            child: Column(
+              children: [
+                const Spacer(flex: 3),
+
+                Image.asset(
+                  'assets/tech_works.png',
+                  width: 260,
+                  height: 260,
+                  fit: BoxFit.contain,
+                ),
+
+                const Spacer(flex: 2),
+
+                Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 24.0,
+                    vertical: 28.0,
+                  ),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF101528),
+                    borderRadius: BorderRadius.circular(28.0),
+                    border: Border.all(
+                      color: Colors.white.withOpacity(0.05),
+                      width: 1,
+                    ),
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      const Text(
+                        'Технические работы',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 22,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        'В приложении ведутся технические работы. Попробуйте зайти позже.',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          color: Colors.white.withOpacity(0.75),
+                          fontSize: 15,
+                          height: 1.35,
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+
+                      TextButton(
+                        onPressed: () {
+                          SystemNavigator.pop();
+                        },
+                        style: TextButton.styleFrom(
+                          minimumSize: const Size(100, 44),
+                          foregroundColor: const Color(0xFF20E298),
+                        ),
+                        child: const Text(
+                          'ОК',
+                          style: TextStyle(
+                            color: Color(0xFF20E298),
+                            fontSize: 16,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                const SizedBox(height: 24),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/presentation/screens/top_up_screen.dart b/lib/presentation/screens/top_up_screen.dart
index 3f43b2e..db93ec3 100644
--- a/lib/presentation/screens/top_up_screen.dart
+++ b/lib/presentation/screens/top_up_screen.dart
@@ -1,289 +1,289 @@
-import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
-import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
-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 '../../di/service_locator.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/set_main_payment_card_usecase.dart';
-import '../components/app_checkbox.dart';
-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/payment_method_sheet_event.dart';
-import '../event/payment_methods_event.dart';
-import '../event/top_up_event.dart';
-import '../state/top_up_state.dart';
-import '../viewmodel/payment_method_sheet_bloc.dart';
-import '../viewmodel/top_up_bloc.dart';
-
-class TopUpScreen extends StatelessWidget {
-  const TopUpScreen({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
-        child: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 20),
-            child: BlocListener<TopUpBloc, TopUpState>(
-              listener: (context, state) {
-                if (state is TopUpPaymentSuccess) {
-                  context.go('/home/payment-methods/top-up/result/success');
-                } else if (state is TopUpPaymentFailure) {
-                  context.go('/home/payment-methods/top-up/result/failed');
-                }
-              },
-              child: Column(
-                children: [
-                  const SizedBox(height: 16),
-                  const CustomAppBar(title: 'Пополнение баланса'),
-                  const SizedBox(height: 20),
-                  BlocBuilder<TopUpBloc, TopUpState>(
-                    builder: (context, state) {
-                      if (state is TopUpLoading) {
-                        return const Expanded(
-                          child: Center(child: CircularProgressIndicator()),
-                        );
-                      }
-
-                      if (state is TopUpLoaded) {
-                        if (state.isProcessingPayment) {
-                          return const Expanded(
-                            child: Center(child: CircularProgressIndicator()),
-                          );
-                        }
-
-                        return Expanded(
-                          child: Stack(
-                            children: [
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  _buildTariffList(state, context),
-                                  const SizedBox(height: 30),
-                                  _buildPriceInfo(state),
-                                  const SizedBox(height: 40),
-                                  const Text(
-                                    'Способ оплаты',
-                                    style: TextStyle(color: Colors.white70),
-                                  ),
-                                  const SizedBox(height: 15),
-                                  _buildCardSelector(state, context),
-                                  const SizedBox(height: 20),
-                                  _buildAgreement(state, context),
-                                  const Spacer(),
-                                  _buildPayButton(state, () {
-                                    context.read<TopUpBloc>().add(TopUpButtonPressed());
-                                  }),
-                                  const SizedBox(height: 30),
-                                ],
-                              ),
-                            ],
-                          ),
-                        );
-                      }
-
-                      return const SizedBox.shrink();
-                    },
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTariffList(TopUpLoaded state, BuildContext context) {
-    return SizedBox(
-      height: 120,
-      child: ListView.separated(
-        scrollDirection: Axis.horizontal,
-        itemCount: state.certificates.length,
-        separatorBuilder: (_, __) => const SizedBox(width: 12),
-        itemBuilder: (context, index) {
-          final tariff = state.certificates[index];
-          final isSelected = state.selectedTariff == tariff;
-          return GestureDetector(
-            onTap: () => context.read<TopUpBloc>().add(SelectCertificate(tariff)),
-            child: Container(
-              width: 140,
-              decoration: BoxDecoration(
-                color: isSelected ? const Color(0xFF80FFC1) : Colors.white.withOpacity(0.1),
-                borderRadius: BorderRadius.circular(16),
-                border: Border.all(color: Colors.white24),
-              ),
-              child: Column(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  if (tariff.discount != null)
-                    Text(
-                      'скидка: ${tariff.discount!.toInt()}%',
-                      style: TextStyle(
-                        color: isSelected ? Colors.black87 : Colors.tealAccent,
-                      ),
-                    ),
-                  Text(
-                    '${tariff.value} баллов',
-                    style: TextStyle(
-                      fontSize: 18,
-                      fontWeight: FontWeight.bold,
-                      color: isSelected ? Colors.black : Colors.white,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget _buildPriceInfo(TopUpLoaded state) {
-    if (state.selectedTariff == null) return const SizedBox.shrink();
-    return Center(
-      child: Column(
-        children: [
-          Text(
-            'Купить со скидкой ${state.selectedTariff!.discount?.toInt()}%:',
-            style: const TextStyle(color: Colors.white, fontSize: 16),
-          ),
-          const SizedBox(height: 10),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Image.asset("assets/icons/money_icon.png", width: 24, height: 24),
-              const SizedBox(width: 8),
-              Text(
-                '${state.selectedTariff!.price.toStringAsFixed(2)} BYN',
-                style: const TextStyle(
-                  color: Color(0xFF80FFC1),
-                  fontSize: 28,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCardSelector(TopUpLoaded state, BuildContext context) {
-    return state.selectedCard != null
-        ? Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: PaymentOption(
-        title: "Карта",
-        subtitle: '${state.selectedCard!.cardLastNumber}',
-        isSelected: true,
-        onTap: () async {
-          final selectedCard = await showModalBottomSheet<PaymentCard>(
-            context: context,
-            isScrollControlled: true,
-            backgroundColor: Colors.transparent,
-            builder: (innerContext) => BlocProvider(
-              create: (context) => PaymentMethodSheetBloc(
-                getIt<GetPaymentCardsUsecase>(),
-                getIt<SetMainPaymentCardUsecase>(),
-                getIt<GetProfileUseCase>(),
-                getIt<AddPaymentCardUsecase>(),
-              )..add(PaymentMethodSheetStarted()),
-              child: const PaymentMethodSheet(showBalance: false),
-            ),
-          );
-
-          if (selectedCard != null) {
-            context.read<TopUpBloc>().add(SelectCard(selectedCard));
-          }
-        },
-      ),
-    )
-        : Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 20),
-      child: Container(
-        height: 56,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(24),
-          border: Border.all(
-            color: Colors.white.withOpacity(0.4),
-            width: 1,
-          ),
-        ),
-        child: Material(
-          color: Colors.transparent,
-          child: InkWell(
-            onTap: () {
-              context.pushReplacement('/home/payment-method-sheet');
-            },
-            borderRadius: BorderRadius.circular(24),
-            child: Center(
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  const Text(
-                    'Способ оплаты',
-                    style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.4)),
-                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.2)),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildAgreement(TopUpLoaded state, BuildContext context) {
-    return Row(
-      children: [
-        AppCheckbox(
-          value: state.isAgreed,
-          onChanged: (v) => context.read<TopUpBloc>().add(ToggleAgreement(v ?? false)),
-        ),
-        const SizedBox(width: 12),
-        const Flexible(
-          child: Text.rich(
-            TextSpan(
-              text: 'Я принимаю условия покупки бонусного пакека, при котором денежные средства не подлежат возврату... ',
-              style: TextStyle(
-                color: AppColors.white70,
-                fontSize: 12,
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildPayButton(TopUpLoaded state, VoidCallback onTap) {
-    return GradientButton(
-      text: 'Оплатить',
-      onTap: state.isAgreed ? onTap : null,
-      enabled: state.isAgreed,
-      showArrows: true,
-      height: 56,
-      width: double.infinity,
-      fontSize: 16,
-    );
-  }
+import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
+import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
+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 '../../di/service_locator.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../components/app_checkbox.dart';
+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/payment_method_sheet_event.dart';
+import '../event/payment_methods_event.dart';
+import '../event/top_up_event.dart';
+import '../state/top_up_state.dart';
+import '../viewmodel/payment_method_sheet_bloc.dart';
+import '../viewmodel/top_up_bloc.dart';
+
+class TopUpScreen extends StatelessWidget {
+  const TopUpScreen({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 20),
+            child: BlocListener<TopUpBloc, TopUpState>(
+              listener: (context, state) {
+                if (state is TopUpPaymentSuccess) {
+                  context.go('/home/payment-methods/top-up/result/success');
+                } else if (state is TopUpPaymentFailure) {
+                  context.go('/home/payment-methods/top-up/result/failed');
+                }
+              },
+              child: Column(
+                children: [
+                  const SizedBox(height: 16),
+                  const CustomAppBar(title: 'Пополнение баланса'),
+                  const SizedBox(height: 20),
+                  BlocBuilder<TopUpBloc, TopUpState>(
+                    builder: (context, state) {
+                      if (state is TopUpLoading) {
+                        return const Expanded(
+                          child: Center(child: CircularProgressIndicator()),
+                        );
+                      }
+
+                      if (state is TopUpLoaded) {
+                        if (state.isProcessingPayment) {
+                          return const Expanded(
+                            child: Center(child: CircularProgressIndicator()),
+                          );
+                        }
+
+                        return Expanded(
+                          child: Stack(
+                            children: [
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  _buildTariffList(state, context),
+                                  const SizedBox(height: 30),
+                                  _buildPriceInfo(state),
+                                  const SizedBox(height: 40),
+                                  const Text(
+                                    'Способ оплаты',
+                                    style: TextStyle(color: Colors.white70),
+                                  ),
+                                  const SizedBox(height: 15),
+                                  _buildCardSelector(state, context),
+                                  const SizedBox(height: 20),
+                                  _buildAgreement(state, context),
+                                  const Spacer(),
+                                  _buildPayButton(state, () {
+                                    context.read<TopUpBloc>().add(TopUpButtonPressed());
+                                  }),
+                                  const SizedBox(height: 30),
+                                ],
+                              ),
+                            ],
+                          ),
+                        );
+                      }
+
+                      return const SizedBox.shrink();
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTariffList(TopUpLoaded state, BuildContext context) {
+    return SizedBox(
+      height: 120,
+      child: ListView.separated(
+        scrollDirection: Axis.horizontal,
+        itemCount: state.certificates.length,
+        separatorBuilder: (_, __) => const SizedBox(width: 12),
+        itemBuilder: (context, index) {
+          final tariff = state.certificates[index];
+          final isSelected = state.selectedTariff == tariff;
+          return GestureDetector(
+            onTap: () => context.read<TopUpBloc>().add(SelectCertificate(tariff)),
+            child: Container(
+              width: 140,
+              decoration: BoxDecoration(
+                color: isSelected ? const Color(0xFF80FFC1) : Colors.white.withOpacity(0.1),
+                borderRadius: BorderRadius.circular(16),
+                border: Border.all(color: Colors.white24),
+              ),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  if (tariff.discount != null)
+                    Text(
+                      'скидка: ${tariff.discount!.toInt()}%',
+                      style: TextStyle(
+                        color: isSelected ? Colors.black87 : Colors.tealAccent,
+                      ),
+                    ),
+                  Text(
+                    '${tariff.value} баллов',
+                    style: TextStyle(
+                      fontSize: 18,
+                      fontWeight: FontWeight.bold,
+                      color: isSelected ? Colors.black : Colors.white,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildPriceInfo(TopUpLoaded state) {
+    if (state.selectedTariff == null) return const SizedBox.shrink();
+    return Center(
+      child: Column(
+        children: [
+          Text(
+            'Купить со скидкой ${state.selectedTariff!.discount?.toInt()}%:',
+            style: const TextStyle(color: Colors.white, fontSize: 16),
+          ),
+          const SizedBox(height: 10),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Image.asset("assets/icons/money_icon.png", width: 24, height: 24),
+              const SizedBox(width: 8),
+              Text(
+                '${state.selectedTariff!.price.toStringAsFixed(2)} BYN',
+                style: const TextStyle(
+                  color: Color(0xFF80FFC1),
+                  fontSize: 28,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCardSelector(TopUpLoaded state, BuildContext context) {
+    return state.selectedCard != null
+        ? Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: PaymentOption(
+        title: "Карта",
+        subtitle: '${state.selectedCard!.cardLastNumber}',
+        isSelected: true,
+        onTap: () async {
+          final selectedCard = await showModalBottomSheet<PaymentCard>(
+            context: context,
+            isScrollControlled: true,
+            backgroundColor: Colors.transparent,
+            builder: (innerContext) => BlocProvider(
+              create: (context) => PaymentMethodSheetBloc(
+                getIt<GetPaymentCardsUsecase>(),
+                getIt<SetMainPaymentCardUsecase>(),
+                getIt<GetProfileUseCase>(),
+                getIt<AddPaymentCardUsecase>(),
+              )..add(PaymentMethodSheetStarted()),
+              child: const PaymentMethodSheet(showBalance: false),
+            ),
+          );
+
+          if (selectedCard != null) {
+            context.read<TopUpBloc>().add(SelectCard(selectedCard));
+          }
+        },
+      ),
+    )
+        : Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: Container(
+        height: 56,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(24),
+          border: Border.all(
+            color: Colors.white.withOpacity(0.4),
+            width: 1,
+          ),
+        ),
+        child: Material(
+          color: Colors.transparent,
+          child: InkWell(
+            onTap: () {
+              context.pushReplacement('/home/payment-method-sheet');
+            },
+            borderRadius: BorderRadius.circular(24),
+            child: Center(
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Text(
+                    'Способ оплаты',
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                  const SizedBox(width: 8),
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.6)),
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.4)),
+                  Icon(Icons.arrow_forward_ios, size: 12, color: Colors.white.withOpacity(0.2)),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildAgreement(TopUpLoaded state, BuildContext context) {
+    return Row(
+      children: [
+        AppCheckbox(
+          value: state.isAgreed,
+          onChanged: (v) => context.read<TopUpBloc>().add(ToggleAgreement(v ?? false)),
+        ),
+        const SizedBox(width: 12),
+        const Flexible(
+          child: Text.rich(
+            TextSpan(
+              text: 'Я принимаю условия покупки бонусного пакека, при котором денежные средства не подлежат возврату... ',
+              style: TextStyle(
+                color: AppColors.white70,
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildPayButton(TopUpLoaded state, VoidCallback onTap) {
+    return GradientButton(
+      text: 'Оплатить',
+      onTap: state.isAgreed ? onTap : null,
+      enabled: state.isAgreed,
+      showArrows: true,
+      height: 56,
+      width: double.infinity,
+      fontSize: 16,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/active_ride_state.dart b/lib/presentation/state/active_ride_state.dart
index 3f87931..14cb787 100644
--- a/lib/presentation/state/active_ride_state.dart
+++ b/lib/presentation/state/active_ride_state.dart
@@ -1,64 +1,64 @@
-import '../../domain/entities/scooter_order.dart';
-
-enum ActiveRideStatus { initial, loading, success, failure }
-
-class ActiveRideState {
-  final ActiveRideStatus status;
-  final ScooterOrder? order;
-  final String? errorMessage;
-  final Duration elapsedTime;
-  final double speed;
-  final double distance;
-  final double cost;
-  final bool isPaused;
-  final bool inZone;
-  final double latitude;
-  final double longitude;
-
-  const ActiveRideState({
-    this.status = ActiveRideStatus.initial,
-    this.order,
-    this.errorMessage,
-    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,
-  });
-
-  ActiveRideState copyWith({
-    ActiveRideStatus? status,
-    ScooterOrder? order,
-    String? errorMessage,
-    Duration? elapsedTime,
-    double? speed,
-    double? distance,
-    double? cost,
-    double? longitude,
-    double? latitude,
-    bool? isPaused,
-    bool? inZone,
-  }) {
-    return ActiveRideState(
-      status: status ?? this.status,
-      order: order ?? this.order,
-      errorMessage: errorMessage ?? this.errorMessage,
-      elapsedTime: elapsedTime ?? this.elapsedTime,
-      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,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'ActiveRideState{status: $status, cost: $cost, isPaused: $isPaused}';
-  }
-}
+import '../../domain/entities/scooter_order.dart';
+
+enum ActiveRideStatus { initial, loading, success, failure }
+
+class ActiveRideState {
+  final ActiveRideStatus status;
+  final ScooterOrder? order;
+  final String? errorMessage;
+  final Duration elapsedTime;
+  final double speed;
+  final double distance;
+  final double cost;
+  final bool isPaused;
+  final bool inZone;
+  final double latitude;
+  final double longitude;
+
+  const ActiveRideState({
+    this.status = ActiveRideStatus.initial,
+    this.order,
+    this.errorMessage,
+    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,
+  });
+
+  ActiveRideState copyWith({
+    ActiveRideStatus? status,
+    ScooterOrder? order,
+    String? errorMessage,
+    Duration? elapsedTime,
+    double? speed,
+    double? distance,
+    double? cost,
+    double? longitude,
+    double? latitude,
+    bool? isPaused,
+    bool? inZone,
+  }) {
+    return ActiveRideState(
+      status: status ?? this.status,
+      order: order ?? this.order,
+      errorMessage: errorMessage ?? this.errorMessage,
+      elapsedTime: elapsedTime ?? this.elapsedTime,
+      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,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'ActiveRideState{status: $status, cost: $cost, isPaused: $isPaused}';
+  }
+}
diff --git a/lib/presentation/state/add_card_state.dart b/lib/presentation/state/add_card_state.dart
index 1300274..20668e5 100644
--- a/lib/presentation/state/add_card_state.dart
+++ b/lib/presentation/state/add_card_state.dart
@@ -1,45 +1,45 @@
-enum AddCardStatus { initial, loading, success, failure }
-
-class AddCardState {
-  final AddCardStatus status;
-  final String cardNumber;
-  final String expiryDate;
-  final String cvv;
-  final String cardHolder;
-  final String errorMessage;
-
-  const AddCardState({
-    this.status = AddCardStatus.initial,
-    this.cardNumber = '',
-    this.expiryDate = '',
-    this.cvv = '',
-    this.cardHolder = '',
-    this.errorMessage = '',
-  });
-
-  AddCardState copyWith({
-    AddCardStatus? status,
-    String? cardNumber,
-    String? expiryDate,
-    String? cvv,
-    String? cardHolder,
-    String? errorMessage,
-  }) {
-    return AddCardState(
-      status: status ?? this.status,
-      cardNumber: cardNumber ?? this.cardNumber,
-      expiryDate: expiryDate ?? this.expiryDate,
-      cvv: cvv ?? this.cvv,
-      cardHolder: cardHolder ?? this.cardHolder,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  bool get isFormValid {
-    final cleanCardNumber = cardNumber.replaceAll(' ', '');
-    return cleanCardNumber.length == 16 &&
-        expiryDate.length == 5 &&
-        cvv.length == 3 &&
-        cardHolder.trim().isNotEmpty;
-  }
+enum AddCardStatus { initial, loading, success, failure }
+
+class AddCardState {
+  final AddCardStatus status;
+  final String cardNumber;
+  final String expiryDate;
+  final String cvv;
+  final String cardHolder;
+  final String errorMessage;
+
+  const AddCardState({
+    this.status = AddCardStatus.initial,
+    this.cardNumber = '',
+    this.expiryDate = '',
+    this.cvv = '',
+    this.cardHolder = '',
+    this.errorMessage = '',
+  });
+
+  AddCardState copyWith({
+    AddCardStatus? status,
+    String? cardNumber,
+    String? expiryDate,
+    String? cvv,
+    String? cardHolder,
+    String? errorMessage,
+  }) {
+    return AddCardState(
+      status: status ?? this.status,
+      cardNumber: cardNumber ?? this.cardNumber,
+      expiryDate: expiryDate ?? this.expiryDate,
+      cvv: cvv ?? this.cvv,
+      cardHolder: cardHolder ?? this.cardHolder,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  bool get isFormValid {
+    final cleanCardNumber = cardNumber.replaceAll(' ', '');
+    return cleanCardNumber.length == 16 &&
+        expiryDate.length == 5 &&
+        cvv.length == 3 &&
+        cardHolder.trim().isNotEmpty;
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/auth_state.dart b/lib/presentation/state/auth_state.dart
index 4b5c98d..efd13c9 100644
--- a/lib/presentation/state/auth_state.dart
+++ b/lib/presentation/state/auth_state.dart
@@ -1,45 +1,45 @@
-class PhoneAuthState {
-  final String phone;
-  final bool isAdult;
-  final bool privacyAccepted;
-  final bool isSubmitting;
-  final bool isSuccess;
-  final String? error;
-
-  PhoneAuthState({
-    required this.phone,
-    required this.isAdult,
-    required this.privacyAccepted,
-    required this.isSubmitting,
-    required this.isSuccess,
-    this.error,
-  });
-
-  factory PhoneAuthState.initial() {
-    return PhoneAuthState(
-      phone: '',
-      isAdult: false,
-      privacyAccepted: false,
-      isSubmitting: false,
-      isSuccess: false,
-    );
-  }
-
-  PhoneAuthState copyWith({
-    String? phone,
-    bool? isAdult,
-    bool? privacyAccepted,
-    bool? isSubmitting,
-    bool? isSuccess,
-    String? error,
-  }) {
-    return PhoneAuthState(
-      phone: phone ?? this.phone,
-      isAdult: isAdult ?? this.isAdult,
-      privacyAccepted: privacyAccepted ?? this.privacyAccepted,
-      isSubmitting: isSubmitting ?? this.isSubmitting,
-      isSuccess: isSuccess ?? this.isSuccess,
-      error: error,
-    );
-  }
+class PhoneAuthState {
+  final String phone;
+  final bool isAdult;
+  final bool privacyAccepted;
+  final bool isSubmitting;
+  final bool isSuccess;
+  final String? error;
+
+  PhoneAuthState({
+    required this.phone,
+    required this.isAdult,
+    required this.privacyAccepted,
+    required this.isSubmitting,
+    required this.isSuccess,
+    this.error,
+  });
+
+  factory PhoneAuthState.initial() {
+    return PhoneAuthState(
+      phone: '',
+      isAdult: false,
+      privacyAccepted: false,
+      isSubmitting: false,
+      isSuccess: false,
+    );
+  }
+
+  PhoneAuthState copyWith({
+    String? phone,
+    bool? isAdult,
+    bool? privacyAccepted,
+    bool? isSubmitting,
+    bool? isSuccess,
+    String? error,
+  }) {
+    return PhoneAuthState(
+      phone: phone ?? this.phone,
+      isAdult: isAdult ?? this.isAdult,
+      privacyAccepted: privacyAccepted ?? this.privacyAccepted,
+      isSubmitting: isSubmitting ?? this.isSubmitting,
+      isSuccess: isSuccess ?? this.isSuccess,
+      error: error,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/current_rides_state.dart b/lib/presentation/state/current_rides_state.dart
index 4128145..70bbfb6 100644
--- a/lib/presentation/state/current_rides_state.dart
+++ b/lib/presentation/state/current_rides_state.dart
@@ -1,27 +1,27 @@
-import '../../domain/entities/scooter_order.dart';
-
-enum CurrentRidesStatus { initial, loading, success, failure }
-
-class CurrentRidesState {
-  final CurrentRidesStatus status;
-  final List<ScooterOrder> orders;
-  final String? errorMessage;
-
-  const CurrentRidesState({
-    this.status = CurrentRidesStatus.initial,
-    this.orders = const [],
-    this.errorMessage,
-  });
-
-  CurrentRidesState copyWith({
-    CurrentRidesStatus? status,
-    List<ScooterOrder>? orders,
-    String? errorMessage,
-  }) {
-    return CurrentRidesState(
-      status: status ?? this.status,
-      orders: orders ?? this.orders,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-}
+import '../../domain/entities/scooter_order.dart';
+
+enum CurrentRidesStatus { initial, loading, success, failure }
+
+class CurrentRidesState {
+  final CurrentRidesStatus status;
+  final List<ScooterOrder> orders;
+  final String? errorMessage;
+
+  const CurrentRidesState({
+    this.status = CurrentRidesStatus.initial,
+    this.orders = const [],
+    this.errorMessage,
+  });
+
+  CurrentRidesState copyWith({
+    CurrentRidesStatus? status,
+    List<ScooterOrder>? orders,
+    String? errorMessage,
+  }) {
+    return CurrentRidesState(
+      status: status ?? this.status,
+      orders: orders ?? this.orders,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+}
diff --git a/lib/presentation/state/edit_profile_state.dart b/lib/presentation/state/edit_profile_state.dart
index 0d6f4f4..b693ba5 100644
--- a/lib/presentation/state/edit_profile_state.dart
+++ b/lib/presentation/state/edit_profile_state.dart
@@ -1,42 +1,42 @@
-import '../../domain/entities/user_profile.dart';
-
-class EditProfileState {
-  final bool isSaving;
-  final bool isSuccess;
-  final bool isLoading;
-  final UserProfile? profile;
-  final String? error;
-
-  const EditProfileState({
-    required this.isSaving,
-    required this.isSuccess,
-    required this.isLoading,
-    this.profile,
-    this.error,
-  });
-
-  factory EditProfileState.initial() {
-    return const EditProfileState(
-      isSaving: false,
-      isSuccess: false,
-      isLoading: false,
-    );
-  }
-
-  EditProfileState copyWith({
-    bool? isSaving,
-    bool? isSuccess,
-    bool? isLoading,
-    UserProfile? profile,
-    String? error,
-  }) {
-    return EditProfileState(
-      isSaving: isSaving ?? this.isSaving,
-      isSuccess: isSuccess ?? this.isSuccess,
-      isLoading: isLoading ?? this.isLoading,
-      profile: profile ?? this.profile,
-      error: error,
-    );
-  }
-}
-
+import '../../domain/entities/user_profile.dart';
+
+class EditProfileState {
+  final bool isSaving;
+  final bool isSuccess;
+  final bool isLoading;
+  final UserProfile? profile;
+  final String? error;
+
+  const EditProfileState({
+    required this.isSaving,
+    required this.isSuccess,
+    required this.isLoading,
+    this.profile,
+    this.error,
+  });
+
+  factory EditProfileState.initial() {
+    return const EditProfileState(
+      isSaving: false,
+      isSuccess: false,
+      isLoading: false,
+    );
+  }
+
+  EditProfileState copyWith({
+    bool? isSaving,
+    bool? isSuccess,
+    bool? isLoading,
+    UserProfile? profile,
+    String? error,
+  }) {
+    return EditProfileState(
+      isSaving: isSaving ?? this.isSaving,
+      isSuccess: isSuccess ?? this.isSuccess,
+      isLoading: isLoading ?? this.isLoading,
+      profile: profile ?? this.profile,
+      error: error,
+    );
+  }
+}
+
diff --git a/lib/presentation/state/fine_payment_state.dart b/lib/presentation/state/fine_payment_state.dart
new file mode 100644
index 0000000..cb4f009
--- /dev/null
+++ b/lib/presentation/state/fine_payment_state.dart
@@ -0,0 +1,56 @@
+import 'package:equatable/equatable.dart';
+import '../../domain/entities/fine.dart';
+import '../../domain/entities/payment_card.dart';
+
+enum FinePaymentStatus { initial, loading, success, failure }
+
+class FinePaymentState extends Equatable {
+  final FinePaymentStatus status;
+  final Fine? fine;
+  final PaymentCard? selectedCard;
+  final bool useBalance;
+  final double userBalance;
+  final String? errorMessage;
+  final bool paymentCompleted;
+
+  const FinePaymentState({
+    this.status = FinePaymentStatus.initial,
+    this.fine,
+    this.selectedCard,
+    this.useBalance = false,
+    this.userBalance = 0.0,
+    this.errorMessage,
+    this.paymentCompleted = false,
+  });
+
+  FinePaymentState copyWith({
+    FinePaymentStatus? status,
+    Fine? fine,
+    PaymentCard? selectedCard,
+    bool? useBalance,
+    double? userBalance,
+    String? errorMessage,
+    bool? paymentCompleted,
+  }) {
+    return FinePaymentState(
+      status: status ?? this.status,
+      fine: fine ?? this.fine,
+      selectedCard: selectedCard ?? this.selectedCard,
+      useBalance: useBalance ?? this.useBalance,
+      userBalance: userBalance ?? this.userBalance,
+      errorMessage: errorMessage,
+      paymentCompleted: paymentCompleted ?? this.paymentCompleted,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+    status,
+    fine,
+    selectedCard,
+    useBalance,
+    userBalance,
+    errorMessage,
+    paymentCompleted,
+  ];
+}
\ No newline at end of file
diff --git a/lib/presentation/state/map_settings_modal_state.dart b/lib/presentation/state/map_settings_modal_state.dart
index fcbbd0e..853ef76 100644
--- a/lib/presentation/state/map_settings_modal_state.dart
+++ b/lib/presentation/state/map_settings_modal_state.dart
@@ -1,29 +1,29 @@
-class MapSettingsModalState {
-  final bool isAllGeomarksActive;
-  final bool isAllGeozonesActive;
-  final bool isRestrictedDrivingZoneActive;
-  final bool isParkingZoneActive;
-  final bool isRestrictedParkingZoneActive;
-
-  MapSettingsModalState({
-    required this.isAllGeomarksActive,
-    required this.isAllGeozonesActive,
-    required this.isRestrictedDrivingZoneActive,
-    required this.isParkingZoneActive,
-    required this.isRestrictedParkingZoneActive,
-  });
-
-  MapSettingsModalState copyWith({
-    bool? isGeomarksActive,
-    bool? isAllGeozonesActive,
-    bool? isRestrictedDrivingZoneActive,
-    bool? isParkingZoneActive,
-    bool? isRestrictedParkingZoneActive,
-  }) => MapSettingsModalState(
-    isAllGeomarksActive: isGeomarksActive ?? this.isAllGeomarksActive,
-    isAllGeozonesActive: isAllGeozonesActive ?? this.isAllGeozonesActive,
-    isRestrictedDrivingZoneActive: isRestrictedDrivingZoneActive ?? this.isRestrictedDrivingZoneActive,
-    isParkingZoneActive: isParkingZoneActive ?? this.isParkingZoneActive,
-    isRestrictedParkingZoneActive: isRestrictedParkingZoneActive ?? this.isRestrictedParkingZoneActive,
-  );
-}
+class MapSettingsModalState {
+  final bool isAllGeomarksActive;
+  final bool isAllGeozonesActive;
+  final bool isRestrictedDrivingZoneActive;
+  final bool isParkingZoneActive;
+  final bool isRestrictedParkingZoneActive;
+
+  MapSettingsModalState({
+    required this.isAllGeomarksActive,
+    required this.isAllGeozonesActive,
+    required this.isRestrictedDrivingZoneActive,
+    required this.isParkingZoneActive,
+    required this.isRestrictedParkingZoneActive,
+  });
+
+  MapSettingsModalState copyWith({
+    bool? isGeomarksActive,
+    bool? isAllGeozonesActive,
+    bool? isRestrictedDrivingZoneActive,
+    bool? isParkingZoneActive,
+    bool? isRestrictedParkingZoneActive,
+  }) => MapSettingsModalState(
+    isAllGeomarksActive: isGeomarksActive ?? this.isAllGeomarksActive,
+    isAllGeozonesActive: isAllGeozonesActive ?? this.isAllGeozonesActive,
+    isRestrictedDrivingZoneActive: isRestrictedDrivingZoneActive ?? this.isRestrictedDrivingZoneActive,
+    isParkingZoneActive: isParkingZoneActive ?? this.isParkingZoneActive,
+    isRestrictedParkingZoneActive: isRestrictedParkingZoneActive ?? this.isRestrictedParkingZoneActive,
+  );
+}
diff --git a/lib/presentation/state/map_state.dart b/lib/presentation/state/map_state.dart
index ec0c9a5..2a2f015 100644
--- a/lib/presentation/state/map_state.dart
+++ b/lib/presentation/state/map_state.dart
@@ -1,76 +1,76 @@
-import 'package:be_happy/domain/entities/user_check_flags.dart';
-
-import '../../domain/entities/point.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/zone.dart';
-import '../../domain/entities/client_notification.dart';
-
-enum ScooterStatus { initial, loading, success, failure }
-
-class ScooterState {
-  final List<Scooter> scooters;
-  final List<Scooter> reservedScooters;
-  final Scooter? selectedScooterForFocus;
-  final List<Zone> zones;
-  final List<double> area;
-  final List<double> areaScooters;
-  final ScooterStatus status;
-  final bool isGeomarksShowed;
-  final String? address;
-  final String? errorMessage;
-  final String phoneNumber;
-  final double balance;
-  final UserCheckFlags flags;
-  final ClientNotification? lastNotification;
-
-  ScooterState({
-    this.scooters = const [],
-    this.reservedScooters = const [],
-    this.selectedScooterForFocus,
-    this.zones = const [],
-    this.area = const [],
-    this.areaScooters = const [],
-    this.status = ScooterStatus.initial,
-    required this.isGeomarksShowed,
-    this.address,
-    this.errorMessage,
-    this.phoneNumber = "+375XXXXXXXXX",
-    this.balance = 999,
-    this.flags = const UserCheckFlags(hasFine: false, hasUnpaidOrder: false, hasCard: false),
-    this.lastNotification,
-  });
-
-  ScooterState copyWith({
-    List<Scooter>? scooters,
-    List<Scooter>? reservedScooters,
-    Scooter? selectedScooterForFocus,
-    List<Zone>? zones,
-    List<double>? area,
-    List<double>? areaScooters,
-    ScooterStatus? status,
-    bool? isGeomarksShowed,
-    String? address,
-    String? errorMessage,
-    String? phoneNumber,
-    double? balance,
-    UserCheckFlags? flags,
-    ClientNotification? lastNotification,
-  }) {
-    return ScooterState(
-      scooters: scooters ?? this.scooters,
-      reservedScooters: reservedScooters ?? this.reservedScooters,
-      selectedScooterForFocus: selectedScooterForFocus ?? this.selectedScooterForFocus,
-      zones: zones ?? this.zones,
-      area: area ?? this.area,
-      areaScooters: areaScooters ?? this.areaScooters,
-      status: status ?? this.status,
-      address: address ?? this.address,
-      isGeomarksShowed: isGeomarksShowed?? this.isGeomarksShowed,
-      errorMessage: errorMessage ?? this.errorMessage,
-      phoneNumber: phoneNumber ?? this.phoneNumber,
-      balance: balance ?? this.balance,
-      flags: flags ?? this.flags,
-      lastNotification: lastNotification ?? this.lastNotification,
-    );
-  }
-}
+import 'package:be_happy/domain/entities/user_check_flags.dart';
+
+import '../../domain/entities/point.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/zone.dart';
+import '../../domain/entities/client_notification.dart';
+
+enum ScooterStatus { initial, loading, success, failure }
+
+class ScooterState {
+  final List<Scooter> scooters;
+  final List<Scooter> reservedScooters;
+  final Scooter? selectedScooterForFocus;
+  final List<Zone> zones;
+  final List<double> area;
+  final List<double> areaScooters;
+  final ScooterStatus status;
+  final bool isGeomarksShowed;
+  final String? address;
+  final String? errorMessage;
+  final String phoneNumber;
+  final double balance;
+  final UserCheckFlags flags;
+  final ClientNotification? lastNotification;
+
+  ScooterState({
+    this.scooters = const [],
+    this.reservedScooters = const [],
+    this.selectedScooterForFocus,
+    this.zones = const [],
+    this.area = const [],
+    this.areaScooters = const [],
+    this.status = ScooterStatus.initial,
+    required this.isGeomarksShowed,
+    this.address,
+    this.errorMessage,
+    this.phoneNumber = "+375XXXXXXXXX",
+    this.balance = 999,
+    this.flags = const UserCheckFlags(hasFine: false, hasUnpaidOrder: false, hasCard: false),
+    this.lastNotification,
+  });
+
+  ScooterState copyWith({
+    List<Scooter>? scooters,
+    List<Scooter>? reservedScooters,
+    Scooter? selectedScooterForFocus,
+    List<Zone>? zones,
+    List<double>? area,
+    List<double>? areaScooters,
+    ScooterStatus? status,
+    bool? isGeomarksShowed,
+    String? address,
+    String? errorMessage,
+    String? phoneNumber,
+    double? balance,
+    UserCheckFlags? flags,
+    ClientNotification? lastNotification,
+  }) {
+    return ScooterState(
+      scooters: scooters ?? this.scooters,
+      reservedScooters: reservedScooters ?? this.reservedScooters,
+      selectedScooterForFocus: selectedScooterForFocus ?? this.selectedScooterForFocus,
+      zones: zones ?? this.zones,
+      area: area ?? this.area,
+      areaScooters: areaScooters ?? this.areaScooters,
+      status: status ?? this.status,
+      address: address ?? this.address,
+      isGeomarksShowed: isGeomarksShowed?? this.isGeomarksShowed,
+      errorMessage: errorMessage ?? this.errorMessage,
+      phoneNumber: phoneNumber ?? this.phoneNumber,
+      balance: balance ?? this.balance,
+      flags: flags ?? this.flags,
+      lastNotification: lastNotification ?? this.lastNotification,
+    );
+  }
+}
diff --git a/lib/presentation/state/news_state.dart b/lib/presentation/state/news_state.dart
index ecd8679..13f29d7 100644
--- a/lib/presentation/state/news_state.dart
+++ b/lib/presentation/state/news_state.dart
@@ -1,31 +1,31 @@
-import '../../../domain/entities/news.dart';
-
-enum NewsStatus { initial, loading, success, failure }
-
-class NewsState {
-  final NewsStatus status;
-  final List<NewsEntity> news;
-  final String? errorMessage;
-
-  const NewsState({
-    required this.status,
-    this.news = const [],
-    this.errorMessage,
-  });
-
-  NewsState copyWith({
-    NewsStatus? status,
-    List<NewsEntity>? news,
-    String? errorMessage,
-  }) {
-    return NewsState(
-      status: status ?? this.status,
-      news: news ?? this.news,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  bool get isLoading => status == NewsStatus.loading;
-  bool get isSuccess => status == NewsStatus.success;
-  bool get isFailure => status == NewsStatus.failure;
+import '../../../domain/entities/news.dart';
+
+enum NewsStatus { initial, loading, success, failure }
+
+class NewsState {
+  final NewsStatus status;
+  final List<NewsEntity> news;
+  final String? errorMessage;
+
+  const NewsState({
+    required this.status,
+    this.news = const [],
+    this.errorMessage,
+  });
+
+  NewsState copyWith({
+    NewsStatus? status,
+    List<NewsEntity>? news,
+    String? errorMessage,
+  }) {
+    return NewsState(
+      status: status ?? this.status,
+      news: news ?? this.news,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  bool get isLoading => status == NewsStatus.loading;
+  bool get isSuccess => status == NewsStatus.success;
+  bool get isFailure => status == NewsStatus.failure;
 }
\ No newline at end of file
diff --git a/lib/presentation/state/notifications_state.dart b/lib/presentation/state/notifications_state.dart
index 20cc561..3a4450d 100644
--- a/lib/presentation/state/notifications_state.dart
+++ b/lib/presentation/state/notifications_state.dart
@@ -1,43 +1,43 @@
-import '../../domain/entities/client_notification.dart';
-
-enum NotificationsStatus { initial, loading, loadingMore, success, failure }
-
-class NotificationsState {
-  final NotificationsStatus status;
-  final List<ClientNotification> notifications;
-  final String? errorMessage;
-  final int currentPage;
-  final int totalPages;
-  final bool hasMore;
-  final bool isLoadingMore;
-
-  const NotificationsState({
-    this.status = NotificationsStatus.initial,
-    this.notifications = const [],
-    this.errorMessage,
-    this.currentPage = 1,
-    this.totalPages = 1,
-    this.hasMore = true,
-    this.isLoadingMore = false,
-  });
-
-  NotificationsState copyWith({
-    NotificationsStatus? status,
-    List<ClientNotification>? notifications,
-    String? errorMessage,
-    int? currentPage,
-    int? totalPages,
-    bool? hasMore,
-    bool? isLoadingMore,
-  }) {
-    return NotificationsState(
-      status: status ?? this.status,
-      notifications: notifications ?? this.notifications,
-      errorMessage: errorMessage ?? this.errorMessage,
-      currentPage: currentPage ?? this.currentPage,
-      totalPages: totalPages ?? this.totalPages,
-      hasMore: hasMore ?? this.hasMore,
-      isLoadingMore: isLoadingMore ?? this.isLoadingMore,
-    );
-  }
+import '../../domain/entities/client_notification.dart';
+
+enum NotificationsStatus { initial, loading, loadingMore, success, failure }
+
+class NotificationsState {
+  final NotificationsStatus status;
+  final List<ClientNotification> notifications;
+  final String? errorMessage;
+  final int currentPage;
+  final int totalPages;
+  final bool hasMore;
+  final bool isLoadingMore;
+
+  const NotificationsState({
+    this.status = NotificationsStatus.initial,
+    this.notifications = const [],
+    this.errorMessage,
+    this.currentPage = 1,
+    this.totalPages = 1,
+    this.hasMore = true,
+    this.isLoadingMore = false,
+  });
+
+  NotificationsState copyWith({
+    NotificationsStatus? status,
+    List<ClientNotification>? notifications,
+    String? errorMessage,
+    int? currentPage,
+    int? totalPages,
+    bool? hasMore,
+    bool? isLoadingMore,
+  }) {
+    return NotificationsState(
+      status: status ?? this.status,
+      notifications: notifications ?? this.notifications,
+      errorMessage: errorMessage ?? this.errorMessage,
+      currentPage: currentPage ?? this.currentPage,
+      totalPages: totalPages ?? this.totalPages,
+      hasMore: hasMore ?? this.hasMore,
+      isLoadingMore: isLoadingMore ?? this.isLoadingMore,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/payment_confirm_state.dart b/lib/presentation/state/payment_confirm_state.dart
index eaa8c22..bee3d78 100644
--- a/lib/presentation/state/payment_confirm_state.dart
+++ b/lib/presentation/state/payment_confirm_state.dart
@@ -1,45 +1,45 @@
-import 'package:be_happy/domain/entities/payment_card.dart';
-
-import '../../domain/entities/scooter_order.dart';
-
-enum PaymentConfirmStatus { initial, loading, success, failure }
-
-class PaymentConfirmState {
-  final PaymentConfirmStatus status;
-  final PaymentCard? selectedCard;
-  final String? errorMessage;
-  final bool paymentCompleted;
-  final ScooterOrder? order;
-  final bool useBalance;
-  final double userBalance;
-
-  const PaymentConfirmState({
-    this.status = PaymentConfirmStatus.initial,
-    this.errorMessage,
-    this.selectedCard,
-    this.paymentCompleted = false,
-    this.order,
-    this.useBalance = false,
-    this.userBalance = 0,
-  });
-
-  PaymentConfirmState copyWith({
-    PaymentConfirmStatus? status,
-    String? errorMessage,
-    PaymentCard? selectedCard,
-    bool? paymentCompleted,
-    ScooterOrder? order,
-    bool? useBalance,
-    double? userBalance,
-  }) {
-    return PaymentConfirmState(
-      status: status ?? this.status,
-      errorMessage: errorMessage ?? this.errorMessage,
-      selectedCard: selectedCard ?? this.selectedCard,
-      paymentCompleted: paymentCompleted ?? this.paymentCompleted,
-      order: order ?? this.order,
-      useBalance: useBalance ?? this.useBalance,
-      userBalance: userBalance ?? this.userBalance,
-    );
-  }
+import 'package:be_happy/domain/entities/payment_card.dart';
+
+import '../../domain/entities/scooter_order.dart';
+
+enum PaymentConfirmStatus { initial, loading, success, failure }
+
+class PaymentConfirmState {
+  final PaymentConfirmStatus status;
+  final PaymentCard? selectedCard;
+  final String? errorMessage;
+  final bool paymentCompleted;
+  final ScooterOrder? order;
+  final bool useBalance;
+  final double userBalance;
+
+  const PaymentConfirmState({
+    this.status = PaymentConfirmStatus.initial,
+    this.errorMessage,
+    this.selectedCard,
+    this.paymentCompleted = false,
+    this.order,
+    this.useBalance = false,
+    this.userBalance = 0,
+  });
+
+  PaymentConfirmState copyWith({
+    PaymentConfirmStatus? status,
+    String? errorMessage,
+    PaymentCard? selectedCard,
+    bool? paymentCompleted,
+    ScooterOrder? order,
+    bool? useBalance,
+    double? userBalance,
+  }) {
+    return PaymentConfirmState(
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      selectedCard: selectedCard ?? this.selectedCard,
+      paymentCompleted: paymentCompleted ?? this.paymentCompleted,
+      order: order ?? this.order,
+      useBalance: useBalance ?? this.useBalance,
+      userBalance: userBalance ?? this.userBalance,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/payment_method_sheet_state.dart b/lib/presentation/state/payment_method_sheet_state.dart
index abf5352..0690319 100644
--- a/lib/presentation/state/payment_method_sheet_state.dart
+++ b/lib/presentation/state/payment_method_sheet_state.dart
@@ -1,30 +1,30 @@
-import '../../domain/entities/payment_card.dart';
-
-enum PaymentMethodSheetStatus { initial, loading, success, failure }
-
-class PaymentMethodSheetState {
-  final PaymentMethodSheetStatus status;
-  final List<PaymentCard> cards;
-  final double balance;
-  final String? errorMessage;
-
-  PaymentMethodSheetState({
-    this.status = PaymentMethodSheetStatus.initial,
-    this.cards = const [],
-    this.balance = 0,
-    this.errorMessage,
-  });
-
-  PaymentMethodSheetState copyWith({
-    PaymentMethodSheetStatus? status,
-    List<PaymentCard>? cards,
-    double? balance,
-    String? errorMessage,
-  }) =>
-      PaymentMethodSheetState(
-        status: status ?? this.status,
-        cards: cards ?? this.cards,
-        balance: balance ?? this.balance,
-        errorMessage: errorMessage ?? this.errorMessage,
-      );
-}
+import '../../domain/entities/payment_card.dart';
+
+enum PaymentMethodSheetStatus { initial, loading, success, failure }
+
+class PaymentMethodSheetState {
+  final PaymentMethodSheetStatus status;
+  final List<PaymentCard> cards;
+  final double balance;
+  final String? errorMessage;
+
+  PaymentMethodSheetState({
+    this.status = PaymentMethodSheetStatus.initial,
+    this.cards = const [],
+    this.balance = 0,
+    this.errorMessage,
+  });
+
+  PaymentMethodSheetState copyWith({
+    PaymentMethodSheetStatus? status,
+    List<PaymentCard>? cards,
+    double? balance,
+    String? errorMessage,
+  }) =>
+      PaymentMethodSheetState(
+        status: status ?? this.status,
+        cards: cards ?? this.cards,
+        balance: balance ?? this.balance,
+        errorMessage: errorMessage ?? this.errorMessage,
+      );
+}
diff --git a/lib/presentation/state/payment_methods_state.dart b/lib/presentation/state/payment_methods_state.dart
index 70e7355..0255332 100644
--- a/lib/presentation/state/payment_methods_state.dart
+++ b/lib/presentation/state/payment_methods_state.dart
@@ -1,38 +1,38 @@
-import '../../domain/entities/payment_card.dart';
-
-enum PaymentMethodsStatus { initial, loading, success, failure }
-
-class PaymentMethodsState {
-  final PaymentMethodsStatus status;
-  final List<PaymentCard> cards;
-  final double balance;
-  final String? errorMessage;
-  final bool isDeleting;
-  final bool isSettingMain;
-
-  PaymentMethodsState({
-    this.status = PaymentMethodsStatus.initial,
-    this.cards = const [],
-    this.balance = 99,
-    this.errorMessage,
-    this.isDeleting = false,
-    this.isSettingMain = false,
-  });
-
-  PaymentMethodsState copyWith({
-    PaymentMethodsStatus? status,
-    List<PaymentCard>? cards,
-    double? balance,
-    String? errorMessage,
-    bool? isDeleting,
-    bool? isSettingMain,
-  }) =>
-      PaymentMethodsState(
-        status: status ?? this.status,
-        cards: cards ?? this.cards,
-        balance: balance ?? this.balance,
-        errorMessage: errorMessage ?? this.errorMessage,
-        isDeleting: isDeleting ?? this.isDeleting,
-        isSettingMain: isSettingMain ?? this.isSettingMain,
-      );
-}
+import '../../domain/entities/payment_card.dart';
+
+enum PaymentMethodsStatus { initial, loading, success, failure }
+
+class PaymentMethodsState {
+  final PaymentMethodsStatus status;
+  final List<PaymentCard> cards;
+  final double balance;
+  final String? errorMessage;
+  final bool isDeleting;
+  final bool isSettingMain;
+
+  PaymentMethodsState({
+    this.status = PaymentMethodsStatus.initial,
+    this.cards = const [],
+    this.balance = 99,
+    this.errorMessage,
+    this.isDeleting = false,
+    this.isSettingMain = false,
+  });
+
+  PaymentMethodsState copyWith({
+    PaymentMethodsStatus? status,
+    List<PaymentCard>? cards,
+    double? balance,
+    String? errorMessage,
+    bool? isDeleting,
+    bool? isSettingMain,
+  }) =>
+      PaymentMethodsState(
+        status: status ?? this.status,
+        cards: cards ?? this.cards,
+        balance: balance ?? this.balance,
+        errorMessage: errorMessage ?? this.errorMessage,
+        isDeleting: isDeleting ?? this.isDeleting,
+        isSettingMain: isSettingMain ?? this.isSettingMain,
+      );
+}
diff --git a/lib/presentation/state/pin_state.dart b/lib/presentation/state/pin_state.dart
index ec54959..38b5ac8 100644
--- a/lib/presentation/state/pin_state.dart
+++ b/lib/presentation/state/pin_state.dart
@@ -1,27 +1,27 @@
-sealed class PinState {
-  final String pin;
-  final String? error;
-
-  const PinState({required this.pin, this.error});
-}
-
-// Состояние создания нового ПИН-кода
-class PinCreateInProgress extends PinState {
-  const PinCreateInProgress({required String pin, String? error})
-      : super(pin: pin, error: error);
-}
-
-// Состояние ввода существующего ПИН-кода для входа
-class PinLoginInProgress extends PinState {
-  const PinLoginInProgress({required String pin, String? error})
-      : super(pin: pin, error: error);
-}
-
-// Технические состояния
-class PinLoading extends PinState {
-  const PinLoading() : super(pin: '');
-}
-
-class PinSuccess extends PinState {
-  const PinSuccess() : super(pin: '');
+sealed class PinState {
+  final String pin;
+  final String? error;
+
+  const PinState({required this.pin, this.error});
+}
+
+// Состояние создания нового ПИН-кода
+class PinCreateInProgress extends PinState {
+  const PinCreateInProgress({required String pin, String? error})
+      : super(pin: pin, error: error);
+}
+
+// Состояние ввода существующего ПИН-кода для входа
+class PinLoginInProgress extends PinState {
+  const PinLoginInProgress({required String pin, String? error})
+      : super(pin: pin, error: error);
+}
+
+// Технические состояния
+class PinLoading extends PinState {
+  const PinLoading() : super(pin: '');
+}
+
+class PinSuccess extends PinState {
+  const PinSuccess() : super(pin: '');
 }
\ No newline at end of file
diff --git a/lib/presentation/state/profile_state.dart b/lib/presentation/state/profile_state.dart
index 5f54d6a..99c067e 100644
--- a/lib/presentation/state/profile_state.dart
+++ b/lib/presentation/state/profile_state.dart
@@ -1,29 +1,29 @@
-import '../../domain/entities/user_profile.dart';
-
-class ProfileState {
-  final bool isLoading;
-  final UserProfile? profile;
-  final String? error;
-
-  const ProfileState({
-    required this.isLoading,
-    this.profile,
-    this.error,
-  });
-
-  factory ProfileState.initial() {
-    return const ProfileState(isLoading: true);
-  }
-
-  ProfileState copyWith({
-    bool? isLoading,
-    UserProfile? profile,
-    String? error,
-  }) {
-    return ProfileState(
-      isLoading: isLoading ?? this.isLoading,
-      profile: profile ?? this.profile,
-      error: error,
-    );
-  }
-}
+import '../../domain/entities/user_profile.dart';
+
+class ProfileState {
+  final bool isLoading;
+  final UserProfile? profile;
+  final String? error;
+
+  const ProfileState({
+    required this.isLoading,
+    this.profile,
+    this.error,
+  });
+
+  factory ProfileState.initial() {
+    return const ProfileState(isLoading: true);
+  }
+
+  ProfileState copyWith({
+    bool? isLoading,
+    UserProfile? profile,
+    String? error,
+  }) {
+    return ProfileState(
+      isLoading: isLoading ?? this.isLoading,
+      profile: profile ?? this.profile,
+      error: error,
+    );
+  }
+}
diff --git a/lib/presentation/state/promo_code_state.dart b/lib/presentation/state/promo_code_state.dart
index f8418f6..01a047a 100644
--- a/lib/presentation/state/promo_code_state.dart
+++ b/lib/presentation/state/promo_code_state.dart
@@ -1,25 +1,25 @@
-enum PromoCodeStatus { initial, loading, success, failure }
-
-class PromoCodeState {
-  final PromoCodeStatus status;
-  final double? newBalance;
-  final String? errorMessage;
-
-  const PromoCodeState({
-    this.status = PromoCodeStatus.initial,
-    this.newBalance,
-    this.errorMessage,
-  });
-
-  PromoCodeState copyWith({
-    PromoCodeStatus? status,
-    double? newBalance,
-    String? errorMessage,
-  }) {
-    return PromoCodeState(
-      status: status ?? this.status,
-      newBalance: newBalance ?? this.newBalance,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
+enum PromoCodeStatus { initial, loading, success, failure }
+
+class PromoCodeState {
+  final PromoCodeStatus status;
+  final double? newBalance;
+  final String? errorMessage;
+
+  const PromoCodeState({
+    this.status = PromoCodeStatus.initial,
+    this.newBalance,
+    this.errorMessage,
+  });
+
+  PromoCodeState copyWith({
+    PromoCodeStatus? status,
+    double? newBalance,
+    String? errorMessage,
+  }) {
+    return PromoCodeState(
+      status: status ?? this.status,
+      newBalance: newBalance ?? this.newBalance,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/state/reserved_ride_state.dart b/lib/presentation/state/reserved_ride_state.dart
index a54a593..60f49bb 100644
--- a/lib/presentation/state/reserved_ride_state.dart
+++ b/lib/presentation/state/reserved_ride_state.dart
@@ -1,29 +1,29 @@
-enum ReservedRideStatus { initial, loading, success, failure }
-
-class ReservedRideState {
-  final ReservedRideStatus status;
-  final String? errorMessage;
-  final bool rideStarted;
-  final bool rideCancelled;
-
-  const ReservedRideState({
-    this.status = ReservedRideStatus.initial,
-    this.errorMessage,
-    this.rideStarted = false,
-    this.rideCancelled = false,
-  });
-
-  ReservedRideState copyWith({
-    ReservedRideStatus? status,
-    String? errorMessage,
-    bool? rideStarted,
-    bool? rideCancelled,
-  }) {
-    return ReservedRideState(
-      status: status ?? this.status,
-      errorMessage: errorMessage ?? this.errorMessage,
-      rideStarted: rideStarted ?? this.rideStarted,
-      rideCancelled: rideCancelled ?? this.rideCancelled,
-    );
-  }
-}
+enum ReservedRideStatus { initial, loading, success, failure }
+
+class ReservedRideState {
+  final ReservedRideStatus status;
+  final String? errorMessage;
+  final bool rideStarted;
+  final bool rideCancelled;
+
+  const ReservedRideState({
+    this.status = ReservedRideStatus.initial,
+    this.errorMessage,
+    this.rideStarted = false,
+    this.rideCancelled = false,
+  });
+
+  ReservedRideState copyWith({
+    ReservedRideStatus? status,
+    String? errorMessage,
+    bool? rideStarted,
+    bool? rideCancelled,
+  }) {
+    return ReservedRideState(
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      rideStarted: rideStarted ?? this.rideStarted,
+      rideCancelled: rideCancelled ?? this.rideCancelled,
+    );
+  }
+}
diff --git a/lib/presentation/state/route_state.dart b/lib/presentation/state/route_state.dart
index c7eeb55..365f30c 100644
--- a/lib/presentation/state/route_state.dart
+++ b/lib/presentation/state/route_state.dart
@@ -1,18 +1,18 @@
-// route_state.dart
-import '../../domain/entities/point.dart';
-
-abstract class RouteState {}
-
-class RouteInitial extends RouteState {}
-
-class RouteLoading extends RouteState {}
-
-class RouteLoaded extends RouteState {
-  final List<Point> points;
-  RouteLoaded(this.points);
-}
-
-class RouteError extends RouteState {
-  final String message;
-  RouteError(this.message);
+// route_state.dart
+import '../../domain/entities/point.dart';
+
+abstract class RouteState {}
+
+class RouteInitial extends RouteState {}
+
+class RouteLoading extends RouteState {}
+
+class RouteLoaded extends RouteState {
+  final List<Point> points;
+  RouteLoaded(this.points);
+}
+
+class RouteError extends RouteState {
+  final String message;
+  RouteError(this.message);
 }
\ No newline at end of file
diff --git a/lib/presentation/state/scooter_code_state.dart b/lib/presentation/state/scooter_code_state.dart
index 0ba7112..e135860 100644
--- a/lib/presentation/state/scooter_code_state.dart
+++ b/lib/presentation/state/scooter_code_state.dart
@@ -1,23 +1,27 @@
-abstract class ScooterCodeState {
-  final String code;
-  final String? error;
-
-  const ScooterCodeState({this.code = '', this.error});
-}
-
-class ScooterCodeInitial extends ScooterCodeState {
-  const ScooterCodeInitial({super.code, super.error});
-}
-
-class ScooterCodeLoading extends ScooterCodeState {
-  const ScooterCodeLoading({super.code});
-}
-
-class ScooterCodeSuccess extends ScooterCodeState {
-  final dynamic scooter; // Замените dynamic на вашу модель Scooter
-  const ScooterCodeSuccess(this.scooter, {super.code});
-}
-
-class ScooterCodeFailure extends ScooterCodeState {
-  const ScooterCodeFailure(String error, {super.code}) : super(error: error);
+import '../../domain/entities/scooter.dart';
+
+abstract class ScooterCodeState {
+  final String code;
+  final String? error;
+
+  const ScooterCodeState({this.code = '', this.error});
+}
+
+class ScooterCodeInitial extends ScooterCodeState {
+  const ScooterCodeInitial({super.code, super.error});
+}
+
+class ScooterCodeLoading extends ScooterCodeState {
+  const ScooterCodeLoading({super.code});
+}
+
+class ScooterCodeSuccess extends ScooterCodeState {
+  final Scooter scooter;
+  final String address;
+  final double distance;
+  const ScooterCodeSuccess(this.scooter, {super.code, required this.address, required this.distance});
+}
+
+class ScooterCodeFailure extends ScooterCodeState {
+  const ScooterCodeFailure(String error, {super.code}) : super(error: error);
 }
\ No newline at end of file
diff --git a/lib/presentation/state/scooter_detail_modal_state.dart b/lib/presentation/state/scooter_detail_modal_state.dart
index 7b78f07..6079fe6 100644
--- a/lib/presentation/state/scooter_detail_modal_state.dart
+++ b/lib/presentation/state/scooter_detail_modal_state.dart
@@ -1,32 +1,32 @@
-
-import '../../domain/entities/scooter.dart';
-
-enum ScooterDetailModalStatus { initial, loading, success, failure }
-
-class ScooterDetailModalState {
-  final ScooterDetailModalStatus status;
-  final String? address;
-  final String? errorMessage;
-  final List<Scooter>? scooters;
-
-  ScooterDetailModalState({
-    this.status = ScooterDetailModalStatus.initial,
-    this.address,
-    this.errorMessage,
-    this.scooters,
-  });
-
-  ScooterDetailModalState copyWith({
-    ScooterDetailModalStatus? status,
-    double? distance,
-    String? address,
-    String? errorMessage,
-    List<Scooter>? scooters,
-
-  }) => ScooterDetailModalState(
-    status: status ?? this.status,
-    address: address ?? this.address,
-    errorMessage: errorMessage ?? this.errorMessage,
-    scooters: scooters ?? this.scooters,
-  );
+
+import '../../domain/entities/scooter.dart';
+
+enum ScooterDetailModalStatus { initial, loading, success, failure }
+
+class ScooterDetailModalState {
+  final ScooterDetailModalStatus status;
+  final String? address;
+  final String? errorMessage;
+  final List<Scooter>? scooters;
+
+  ScooterDetailModalState({
+    this.status = ScooterDetailModalStatus.initial,
+    this.address,
+    this.errorMessage,
+    this.scooters,
+  });
+
+  ScooterDetailModalState copyWith({
+    ScooterDetailModalStatus? status,
+    double? distance,
+    String? address,
+    String? errorMessage,
+    List<Scooter>? scooters,
+
+  }) => ScooterDetailModalState(
+    status: status ?? this.status,
+    address: address ?? this.address,
+    errorMessage: errorMessage ?? this.errorMessage,
+    scooters: scooters ?? this.scooters,
+  );
 }
\ No newline at end of file
diff --git a/lib/presentation/state/scooter_detail_state.dart b/lib/presentation/state/scooter_detail_state.dart
index a22fb01..b123658 100644
--- a/lib/presentation/state/scooter_detail_state.dart
+++ b/lib/presentation/state/scooter_detail_state.dart
@@ -1,27 +1,27 @@
-import '../../domain/entities/scooter.dart';
-
-enum ScooterStatus { initial, loading, success, failure }
-
-class ScooterDetailState {
-  final ScooterStatus status;
-  final Scooter? scooter;
-  final String? errorMessage;
-
-  const ScooterDetailState({
-    this.status = ScooterStatus.initial,
-    this.scooter,
-    this.errorMessage,
-  });
-
-  ScooterDetailState copyWith({
-    ScooterStatus? status,
-    Scooter? scooter,
-    String? errorMessage,
-  }) {
-    return ScooterDetailState(
-      status: status ?? this.status,
-      scooter: scooter ?? this.scooter,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-}
+import '../../domain/entities/scooter.dart';
+
+enum ScooterStatus { initial, loading, success, failure }
+
+class ScooterDetailState {
+  final ScooterStatus status;
+  final Scooter? scooter;
+  final String? errorMessage;
+
+  const ScooterDetailState({
+    this.status = ScooterStatus.initial,
+    this.scooter,
+    this.errorMessage,
+  });
+
+  ScooterDetailState copyWith({
+    ScooterStatus? status,
+    Scooter? scooter,
+    String? errorMessage,
+  }) {
+    return ScooterDetailState(
+      status: status ?? this.status,
+      scooter: scooter ?? this.scooter,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+}
diff --git a/lib/presentation/state/send_photo_state.dart b/lib/presentation/state/send_photo_state.dart
index faabecf..d9d4361 100644
--- a/lib/presentation/state/send_photo_state.dart
+++ b/lib/presentation/state/send_photo_state.dart
@@ -1,31 +1,31 @@
-enum SendPhotoStatus { initial, loading, success, failure }
-
-class SendPhotoState {
-  final SendPhotoStatus status;
-  final List<String> selectedImages;
-  final List<int> recievedPhotoIds;
-  final String errorMessage;
-
-  const SendPhotoState({
-    this.status = SendPhotoStatus.initial,
-    this.selectedImages = const [],
-    this.recievedPhotoIds = const [],
-    this.errorMessage = '',
-  });
-
-  SendPhotoState copyWith({
-    SendPhotoStatus? status,
-    List<String>? selectedImages,
-    List<int>? recievedPhotoIds,
-    String? errorMessage,
-  }) {
-    return SendPhotoState(
-      status: status ?? this.status,
-      selectedImages: selectedImages ?? this.selectedImages,
-      recievedPhotoIds: recievedPhotoIds ?? this.recievedPhotoIds,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  bool get hasSelectedImages => selectedImages.isNotEmpty;
-}
+enum SendPhotoStatus { initial, loading, success, failure }
+
+class SendPhotoState {
+  final SendPhotoStatus status;
+  final List<String> selectedImages;
+  final List<int> recievedPhotoIds;
+  final String errorMessage;
+
+  const SendPhotoState({
+    this.status = SendPhotoStatus.initial,
+    this.selectedImages = const [],
+    this.recievedPhotoIds = const [],
+    this.errorMessage = '',
+  });
+
+  SendPhotoState copyWith({
+    SendPhotoStatus? status,
+    List<String>? selectedImages,
+    List<int>? recievedPhotoIds,
+    String? errorMessage,
+  }) {
+    return SendPhotoState(
+      status: status ?? this.status,
+      selectedImages: selectedImages ?? this.selectedImages,
+      recievedPhotoIds: recievedPhotoIds ?? this.recievedPhotoIds,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  bool get hasSelectedImages => selectedImages.isNotEmpty;
+}
diff --git a/lib/presentation/state/splash_state.dart b/lib/presentation/state/splash_state.dart
index f523a7f..41fd68d 100644
--- a/lib/presentation/state/splash_state.dart
+++ b/lib/presentation/state/splash_state.dart
@@ -1,25 +1,25 @@
-import 'package:equatable/equatable.dart';
-
-abstract class SplashState extends Equatable {
-  const SplashState();
-
-  @override
-  List<Object> get props => [];
-}
-
-// Начальное состояние, когда мы еще не знаем, авторизован ли пользователь
-class AuthInitial extends SplashState {}
-
-class AuthInProgress extends SplashState {}
-
-// Пользователь успешно авторизован (токен обновлен)
-class AuthAuthenticated extends SplashState {}
-
-// Пользователь не авторизован (нет токена или его не удалось обновить)
-class AuthUnauthenticated extends SplashState {}
-
-// успешно ввел пин код
-class AuthPinVerified extends SplashState {}
-
-// Специальное состояние для первого запуска приложения
-class AuthFirstLaunch extends SplashState {}
+import 'package:equatable/equatable.dart';
+
+abstract class SplashState extends Equatable {
+  const SplashState();
+
+  @override
+  List<Object> get props => [];
+}
+
+// Начальное состояние, когда мы еще не знаем, авторизован ли пользователь
+class AuthInitial extends SplashState {}
+
+class AuthInProgress extends SplashState {}
+
+// Пользователь успешно авторизован (токен обновлен)
+class AuthAuthenticated extends SplashState {}
+
+// Пользователь не авторизован (нет токена или его не удалось обновить)
+class AuthUnauthenticated extends SplashState {}
+
+// успешно ввел пин код
+class AuthPinVerified extends SplashState {}
+
+// Специальное состояние для первого запуска приложения
+class AuthFirstLaunch extends SplashState {}
diff --git a/lib/presentation/state/subscription_list_state.dart b/lib/presentation/state/subscription_list_state.dart
index 1db5045..6ae86fc 100644
--- a/lib/presentation/state/subscription_list_state.dart
+++ b/lib/presentation/state/subscription_list_state.dart
@@ -1,22 +1,22 @@
-import 'package:be_happy/domain/entities/client_subscription.dart';
-
-import '../../domain/entities/subscription.dart';
-
-abstract class SubscriptionState {}
-
-class SubscriptionsLoading extends SubscriptionState {}
-
-class SubscriptionsLoaded extends SubscriptionState {
-  final List<Subscription> subscriptions;
-  final List<ClientSubscription> activeSubscriptions;
-
-  SubscriptionsLoaded({
-    required this.subscriptions,
-    required this.activeSubscriptions,
-  });
-}
-
-class SubscriptionsError extends SubscriptionState {
-  final String message;
-  SubscriptionsError(this.message);
+import 'package:be_happy/domain/entities/client_subscription.dart';
+
+import '../../domain/entities/subscription.dart';
+
+abstract class SubscriptionState {}
+
+class SubscriptionsLoading extends SubscriptionState {}
+
+class SubscriptionsLoaded extends SubscriptionState {
+  final List<Subscription> subscriptions;
+  final List<ClientSubscription> activeSubscriptions;
+
+  SubscriptionsLoaded({
+    required this.subscriptions,
+    required this.activeSubscriptions,
+  });
+}
+
+class SubscriptionsError extends SubscriptionState {
+  final String message;
+  SubscriptionsError(this.message);
 }
\ No newline at end of file
diff --git a/lib/presentation/state/susbcription_details_state.dart b/lib/presentation/state/susbcription_details_state.dart
index ecc4740..5b7b71f 100644
--- a/lib/presentation/state/susbcription_details_state.dart
+++ b/lib/presentation/state/susbcription_details_state.dart
@@ -1,51 +1,51 @@
-import 'package:be_happy/domain/entities/payment_card.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-
-import '../../domain/entities/subscription_period.dart';
-
-abstract class SubscriptionDetailsState {}
-
-class DetailsLoading extends SubscriptionDetailsState {}
-
-class DetailsError extends SubscriptionDetailsState {
-  final String message;
-
-  DetailsError(this.message);
-}
-
-class DetailsContentState extends SubscriptionDetailsState {
-  final Subscription subscription;
-  final SubscriptionPeriod selectedPeriod;
-  final List<PaymentCard> cards;
-  final PaymentCard selectedCard;
-  final bool isAgreed;
-  final bool isAlreadyPurchased;
-  final bool isSuccess;
-
-  DetailsContentState({
-    required this.subscription,
-    required this.selectedPeriod,
-    required this.selectedCard,
-    this.cards = const [],
-    this.isAgreed = false,
-    this.isAlreadyPurchased = false,
-    this.isSuccess = false,
-  });
-
-  DetailsContentState copyWith({
-    SubscriptionPeriod? selectedPeriod,
-    PaymentCard? selectedCard,
-    bool? isAgreed,
-    bool? isAlreadyPurchased,
-    bool? isSuccess,
-  }) {
-    return DetailsContentState(
-      subscription: this.subscription,
-      selectedPeriod: selectedPeriod ?? this.selectedPeriod,
-      selectedCard: selectedCard ?? this.selectedCard,
-      isAgreed: isAgreed ?? this.isAgreed,
-      isAlreadyPurchased: isAlreadyPurchased ?? this.isAlreadyPurchased,
-      isSuccess: isSuccess ?? this.isSuccess,
-    );
-  }
-}
+import 'package:be_happy/domain/entities/payment_card.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+
+import '../../domain/entities/subscription_period.dart';
+
+abstract class SubscriptionDetailsState {}
+
+class DetailsLoading extends SubscriptionDetailsState {}
+
+class DetailsError extends SubscriptionDetailsState {
+  final String message;
+
+  DetailsError(this.message);
+}
+
+class DetailsContentState extends SubscriptionDetailsState {
+  final Subscription subscription;
+  final SubscriptionPeriod selectedPeriod;
+  final List<PaymentCard> cards;
+  final PaymentCard selectedCard;
+  final bool isAgreed;
+  final bool isAlreadyPurchased;
+  final bool isSuccess;
+
+  DetailsContentState({
+    required this.subscription,
+    required this.selectedPeriod,
+    required this.selectedCard,
+    this.cards = const [],
+    this.isAgreed = false,
+    this.isAlreadyPurchased = false,
+    this.isSuccess = false,
+  });
+
+  DetailsContentState copyWith({
+    SubscriptionPeriod? selectedPeriod,
+    PaymentCard? selectedCard,
+    bool? isAgreed,
+    bool? isAlreadyPurchased,
+    bool? isSuccess,
+  }) {
+    return DetailsContentState(
+      subscription: this.subscription,
+      selectedPeriod: selectedPeriod ?? this.selectedPeriod,
+      selectedCard: selectedCard ?? this.selectedCard,
+      isAgreed: isAgreed ?? this.isAgreed,
+      isAlreadyPurchased: isAlreadyPurchased ?? this.isAlreadyPurchased,
+      isSuccess: isSuccess ?? this.isSuccess,
+    );
+  }
+}
diff --git a/lib/presentation/state/tariff_sheet_state.dart b/lib/presentation/state/tariff_sheet_state.dart
index 60f8b49..34acce2 100644
--- a/lib/presentation/state/tariff_sheet_state.dart
+++ b/lib/presentation/state/tariff_sheet_state.dart
@@ -1,44 +1,44 @@
-import 'package:be_happy/domain/entities/payment_card.dart';
-
-import '../../domain/entities/tariff.dart';
-
-enum TariffSheetStatus { initial, loading, success, failure }
-
-class TariffSheetState {
-  final TariffSheetStatus status;
-  final List<Tariff> tariffs;
-  final String? errorMessage;
-  final PaymentCard? selectedCard;
-  final bool isInsurance;
-  final double userBalance;
-  final bool useBalance ;
-
-  TariffSheetState({
-    this.status = TariffSheetStatus.initial,
-    this.tariffs = const [],
-    this.selectedCard,
-    this.isInsurance = false,
-    this.errorMessage,
-    this.userBalance = 0,
-    this.useBalance = false,
-  });
-
-  TariffSheetState copyWith({
-    TariffSheetStatus? status,
-    List<Tariff>? tariffs,
-    PaymentCard? selectedCard,
-    String? errorMessage,
-    bool? isInsurance,
-    double? userBalance,
-    bool? useBalance,
-
-  }) => TariffSheetState(
-    status: status ?? this.status,
-    tariffs: tariffs ?? this.tariffs,
-    selectedCard: selectedCard ?? this.selectedCard,
-    useBalance: useBalance ?? this.useBalance,
-    userBalance: userBalance ?? this.userBalance,
-    isInsurance: isInsurance ?? this.isInsurance,
-    errorMessage: errorMessage ?? this.errorMessage,
-  );
-}
+import 'package:be_happy/domain/entities/payment_card.dart';
+
+import '../../domain/entities/tariff.dart';
+
+enum TariffSheetStatus { initial, loading, success, failure }
+
+class TariffSheetState {
+  final TariffSheetStatus status;
+  final List<Tariff> tariffs;
+  final String? errorMessage;
+  final PaymentCard? selectedCard;
+  final bool isInsurance;
+  final double userBalance;
+  final bool useBalance ;
+
+  TariffSheetState({
+    this.status = TariffSheetStatus.initial,
+    this.tariffs = const [],
+    this.selectedCard,
+    this.isInsurance = false,
+    this.errorMessage,
+    this.userBalance = 0,
+    this.useBalance = false,
+  });
+
+  TariffSheetState copyWith({
+    TariffSheetStatus? status,
+    List<Tariff>? tariffs,
+    PaymentCard? selectedCard,
+    String? errorMessage,
+    bool? isInsurance,
+    double? userBalance,
+    bool? useBalance,
+
+  }) => TariffSheetState(
+    status: status ?? this.status,
+    tariffs: tariffs ?? this.tariffs,
+    selectedCard: selectedCard ?? this.selectedCard,
+    useBalance: useBalance ?? this.useBalance,
+    userBalance: userBalance ?? this.userBalance,
+    isInsurance: isInsurance ?? this.isInsurance,
+    errorMessage: errorMessage ?? this.errorMessage,
+  );
+}
diff --git a/lib/presentation/state/top_up_state.dart b/lib/presentation/state/top_up_state.dart
index ff21a60..fb358d0 100644
--- a/lib/presentation/state/top_up_state.dart
+++ b/lib/presentation/state/top_up_state.dart
@@ -1,55 +1,55 @@
-import 'package:be_happy/domain/entities/certificate.dart';
-import 'package:be_happy/domain/entities/payment_card.dart';
-
-sealed class TopUpState {
-  const TopUpState();
-}
-
-class TopUpLoading extends TopUpState {
-  const TopUpLoading();
-}
-
-class TopUpLoaded extends TopUpState {
-  final List<Certificate> certificates;
-  final List<PaymentCard> cards;
-  final Certificate? selectedTariff;
-  final PaymentCard? selectedCard;
-  final bool isAgreed;
-  final bool isProcessingPayment;
-
-  const TopUpLoaded({
-    this.certificates = const [],
-    this.cards = const [],
-    this.selectedTariff,
-    this.selectedCard,
-    this.isAgreed = false,
-    this.isProcessingPayment = false,
-  });
-
-  TopUpLoaded copyWith({
-    List<Certificate>? certificates,
-    List<PaymentCard>? cards,
-    Certificate? selectedTariff,
-    PaymentCard? selectedCard,
-    bool? isAgreed,
-    bool? isProcessingPayment,
-  }) {
-    return TopUpLoaded(
-      certificates: certificates ?? this.certificates,
-      cards: cards ?? this.cards,
-      selectedTariff: selectedTariff ?? this.selectedTariff,
-      selectedCard: selectedCard ?? this.selectedCard,
-      isAgreed: isAgreed ?? this.isAgreed,
-      isProcessingPayment: isProcessingPayment ?? this.isProcessingPayment,
-    );
-  }
-}
-
-class TopUpPaymentSuccess extends TopUpState {
-  const TopUpPaymentSuccess();
-}
-
-class TopUpPaymentFailure extends TopUpState {
-  final String errorMessage;
-  const TopUpPaymentFailure(this.errorMessage);
+import 'package:be_happy/domain/entities/certificate.dart';
+import 'package:be_happy/domain/entities/payment_card.dart';
+
+sealed class TopUpState {
+  const TopUpState();
+}
+
+class TopUpLoading extends TopUpState {
+  const TopUpLoading();
+}
+
+class TopUpLoaded extends TopUpState {
+  final List<Certificate> certificates;
+  final List<PaymentCard> cards;
+  final Certificate? selectedTariff;
+  final PaymentCard? selectedCard;
+  final bool isAgreed;
+  final bool isProcessingPayment;
+
+  const TopUpLoaded({
+    this.certificates = const [],
+    this.cards = const [],
+    this.selectedTariff,
+    this.selectedCard,
+    this.isAgreed = false,
+    this.isProcessingPayment = false,
+  });
+
+  TopUpLoaded copyWith({
+    List<Certificate>? certificates,
+    List<PaymentCard>? cards,
+    Certificate? selectedTariff,
+    PaymentCard? selectedCard,
+    bool? isAgreed,
+    bool? isProcessingPayment,
+  }) {
+    return TopUpLoaded(
+      certificates: certificates ?? this.certificates,
+      cards: cards ?? this.cards,
+      selectedTariff: selectedTariff ?? this.selectedTariff,
+      selectedCard: selectedCard ?? this.selectedCard,
+      isAgreed: isAgreed ?? this.isAgreed,
+      isProcessingPayment: isProcessingPayment ?? this.isProcessingPayment,
+    );
+  }
+}
+
+class TopUpPaymentSuccess extends TopUpState {
+  const TopUpPaymentSuccess();
+}
+
+class TopUpPaymentFailure extends TopUpState {
+  final String errorMessage;
+  const TopUpPaymentFailure(this.errorMessage);
 }
\ No newline at end of file
diff --git a/lib/presentation/state/verify_code_state.dart b/lib/presentation/state/verify_code_state.dart
index f1aa96a..d0fb811 100644
--- a/lib/presentation/state/verify_code_state.dart
+++ b/lib/presentation/state/verify_code_state.dart
@@ -1,60 +1,60 @@
-class VerifyCodeState {
-  final String phoneNumber;
-  final String tempToken;
-  final String code;
-  final int secondsLeft;
-  final int attemptsLeft;
-  final bool isSubmitting;
-  final bool isSuccess;
-  final bool isBlocked;
-  final String? error;
-
-  VerifyCodeState({
-    required this.phoneNumber,
-    required this.tempToken,
-    required this.code,
-    required this.secondsLeft,
-    required this.attemptsLeft,
-    required this.isSubmitting,
-    required this.isSuccess,
-    required this.isBlocked,
-    this.error,
-  });
-
-  factory VerifyCodeState.initial() {
-    return VerifyCodeState(
-      phoneNumber: '',
-      tempToken: '',
-      code: '',
-      secondsLeft: 60,
-      attemptsLeft: 3,
-      isSubmitting: false,
-      isSuccess: false,
-      isBlocked: false,
-    );
-  }
-
-  VerifyCodeState copyWith({
-    String? phoneNumber,
-    String? tempToken,
-    String? code,
-    int? secondsLeft,
-    int? attemptsLeft,
-    bool? isSubmitting,
-    bool? isSuccess,
-    bool? isBlocked,
-    String? error,
-  }) {
-    return VerifyCodeState(
-      phoneNumber: phoneNumber ?? this.phoneNumber,
-      tempToken: tempToken ?? this.tempToken,
-      code: code ?? this.code,
-      secondsLeft: secondsLeft ?? this.secondsLeft,
-      attemptsLeft: attemptsLeft ?? this.attemptsLeft,
-      isSubmitting: isSubmitting ?? this.isSubmitting,
-      isSuccess: isSuccess ?? this.isSuccess,
-      isBlocked: isBlocked ?? this.isBlocked,
-      error: error,
-    );
-  }
+class VerifyCodeState {
+  final String phoneNumber;
+  final String tempToken;
+  final String code;
+  final int secondsLeft;
+  final int attemptsLeft;
+  final bool isSubmitting;
+  final bool isSuccess;
+  final bool isBlocked;
+  final String? error;
+
+  VerifyCodeState({
+    required this.phoneNumber,
+    required this.tempToken,
+    required this.code,
+    required this.secondsLeft,
+    required this.attemptsLeft,
+    required this.isSubmitting,
+    required this.isSuccess,
+    required this.isBlocked,
+    this.error,
+  });
+
+  factory VerifyCodeState.initial() {
+    return VerifyCodeState(
+      phoneNumber: '',
+      tempToken: '',
+      code: '',
+      secondsLeft: 60,
+      attemptsLeft: 3,
+      isSubmitting: false,
+      isSuccess: false,
+      isBlocked: false,
+    );
+  }
+
+  VerifyCodeState copyWith({
+    String? phoneNumber,
+    String? tempToken,
+    String? code,
+    int? secondsLeft,
+    int? attemptsLeft,
+    bool? isSubmitting,
+    bool? isSuccess,
+    bool? isBlocked,
+    String? error,
+  }) {
+    return VerifyCodeState(
+      phoneNumber: phoneNumber ?? this.phoneNumber,
+      tempToken: tempToken ?? this.tempToken,
+      code: code ?? this.code,
+      secondsLeft: secondsLeft ?? this.secondsLeft,
+      attemptsLeft: attemptsLeft ?? this.attemptsLeft,
+      isSubmitting: isSubmitting ?? this.isSubmitting,
+      isSuccess: isSuccess ?? this.isSuccess,
+      isBlocked: isBlocked ?? this.isBlocked,
+      error: error,
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/active_ride_bloc.dart b/lib/presentation/viewmodel/active_ride_bloc.dart
index b525bc0..8100243 100644
--- a/lib/presentation/viewmodel/active_ride_bloc.dart
+++ b/lib/presentation/viewmodel/active_ride_bloc.dart
@@ -1,210 +1,210 @@
-import 'dart:async';
-import 'package:be_happy/domain/entities/active_scooter_order.dart';
-import 'package:be_happy/domain/usecase/update_scooter_order_data_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../core/result.dart';
-import '../../../domain/entities/scooter_order.dart';
-import '../../../domain/usecase/finish_ride_usecase.dart';
-import '../../../domain/usecase/pause_ride_usecase.dart';
-import '../../../domain/usecase/resume_ride_usecase.dart';
-import '../../../domain/usecase/get_scooter_order_by_id_usecase.dart';
-import '../event/active_ride_event.dart';
-import '../state/active_ride_state.dart';
-
-class ActiveRideBloc extends Bloc<ActiveRideEvent, ActiveRideState> {
-  final FinishRideUsecase _finishRideUsecase;
-  final PauseRideUsecase _pauseRideUsecase;
-  final ResumeRideUsecase _resumeRideUsecase;
-  final GetScooterOrderByIdUsecase _getScooterOrderByIdUsecase;
-  final UpdateScooterOrderDataUsecase _updateScooterOrderDataUsecase;
-  Timer? _syncTimer;
-
-  ActiveRideBloc(
-    this._finishRideUsecase,
-    this._pauseRideUsecase,
-    this._resumeRideUsecase,
-    this._getScooterOrderByIdUsecase,
-    this._updateScooterOrderDataUsecase,
-  ) : super(const ActiveRideState()) {
-    on<LoadScooterOrder>(_onLoadScooterOrder);
-    on<PauseRide>(_onPauseRide);
-    on<ResumeRide>(_onResumeRide);
-    on<FinishRide>(_onFinishRide);
-    on<SyncScooterOrder>(_onSyncScooterOrder);
-  }
-
-  @override
-  Future<void> close() {
-    _syncTimer?.cancel();
-    return super.close();
-  }
-
-  Future<void> _onLoadScooterOrder(
-    LoadScooterOrder event,
-    Emitter<ActiveRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ActiveRideStatus.loading));
-
-    final results = await Future.wait([
-      _getScooterOrderByIdUsecase(event.orderId),
-      _updateScooterOrderDataUsecase(orderId: event.orderId),
-    ]);
-
-    final orderResult = results[0];
-    final activeOrderData = results[1];
-
-    if (orderResult is Success<ScooterOrder>) {
-      final order = orderResult.data;
-
-      final orderData = activeOrderData is Success<ActiveScooterOrder>
-          ? activeOrderData.data
-          : null;
-
-      final startTime = order?.startAt ?? order?.createdAt;
-      final elapsedTime = DateTime.now().difference(startTime!);
-      final isPaused = order?.status.toLowerCase() == 'pause';
-
-      print("ORDER DATA2: $orderData");
-
-      emit(state.copyWith(
-        status: ActiveRideStatus.success,
-        order: order,
-        elapsedTime: elapsedTime,
-        speed: orderData?.speed ?? 0.0,
-        distance: orderData?.mileage ?? 0.0,
-        cost: orderData?.price ?? 0.0,
-        isPaused: isPaused,
-        inZone: orderData?.zone,
-        latitude: orderData?.latitude,
-        longitude: orderData?.longitude,
-      ));
-
-      _syncTimer?.cancel();
-      _syncTimer = Timer.periodic(const Duration(seconds: 5), (timer) {
-        add(SyncScooterOrder(event.orderId));
-      });
-    } else if (orderResult is Failure) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.failure,
-        errorMessage: 'Не удалось загрузить информацию о поездке',
-      ));
-    }
-    print("CURRENT STATE $state");
-
-  }
-
-  Future<void> _onPauseRide(
-    PauseRide event,
-    Emitter<ActiveRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ActiveRideStatus.loading));
-
-    final result = await _pauseRideUsecase(event.orderId);
-
-    if (result is Success<ScooterOrder>) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.success,
-        order: result.data,
-        isPaused: true,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.failure,
-        errorMessage: 'Не удалось поставить поездку на паузу',
-      ));
-    }
-    print("CURRENT STATE $state");
-  }
-
-  Future<void> _onResumeRide(
-    ResumeRide event,
-    Emitter<ActiveRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ActiveRideStatus.loading));
-
-    final result = await _resumeRideUsecase(event.orderId);
-
-    if (result is Success<ScooterOrder>) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.success,
-        order: result.data,
-        isPaused: false,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.failure,
-        errorMessage: 'Не удалось возобновить поездку',
-      ));
-    }
-    print("CURRENT STATE $state");
-  }
-
-  Future<void> _onFinishRide(
-    FinishRide event,
-    Emitter<ActiveRideState> emit,
-  ) async {
-    // emit(state.copyWith(status: ActiveRideStatus.loading));
-
-    /*final result = await _finishRideUsecase(event.orderId);
-
-
-
-    if (result is Success<ScooterOrder>) {
-      _syncTimer?.cancel();
-      _syncTimer = null;
-
-      emit(state.copyWith(
-        status: ActiveRideStatus.success,
-        order: result.data,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ActiveRideStatus.failure,
-        errorMessage: 'Не удалось завершить поездку',
-      ));
-    }*/
-  }
-
-  Future<void> _onSyncScooterOrder(
-    SyncScooterOrder event,
-    Emitter<ActiveRideState> emit,
-  ) async {
-    final results = await Future.wait([
-      _getScooterOrderByIdUsecase(event.orderId),
-      _updateScooterOrderDataUsecase(orderId: event.orderId),
-    ]);
-
-    final orderResult = results[0];
-    final activeOrderData = results[1];
-
-    if (orderResult is Success<ScooterOrder>) {
-      final order = orderResult.data;
-
-      // Пытаемся достать доп. данные, если они Success
-      final orderData = activeOrderData is Success<ActiveScooterOrder>
-          ? activeOrderData.data
-          : null;
-
-      final startTime = order?.startAt ?? order?.createdAt;
-      final elapsedTime = DateTime.now().difference(startTime!);
-      final isPaused = order?.status.toLowerCase() == 'pause';
-
-      emit(state.copyWith(
-        order: order,
-        elapsedTime: elapsedTime,
-        speed: orderData?.speed ?? 0.0,
-        distance: orderData?.mileage ?? 0.0,
-        cost: orderData?.price ?? state.cost,
-        isPaused: isPaused,
-        inZone: orderData?.zone,
-        latitude: orderData?.latitude,
-        longitude: orderData?.longitude,
-      ));
-    }
-    print("CURRENT STATE $state");
-
-  }
-
-
-}
+import 'dart:async';
+import 'package:be_happy/domain/entities/active_scooter_order.dart';
+import 'package:be_happy/domain/usecase/update_scooter_order_data_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../../core/result.dart';
+import '../../../domain/entities/scooter_order.dart';
+import '../../../domain/usecase/finish_ride_usecase.dart';
+import '../../../domain/usecase/pause_ride_usecase.dart';
+import '../../../domain/usecase/resume_ride_usecase.dart';
+import '../../../domain/usecase/get_scooter_order_by_id_usecase.dart';
+import '../event/active_ride_event.dart';
+import '../state/active_ride_state.dart';
+
+class ActiveRideBloc extends Bloc<ActiveRideEvent, ActiveRideState> {
+  final FinishRideUsecase _finishRideUsecase;
+  final PauseRideUsecase _pauseRideUsecase;
+  final ResumeRideUsecase _resumeRideUsecase;
+  final GetScooterOrderByIdUsecase _getScooterOrderByIdUsecase;
+  final UpdateScooterOrderDataUsecase _updateScooterOrderDataUsecase;
+  Timer? _syncTimer;
+
+  ActiveRideBloc(
+    this._finishRideUsecase,
+    this._pauseRideUsecase,
+    this._resumeRideUsecase,
+    this._getScooterOrderByIdUsecase,
+    this._updateScooterOrderDataUsecase,
+  ) : super(const ActiveRideState()) {
+    on<LoadScooterOrder>(_onLoadScooterOrder);
+    on<PauseRide>(_onPauseRide);
+    on<ResumeRide>(_onResumeRide);
+    on<FinishRide>(_onFinishRide);
+    on<SyncScooterOrder>(_onSyncScooterOrder);
+  }
+
+  @override
+  Future<void> close() {
+    _syncTimer?.cancel();
+    return super.close();
+  }
+
+  Future<void> _onLoadScooterOrder(
+    LoadScooterOrder event,
+    Emitter<ActiveRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ActiveRideStatus.loading));
+
+    final results = await Future.wait([
+      _getScooterOrderByIdUsecase(event.orderId),
+      _updateScooterOrderDataUsecase(orderId: event.orderId),
+    ]);
+
+    final orderResult = results[0];
+    final activeOrderData = results[1];
+
+    if (orderResult is Success<ScooterOrder>) {
+      final order = orderResult.data;
+
+      final orderData = activeOrderData is Success<ActiveScooterOrder>
+          ? activeOrderData.data
+          : null;
+
+      final startTime = order?.startAt ?? order?.createdAt;
+      final elapsedTime = DateTime.now().difference(startTime!);
+      final isPaused = order?.status.toLowerCase() == 'pause';
+
+      print("ORDER DATA2: $orderData");
+
+      emit(state.copyWith(
+        status: ActiveRideStatus.success,
+        order: order,
+        elapsedTime: elapsedTime,
+        speed: orderData?.speed ?? 0.0,
+        distance: orderData?.mileage ?? 0.0,
+        cost: orderData?.price ?? 0.0,
+        isPaused: isPaused,
+        inZone: orderData?.zone,
+        latitude: orderData?.latitude,
+        longitude: orderData?.longitude,
+      ));
+
+      _syncTimer?.cancel();
+      _syncTimer = Timer.periodic(const Duration(seconds: 5), (timer) {
+        add(SyncScooterOrder(event.orderId));
+      });
+    } else if (orderResult is Failure) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.failure,
+        errorMessage: 'Не удалось загрузить информацию о поездке',
+      ));
+    }
+    print("CURRENT STATE $state");
+
+  }
+
+  Future<void> _onPauseRide(
+    PauseRide event,
+    Emitter<ActiveRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ActiveRideStatus.loading));
+
+    final result = await _pauseRideUsecase(event.orderId);
+
+    if (result is Success<ScooterOrder>) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.success,
+        order: result.data,
+        isPaused: true,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.failure,
+        errorMessage: 'Не удалось поставить поездку на паузу',
+      ));
+    }
+    print("CURRENT STATE $state");
+  }
+
+  Future<void> _onResumeRide(
+    ResumeRide event,
+    Emitter<ActiveRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ActiveRideStatus.loading));
+
+    final result = await _resumeRideUsecase(event.orderId);
+
+    if (result is Success<ScooterOrder>) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.success,
+        order: result.data,
+        isPaused: false,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.failure,
+        errorMessage: 'Не удалось возобновить поездку',
+      ));
+    }
+    print("CURRENT STATE $state");
+  }
+
+  Future<void> _onFinishRide(
+    FinishRide event,
+    Emitter<ActiveRideState> emit,
+  ) async {
+    // emit(state.copyWith(status: ActiveRideStatus.loading));
+
+    /*final result = await _finishRideUsecase(event.orderId);
+
+
+
+    if (result is Success<ScooterOrder>) {
+      _syncTimer?.cancel();
+      _syncTimer = null;
+
+      emit(state.copyWith(
+        status: ActiveRideStatus.success,
+        order: result.data,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ActiveRideStatus.failure,
+        errorMessage: 'Не удалось завершить поездку',
+      ));
+    }*/
+  }
+
+  Future<void> _onSyncScooterOrder(
+    SyncScooterOrder event,
+    Emitter<ActiveRideState> emit,
+  ) async {
+    final results = await Future.wait([
+      _getScooterOrderByIdUsecase(event.orderId),
+      _updateScooterOrderDataUsecase(orderId: event.orderId),
+    ]);
+
+    final orderResult = results[0];
+    final activeOrderData = results[1];
+
+    if (orderResult is Success<ScooterOrder>) {
+      final order = orderResult.data;
+
+      // Пытаемся достать доп. данные, если они Success
+      final orderData = activeOrderData is Success<ActiveScooterOrder>
+          ? activeOrderData.data
+          : null;
+
+      final startTime = order?.startAt ?? order?.createdAt;
+      final elapsedTime = DateTime.now().difference(startTime!);
+      final isPaused = order?.status.toLowerCase() == 'pause';
+
+      emit(state.copyWith(
+        order: order,
+        elapsedTime: elapsedTime,
+        speed: orderData?.speed ?? 0.0,
+        distance: orderData?.mileage ?? 0.0,
+        cost: orderData?.price ?? state.cost,
+        isPaused: isPaused,
+        inZone: orderData?.zone,
+        latitude: orderData?.latitude,
+        longitude: orderData?.longitude,
+      ));
+    }
+    print("CURRENT STATE $state");
+
+  }
+
+
+}
diff --git a/lib/presentation/viewmodel/add_card_bloc.dart b/lib/presentation/viewmodel/add_card_bloc.dart
index 476bf42..9108308 100644
--- a/lib/presentation/viewmodel/add_card_bloc.dart
+++ b/lib/presentation/viewmodel/add_card_bloc.dart
@@ -1,112 +1,112 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../domain/usecase/add_payment_card_usecase.dart';
-import '../event/add_card_event.dart';
-import '../state/add_card_state.dart';
-
-// 🔹 Импорты для Result и Failure
-import '../../core/result.dart';
-import '../../core/failures.dart';
-
-class AddCardBloc extends Bloc<AddCardEvent, AddCardState> {
-  final AddPaymentCardUsecase addPaymentCardUsecase;
-
-  AddCardBloc(this.addPaymentCardUsecase) : super(const AddCardState()) {
-    on<CardNumberChanged>(_onCardNumberChanged);
-    on<ExpiryDateChanged>(_onExpiryDateChanged);
-    on<CvvChanged>(_onCvvChanged);
-    on<CardHolderChanged>(_onCardHolderChanged);
-    on<AddCardSubmitted>(_onAddCardSubmitted);
-  }
-
-  void _onCardNumberChanged(CardNumberChanged event, Emitter<AddCardState> emit) {
-    final formatted = _formatCardNumber(event.cardNumber);
-    emit(state.copyWith(cardNumber: formatted));
-  }
-
-  void _onExpiryDateChanged(ExpiryDateChanged event, Emitter<AddCardState> emit) {
-    final formatted = _formatExpiryDate(event.expiryDate);
-    emit(state.copyWith(expiryDate: formatted));
-  }
-
-  void _onCvvChanged(CvvChanged event, Emitter<AddCardState> emit) {
-    final formatted = event.cvv.replaceAll(RegExp(r'\D'), '').substring(0, 3);
-    emit(state.copyWith(cvv: formatted));
-  }
-
-  void _onCardHolderChanged(CardHolderChanged event, Emitter<AddCardState> emit) {
-    emit(state.copyWith(cardHolder: event.cardHolder));
-  }
-
-  Future<void> _onAddCardSubmitted(AddCardSubmitted event, Emitter<AddCardState> emit) async {
-    if (state.cardNumber.isEmpty || state.expiryDate.isEmpty) return;
-
-    emit(state.copyWith(status: AddCardStatus.loading));
-
-    final expiryParts = state.expiryDate.split('/'); // Используем state
-    if (expiryParts.length != 2) {
-      emit(state.copyWith(
-        status: AddCardStatus.failure,
-        errorMessage: 'Неверный формат даты',
-      ));
-      return;
-    }
-
-    final result = await addPaymentCardUsecase(
-      /*cardNumber: state.cardNumber.replaceAll(' ', ''),
-      expiryMonth: expiryParts[0],
-      expiryYear: expiryParts[1],
-      cardHolder: state.cardHolder.trim(),
-      cvv: state.cvv,*/
-    );
-
-    if (result is Success) {
-      emit(state.copyWith(status: AddCardStatus.success));
-    } else if (result is Failure) {
-      /*final failure = result.failure;
-
-      String errorMessage = 'Ошибка добавления карты';
-
-      if (failure is AuthFailure) {
-        errorMessage = 'Неверные данные карты';
-      } else if (failure is AuthBlockFailure) {
-        errorMessage = 'Доступ заблокирован';
-      } else if (failure is UnknownFailure) {
-        errorMessage = failure.message ?? 'Неизвестная ошибка';
-      }*/
-
-     /* emit(state.copyWith(
-        status: AddCardStatus.failure,
-        errorMessage: errorMessage,
-      ));*/
-    }
-  }
-
-  String _formatCardNumber(String value) {
-    final cleaned = value.replaceAll(RegExp(r'\D'), '');
-    final limited = cleaned.substring(0, cleaned.length > 16 ? 16 : cleaned.length);
-
-    String formatted = '';
-    for (int i = 0; i < limited.length; i++) {
-      if (i > 0 && i % 4 == 0) {
-        formatted += ' ';
-      }
-      formatted += limited[i];
-    }
-
-    return formatted;
-  }
-
-  String _formatExpiryDate(String value) {
-    final cleaned = value.replaceAll(RegExp(r'\D'), '');
-    if (cleaned.isEmpty) return '';
-
-    if (cleaned.length <= 2) {
-      return cleaned;
-    }
-
-    final month = cleaned.substring(0, 2);
-    final year = cleaned.substring(2, cleaned.length > 4 ? 4 : cleaned.length);
-
-    return '$month/$year';
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/add_payment_card_usecase.dart';
+import '../event/add_card_event.dart';
+import '../state/add_card_state.dart';
+
+// 🔹 Импорты для Result и Failure
+import '../../core/result.dart';
+import '../../core/failures.dart';
+
+class AddCardBloc extends Bloc<AddCardEvent, AddCardState> {
+  final AddPaymentCardUsecase addPaymentCardUsecase;
+
+  AddCardBloc(this.addPaymentCardUsecase) : super(const AddCardState()) {
+    on<CardNumberChanged>(_onCardNumberChanged);
+    on<ExpiryDateChanged>(_onExpiryDateChanged);
+    on<CvvChanged>(_onCvvChanged);
+    on<CardHolderChanged>(_onCardHolderChanged);
+    on<AddCardSubmitted>(_onAddCardSubmitted);
+  }
+
+  void _onCardNumberChanged(CardNumberChanged event, Emitter<AddCardState> emit) {
+    final formatted = _formatCardNumber(event.cardNumber);
+    emit(state.copyWith(cardNumber: formatted));
+  }
+
+  void _onExpiryDateChanged(ExpiryDateChanged event, Emitter<AddCardState> emit) {
+    final formatted = _formatExpiryDate(event.expiryDate);
+    emit(state.copyWith(expiryDate: formatted));
+  }
+
+  void _onCvvChanged(CvvChanged event, Emitter<AddCardState> emit) {
+    final formatted = event.cvv.replaceAll(RegExp(r'\D'), '').substring(0, 3);
+    emit(state.copyWith(cvv: formatted));
+  }
+
+  void _onCardHolderChanged(CardHolderChanged event, Emitter<AddCardState> emit) {
+    emit(state.copyWith(cardHolder: event.cardHolder));
+  }
+
+  Future<void> _onAddCardSubmitted(AddCardSubmitted event, Emitter<AddCardState> emit) async {
+    if (state.cardNumber.isEmpty || state.expiryDate.isEmpty) return;
+
+    emit(state.copyWith(status: AddCardStatus.loading));
+
+    final expiryParts = state.expiryDate.split('/'); // Используем state
+    if (expiryParts.length != 2) {
+      emit(state.copyWith(
+        status: AddCardStatus.failure,
+        errorMessage: 'Неверный формат даты',
+      ));
+      return;
+    }
+
+    final result = await addPaymentCardUsecase(
+      /*cardNumber: state.cardNumber.replaceAll(' ', ''),
+      expiryMonth: expiryParts[0],
+      expiryYear: expiryParts[1],
+      cardHolder: state.cardHolder.trim(),
+      cvv: state.cvv,*/
+    );
+
+    if (result is Success) {
+      emit(state.copyWith(status: AddCardStatus.success));
+    } else if (result is Failure) {
+      /*final failure = result.failure;
+
+      String errorMessage = 'Ошибка добавления карты';
+
+      if (failure is AuthFailure) {
+        errorMessage = 'Неверные данные карты';
+      } else if (failure is AuthBlockFailure) {
+        errorMessage = 'Доступ заблокирован';
+      } else if (failure is UnknownFailure) {
+        errorMessage = failure.message ?? 'Неизвестная ошибка';
+      }*/
+
+     /* emit(state.copyWith(
+        status: AddCardStatus.failure,
+        errorMessage: errorMessage,
+      ));*/
+    }
+  }
+
+  String _formatCardNumber(String value) {
+    final cleaned = value.replaceAll(RegExp(r'\D'), '');
+    final limited = cleaned.substring(0, cleaned.length > 16 ? 16 : cleaned.length);
+
+    String formatted = '';
+    for (int i = 0; i < limited.length; i++) {
+      if (i > 0 && i % 4 == 0) {
+        formatted += ' ';
+      }
+      formatted += limited[i];
+    }
+
+    return formatted;
+  }
+
+  String _formatExpiryDate(String value) {
+    final cleaned = value.replaceAll(RegExp(r'\D'), '');
+    if (cleaned.isEmpty) return '';
+
+    if (cleaned.length <= 2) {
+      return cleaned;
+    }
+
+    final month = cleaned.substring(0, 2);
+    final year = cleaned.substring(2, cleaned.length > 4 ? 4 : cleaned.length);
+
+    return '$month/$year';
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/auth_bloc.dart b/lib/presentation/viewmodel/auth_bloc.dart
index 1b9f756..e95c3c2 100644
--- a/lib/presentation/viewmodel/auth_bloc.dart
+++ b/lib/presentation/viewmodel/auth_bloc.dart
@@ -1,55 +1,55 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../domain/usecase/login_usecase.dart';
-import '../event/auth_event.dart';
-import '../state/auth_state.dart';
-
-class PhoneAuthBloc extends Bloc<PhoneAuthEvent, PhoneAuthState> {
-  final LoginUseCase _loginUseCase;
-
-  PhoneAuthBloc(this._loginUseCase) : super(PhoneAuthState.initial()) {
-    on<PhoneChanged>((event, emit) {
-      emit(state.copyWith(
-        phone: event.phone,
-        isSuccess: false,
-        error: null,
-      ));
-    });
-
-    on<IsAdultChanged>((event, emit) {
-      emit(state.copyWith(isAdult: event.isAdult));
-    });
-
-    on<PrivacyAcceptedChanged>((event, emit) {
-      emit(state.copyWith(privacyAccepted: event.accepted));
-    });
-
-    on<SubmitPhonePressed>(_onSubmitPhonePressed);
-  }
-
-  Future<void> _onSubmitPhonePressed(
-      SubmitPhonePressed event,
-      Emitter<PhoneAuthState> emit,
-      ) async {
-    if (state.isSubmitting) return;
-
-    final phone = state.phone;
-    final isAdult = state.isAdult;
-    final privacyAccepted = state.privacyAccepted;
-
-    if (phone.isEmpty || !isAdult || !privacyAccepted) {
-      emit(state.copyWith(error: "Пожалуйста, заполните все поля."));
-      return;
-    }
-
-    emit(state.copyWith(isSubmitting: true, error: null));
-
-    //готовы отправить данные, вызываем юзкейс
-    try {
-      final tempToken = await _loginUseCase.execute('+375$phone');
-      print("TOKEN ON PRESENTATION LAYER: $tempToken");
-      emit(state.copyWith(isSubmitting: false, isSuccess: true));
-    } catch (e) {
-      emit(state.copyWith(isSubmitting: false, error: e.toString()));
-    }
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/login_usecase.dart';
+import '../event/auth_event.dart';
+import '../state/auth_state.dart';
+
+class PhoneAuthBloc extends Bloc<PhoneAuthEvent, PhoneAuthState> {
+  final LoginUseCase _loginUseCase;
+
+  PhoneAuthBloc(this._loginUseCase) : super(PhoneAuthState.initial()) {
+    on<PhoneChanged>((event, emit) {
+      emit(state.copyWith(
+        phone: event.phone,
+        isSuccess: false,
+        error: null,
+      ));
+    });
+
+    on<IsAdultChanged>((event, emit) {
+      emit(state.copyWith(isAdult: event.isAdult));
+    });
+
+    on<PrivacyAcceptedChanged>((event, emit) {
+      emit(state.copyWith(privacyAccepted: event.accepted));
+    });
+
+    on<SubmitPhonePressed>(_onSubmitPhonePressed);
+  }
+
+  Future<void> _onSubmitPhonePressed(
+      SubmitPhonePressed event,
+      Emitter<PhoneAuthState> emit,
+      ) async {
+    if (state.isSubmitting) return;
+
+    final phone = state.phone;
+    final isAdult = state.isAdult;
+    final privacyAccepted = state.privacyAccepted;
+
+    if (phone.isEmpty || !isAdult || !privacyAccepted) {
+      emit(state.copyWith(error: "Пожалуйста, заполните все поля."));
+      return;
+    }
+
+    emit(state.copyWith(isSubmitting: true, error: null));
+
+    //готовы отправить данные, вызываем юзкейс
+    try {
+      final tempToken = await _loginUseCase.execute('+375$phone');
+      print("TOKEN ON PRESENTATION LAYER: $tempToken");
+      emit(state.copyWith(isSubmitting: false, isSuccess: true));
+    } catch (e) {
+      emit(state.copyWith(isSubmitting: false, error: e.toString()));
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/current_rides_bloc.dart b/lib/presentation/viewmodel/current_rides_bloc.dart
index 4054f47..8b6c73b 100644
--- a/lib/presentation/viewmodel/current_rides_bloc.dart
+++ b/lib/presentation/viewmodel/current_rides_bloc.dart
@@ -1,42 +1,42 @@
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/usecase/get_client_orders_usecase.dart';
-import '../event/current_rides_event.dart';
-import '../state/current_rides_state.dart';
-
-class CurrentRidesBloc extends Bloc<CurrentRidesEvent, CurrentRidesState> {
-  final GetClientOrdersUsecase _getClientOrdersUsecase;
-
-  CurrentRidesBloc(this._getClientOrdersUsecase) : super(const CurrentRidesState()) {
-    on<LoadClientOrders>(_onLoadClientOrders);
-  }
-
-  Future<void> _onLoadClientOrders(
-    LoadClientOrders event,
-    Emitter<CurrentRidesState> emit,
-  ) async {
-    emit(state.copyWith(status: CurrentRidesStatus.loading));
-
-    await Future.delayed(const Duration(seconds: 2));
-
-    final result = await _getClientOrdersUsecase();
-
-    if (result is Success<List<ScooterOrder>>) {
-
-      print("RESULT: ${result.data}");
-
-      emit(state.copyWith(
-        status: CurrentRidesStatus.success,
-        orders: result.data ?? [],
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: CurrentRidesStatus.failure,
-        errorMessage: "Не удалось загрузить заказы",
-      ));
-    }
-  }
-}
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/usecase/get_client_orders_usecase.dart';
+import '../event/current_rides_event.dart';
+import '../state/current_rides_state.dart';
+
+class CurrentRidesBloc extends Bloc<CurrentRidesEvent, CurrentRidesState> {
+  final GetClientOrdersUsecase _getClientOrdersUsecase;
+
+  CurrentRidesBloc(this._getClientOrdersUsecase) : super(const CurrentRidesState()) {
+    on<LoadClientOrders>(_onLoadClientOrders);
+  }
+
+  Future<void> _onLoadClientOrders(
+    LoadClientOrders event,
+    Emitter<CurrentRidesState> emit,
+  ) async {
+    emit(state.copyWith(status: CurrentRidesStatus.loading));
+
+    await Future.delayed(const Duration(seconds: 2));
+
+    final result = await _getClientOrdersUsecase();
+
+    if (result is Success<List<ScooterOrder>>) {
+
+      print("RESULT: ${result.data}");
+
+      emit(state.copyWith(
+        status: CurrentRidesStatus.success,
+        orders: result.data ?? [],
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: CurrentRidesStatus.failure,
+        errorMessage: "Не удалось загрузить заказы",
+      ));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/edit_profile_bloc.dart b/lib/presentation/viewmodel/edit_profile_bloc.dart
index 276e7e7..edd7bad 100644
--- a/lib/presentation/viewmodel/edit_profile_bloc.dart
+++ b/lib/presentation/viewmodel/edit_profile_bloc.dart
@@ -1,59 +1,59 @@
-import 'package:be_happy/domain/entities/user_profile.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:intl/intl.dart';
-
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/update_profile_usecase.dart';
-import '../event/edit_profile_event.dart';
-import '../event/profile_event.dart';
-import '../state/edit_profile_state.dart';
-import '../state/profile_state.dart';
-
-class EditProfileBloc
-    extends Bloc<EditProfileEvent, EditProfileState> {
-  final UpdateProfileUseCase updateProfileUseCase;
-  final GetProfileUseCase getProfileUseCase;
-
-  EditProfileBloc(this.updateProfileUseCase, this.getProfileUseCase)
-      : super(EditProfileState.initial()) {
-
-    on<EditProfileStarted>(_onStarted);
-
-    on<EditProfileSubmitted>(_onSubmitted);
-  }
-
-  Future<void> _onSubmitted(
-      EditProfileSubmitted event,
-      Emitter<EditProfileState> emit,
-      ) async {
-    emit(state.copyWith(isSaving: true));
-
-    try {
-      final result = await updateProfileUseCase(event.profile);
-
-      if (result != null) {
-        emit(state.copyWith(isSaving: false, isSuccess: true));
-      } else {
-        emit(state.copyWith(isSaving: false, error: "Не удалось обновить профиль"));
-      }
-    } catch (e) {
-      emit(state.copyWith(isSaving: false, error: e.toString()));
-    }
-  }
-
-  Future<void> _onStarted(
-      EditProfileStarted event,
-      Emitter<EditProfileState> emit,
-      ) async {
-    emit(state.copyWith(isSaving: true));
-
-    print("EDIT BLOC STARTED");
-    try {
-      final profile = await getProfileUseCase();
-
-      emit(state.copyWith(profile: profile, isSaving: false, isSuccess: false));
-    } catch (e) {
-      emit(state.copyWith(isSaving: false, error: e.toString()));
-    }
-  }
-}
+import 'package:be_happy/domain/entities/user_profile.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
+
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/update_profile_usecase.dart';
+import '../event/edit_profile_event.dart';
+import '../event/profile_event.dart';
+import '../state/edit_profile_state.dart';
+import '../state/profile_state.dart';
+
+class EditProfileBloc
+    extends Bloc<EditProfileEvent, EditProfileState> {
+  final UpdateProfileUseCase updateProfileUseCase;
+  final GetProfileUseCase getProfileUseCase;
+
+  EditProfileBloc(this.updateProfileUseCase, this.getProfileUseCase)
+      : super(EditProfileState.initial()) {
+
+    on<EditProfileStarted>(_onStarted);
+
+    on<EditProfileSubmitted>(_onSubmitted);
+  }
+
+  Future<void> _onSubmitted(
+      EditProfileSubmitted event,
+      Emitter<EditProfileState> emit,
+      ) async {
+    emit(state.copyWith(isSaving: true));
+
+    try {
+      final result = await updateProfileUseCase(event.profile);
+
+      if (result != null) {
+        emit(state.copyWith(isSaving: false, isSuccess: true));
+      } else {
+        emit(state.copyWith(isSaving: false, error: "Не удалось обновить профиль"));
+      }
+    } catch (e) {
+      emit(state.copyWith(isSaving: false, error: e.toString()));
+    }
+  }
+
+  Future<void> _onStarted(
+      EditProfileStarted event,
+      Emitter<EditProfileState> emit,
+      ) async {
+    emit(state.copyWith(isSaving: true));
+
+    print("EDIT BLOC STARTED");
+    try {
+      final profile = await getProfileUseCase();
+
+      emit(state.copyWith(profile: profile, isSaving: false, isSuccess: false));
+    } catch (e) {
+      emit(state.copyWith(isSaving: false, error: e.toString()));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/fine_payment_bloc.dart b/lib/presentation/viewmodel/fine_payment_bloc.dart
new file mode 100644
index 0000000..0b6221f
--- /dev/null
+++ b/lib/presentation/viewmodel/fine_payment_bloc.dart
@@ -0,0 +1,81 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/get_fine_details_usecase.dart';
+import '../../domain/usecase/pay_fine_usecase.dart';
+import '../event/fine_payment_event.dart';
+import '../state/fine_payment_state.dart';
+
+class FinePaymentBloc extends Bloc<FinePaymentEvent, FinePaymentState> {
+  final GetFineDetailsUsecase getFineDetailsUsecase;
+  final PayFineUsecase payFineUsecase;
+
+  FinePaymentBloc({
+    required this.getFineDetailsUsecase,
+    required this.payFineUsecase,
+  }) : super(const FinePaymentState()) {
+    on<FetchFineDetails>(_onFetchFineDetails);
+    on<FinePaymentCardChanged>(_onCardChanged);
+    on<SelectFineBalancePressed>(_onSelectBalance);
+    on<PayFineSubmitted>(_onPayFineSubmitted);
+  }
+
+  Future<void> _onFetchFineDetails(
+    FetchFineDetails event,
+    Emitter<FinePaymentState> emit,
+  ) async {
+    emit(state.copyWith(status: FinePaymentStatus.loading));
+    try {
+      final fine = await getFineDetailsUsecase(event.fineId);
+      // emit(state.copyWith(status: FinePaymentStatus.initial, fine: fine));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: FinePaymentStatus.failure,
+          errorMessage: 'Не удалось загрузить данные о штрафе',
+        ),
+      );
+    }
+  }
+
+  void _onCardChanged(
+    FinePaymentCardChanged event,
+    Emitter<FinePaymentState> emit,
+  ) {
+    emit(state.copyWith(selectedCard: event.card, useBalance: false));
+  }
+
+  void _onSelectBalance(
+    SelectFineBalancePressed event,
+    Emitter<FinePaymentState> emit,
+  ) {
+    emit(state.copyWith(useBalance: true, selectedCard: null));
+  }
+
+  Future<void> _onPayFineSubmitted(
+    PayFineSubmitted event,
+    Emitter<FinePaymentState> emit,
+  ) async {
+    if (state.fine == null) return;
+
+    emit(state.copyWith(status: FinePaymentStatus.loading));
+    try {
+      await payFineUsecase(
+        orderId: state.fine!.id,
+        cardId: state.useBalance ? null : state.selectedCard?.id,
+        isBalance: state.useBalance,
+      );
+      emit(
+        state.copyWith(
+          status: FinePaymentStatus.success,
+          paymentCompleted: true,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: FinePaymentStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/map_bloc.dart b/lib/presentation/viewmodel/map_bloc.dart
index e039989..057e8b5 100644
--- a/lib/presentation/viewmodel/map_bloc.dart
+++ b/lib/presentation/viewmodel/map_bloc.dart
@@ -1,346 +1,346 @@
-import 'dart:async';
-
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/client_notification.dart';
-import 'package:be_happy/domain/entities/map_settings.dart';
-import 'package:be_happy/domain/usecase/check_user_usecase.dart';
-import 'package:be_happy/domain/usecase/get_available_zones_usecase.dart';
-import 'package:be_happy/domain/usecase/get_client_orders_usecase.dart';
-import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
-import 'package:be_happy/domain/usecase/get_notifications_stream_usecase.dart';
-import 'package:be_happy/domain/usecase/logout_usecase.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../domain/entities/point.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/entities/zone.dart';
-import '../../domain/usecase/get_available_scooters_usecase.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../event/map_event.dart';
-import '../event/spalsh_event.dart';
-import '../state/map_state.dart';
-import 'package:maps_toolkit/maps_toolkit.dart' as mt;
-
-class MapBloc extends Bloc<ScooterEvent, ScooterState> {
-  final GetAvailableScootersUsecase getScootersUsecase;
-  final GetClientOrdersUsecase getClientOrdersUsecase;
-  final GetAvailableZonesUsecase getAvailableZonesUsecase;
-  final GetMapSettingsUsecase getMapSettingsUsecase;
-  final GetNotificationsStreamUseCase getNotificationsStreamUseCase;
-  final GetProfileUseCase getProfileUseCase;
-  final CheckUserUseCase checkUserUseCase;
-  final LogoutUseCase logoutUseCase;
-  final SplashBloc splashBloc;
-  StreamSubscription<ClientNotification>? _notificationSubscription;
-
-  MapBloc(
-    this.getAvailableZonesUsecase,
-    this.getScootersUsecase,
-    this.getClientOrdersUsecase,
-    this.getMapSettingsUsecase,
-    this.getNotificationsStreamUseCase,
-    this.getProfileUseCase,
-    this.checkUserUseCase,
-    this.logoutUseCase,
-    this.splashBloc,
-  ) : super(ScooterState(isGeomarksShowed: true)) {
-    on<FetchScooters>(_onFetchScooters);
-    on<UpdateMap>(_onUpdateMap);
-    on<UpdateUserLocation>(_onUpdateUserLocation);
-    on<NotificationReceived>(_onNotificationReceived);
-    on<FetchProfileData>(_onFetchProfileData);
-    on<CheckUser>(_onCheckUser);
-    on<LogoutPressed>(_onLogoutPressed);
-    on<FocusOnScooter>(_onFocusOnScooter);
-    on<ClearMapPlacemarks>(_onClearMapPlacemarks);
-    on<ClearMapFocus>(_onClearMapFocus);
-  }
-
-  void startNotificationStream() {
-    _notificationSubscription?.cancel();
-
-    _notificationSubscription = getNotificationsStreamUseCase().listen(
-      (notification) {
-        add(NotificationReceived(notification));
-      },
-      onError: (error) {
-        print(" SSE BLOC ERROR: $error");
-        _handleReconnect();
-      },
-      onDone: () {
-        print(" SSE Stream closed by server (onDone)");
-        _handleReconnect();
-      },
-      cancelOnError: true,
-    );
-  }
-
-  void _handleReconnect() {
-    if (isClosed) return;
-
-    Future.delayed(const Duration(seconds: 5), () {
-      if (!isClosed) {
-        print(" Attempting to reconnect to SSE...");
-        startNotificationStream();
-      }
-    });
-  }
-
-  void stopNotificationStream() {
-    _notificationSubscription?.cancel();
-    _notificationSubscription = null;
-  }
-
-  Future<void> _onFetchScooters(
-    FetchScooters event,
-    Emitter<ScooterState> emit,
-  ) async {
-    emit(state.copyWith(status: ScooterStatus.loading));
-
-    try {
-      final results = await Future.wait([
-        getScootersUsecase(event.areaScooters, 0, 100),
-        getAvailableZonesUsecase(event.area, 0, 100),
-        getMapSettingsUsecase(),
-        getClientOrdersUsecase(),
-      ]);
-
-      final scooters = results[0] as List<Scooter>;
-      final zones = results[1] as List<Zone>;
-      final settings = results[2] as MapSettings;
-      final orders = results[3];
-
-
-
-      zones.forEach(print);
-
-      List<Zone> filteredZones = [];
-
-      if (settings.all_zones) {
-        if (settings.parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
-        }
-        if (settings.restricted_parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
-        }
-        if (settings.restricted_driving_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
-        }
-      }
-
-      print(
-        " FETCH: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
-      );
-
-      emit(
-        state.copyWith(
-          status: ScooterStatus.success,
-          scooters: scooters,
-          // reservedScooters: reservedScooters,
-          zones: filteredZones,
-          area: event.area,
-          areaScooters: event.areaScooters,
-          isGeomarksShowed: settings.all_placemarks,
-        ),
-      );
-    } catch (e) {
-      print("FETCH ERROR: $e");
-      emit(
-        state.copyWith(
-          status: ScooterStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  Future<void> _onUpdateMap(UpdateMap event, Emitter<ScooterState> emit) async {
-    emit(state.copyWith(status: ScooterStatus.loading));
-
-    try {
-      final results = await Future.wait([
-        getScootersUsecase(state.areaScooters, 0, 100),
-        getAvailableZonesUsecase(state.area, 0, 100),
-        getMapSettingsUsecase(),
-      ]);
-
-      final scooters = results[0] as List<Scooter>;
-      final zones = results[1] as List<Zone>;
-      final settings = results[2] as MapSettings;
-
-      List<Zone> filteredZones = [];
-
-      if (settings.all_zones) {
-        if (settings.parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
-        }
-        if (settings.restricted_parking_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
-        }
-        if (settings.restricted_driving_zones) {
-          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
-        }
-      }
-
-      print(
-        " UPDATE MAP: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
-      );
-
-      final zonesToEmit = filteredZones.isNotEmpty
-          ? filteredZones
-          : state.zones;
-
-      emit(
-        state.copyWith(
-          status: ScooterStatus.success,
-          scooters: scooters,
-          zones: zonesToEmit,
-          isGeomarksShowed: settings.all_placemarks,
-        ),
-      );
-    } catch (e) {
-      print("UPDATE ERROR: $e");
-      emit(
-        state.copyWith(
-          status: ScooterStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onUpdateUserLocation(
-    UpdateUserLocation event,
-    Emitter<ScooterState> emit,
-  ) {
-    print("USER LOCATION UPDATED EVENT start");
-    state.zones.forEach((z) {
-      if (checkUserInZone(Point(event.latitude, event.longitude), z.points)) {
-        print("USER IN ZONE - ${z.type}");
-      }
-    });
-  }
-
-  FutureOr<void> _onNotificationReceived(
-    NotificationReceived event,
-    Emitter<ScooterState> emit,
-  ) {
-    print("NOTIFICATION RECEIVED: ${event.notification.content}");
-    emit(state.copyWith(lastNotification: event.notification));
-  }
-
-  bool checkUserInZone(Point userPos, List<Point> zonePoints) {
-    List<mt.LatLng> polygon = zonePoints
-        .map((p) => mt.LatLng(p.latitude, p.longitude))
-        .toList();
-
-    mt.LatLng userLatLng = mt.LatLng(userPos.latitude, userPos.longitude);
-
-    return mt.PolygonUtil.containsLocation(userLatLng, polygon, true);
-  }
-
-  FutureOr<void> _onFetchProfileData(
-    FetchProfileData event,
-    Emitter<ScooterState> emit,
-  ) async {
-    try {
-      final profile = await getProfileUseCase();
-
-      emit(
-        state.copyWith(phoneNumber: profile.phone, balance: profile.balance),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: ScooterStatus.failure,
-          errorMessage: "FetchProfileData for SideMenu: ${e.toString()}",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onLogoutPressed(
-    LogoutPressed event,
-    Emitter<ScooterState> emit,
-  ) async {
-    await logoutUseCase();
-    stopNotificationStream();
-    splashBloc.add(AuthLogoutRequested());
-  }
-
-  FutureOr<void> _onCheckUser(
-    CheckUser event,
-    Emitter<ScooterState> emit,
-  ) async {
-    try {
-      final flags = await checkUserUseCase();
-
-      print("flags: $flags");
-
-      if (flags == null) {
-        return;
-      }
-
-      print("check user success");
-
-      emit(state.copyWith(flags: flags));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: ScooterStatus.failure,
-          errorMessage: "CheckUser: ${e.toString()}",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onFocusOnScooter(FocusOnScooter event, Emitter<ScooterState> emit) {
-    final updatedReserved = List<Scooter>.from(state.reservedScooters ?? []);
-    if (!updatedReserved.any((s) => s.id == event.scooter.id)) {
-      updatedReserved.add(event.scooter);
-    }
-
-    emit(state.copyWith(
-      selectedScooterForFocus: event.scooter,
-      reservedScooters: updatedReserved,
-    ));
-  }
-
-
-
-  FutureOr<void> _onClearMapPlacemarks(ClearMapPlacemarks event, Emitter<ScooterState> emit) async {
-    try{
-      final orders = await getClientOrdersUsecase();
-
-      List<Scooter> updatedReservedScooters = [];
-
-      if (orders is Success<List<ScooterOrder>>) {
-        print("FETCH: orders.data.length = ${orders.data?.length}");
-
-        updatedReservedScooters = orders.data?.map((order) {
-          return order.scooter;
-        }).toList() ?? [];
-      }
-
-      emit(state.copyWith(
-        reservedScooters: updatedReservedScooters,
-      ));
-    } catch (e) {
-      print("Error in _onClearMapPlacemarks: $e");
-      emit(state.copyWith(
-        status: ScooterStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  FutureOr<void> _onClearMapFocus(ClearMapFocus event, Emitter<ScooterState> emit) {
-    emit(state.copyWith(
-      selectedScooterForFocus: null,
-    ));
-  }
-}
-
-
+import 'dart:async';
+
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/client_notification.dart';
+import 'package:be_happy/domain/entities/map_settings.dart';
+import 'package:be_happy/domain/usecase/check_user_usecase.dart';
+import 'package:be_happy/domain/usecase/get_available_zones_usecase.dart';
+import 'package:be_happy/domain/usecase/get_client_orders_usecase.dart';
+import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
+import 'package:be_happy/domain/usecase/get_notifications_stream_usecase.dart';
+import 'package:be_happy/domain/usecase/logout_usecase.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../domain/entities/point.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/entities/zone.dart';
+import '../../domain/usecase/get_available_scooters_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../event/map_event.dart';
+import '../event/spalsh_event.dart';
+import '../state/map_state.dart';
+import 'package:maps_toolkit/maps_toolkit.dart' as mt;
+
+class MapBloc extends Bloc<ScooterEvent, ScooterState> {
+  final GetAvailableScootersUsecase getScootersUsecase;
+  final GetClientOrdersUsecase getClientOrdersUsecase;
+  final GetAvailableZonesUsecase getAvailableZonesUsecase;
+  final GetMapSettingsUsecase getMapSettingsUsecase;
+  final GetNotificationsStreamUseCase getNotificationsStreamUseCase;
+  final GetProfileUseCase getProfileUseCase;
+  final CheckUserUseCase checkUserUseCase;
+  final LogoutUseCase logoutUseCase;
+  final SplashBloc splashBloc;
+  StreamSubscription<ClientNotification>? _notificationSubscription;
+
+  MapBloc(
+    this.getAvailableZonesUsecase,
+    this.getScootersUsecase,
+    this.getClientOrdersUsecase,
+    this.getMapSettingsUsecase,
+    this.getNotificationsStreamUseCase,
+    this.getProfileUseCase,
+    this.checkUserUseCase,
+    this.logoutUseCase,
+    this.splashBloc,
+  ) : super(ScooterState(isGeomarksShowed: true)) {
+    on<FetchScooters>(_onFetchScooters);
+    on<UpdateMap>(_onUpdateMap);
+    on<UpdateUserLocation>(_onUpdateUserLocation);
+    on<NotificationReceived>(_onNotificationReceived);
+    on<FetchProfileData>(_onFetchProfileData);
+    on<CheckUser>(_onCheckUser);
+    on<LogoutPressed>(_onLogoutPressed);
+    on<FocusOnScooter>(_onFocusOnScooter);
+    on<ClearMapPlacemarks>(_onClearMapPlacemarks);
+    on<ClearMapFocus>(_onClearMapFocus);
+  }
+
+  void startNotificationStream() {
+    _notificationSubscription?.cancel();
+
+    _notificationSubscription = getNotificationsStreamUseCase().listen(
+      (notification) {
+        add(NotificationReceived(notification));
+      },
+      onError: (error) {
+        print(" SSE BLOC ERROR: $error");
+        _handleReconnect();
+      },
+      onDone: () {
+        print(" SSE Stream closed by server (onDone)");
+        _handleReconnect();
+      },
+      cancelOnError: true,
+    );
+  }
+
+  void _handleReconnect() {
+    if (isClosed) return;
+
+    Future.delayed(const Duration(seconds: 5), () {
+      if (!isClosed) {
+        print(" Attempting to reconnect to SSE...");
+        startNotificationStream();
+      }
+    });
+  }
+
+  void stopNotificationStream() {
+    _notificationSubscription?.cancel();
+    _notificationSubscription = null;
+  }
+
+  Future<void> _onFetchScooters(
+    FetchScooters event,
+    Emitter<ScooterState> emit,
+  ) async {
+    emit(state.copyWith(status: ScooterStatus.loading));
+
+    try {
+      final results = await Future.wait([
+        getScootersUsecase(event.areaScooters, 0, 100),
+        getAvailableZonesUsecase(event.area, 0, 100),
+        getMapSettingsUsecase(),
+        getClientOrdersUsecase(),
+      ]);
+
+      final scooters = results[0] as List<Scooter>;
+      final zones = results[1] as List<Zone>;
+      final settings = results[2] as MapSettings;
+      final orders = results[3];
+
+
+
+      zones.forEach(print);
+
+      List<Zone> filteredZones = [];
+
+      if (settings.all_zones) {
+        if (settings.parking_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
+        }
+        if (settings.restricted_parking_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
+        }
+        if (settings.restricted_driving_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
+        }
+      }
+
+      print(
+        " FETCH: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
+      );
+
+      emit(
+        state.copyWith(
+          status: ScooterStatus.success,
+          scooters: scooters,
+          // reservedScooters: reservedScooters,
+          zones: filteredZones,
+          area: event.area,
+          areaScooters: event.areaScooters,
+          isGeomarksShowed: settings.all_placemarks,
+        ),
+      );
+    } catch (e) {
+      print("FETCH ERROR: $e");
+      emit(
+        state.copyWith(
+          status: ScooterStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  Future<void> _onUpdateMap(UpdateMap event, Emitter<ScooterState> emit) async {
+    emit(state.copyWith(status: ScooterStatus.loading));
+
+    try {
+      final results = await Future.wait([
+        getScootersUsecase(state.areaScooters, 0, 100),
+        getAvailableZonesUsecase(state.area, 0, 100),
+        getMapSettingsUsecase(),
+      ]);
+
+      final scooters = results[0] as List<Scooter>;
+      final zones = results[1] as List<Zone>;
+      final settings = results[2] as MapSettings;
+
+      List<Zone> filteredZones = [];
+
+      if (settings.all_zones) {
+        if (settings.parking_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "Finish"));
+        }
+        if (settings.restricted_parking_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "Drive"));
+        }
+        if (settings.restricted_driving_zones) {
+          filteredZones.addAll(zones.where((el) => el.type == "NotDrive"));
+        }
+      }
+
+      print(
+        " UPDATE MAP: filteredZones.length = ${filteredZones.length}, all_zones=${settings.all_zones}",
+      );
+
+      final zonesToEmit = filteredZones.isNotEmpty
+          ? filteredZones
+          : state.zones;
+
+      emit(
+        state.copyWith(
+          status: ScooterStatus.success,
+          scooters: scooters,
+          zones: zonesToEmit,
+          isGeomarksShowed: settings.all_placemarks,
+        ),
+      );
+    } catch (e) {
+      print("UPDATE ERROR: $e");
+      emit(
+        state.copyWith(
+          status: ScooterStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onUpdateUserLocation(
+    UpdateUserLocation event,
+    Emitter<ScooterState> emit,
+  ) {
+    print("USER LOCATION UPDATED EVENT start");
+    state.zones.forEach((z) {
+      if (checkUserInZone(Point(event.latitude, event.longitude), z.points)) {
+        print("USER IN ZONE - ${z.type}");
+      }
+    });
+  }
+
+  FutureOr<void> _onNotificationReceived(
+    NotificationReceived event,
+    Emitter<ScooterState> emit,
+  ) {
+    print("NOTIFICATION RECEIVED: ${event.notification.content}");
+    emit(state.copyWith(lastNotification: event.notification));
+  }
+
+  bool checkUserInZone(Point userPos, List<Point> zonePoints) {
+    List<mt.LatLng> polygon = zonePoints
+        .map((p) => mt.LatLng(p.latitude, p.longitude))
+        .toList();
+
+    mt.LatLng userLatLng = mt.LatLng(userPos.latitude, userPos.longitude);
+
+    return mt.PolygonUtil.containsLocation(userLatLng, polygon, true);
+  }
+
+  FutureOr<void> _onFetchProfileData(
+    FetchProfileData event,
+    Emitter<ScooterState> emit,
+  ) async {
+    try {
+      final profile = await getProfileUseCase();
+
+      emit(
+        state.copyWith(phoneNumber: profile.phone, balance: profile.balance),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: ScooterStatus.failure,
+          errorMessage: "FetchProfileData for SideMenu: ${e.toString()}",
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onLogoutPressed(
+    LogoutPressed event,
+    Emitter<ScooterState> emit,
+  ) async {
+    await logoutUseCase();
+    stopNotificationStream();
+    splashBloc.add(AuthLogoutRequested());
+  }
+
+  FutureOr<void> _onCheckUser(
+    CheckUser event,
+    Emitter<ScooterState> emit,
+  ) async {
+    try {
+      final flags = await checkUserUseCase();
+
+      print("flags: $flags");
+
+      if (flags == null) {
+        return;
+      }
+
+      print("check user success");
+
+      emit(state.copyWith(flags: flags));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: ScooterStatus.failure,
+          errorMessage: "CheckUser: ${e.toString()}",
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onFocusOnScooter(FocusOnScooter event, Emitter<ScooterState> emit) {
+    final updatedReserved = List<Scooter>.from(state.reservedScooters ?? []);
+    if (!updatedReserved.any((s) => s.id == event.scooter.id)) {
+      updatedReserved.add(event.scooter);
+    }
+
+    emit(state.copyWith(
+      selectedScooterForFocus: event.scooter,
+      reservedScooters: updatedReserved,
+    ));
+  }
+
+
+
+  FutureOr<void> _onClearMapPlacemarks(ClearMapPlacemarks event, Emitter<ScooterState> emit) async {
+    try{
+      final orders = await getClientOrdersUsecase();
+
+      List<Scooter> updatedReservedScooters = [];
+
+      if (orders is Success<List<ScooterOrder>>) {
+        print("FETCH: orders.data.length = ${orders.data?.length}");
+
+        updatedReservedScooters = orders.data?.map((order) {
+          return order.scooter;
+        }).toList() ?? [];
+      }
+
+      emit(state.copyWith(
+        reservedScooters: updatedReservedScooters,
+      ));
+    } catch (e) {
+      print("Error in _onClearMapPlacemarks: $e");
+      emit(state.copyWith(
+        status: ScooterStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  FutureOr<void> _onClearMapFocus(ClearMapFocus event, Emitter<ScooterState> emit) {
+    emit(state.copyWith(
+      selectedScooterForFocus: null,
+    ));
+  }
+}
+
+
diff --git a/lib/presentation/viewmodel/map_settings_modal_bloc.dart b/lib/presentation/viewmodel/map_settings_modal_bloc.dart
index db55122..fa70d36 100644
--- a/lib/presentation/viewmodel/map_settings_modal_bloc.dart
+++ b/lib/presentation/viewmodel/map_settings_modal_bloc.dart
@@ -1,90 +1,90 @@
-import 'dart:async';
-
-import 'package:be_happy/domain/entities/map_settings.dart';
-import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
-import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
-import 'package:be_happy/domain/usecase/save_map_settings_usecase.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:flutter_bloc/flutter_bloc.dart';
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-class MapSettingsModalBloc extends Bloc<MapSettingsModalEvent, MapSettingsModalState> {
-  final GetMapSettingsUsecase getMapSettingsUsecase;
-  final SaveMapSettingsUsecase saveMapSettingsUsecase;
-
-  MapSettingsModalBloc(this.getMapSettingsUsecase, this.saveMapSettingsUsecase)
-      : super(MapSettingsModalState(
-    isAllGeomarksActive: true,
-    isAllGeozonesActive: true,
-    isParkingZoneActive: true,
-    isRestrictedParkingZoneActive: true,
-    isRestrictedDrivingZoneActive: true,
-  )) {
-    on<AllGeozonesToggled>(_onAllGeozonesToggled);
-    on<AllGeomarksToggled>(_onAllGeomarksToggled);
-    on<ParkingZonesToggled>(_onParkingZonesToggled);
-    on<RestrictedParkingZonesToggled>(_onRestrictedParkingZonesToggled);
-    on<RestrictedDrivingZonesToggled>(_onRestrictedDrivingZonesToggled);
-    on<ApllyButtonClick>(_onApplyClick);
-    on<MapSettingsModalStarted>(_onModalStarted);
-  }
-
-  FutureOr<void> _onAllGeozonesToggled(AllGeozonesToggled event, Emitter<MapSettingsModalState> emit) {
-    emit(state.copyWith(
-      isAllGeozonesActive: event.value,
-      isRestrictedParkingZoneActive: event.value,
-      isParkingZoneActive: event.value,
-      isRestrictedDrivingZoneActive: event.value,
-    ));
-  }
-
-  FutureOr<void> _onParkingZonesToggled(ParkingZonesToggled event, Emitter<MapSettingsModalState> emit) {
-    final newState = state.copyWith(isParkingZoneActive: event.value);
-    emit(_calculateParentState(newState));
-  }
-
-  FutureOr<void> _onRestrictedParkingZonesToggled(RestrictedParkingZonesToggled event, Emitter<MapSettingsModalState> emit) {
-    final newState = state.copyWith(isRestrictedParkingZoneActive: event.value);
-    emit(_calculateParentState(newState));
-  }
-
-  FutureOr<void> _onRestrictedDrivingZonesToggled(RestrictedDrivingZonesToggled event, Emitter<MapSettingsModalState> emit) {
-    final newState = state.copyWith(isRestrictedDrivingZoneActive: event.value);
-    emit(_calculateParentState(newState));
-  }
-
-  MapSettingsModalState _calculateParentState(MapSettingsModalState currentState) {
-    final bool anyChildActive = currentState.isParkingZoneActive ||
-        currentState.isRestrictedParkingZoneActive ||
-        currentState.isRestrictedDrivingZoneActive;
-
-    return currentState.copyWith(isAllGeozonesActive: anyChildActive);
-  }
-
-  FutureOr<void> _onAllGeomarksToggled(AllGeomarksToggled event, Emitter<MapSettingsModalState> emit) {
-    emit(state.copyWith(isGeomarksActive: event.value));
-  }
-
-  FutureOr<void> _onApplyClick(ApllyButtonClick event, Emitter<MapSettingsModalState> emit) async {
-    MapSettings settings = MapSettings(
-        all_placemarks: state.isAllGeomarksActive,
-        all_zones: state.isAllGeozonesActive,
-        parking_zones: state.isParkingZoneActive,
-        restricted_parking_zones: state.isRestrictedParkingZoneActive,
-        restricted_driving_zones: state.isRestrictedDrivingZoneActive);
-    await saveMapSettingsUsecase(settings);
-  }
-
-  FutureOr<void> _onModalStarted(MapSettingsModalStarted event, Emitter<MapSettingsModalState> emit) async {
-    final settings = await getMapSettingsUsecase();
-    emit(state.copyWith(
-      isGeomarksActive: settings.all_placemarks,
-      isAllGeozonesActive: settings.all_zones,
-      isParkingZoneActive: settings.parking_zones,
-      isRestrictedParkingZoneActive: settings.restricted_parking_zones,
-      isRestrictedDrivingZoneActive: settings.restricted_driving_zones,
-    ));
-  }
-}
+import 'dart:async';
+
+import 'package:be_happy/domain/entities/map_settings.dart';
+import 'package:be_happy/domain/usecase/get_map_settings_usecase.dart';
+import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
+import 'package:be_happy/domain/usecase/save_map_settings_usecase.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:flutter_bloc/flutter_bloc.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+class MapSettingsModalBloc extends Bloc<MapSettingsModalEvent, MapSettingsModalState> {
+  final GetMapSettingsUsecase getMapSettingsUsecase;
+  final SaveMapSettingsUsecase saveMapSettingsUsecase;
+
+  MapSettingsModalBloc(this.getMapSettingsUsecase, this.saveMapSettingsUsecase)
+      : super(MapSettingsModalState(
+    isAllGeomarksActive: true,
+    isAllGeozonesActive: true,
+    isParkingZoneActive: true,
+    isRestrictedParkingZoneActive: true,
+    isRestrictedDrivingZoneActive: true,
+  )) {
+    on<AllGeozonesToggled>(_onAllGeozonesToggled);
+    on<AllGeomarksToggled>(_onAllGeomarksToggled);
+    on<ParkingZonesToggled>(_onParkingZonesToggled);
+    on<RestrictedParkingZonesToggled>(_onRestrictedParkingZonesToggled);
+    on<RestrictedDrivingZonesToggled>(_onRestrictedDrivingZonesToggled);
+    on<ApllyButtonClick>(_onApplyClick);
+    on<MapSettingsModalStarted>(_onModalStarted);
+  }
+
+  FutureOr<void> _onAllGeozonesToggled(AllGeozonesToggled event, Emitter<MapSettingsModalState> emit) {
+    emit(state.copyWith(
+      isAllGeozonesActive: event.value,
+      isRestrictedParkingZoneActive: event.value,
+      isParkingZoneActive: event.value,
+      isRestrictedDrivingZoneActive: event.value,
+    ));
+  }
+
+  FutureOr<void> _onParkingZonesToggled(ParkingZonesToggled event, Emitter<MapSettingsModalState> emit) {
+    final newState = state.copyWith(isParkingZoneActive: event.value);
+    emit(_calculateParentState(newState));
+  }
+
+  FutureOr<void> _onRestrictedParkingZonesToggled(RestrictedParkingZonesToggled event, Emitter<MapSettingsModalState> emit) {
+    final newState = state.copyWith(isRestrictedParkingZoneActive: event.value);
+    emit(_calculateParentState(newState));
+  }
+
+  FutureOr<void> _onRestrictedDrivingZonesToggled(RestrictedDrivingZonesToggled event, Emitter<MapSettingsModalState> emit) {
+    final newState = state.copyWith(isRestrictedDrivingZoneActive: event.value);
+    emit(_calculateParentState(newState));
+  }
+
+  MapSettingsModalState _calculateParentState(MapSettingsModalState currentState) {
+    final bool anyChildActive = currentState.isParkingZoneActive ||
+        currentState.isRestrictedParkingZoneActive ||
+        currentState.isRestrictedDrivingZoneActive;
+
+    return currentState.copyWith(isAllGeozonesActive: anyChildActive);
+  }
+
+  FutureOr<void> _onAllGeomarksToggled(AllGeomarksToggled event, Emitter<MapSettingsModalState> emit) {
+    emit(state.copyWith(isGeomarksActive: event.value));
+  }
+
+  FutureOr<void> _onApplyClick(ApllyButtonClick event, Emitter<MapSettingsModalState> emit) async {
+    MapSettings settings = MapSettings(
+        all_placemarks: state.isAllGeomarksActive,
+        all_zones: state.isAllGeozonesActive,
+        parking_zones: state.isParkingZoneActive,
+        restricted_parking_zones: state.isRestrictedParkingZoneActive,
+        restricted_driving_zones: state.isRestrictedDrivingZoneActive);
+    await saveMapSettingsUsecase(settings);
+  }
+
+  FutureOr<void> _onModalStarted(MapSettingsModalStarted event, Emitter<MapSettingsModalState> emit) async {
+    final settings = await getMapSettingsUsecase();
+    emit(state.copyWith(
+      isGeomarksActive: settings.all_placemarks,
+      isAllGeozonesActive: settings.all_zones,
+      isParkingZoneActive: settings.parking_zones,
+      isRestrictedParkingZoneActive: settings.restricted_parking_zones,
+      isRestrictedDrivingZoneActive: settings.restricted_driving_zones,
+    ));
+  }
+}
diff --git a/lib/presentation/viewmodel/news_bloc.dart b/lib/presentation/viewmodel/news_bloc.dart
index dbfb912..d56f6f4 100644
--- a/lib/presentation/viewmodel/news_bloc.dart
+++ b/lib/presentation/viewmodel/news_bloc.dart
@@ -1,40 +1,40 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'dart:developer' as dev;
-import '../../../domain/repositories/news_repository.dart';
-import '../event/news_event.dart';
-import '../state/news_state.dart';
-
-class NewsBloc extends Bloc<NewsEvent, NewsState> {
-  final NewsRepository _newsRepository;
-
-  NewsBloc(this._newsRepository) : super(const NewsState(status: NewsStatus.initial)) {
-    on<NewsFetchRequested>(_onFetchRequested);
-  }
-
-  Future<void> _onFetchRequested(
-      NewsFetchRequested event,
-      Emitter<NewsState> emit,
-      ) async {
-    dev.log('NewsBloc: Получено событие NewsFetchRequested');
-
-    emit(state.copyWith(status: NewsStatus.loading));
-
-    try {
-      final news = await _newsRepository.getNews();
-
-      dev.log('NewsBloc: Успешно загружено ${news.length} новостей');
-
-      emit(state.copyWith(
-        status: NewsStatus.success,
-        news: news,
-      ));
-    } catch (e, stackTrace) {
-      dev.log('NewsBloc: Ошибка: $e', stackTrace: stackTrace);
-
-      emit(state.copyWith(
-        status: NewsStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'dart:developer' as dev;
+import '../../../domain/repositories/news_repository.dart';
+import '../event/news_event.dart';
+import '../state/news_state.dart';
+
+class NewsBloc extends Bloc<NewsEvent, NewsState> {
+  final NewsRepository _newsRepository;
+
+  NewsBloc(this._newsRepository) : super(const NewsState(status: NewsStatus.initial)) {
+    on<NewsFetchRequested>(_onFetchRequested);
+  }
+
+  Future<void> _onFetchRequested(
+      NewsFetchRequested event,
+      Emitter<NewsState> emit,
+      ) async {
+    dev.log('NewsBloc: Получено событие NewsFetchRequested');
+
+    emit(state.copyWith(status: NewsStatus.loading));
+
+    try {
+      final news = await _newsRepository.getNews();
+
+      dev.log('NewsBloc: Успешно загружено ${news.length} новостей');
+
+      emit(state.copyWith(
+        status: NewsStatus.success,
+        news: news,
+      ));
+    } catch (e, stackTrace) {
+      dev.log('NewsBloc: Ошибка: $e', stackTrace: stackTrace);
+
+      emit(state.copyWith(
+        status: NewsStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/notifications_bloc.dart b/lib/presentation/viewmodel/notifications_bloc.dart
index f56c45e..f3bf4ea 100644
--- a/lib/presentation/viewmodel/notifications_bloc.dart
+++ b/lib/presentation/viewmodel/notifications_bloc.dart
@@ -1,61 +1,61 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'dart:developer' as dev;
-import '../../domain/usecase/get_notifications_usecase.dart';
-import '../event/notifications_event.dart';
-import '../state/notifications_state.dart';
-
-class NotificationsBloc extends Bloc<NotificationsEvent, NotificationsState> {
-  final GetNotificationsUsecase _getNotificationsUsecase;
-
-  NotificationsBloc(this._getNotificationsUsecase) : super(const NotificationsState()) {
-    on<NotificationsFetchRequested>(_onFetchRequested);
-    on<NotificationsLoadMoreRequested>(_onLoadMoreRequested);
-  }
-
-  Future<void> _onFetchRequested(
-      NotificationsFetchRequested event,
-      Emitter<NotificationsState> emit,
-      ) async {
-    if (event.page == 1) {
-      emit(state.copyWith(status: NotificationsStatus.loading));
-    }
-
-    try {
-      final result = await _getNotificationsUsecase(
-        page: event.page,
-        pageSize: 100,
-      );
-
-      final newNotifications = event.page == 1
-          ? result.notifications
-          : [...state.notifications, ...result.notifications];
-
-      emit(state.copyWith(
-        status: NotificationsStatus.success,
-        notifications: newNotifications,
-        currentPage: result.pagination.currentPage,
-        totalPages: result.pagination.lastPage,
-        hasMore: result.pagination.currentPage < result.pagination.lastPage,
-        isLoadingMore: false,
-      ));
-    } catch (e) {
-      dev.log('NotificationsBloc: Ошибка загрузки: $e');
-      emit(state.copyWith(
-        status: event.page == 1 ? NotificationsStatus.failure : NotificationsStatus.success,
-        errorMessage: event.page == 1 ? e.toString() : null,
-        isLoadingMore: false,
-      ));
-    }
-  }
-
-  Future<void> _onLoadMoreRequested(
-      NotificationsLoadMoreRequested event,
-      Emitter<NotificationsState> emit,
-      ) async {
-    if (!state.hasMore || state.isLoadingMore) return;
-
-    emit(state.copyWith(isLoadingMore: true));
-    final nextPage = state.currentPage + 1;
-    add(NotificationsFetchRequested(page: nextPage));
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'dart:developer' as dev;
+import '../../domain/usecase/get_notifications_usecase.dart';
+import '../event/notifications_event.dart';
+import '../state/notifications_state.dart';
+
+class NotificationsBloc extends Bloc<NotificationsEvent, NotificationsState> {
+  final GetNotificationsUsecase _getNotificationsUsecase;
+
+  NotificationsBloc(this._getNotificationsUsecase) : super(const NotificationsState()) {
+    on<NotificationsFetchRequested>(_onFetchRequested);
+    on<NotificationsLoadMoreRequested>(_onLoadMoreRequested);
+  }
+
+  Future<void> _onFetchRequested(
+      NotificationsFetchRequested event,
+      Emitter<NotificationsState> emit,
+      ) async {
+    if (event.page == 1) {
+      emit(state.copyWith(status: NotificationsStatus.loading));
+    }
+
+    try {
+      final result = await _getNotificationsUsecase(
+        page: event.page,
+        pageSize: 100,
+      );
+
+      final newNotifications = event.page == 1
+          ? result.notifications
+          : [...state.notifications, ...result.notifications];
+
+      emit(state.copyWith(
+        status: NotificationsStatus.success,
+        notifications: newNotifications,
+        currentPage: result.pagination.currentPage,
+        totalPages: result.pagination.lastPage,
+        hasMore: result.pagination.currentPage < result.pagination.lastPage,
+        isLoadingMore: false,
+      ));
+    } catch (e) {
+      dev.log('NotificationsBloc: Ошибка загрузки: $e');
+      emit(state.copyWith(
+        status: event.page == 1 ? NotificationsStatus.failure : NotificationsStatus.success,
+        errorMessage: event.page == 1 ? e.toString() : null,
+        isLoadingMore: false,
+      ));
+    }
+  }
+
+  Future<void> _onLoadMoreRequested(
+      NotificationsLoadMoreRequested event,
+      Emitter<NotificationsState> emit,
+      ) async {
+    if (!state.hasMore || state.isLoadingMore) return;
+
+    emit(state.copyWith(isLoadingMore: true));
+    final nextPage = state.currentPage + 1;
+    add(NotificationsFetchRequested(page: nextPage));
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/order_history_bloc.dart b/lib/presentation/viewmodel/order_history_bloc.dart
index fb7e752..e1526bc 100644
--- a/lib/presentation/viewmodel/order_history_bloc.dart
+++ b/lib/presentation/viewmodel/order_history_bloc.dart
@@ -1,106 +1,106 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import 'package:be_happy/domain/usecase/get_scooter_order_history_usecase.dart';
-import 'package:be_happy/core/result.dart';
-
-abstract class OrderHistoryEvent {}
-
-class OrderHistoryFetchRequested extends OrderHistoryEvent {
-  final int page;
-  OrderHistoryFetchRequested({this.page = 1});
-}
-
-class OrderHistoryRefreshRequested extends OrderHistoryEvent {}
-
-enum OrderHistoryStatus { initial, loading, success, failure, empty }
-
-class OrderHistoryState {
-  final OrderHistoryStatus status;
-  final List<ScooterOrder> orders;
-  final String? errorMessage;
-  final int currentPage;
-  final bool hasMore; // можно оставить, но всегда будет false
-
-  OrderHistoryState({
-    required this.status,
-    this.orders = const [],
-    this.errorMessage,
-    this.currentPage = 1,
-    this.hasMore = false, // ✅ По умолчанию — нет больше данных
-  });
-
-  OrderHistoryState copyWith({
-    OrderHistoryStatus? status,
-    List<ScooterOrder>? orders,
-    String? errorMessage,
-    int? currentPage,
-    bool? hasMore,
-  }) {
-    return OrderHistoryState(
-      status: status ?? this.status,
-      orders: orders ?? this.orders,
-      errorMessage: errorMessage ?? this.errorMessage,
-      currentPage: currentPage ?? this.currentPage,
-      hasMore: hasMore ?? this.hasMore,
-    );
-  }
-}
-
-class OrderHistoryBloc extends Bloc<OrderHistoryEvent, OrderHistoryState> {
-  final GetScooterOrderHistoryUsecase _usecase;
-
-  OrderHistoryBloc(this._usecase)
-      : super(OrderHistoryState(status: OrderHistoryStatus.initial)) {
-    on<OrderHistoryFetchRequested>(_onFetchRequested);
-    on<OrderHistoryRefreshRequested>(_onRefreshRequested);
-  }
-
-  Future<void> _onFetchRequested(
-      OrderHistoryFetchRequested event,
-      Emitter<OrderHistoryState> emit,
-      ) async {
-    if (event.page == 1) {
-      emit(state.copyWith(status: OrderHistoryStatus.loading));
-    }
-
-    final result = await _usecase.call(
-      page: event.page,
-      pageSize: 1000,
-    );
-
-    if (result is Success<List<ScooterOrder>>) {
-      final orders = result.data;
-
-      if (orders == null || orders.isEmpty) {
-        emit(state.copyWith(
-          status: OrderHistoryStatus.empty,
-          orders: [],
-        ));
-      } else {
-        final newOrders = event.page == 1
-            ? orders
-            : [...state.orders, ...orders];
-
-        emit(state.copyWith(
-          status: OrderHistoryStatus.success,
-          orders: newOrders,
-          currentPage: event.page,
-          hasMore: false,
-        ));
-      }
-    } else if (result is Failure<List<ScooterOrder>>) {
-      emit(state.copyWith(
-        status: OrderHistoryStatus.failure,
-        errorMessage: result.failure.message ?? 'Неизвестная ошибка',
-      ));
-    }
-  }
-
-  Future<void> _onRefreshRequested(
-      OrderHistoryRefreshRequested event,
-      Emitter<OrderHistoryState> emit,
-      ) async {
-    emit(state.copyWith(status: OrderHistoryStatus.loading));
-    add(OrderHistoryFetchRequested(page: 1));
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import 'package:be_happy/domain/usecase/get_scooter_order_history_usecase.dart';
+import 'package:be_happy/core/result.dart';
+
+abstract class OrderHistoryEvent {}
+
+class OrderHistoryFetchRequested extends OrderHistoryEvent {
+  final int page;
+  OrderHistoryFetchRequested({this.page = 1});
+}
+
+class OrderHistoryRefreshRequested extends OrderHistoryEvent {}
+
+enum OrderHistoryStatus { initial, loading, success, failure, empty }
+
+class OrderHistoryState {
+  final OrderHistoryStatus status;
+  final List<ScooterOrder> orders;
+  final String? errorMessage;
+  final int currentPage;
+  final bool hasMore; // можно оставить, но всегда будет false
+
+  OrderHistoryState({
+    required this.status,
+    this.orders = const [],
+    this.errorMessage,
+    this.currentPage = 1,
+    this.hasMore = false, // ✅ По умолчанию — нет больше данных
+  });
+
+  OrderHistoryState copyWith({
+    OrderHistoryStatus? status,
+    List<ScooterOrder>? orders,
+    String? errorMessage,
+    int? currentPage,
+    bool? hasMore,
+  }) {
+    return OrderHistoryState(
+      status: status ?? this.status,
+      orders: orders ?? this.orders,
+      errorMessage: errorMessage ?? this.errorMessage,
+      currentPage: currentPage ?? this.currentPage,
+      hasMore: hasMore ?? this.hasMore,
+    );
+  }
+}
+
+class OrderHistoryBloc extends Bloc<OrderHistoryEvent, OrderHistoryState> {
+  final GetScooterOrderHistoryUsecase _usecase;
+
+  OrderHistoryBloc(this._usecase)
+      : super(OrderHistoryState(status: OrderHistoryStatus.initial)) {
+    on<OrderHistoryFetchRequested>(_onFetchRequested);
+    on<OrderHistoryRefreshRequested>(_onRefreshRequested);
+  }
+
+  Future<void> _onFetchRequested(
+      OrderHistoryFetchRequested event,
+      Emitter<OrderHistoryState> emit,
+      ) async {
+    if (event.page == 1) {
+      emit(state.copyWith(status: OrderHistoryStatus.loading));
+    }
+
+    final result = await _usecase.call(
+      page: event.page,
+      pageSize: 1000,
+    );
+
+    if (result is Success<List<ScooterOrder>>) {
+      final orders = result.data;
+
+      if (orders == null || orders.isEmpty) {
+        emit(state.copyWith(
+          status: OrderHistoryStatus.empty,
+          orders: [],
+        ));
+      } else {
+        final newOrders = event.page == 1
+            ? orders
+            : [...state.orders, ...orders];
+
+        emit(state.copyWith(
+          status: OrderHistoryStatus.success,
+          orders: newOrders,
+          currentPage: event.page,
+          hasMore: false,
+        ));
+      }
+    } else if (result is Failure<List<ScooterOrder>>) {
+      emit(state.copyWith(
+        status: OrderHistoryStatus.failure,
+        errorMessage: result.failure.message ?? 'Неизвестная ошибка',
+      ));
+    }
+  }
+
+  Future<void> _onRefreshRequested(
+      OrderHistoryRefreshRequested event,
+      Emitter<OrderHistoryState> emit,
+      ) async {
+    emit(state.copyWith(status: OrderHistoryStatus.loading));
+    add(OrderHistoryFetchRequested(page: 1));
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/payment_confirm_bloc.dart b/lib/presentation/viewmodel/payment_confirm_bloc.dart
index 4ce9f0f..0c19528 100644
--- a/lib/presentation/viewmodel/payment_confirm_bloc.dart
+++ b/lib/presentation/viewmodel/payment_confirm_bloc.dart
@@ -1,123 +1,123 @@
-import 'dart:async';
-
-import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_order_by_id_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../core/result.dart';
-import '../../../domain/entities/scooter_order.dart';
-import '../../../domain/usecase/pay_ride_usecase.dart';
-import '../../domain/entities/payment_card.dart';
-import '../event/payment_confirm_event.dart';
-import '../state/payment_confirm_state.dart';
-
-class PaymentConfirmBloc
-    extends Bloc<PaymentConfirmEvent, PaymentConfirmState> {
-  final PayRideUsecase _payRideUsecase;
-  final GetScooterOrderByIdUsecase _getScooterOrderByIdUsecase;
-  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
-  final GetProfileUseCase _getProfileUseCase;
-
-  PaymentConfirmBloc(
-    this._payRideUsecase,
-    this._getScooterOrderByIdUsecase,
-    this._getPaymentCardsUsecase,
-    this._getProfileUseCase,
-  ) : super(const PaymentConfirmState()) {
-    on<PayRide>(_onPayRide);
-    on<PaymentConfirmStarted>(_onStarted);
-    on<PaymentCardChanged>(_onCardChanged);
-    on<SelectBalancePressed>(_onSelectBalancePressed);
-  }
-
-  Future<void> _onStarted(
-    PaymentConfirmStarted event,
-    Emitter<PaymentConfirmState> emit,
-  ) async {
-    emit(state.copyWith(status: PaymentConfirmStatus.loading));
-
-    PaymentCard? mainCard;
-    final result = await _getScooterOrderByIdUsecase(event.orderId);
-    final cards_result = await _getPaymentCardsUsecase();
-
-    if (cards_result is Success<List<PaymentCard>>) {
-      mainCard = cards_result.data?.firstWhere(
-        (card) => card.isMain,
-        orElse: () => cards_result.data!.first,
-      );
-    }
-
-    switch (result) {
-      case Success<ScooterOrder>(data: final order):
-        emit(
-          state.copyWith(
-            status: PaymentConfirmStatus.initial,
-            order: order,
-            selectedCard: mainCard,
-          ),
-        );
-        break;
-      case Failure<ScooterOrder>():
-        emit(
-          state.copyWith(
-            status: PaymentConfirmStatus.failure,
-            errorMessage: 'Не удалось загрузить данные поездки',
-          ),
-        );
-    }
-  }
-
-  void _onCardChanged(
-    PaymentCardChanged event,
-    Emitter<PaymentConfirmState> emit,
-  ) {
-    emit(state.copyWith(selectedCard: event.card, useBalance: false));
-  }
-
-  Future<void> _onPayRide(
-    PayRide event,
-    Emitter<PaymentConfirmState> emit,
-  ) async {
-    emit(state.copyWith(status: PaymentConfirmStatus.loading));
-
-    final photoIds = event.photoIds.isEmpty ? [1] : event.photoIds;
-
-    final result = await _payRideUsecase(
-      event.orderId,
-      event.cardId,
-      event.isBalance,
-    );
-
-    if (result is Success<void>) {
-      emit(
-        state.copyWith(
-          status: PaymentConfirmStatus.success,
-          paymentCompleted: true,
-        ),
-      );
-    } else if (result is Failure) {
-      emit(
-        state.copyWith(
-          status: PaymentConfirmStatus.failure,
-          errorMessage: 'Не удалось оплатить поездку',
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onSelectBalancePressed(
-    SelectBalancePressed event,
-    Emitter<PaymentConfirmState> emit,
-  ) async {
-    final profile = await _getProfileUseCase();
-
-    emit(
-      state.copyWith(
-        useBalance: true,
-        userBalance: profile.balance,
-        selectedCard: null,
-      ),
-    );
-  }
-}
+import 'dart:async';
+
+import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_order_by_id_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../../core/result.dart';
+import '../../../domain/entities/scooter_order.dart';
+import '../../../domain/usecase/pay_ride_usecase.dart';
+import '../../domain/entities/payment_card.dart';
+import '../event/payment_confirm_event.dart';
+import '../state/payment_confirm_state.dart';
+
+class PaymentConfirmBloc
+    extends Bloc<PaymentConfirmEvent, PaymentConfirmState> {
+  final PayRideUsecase _payRideUsecase;
+  final GetScooterOrderByIdUsecase _getScooterOrderByIdUsecase;
+  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
+  final GetProfileUseCase _getProfileUseCase;
+
+  PaymentConfirmBloc(
+    this._payRideUsecase,
+    this._getScooterOrderByIdUsecase,
+    this._getPaymentCardsUsecase,
+    this._getProfileUseCase,
+  ) : super(const PaymentConfirmState()) {
+    on<PayRide>(_onPayRide);
+    on<PaymentConfirmStarted>(_onStarted);
+    on<PaymentCardChanged>(_onCardChanged);
+    on<SelectBalancePressed>(_onSelectBalancePressed);
+  }
+
+  Future<void> _onStarted(
+    PaymentConfirmStarted event,
+    Emitter<PaymentConfirmState> emit,
+  ) async {
+    emit(state.copyWith(status: PaymentConfirmStatus.loading));
+
+    PaymentCard? mainCard;
+    final result = await _getScooterOrderByIdUsecase(event.orderId);
+    final cards_result = await _getPaymentCardsUsecase();
+
+    if (cards_result is Success<List<PaymentCard>>) {
+      mainCard = cards_result.data?.firstWhere(
+        (card) => card.isMain,
+        orElse: () => cards_result.data!.first,
+      );
+    }
+
+    switch (result) {
+      case Success<ScooterOrder>(data: final order):
+        emit(
+          state.copyWith(
+            status: PaymentConfirmStatus.initial,
+            order: order,
+            selectedCard: mainCard,
+          ),
+        );
+        break;
+      case Failure<ScooterOrder>():
+        emit(
+          state.copyWith(
+            status: PaymentConfirmStatus.failure,
+            errorMessage: 'Не удалось загрузить данные поездки',
+          ),
+        );
+    }
+  }
+
+  void _onCardChanged(
+    PaymentCardChanged event,
+    Emitter<PaymentConfirmState> emit,
+  ) {
+    emit(state.copyWith(selectedCard: event.card, useBalance: false));
+  }
+
+  Future<void> _onPayRide(
+    PayRide event,
+    Emitter<PaymentConfirmState> emit,
+  ) async {
+    emit(state.copyWith(status: PaymentConfirmStatus.loading));
+
+    final photoIds = event.photoIds.isEmpty ? [1] : event.photoIds;
+
+    final result = await _payRideUsecase(
+      event.orderId,
+      event.cardId,
+      event.isBalance,
+    );
+
+    if (result is Success<void>) {
+      emit(
+        state.copyWith(
+          status: PaymentConfirmStatus.success,
+          paymentCompleted: true,
+        ),
+      );
+    } else if (result is Failure) {
+      emit(
+        state.copyWith(
+          status: PaymentConfirmStatus.failure,
+          errorMessage: 'Не удалось оплатить поездку',
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onSelectBalancePressed(
+    SelectBalancePressed event,
+    Emitter<PaymentConfirmState> emit,
+  ) async {
+    final profile = await _getProfileUseCase();
+
+    emit(
+      state.copyWith(
+        useBalance: true,
+        userBalance: profile.balance,
+        selectedCard: null,
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/viewmodel/payment_method_sheet_bloc.dart b/lib/presentation/viewmodel/payment_method_sheet_bloc.dart
index 05d31e7..3f8fd10 100644
--- a/lib/presentation/viewmodel/payment_method_sheet_bloc.dart
+++ b/lib/presentation/viewmodel/payment_method_sheet_bloc.dart
@@ -1,150 +1,150 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/usecase/add_payment_card_usecase.dart';
-import '../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/set_main_payment_card_usecase.dart';
-import '../event/payment_method_sheet_event.dart';
-import '../state/payment_method_sheet_state.dart';
-
-class PaymentMethodSheetBloc extends Bloc<PaymentMethodSheetEvent, PaymentMethodSheetState> {
-  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
-  final GetProfileUseCase _getProfileUseCase;
-  final SetMainPaymentCardUsecase _setMainPaymentCardUsecase;
-  final AddPaymentCardUsecase _addPaymentCardUsecase;
-
-  PaymentMethodSheetBloc(this._getPaymentCardsUsecase, this._setMainPaymentCardUsecase, this._getProfileUseCase, this._addPaymentCardUsecase)
-      : super(PaymentMethodSheetState(status: PaymentMethodSheetStatus.initial)) {
-    on<PaymentMethodSheetStarted>(_onStarted);
-    on<SelectPaymentCardRequested>(_onSelectCard);
-    on<AddPaymentCardRequested>(_onAddPaymentCardRequested);
-  }
-
-  Future<void> _onStarted(
-    PaymentMethodSheetStarted event,
-    Emitter<PaymentMethodSheetState> emit,
-  ) async {
-    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
-
-    try {
-      final result = await _getPaymentCardsUsecase();
-      final profile = await _getProfileUseCase();
-
-
-      if (result is Success<List<PaymentCard>>) {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.success,
-          balance: profile.balance,
-          cards: result.data ?? [],
-        ));
-      } else {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.failure,
-          errorMessage: 'Failed to load payment cards',
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        status: PaymentMethodSheetStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-  Future<void> _onSelectCard(
-      SelectPaymentCardRequested event,
-      Emitter<PaymentMethodSheetState> emit,
-      ) async {
-    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
-
-    final result = await _setMainPaymentCardUsecase(event.card.id);
-
-    if (result is Success<void>) {
-      final cardsResult = await _getPaymentCardsUsecase();
-      if (cardsResult is Success<List<PaymentCard>>) {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.success,
-          cards: cardsResult.data ?? [],
-        ));
-      } else {
-        emit(state.copyWith(status: PaymentMethodSheetStatus.failure, errorMessage: 'Ошибка обновления списка карт'));
-      }
-    } else {
-      emit(state.copyWith(
-        status: PaymentMethodSheetStatus.failure,
-        errorMessage: 'Не удалось установить карту основной',
-      ));
-    }
-  }
-
-  Future<void> _loadCards(Emitter<PaymentMethodSheetState> emit) async {
-    try {
-      final result = await _getPaymentCardsUsecase();
-      if (result is Success<List<PaymentCard>>) {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.success,
-          cards: result.data ?? [],
-        ));
-      } else {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.failure,
-          errorMessage: 'Failed to load payment cards',
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        status: PaymentMethodSheetStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  Future<void> _onAddPaymentCardRequested(
-      AddPaymentCardRequested event,
-      Emitter<PaymentMethodSheetState> emit,
-      ) async {
-    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
-
-    try {
-      final result = await _addPaymentCardUsecase();
-
-      if (result is Success<Map<String, dynamic>>) {
-        final formUrlString = result.data?['formUrl'] as String?;
-
-        if (formUrlString != null && formUrlString.isNotEmpty) {
-          final url = Uri.parse(formUrlString);
-
-          if (await canLaunchUrl(url)) {
-            await launchUrl(
-              url,
-              mode: LaunchMode.externalApplication,
-            );
-            emit(state.copyWith(status: PaymentMethodSheetStatus.success));
-          } else {
-            emit(state.copyWith(
-              status: PaymentMethodSheetStatus.failure,
-              errorMessage: 'Не удалось открыть ссылку для оплаты',
-            ));
-          }
-        } else {
-          emit(state.copyWith(
-            status: PaymentMethodSheetStatus.failure,
-            errorMessage: 'Ссылка для привязки карты не получена от сервера',
-          ));
-        }
-      } else if (result is Failure) {
-        emit(state.copyWith(
-          status: PaymentMethodSheetStatus.failure,
-          errorMessage: 'Ошибка при добавлении карты',
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        status: PaymentMethodSheetStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-}
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/add_payment_card_usecase.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../event/payment_method_sheet_event.dart';
+import '../state/payment_method_sheet_state.dart';
+
+class PaymentMethodSheetBloc extends Bloc<PaymentMethodSheetEvent, PaymentMethodSheetState> {
+  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
+  final GetProfileUseCase _getProfileUseCase;
+  final SetMainPaymentCardUsecase _setMainPaymentCardUsecase;
+  final AddPaymentCardUsecase _addPaymentCardUsecase;
+
+  PaymentMethodSheetBloc(this._getPaymentCardsUsecase, this._setMainPaymentCardUsecase, this._getProfileUseCase, this._addPaymentCardUsecase)
+      : super(PaymentMethodSheetState(status: PaymentMethodSheetStatus.initial)) {
+    on<PaymentMethodSheetStarted>(_onStarted);
+    on<SelectPaymentCardRequested>(_onSelectCard);
+    on<AddPaymentCardRequested>(_onAddPaymentCardRequested);
+  }
+
+  Future<void> _onStarted(
+    PaymentMethodSheetStarted event,
+    Emitter<PaymentMethodSheetState> emit,
+  ) async {
+    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
+
+    try {
+      final result = await _getPaymentCardsUsecase();
+      final profile = await _getProfileUseCase();
+
+
+      if (result is Success<List<PaymentCard>>) {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.success,
+          balance: profile.balance,
+          cards: result.data ?? [],
+        ));
+      } else {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.failure,
+          errorMessage: 'Failed to load payment cards',
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        status: PaymentMethodSheetStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+  Future<void> _onSelectCard(
+      SelectPaymentCardRequested event,
+      Emitter<PaymentMethodSheetState> emit,
+      ) async {
+    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
+
+    final result = await _setMainPaymentCardUsecase(event.card.id);
+
+    if (result is Success<void>) {
+      final cardsResult = await _getPaymentCardsUsecase();
+      if (cardsResult is Success<List<PaymentCard>>) {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.success,
+          cards: cardsResult.data ?? [],
+        ));
+      } else {
+        emit(state.copyWith(status: PaymentMethodSheetStatus.failure, errorMessage: 'Ошибка обновления списка карт'));
+      }
+    } else {
+      emit(state.copyWith(
+        status: PaymentMethodSheetStatus.failure,
+        errorMessage: 'Не удалось установить карту основной',
+      ));
+    }
+  }
+
+  Future<void> _loadCards(Emitter<PaymentMethodSheetState> emit) async {
+    try {
+      final result = await _getPaymentCardsUsecase();
+      if (result is Success<List<PaymentCard>>) {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.success,
+          cards: result.data ?? [],
+        ));
+      } else {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.failure,
+          errorMessage: 'Failed to load payment cards',
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        status: PaymentMethodSheetStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  Future<void> _onAddPaymentCardRequested(
+      AddPaymentCardRequested event,
+      Emitter<PaymentMethodSheetState> emit,
+      ) async {
+    emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
+
+    try {
+      final result = await _addPaymentCardUsecase();
+
+      if (result is Success<Map<String, dynamic>>) {
+        final formUrlString = result.data?['formUrl'] as String?;
+
+        if (formUrlString != null && formUrlString.isNotEmpty) {
+          final url = Uri.parse(formUrlString);
+
+          if (await canLaunchUrl(url)) {
+            await launchUrl(
+              url,
+              mode: LaunchMode.externalApplication,
+            );
+            emit(state.copyWith(status: PaymentMethodSheetStatus.success));
+          } else {
+            emit(state.copyWith(
+              status: PaymentMethodSheetStatus.failure,
+              errorMessage: 'Не удалось открыть ссылку для оплаты',
+            ));
+          }
+        } else {
+          emit(state.copyWith(
+            status: PaymentMethodSheetStatus.failure,
+            errorMessage: 'Ссылка для привязки карты не получена от сервера',
+          ));
+        }
+      } else if (result is Failure) {
+        emit(state.copyWith(
+          status: PaymentMethodSheetStatus.failure,
+          errorMessage: 'Ошибка при добавлении карты',
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        status: PaymentMethodSheetStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/payment_methods_bloc.dart b/lib/presentation/viewmodel/payment_methods_bloc.dart
index 53ba9cc..67da100 100644
--- a/lib/presentation/viewmodel/payment_methods_bloc.dart
+++ b/lib/presentation/viewmodel/payment_methods_bloc.dart
@@ -1,198 +1,198 @@
-import 'dart:async';
-
-import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-import '../../core/result.dart';
-import '../../core/failures.dart';
-import '../../domain/entities/payment_card.dart';
-import '../../domain/usecase/get_payment_cards_usecase.dart';
-import '../../domain/usecase/remove_payment_card_usecase.dart';
-import '../../domain/usecase/set_main_payment_card_usecase.dart';
-import '../event/payment_methods_event.dart';
-import '../state/payment_methods_state.dart';
-
-class PaymentMethodsBloc extends Bloc<PaymentMethodsEvent, PaymentMethodsState> {
-  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
-  final RemovePaymentCardUsecase _removePaymentCardUsecase;
-  final SetMainPaymentCardUsecase _setMainPaymentCardUsecase;
-  final GetProfileUseCase _getProfileUseCase;
-  final AddPaymentCardUsecase _addPaymentCardUsecase;
-
-  PaymentMethodsBloc(
-    this._getPaymentCardsUsecase,
-    this._removePaymentCardUsecase,
-    this._setMainPaymentCardUsecase,
-    this._getProfileUseCase,
-    this._addPaymentCardUsecase,
-  ) : super(PaymentMethodsState(status: PaymentMethodsStatus.initial)) {
-    on<PaymentMethodsStarted>(_onStarted);
-    on<PaymentMethodsDeleteCard>(_onDeleteCard);
-    on<PaymentMethodsSetMainCard>(_onSetMainCard);
-    on<AddPayemntCardPressed>(_onAddPayemntCardPressed);
-  }
-
-  Future<void> _onStarted(
-    PaymentMethodsStarted event,
-    Emitter<PaymentMethodsState> emit,
-  ) async {
-    emit(state.copyWith(status: PaymentMethodsStatus.loading));
-
-    try {
-      final result = await _getPaymentCardsUsecase();
-      final profile = await _getProfileUseCase();
-
-
-      if (result is Success<List<PaymentCard>>) {
-
-        print("BALANCE: ${profile.balance} BYN");
-        emit(state.copyWith(
-          status: PaymentMethodsStatus.success,
-          cards: result.data ?? [],
-          balance: profile.balance,
-        ));
-      } else if (result is Failure) {
-        String errorMessage = 'Не удалось загрузить карты';
-        
-        /*if (result.failure is AuthFailure) {
-          errorMessage = 'Ошибка авторизации';
-        } else if (result.failure is UnknownFailure) {
-          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
-        }*/
-        
-        emit(state.copyWith(
-          status: PaymentMethodsStatus.failure,
-          errorMessage: errorMessage,
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        status: PaymentMethodsStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  Future<void> _onDeleteCard(
-    PaymentMethodsDeleteCard event,
-    Emitter<PaymentMethodsState> emit,
-  ) async {
-    emit(state.copyWith(
-      status: PaymentMethodsStatus.loading,
-      isDeleting: true,
-    ));
-
-    try {
-      final result = await _removePaymentCardUsecase(event.cardId);
-
-      if (result is Success) {
-        emit(state.copyWith(isDeleting: false, status: PaymentMethodsStatus.success));
-        add(PaymentMethodsStarted());
-      } else if (result is Failure) {
-        String errorMessage = 'Не удалось удалить карту';
-        
-        if (result.failure is AuthFailure) {
-          errorMessage = 'Ошибка авторизации';
-        } else if (result.failure is UnknownFailure) {
-          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
-        }
-        
-        emit(state.copyWith(
-          isDeleting: false,
-          errorMessage: errorMessage,
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        isDeleting: false,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  Future<void> _onSetMainCard(
-    PaymentMethodsSetMainCard event,
-    Emitter<PaymentMethodsState> emit,
-  ) async {
-    emit(state.copyWith(isSettingMain: true));
-
-    try {
-      final result = await _setMainPaymentCardUsecase(event.cardId);
-
-      if (result is Success) {
-        emit(state.copyWith(isSettingMain: false));
-        add(PaymentMethodsStarted());
-      } else if (result is Failure) {
-        String errorMessage = 'Не удалось установить основную карту';
-        
-        if (result.failure is AuthFailure) {
-          errorMessage = 'Ошибка авторизации';
-        } else if (result.failure is UnknownFailure) {
-          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
-        }
-        
-        emit(state.copyWith(
-          isSettingMain: false,
-          errorMessage: errorMessage,
-        ));
-      }
-    } catch (e) {
-      emit(state.copyWith(
-        isSettingMain: false,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  FutureOr<void> _onAddPayemntCardPressed(
-      AddPayemntCardPressed event,
-      Emitter<PaymentMethodsState> emit
-      ) async {
-    emit(state.copyWith(status: PaymentMethodsStatus.loading));
-
-    try {
-      final result = await _addPaymentCardUsecase();
-
-      if (result is Success<Map<String, dynamic>>) {
-        final formUrlString = result.data?['formUrl'] as String?;
-
-        if (formUrlString != null && formUrlString.isNotEmpty) {
-          final url = Uri.parse(formUrlString);
-
-          if (await canLaunchUrl(url)) {
-            launchUrl(
-              url,
-              mode: LaunchMode.externalApplication,
-            );
-            emit(state.copyWith(status: PaymentMethodsStatus.success));
-          } else {
-            emit(state.copyWith(
-              status: PaymentMethodsStatus.failure,
-              errorMessage: 'Не удалось открыть ссылку для оплаты',
-            ));
-          }
-        } else {
-          emit(state.copyWith(
-            status: PaymentMethodsStatus.failure,
-            errorMessage: 'Ссылка для привязки карты не получена от сервера',
-          ));
-        }
-
-      } else if (result is Failure) {
-        String errorMessage = 'Ошибка при добавлении карты';
-
-        emit(state.copyWith(
-          status: PaymentMethodsStatus.failure,
-          errorMessage: errorMessage,
-        ));
-      }
-
-    } catch (e) {
-      emit(state.copyWith(
-        status: PaymentMethodsStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }}
+import 'dart:async';
+
+import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../core/result.dart';
+import '../../core/failures.dart';
+import '../../domain/entities/payment_card.dart';
+import '../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../domain/usecase/remove_payment_card_usecase.dart';
+import '../../domain/usecase/set_main_payment_card_usecase.dart';
+import '../event/payment_methods_event.dart';
+import '../state/payment_methods_state.dart';
+
+class PaymentMethodsBloc extends Bloc<PaymentMethodsEvent, PaymentMethodsState> {
+  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
+  final RemovePaymentCardUsecase _removePaymentCardUsecase;
+  final SetMainPaymentCardUsecase _setMainPaymentCardUsecase;
+  final GetProfileUseCase _getProfileUseCase;
+  final AddPaymentCardUsecase _addPaymentCardUsecase;
+
+  PaymentMethodsBloc(
+    this._getPaymentCardsUsecase,
+    this._removePaymentCardUsecase,
+    this._setMainPaymentCardUsecase,
+    this._getProfileUseCase,
+    this._addPaymentCardUsecase,
+  ) : super(PaymentMethodsState(status: PaymentMethodsStatus.initial)) {
+    on<PaymentMethodsStarted>(_onStarted);
+    on<PaymentMethodsDeleteCard>(_onDeleteCard);
+    on<PaymentMethodsSetMainCard>(_onSetMainCard);
+    on<AddPayemntCardPressed>(_onAddPayemntCardPressed);
+  }
+
+  Future<void> _onStarted(
+    PaymentMethodsStarted event,
+    Emitter<PaymentMethodsState> emit,
+  ) async {
+    emit(state.copyWith(status: PaymentMethodsStatus.loading));
+
+    try {
+      final result = await _getPaymentCardsUsecase();
+      final profile = await _getProfileUseCase();
+
+
+      if (result is Success<List<PaymentCard>>) {
+
+        print("BALANCE: ${profile.balance} BYN");
+        emit(state.copyWith(
+          status: PaymentMethodsStatus.success,
+          cards: result.data ?? [],
+          balance: profile.balance,
+        ));
+      } else if (result is Failure) {
+        String errorMessage = 'Не удалось загрузить карты';
+        
+        /*if (result.failure is AuthFailure) {
+          errorMessage = 'Ошибка авторизации';
+        } else if (result.failure is UnknownFailure) {
+          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
+        }*/
+        
+        emit(state.copyWith(
+          status: PaymentMethodsStatus.failure,
+          errorMessage: errorMessage,
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        status: PaymentMethodsStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  Future<void> _onDeleteCard(
+    PaymentMethodsDeleteCard event,
+    Emitter<PaymentMethodsState> emit,
+  ) async {
+    emit(state.copyWith(
+      status: PaymentMethodsStatus.loading,
+      isDeleting: true,
+    ));
+
+    try {
+      final result = await _removePaymentCardUsecase(event.cardId);
+
+      if (result is Success) {
+        emit(state.copyWith(isDeleting: false, status: PaymentMethodsStatus.success));
+        add(PaymentMethodsStarted());
+      } else if (result is Failure) {
+        String errorMessage = 'Не удалось удалить карту';
+        
+        if (result.failure is AuthFailure) {
+          errorMessage = 'Ошибка авторизации';
+        } else if (result.failure is UnknownFailure) {
+          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
+        }
+        
+        emit(state.copyWith(
+          isDeleting: false,
+          errorMessage: errorMessage,
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        isDeleting: false,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  Future<void> _onSetMainCard(
+    PaymentMethodsSetMainCard event,
+    Emitter<PaymentMethodsState> emit,
+  ) async {
+    emit(state.copyWith(isSettingMain: true));
+
+    try {
+      final result = await _setMainPaymentCardUsecase(event.cardId);
+
+      if (result is Success) {
+        emit(state.copyWith(isSettingMain: false));
+        add(PaymentMethodsStarted());
+      } else if (result is Failure) {
+        String errorMessage = 'Не удалось установить основную карту';
+        
+        if (result.failure is AuthFailure) {
+          errorMessage = 'Ошибка авторизации';
+        } else if (result.failure is UnknownFailure) {
+          errorMessage = result.failure.message ?? 'Неизвестная ошибка';
+        }
+        
+        emit(state.copyWith(
+          isSettingMain: false,
+          errorMessage: errorMessage,
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        isSettingMain: false,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  FutureOr<void> _onAddPayemntCardPressed(
+      AddPayemntCardPressed event,
+      Emitter<PaymentMethodsState> emit
+      ) async {
+    emit(state.copyWith(status: PaymentMethodsStatus.loading));
+
+    try {
+      final result = await _addPaymentCardUsecase();
+
+      if (result is Success<Map<String, dynamic>>) {
+        final formUrlString = result.data?['formUrl'] as String?;
+
+        if (formUrlString != null && formUrlString.isNotEmpty) {
+          final url = Uri.parse(formUrlString);
+
+          if (await canLaunchUrl(url)) {
+            launchUrl(
+              url,
+              mode: LaunchMode.externalApplication,
+            );
+            emit(state.copyWith(status: PaymentMethodsStatus.success));
+          } else {
+            emit(state.copyWith(
+              status: PaymentMethodsStatus.failure,
+              errorMessage: 'Не удалось открыть ссылку для оплаты',
+            ));
+          }
+        } else {
+          emit(state.copyWith(
+            status: PaymentMethodsStatus.failure,
+            errorMessage: 'Ссылка для привязки карты не получена от сервера',
+          ));
+        }
+
+      } else if (result is Failure) {
+        String errorMessage = 'Ошибка при добавлении карты';
+
+        emit(state.copyWith(
+          status: PaymentMethodsStatus.failure,
+          errorMessage: errorMessage,
+        ));
+      }
+
+    } catch (e) {
+      emit(state.copyWith(
+        status: PaymentMethodsStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }}
diff --git a/lib/presentation/viewmodel/pin_bloc.dart b/lib/presentation/viewmodel/pin_bloc.dart
index 3138d94..77e675b 100644
--- a/lib/presentation/viewmodel/pin_bloc.dart
+++ b/lib/presentation/viewmodel/pin_bloc.dart
@@ -1,84 +1,84 @@
-import 'dart:async';
-
-import 'package:be_happy/domain/usecase/verify_pin_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../domain/usecase/is_pin_set_usecase.dart';
-import '../event/pin_event.dart';
-import '../state/pin_state.dart';
-import '../../domain/usecase/create_pin_usecase.dart';
-
-class PinBloc extends Bloc<PinEvent, PinState> {
-  final CreatePinUseCase createPinUseCase;
-  final VerifyPinUseCase verifyPinUsecase;
-  final IsPinSetUsecase isPinSetUsecase;
-
-  PinBloc({
-    required this.createPinUseCase,
-    required this.verifyPinUsecase,
-    required this.isPinSetUsecase,
-    bool isRegistration = true,
-  }) : super(const PinLoading()) {
-    on<PinDigitChanged>(_onPinChanged);
-    on<PinSubmitted>(_onPinSubmitted);
-    on<PinScreenStarted>(_onPinScreenStarted);
-  }
-
-  void _onPinChanged(
-      PinDigitChanged event,
-      Emitter<PinState> emit,
-      ) {
-    if (state is PinCreateInProgress) {
-      emit(PinCreateInProgress(pin: event.pin));
-    } else if (state is PinLoginInProgress) {
-      emit(PinLoginInProgress(pin: event.pin));
-    }
-  }
-
-  Future<void> _onPinSubmitted(
-      PinSubmitted event,
-      Emitter<PinState> emit,
-      ) async {
-    final currentPin = event.pin;
-    final bool isCreateMode = state is PinCreateInProgress;
-
-    emit(const PinLoading());
-
-    try {
-      if (isCreateMode) {
-        await createPinUseCase(currentPin);
-        emit(const PinSuccess());
-      } else {
-        final isValid = await verifyPinUsecase(currentPin);
-        if (isValid) {
-          emit(const PinSuccess());
-        } else {
-          throw Exception("Неверный ПИН-код");
-        }
-      }
-    } catch (e) {
-      if (isCreateMode) {
-        emit(PinCreateInProgress(pin: '', error: e.toString()));
-      } else {
-        emit(PinLoginInProgress(pin: '', error: e.toString().contains("Неверный")
-            ? "Неверный ПИН-код"
-            : "Ошибка при проверке"));
-      }
-    }
-  }
-
-  FutureOr<void> _onPinScreenStarted(PinScreenStarted event, Emitter<PinState> emit) async {
-    try {
-      final bool hasPin = await isPinSetUsecase();
-
-      if (hasPin) {
-        // Пин ЕСТЬ в базе — значит, нужно его ВВЕСТИ (Login)
-        emit(const PinLoginInProgress(pin: ''));
-      } else {
-        // Пина НЕТ в базе — значит, нужно его СОЗДАТЬ (Create)
-        emit(const PinCreateInProgress(pin: ''));
-      }
-    } catch (e) {
-      emit(PinLoginInProgress(pin: '', error: "Ошибка доступа к хранилищу"));
-    }
-  }
+import 'dart:async';
+
+import 'package:be_happy/domain/usecase/verify_pin_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/is_pin_set_usecase.dart';
+import '../event/pin_event.dart';
+import '../state/pin_state.dart';
+import '../../domain/usecase/create_pin_usecase.dart';
+
+class PinBloc extends Bloc<PinEvent, PinState> {
+  final CreatePinUseCase createPinUseCase;
+  final VerifyPinUseCase verifyPinUsecase;
+  final IsPinSetUsecase isPinSetUsecase;
+
+  PinBloc({
+    required this.createPinUseCase,
+    required this.verifyPinUsecase,
+    required this.isPinSetUsecase,
+    bool isRegistration = true,
+  }) : super(const PinLoading()) {
+    on<PinDigitChanged>(_onPinChanged);
+    on<PinSubmitted>(_onPinSubmitted);
+    on<PinScreenStarted>(_onPinScreenStarted);
+  }
+
+  void _onPinChanged(
+      PinDigitChanged event,
+      Emitter<PinState> emit,
+      ) {
+    if (state is PinCreateInProgress) {
+      emit(PinCreateInProgress(pin: event.pin));
+    } else if (state is PinLoginInProgress) {
+      emit(PinLoginInProgress(pin: event.pin));
+    }
+  }
+
+  Future<void> _onPinSubmitted(
+      PinSubmitted event,
+      Emitter<PinState> emit,
+      ) async {
+    final currentPin = event.pin;
+    final bool isCreateMode = state is PinCreateInProgress;
+
+    emit(const PinLoading());
+
+    try {
+      if (isCreateMode) {
+        await createPinUseCase(currentPin);
+        emit(const PinSuccess());
+      } else {
+        final isValid = await verifyPinUsecase(currentPin);
+        if (isValid) {
+          emit(const PinSuccess());
+        } else {
+          throw Exception("Неверный ПИН-код");
+        }
+      }
+    } catch (e) {
+      if (isCreateMode) {
+        emit(PinCreateInProgress(pin: '', error: e.toString()));
+      } else {
+        emit(PinLoginInProgress(pin: '', error: e.toString().contains("Неверный")
+            ? "Неверный ПИН-код"
+            : "Ошибка при проверке"));
+      }
+    }
+  }
+
+  FutureOr<void> _onPinScreenStarted(PinScreenStarted event, Emitter<PinState> emit) async {
+    try {
+      final bool hasPin = await isPinSetUsecase();
+
+      if (hasPin) {
+        // Пин ЕСТЬ в базе — значит, нужно его ВВЕСТИ (Login)
+        emit(const PinLoginInProgress(pin: ''));
+      } else {
+        // Пина НЕТ в базе — значит, нужно его СОЗДАТЬ (Create)
+        emit(const PinCreateInProgress(pin: ''));
+      }
+    } catch (e) {
+      emit(PinLoginInProgress(pin: '', error: "Ошибка доступа к хранилищу"));
+    }
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/profile_bloc.dart b/lib/presentation/viewmodel/profile_bloc.dart
index 16bcef9..f846820 100644
--- a/lib/presentation/viewmodel/profile_bloc.dart
+++ b/lib/presentation/viewmodel/profile_bloc.dart
@@ -1,75 +1,75 @@
-import 'package:be_happy/domain/usecase/upload_profile_photo_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../domain/entities/user_profile.dart';
-import '../../domain/usecase/get_profile_usecase.dart';
-import '../../domain/usecase/update_profile_usecase.dart';
-import '../event/profile_event.dart';
-import '../state/profile_state.dart';
-
-class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
-  final GetProfileUseCase getProfileUseCase;
-  final UploadProfilePhotoUsecase uploadProfilePhotoUsecase;
-  final UpdateProfileUseCase updateProfileUseCase;
-
-
-  ProfileBloc(this.getProfileUseCase,
-      this.uploadProfilePhotoUsecase,
-      this.updateProfileUseCase)
-      : super(ProfileState.initial()) {
-    on<ProfileStarted>(_onStarted);
-    on<ProfileUpdated>(_onUpdated);
-    on<ProfilePhotoUpdated>(_onPhotoUploaded);
-  }
-
-  Future<void> _onStarted(
-      ProfileStarted event,
-      Emitter<ProfileState> emit,
-      ) async {
-    emit(state.copyWith(isLoading: true));
-    print("_onStarted method was start");
-    try {
-      final profile = await getProfileUseCase();
-      print(profile.name);
-
-      emit(state.copyWith(isLoading: false, profile: profile));
-    } catch (e) {
-      emit(state.copyWith(isLoading: false, error: "STARTED: ${e.toString()}"));
-    }
-  }
-
-  Future<void> _onUpdated(
-      ProfileUpdated event,
-      Emitter<ProfileState> emit,
-      ) async {
-    final profile = await getProfileUseCase();
-    emit(state.copyWith(profile: profile));
-  }
-
-  Future<void> _onPhotoUploaded(
-      ProfilePhotoUpdated event,
-      Emitter<ProfileState> emit,
-      ) async {
-    emit(state.copyWith(isLoading: true));
-    try {
-      final avatarId = await uploadProfilePhotoUsecase(event.imageFile);
-
-      if (avatarId != null) {
-        // Отправляем PATCH запрос с новым avatarId
-        await updateProfileUseCase(UserProfile(
-          name: '',
-          birthDate: '',
-          phone: '',
-          email: '',
-          avatarId: avatarId,
-        ));
-      }
-
-      final updatedProfile = await getProfileUseCase();
-
-      emit(state.copyWith(isLoading: false, profile: updatedProfile, error: null));
-    } catch (e) {
-      emit(state.copyWith(isLoading: false, error: "Ошибка загрузки: ${e.toString()}"));
-    }
-  }
-}
+import 'package:be_happy/domain/usecase/upload_profile_photo_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../domain/entities/user_profile.dart';
+import '../../domain/usecase/get_profile_usecase.dart';
+import '../../domain/usecase/update_profile_usecase.dart';
+import '../event/profile_event.dart';
+import '../state/profile_state.dart';
+
+class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
+  final GetProfileUseCase getProfileUseCase;
+  final UploadProfilePhotoUsecase uploadProfilePhotoUsecase;
+  final UpdateProfileUseCase updateProfileUseCase;
+
+
+  ProfileBloc(this.getProfileUseCase,
+      this.uploadProfilePhotoUsecase,
+      this.updateProfileUseCase)
+      : super(ProfileState.initial()) {
+    on<ProfileStarted>(_onStarted);
+    on<ProfileUpdated>(_onUpdated);
+    on<ProfilePhotoUpdated>(_onPhotoUploaded);
+  }
+
+  Future<void> _onStarted(
+      ProfileStarted event,
+      Emitter<ProfileState> emit,
+      ) async {
+    emit(state.copyWith(isLoading: true));
+    print("_onStarted method was start");
+    try {
+      final profile = await getProfileUseCase();
+      print(profile.name);
+
+      emit(state.copyWith(isLoading: false, profile: profile));
+    } catch (e) {
+      emit(state.copyWith(isLoading: false, error: "STARTED: ${e.toString()}"));
+    }
+  }
+
+  Future<void> _onUpdated(
+      ProfileUpdated event,
+      Emitter<ProfileState> emit,
+      ) async {
+    final profile = await getProfileUseCase();
+    emit(state.copyWith(profile: profile));
+  }
+
+  Future<void> _onPhotoUploaded(
+      ProfilePhotoUpdated event,
+      Emitter<ProfileState> emit,
+      ) async {
+    emit(state.copyWith(isLoading: true));
+    try {
+      final avatarId = await uploadProfilePhotoUsecase(event.imageFile);
+
+      if (avatarId != null) {
+        // Отправляем PATCH запрос с новым avatarId
+        await updateProfileUseCase(UserProfile(
+          name: '',
+          birthDate: '',
+          phone: '',
+          email: '',
+          avatarId: avatarId,
+        ));
+      }
+
+      final updatedProfile = await getProfileUseCase();
+
+      emit(state.copyWith(isLoading: false, profile: updatedProfile, error: null));
+    } catch (e) {
+      emit(state.copyWith(isLoading: false, error: "Ошибка загрузки: ${e.toString()}"));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/promo_code_bloc.dart b/lib/presentation/viewmodel/promo_code_bloc.dart
index 50e7e47..3ed6056 100644
--- a/lib/presentation/viewmodel/promo_code_bloc.dart
+++ b/lib/presentation/viewmodel/promo_code_bloc.dart
@@ -1,37 +1,37 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../domain/usecase/apply_promo_code_usecase.dart';
-import '../event/promo_code_event.dart';
-import '../state/promo_code_state.dart';
-
-class PromoCodeBloc extends Bloc<PromoCodeEvent, PromoCodeState> {
-  final ApplyPromoCodeUsecase _applyPromoCodeUsecase;
-
-  PromoCodeBloc(this._applyPromoCodeUsecase) : super(const PromoCodeState()) {
-    on<PromoCodeApplyRequested>(_onApplyRequested);
-    on<PromoCodeReset>(_onReset);
-  }
-
-  Future<void> _onApplyRequested(
-      PromoCodeApplyRequested event,
-      Emitter<PromoCodeState> emit,
-      ) async {
-    emit(state.copyWith(status: PromoCodeStatus.loading));
-
-    try {
-      final result = await _applyPromoCodeUsecase(event.code);
-      emit(state.copyWith(
-        status: PromoCodeStatus.success,
-        newBalance: result.balance,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-        status: PromoCodeStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-  void _onReset(PromoCodeReset event, Emitter<PromoCodeState> emit) {
-    emit(const PromoCodeState());
-  }
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/apply_promo_code_usecase.dart';
+import '../event/promo_code_event.dart';
+import '../state/promo_code_state.dart';
+
+class PromoCodeBloc extends Bloc<PromoCodeEvent, PromoCodeState> {
+  final ApplyPromoCodeUsecase _applyPromoCodeUsecase;
+
+  PromoCodeBloc(this._applyPromoCodeUsecase) : super(const PromoCodeState()) {
+    on<PromoCodeApplyRequested>(_onApplyRequested);
+    on<PromoCodeReset>(_onReset);
+  }
+
+  Future<void> _onApplyRequested(
+      PromoCodeApplyRequested event,
+      Emitter<PromoCodeState> emit,
+      ) async {
+    emit(state.copyWith(status: PromoCodeStatus.loading));
+
+    try {
+      final result = await _applyPromoCodeUsecase(event.code);
+      emit(state.copyWith(
+        status: PromoCodeStatus.success,
+        newBalance: result.balance,
+      ));
+    } catch (e) {
+      emit(state.copyWith(
+        status: PromoCodeStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+  void _onReset(PromoCodeReset event, Emitter<PromoCodeState> emit) {
+    emit(const PromoCodeState());
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/reserved_ride_bloc.dart b/lib/presentation/viewmodel/reserved_ride_bloc.dart
index 2e9310a..7d61641 100644
--- a/lib/presentation/viewmodel/reserved_ride_bloc.dart
+++ b/lib/presentation/viewmodel/reserved_ride_bloc.dart
@@ -1,63 +1,63 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../core/result.dart';
-import '../../../domain/entities/scooter_order.dart';
-import '../../../domain/usecase/cancel_ride_usecase.dart';
-import '../../../domain/usecase/start_ride_usecase.dart';
-import '../event/reserved_ride_event.dart';
-import '../state/reserved_ride_state.dart';
-
-class ReservedRideBloc extends Bloc<ReservedRideEvent, ReservedRideState> {
-  final StartRideUsecase _startRideUsecase;
-  final CancelRideUsecase _cancelRideUsecase;
-
-  ReservedRideBloc(
-    this._startRideUsecase,
-    this._cancelRideUsecase,
-  ) : super(const ReservedRideState()) {
-    on<StartRide>(_onStartRide);
-    on<CancelRide>(_onCancelRide);
-  }
-
-  Future<void> _onStartRide(
-    StartRide event,
-    Emitter<ReservedRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ReservedRideStatus.loading));
-
-    final result = await _startRideUsecase(event.orderId);
-
-    if (result is Success<ScooterOrder>) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.success,
-        rideStarted: true,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.failure,
-        errorMessage: 'Не удалось начать поездку',
-      ));
-    }
-  }
-
-  Future<void> _onCancelRide(
-    CancelRide event,
-    Emitter<ReservedRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ReservedRideStatus.loading));
-
-    final result = await _cancelRideUsecase(event.orderId);
-
-    if (result is Success) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.success,
-        rideCancelled: true,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.failure,
-        errorMessage: 'Не удалось отменить бронирование',
-      ));
-    }
-  }
-}
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../../core/result.dart';
+import '../../../domain/entities/scooter_order.dart';
+import '../../../domain/usecase/cancel_ride_usecase.dart';
+import '../../../domain/usecase/start_ride_usecase.dart';
+import '../event/reserved_ride_event.dart';
+import '../state/reserved_ride_state.dart';
+
+class ReservedRideBloc extends Bloc<ReservedRideEvent, ReservedRideState> {
+  final StartRideUsecase _startRideUsecase;
+  final CancelRideUsecase _cancelRideUsecase;
+
+  ReservedRideBloc(
+    this._startRideUsecase,
+    this._cancelRideUsecase,
+  ) : super(const ReservedRideState()) {
+    on<StartRide>(_onStartRide);
+    on<CancelRide>(_onCancelRide);
+  }
+
+  Future<void> _onStartRide(
+    StartRide event,
+    Emitter<ReservedRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ReservedRideStatus.loading));
+
+    final result = await _startRideUsecase(event.orderId);
+
+    if (result is Success<ScooterOrder>) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.success,
+        rideStarted: true,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.failure,
+        errorMessage: 'Не удалось начать поездку',
+      ));
+    }
+  }
+
+  Future<void> _onCancelRide(
+    CancelRide event,
+    Emitter<ReservedRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ReservedRideStatus.loading));
+
+    final result = await _cancelRideUsecase(event.orderId);
+
+    if (result is Success) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.success,
+        rideCancelled: true,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.failure,
+        errorMessage: 'Не удалось отменить бронирование',
+      ));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/route_bloc.dart b/lib/presentation/viewmodel/route_bloc.dart
index d0c0e6f..7ad0ea2 100644
--- a/lib/presentation/viewmodel/route_bloc.dart
+++ b/lib/presentation/viewmodel/route_bloc.dart
@@ -1,31 +1,31 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/point.dart';
-import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../event/route_event.dart';
-import '../state/route_state.dart';
-
-class RouteBloc extends Bloc<RouteEvent, RouteState> {
-  final GetScooterOrderRouteHistoryUsecase getRouteUseCase;
-
-  RouteBloc({required this.getRouteUseCase}) : super(RouteInitial()) {
-    on<FetchRouteEvent>((event, emit) async {
-      emit(RouteLoading());
-      try {
-        final result = await getRouteUseCase(event.orderId);
-
-        if (result is Success<List<Point>>) {
-
-          final List<Point> points = result.data ?? [];
-
-          emit(RouteLoaded(points));
-
-        }
-
-      } catch (e) {
-        emit(RouteError("Ошибка загрузки пути"));
-      }
-    });
-  }
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/point.dart';
+import 'package:be_happy/domain/usecase/get_scooter_order_route_history_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../event/route_event.dart';
+import '../state/route_state.dart';
+
+class RouteBloc extends Bloc<RouteEvent, RouteState> {
+  final GetScooterOrderRouteHistoryUsecase getRouteUseCase;
+
+  RouteBloc({required this.getRouteUseCase}) : super(RouteInitial()) {
+    on<FetchRouteEvent>((event, emit) async {
+      emit(RouteLoading());
+      try {
+        final result = await getRouteUseCase(event.orderId);
+
+        if (result is Success<List<Point>>) {
+
+          final List<Point> points = result.data ?? [];
+
+          emit(RouteLoaded(points));
+
+        }
+
+      } catch (e) {
+        emit(RouteError("Ошибка загрузки пути"));
+      }
+    });
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/scooter_code_bloc.dart b/lib/presentation/viewmodel/scooter_code_bloc.dart
index 7060486..4ed954f 100644
--- a/lib/presentation/viewmodel/scooter_code_bloc.dart
+++ b/lib/presentation/viewmodel/scooter_code_bloc.dart
@@ -1,27 +1,78 @@
-import 'package:be_happy/domain/entities/scooter.dart';
-import 'package:be_happy/domain/usecase/get_scooter_by_title_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../event/scooter_code_event.dart';
-import '../state/scooter_code_state.dart';
-
-class ScooterCodeBloc extends Bloc<ScooterCodeEvent, ScooterCodeState> {
-  final GetScooterByTitleUsecase getScooterByTitleUsecase;
-
-  ScooterCodeBloc({required this.getScooterByTitleUsecase}) : super(const ScooterCodeInitial()) {
-    on<ScooterCodeChanged>((event, emit) {
-      emit(ScooterCodeInitial(code: event.code));
-    });
-
-    on<ScooterCodeSubmitted>((event, emit) async {
-      emit(ScooterCodeLoading(code: event.code));
-
-      final result = await getScooterByTitleUsecase(event.code);
-
-      /*result.fold(
-        (error) => emit(ScooterCodeFailure(error.message ?? "Ошибка", code: event.code)),
-        (scooter) => emit(ScooterCodeSuccess(scooter, code: event.code)),
-      );*/
-    });
-  }
-}
\ No newline at end of file
+import 'package:be_happy/domain/entities/scooter.dart';
+import 'package:be_happy/domain/usecase/get_scooter_by_title_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+import '../../core/result.dart';
+import '../../domain/usecase/get_address_by_point_usecase.dart';
+import '../../domain/usecase/get_pedestrian_routes_usecase.dart';
+import '../event/scooter_code_event.dart';
+import '../state/scooter_code_state.dart';
+
+class ScooterCodeBloc extends Bloc<ScooterCodeEvent, ScooterCodeState> {
+  final GetScooterByTitleUsecase getScooterByTitleUsecase;
+  final GetAddressByPointUsecase getAddressUsecase;
+  final GetPedestrianRoutesUsecase getPedestrianRoutesUsecase;
+
+  ScooterCodeBloc({
+    required this.getScooterByTitleUsecase,
+    required this.getAddressUsecase,
+    required this.getPedestrianRoutesUsecase,
+  }) : super(const ScooterCodeInitial()) {
+    on<ScooterCodeChanged>((event, emit) {
+      emit(ScooterCodeInitial(code: event.code));
+    });
+
+    on<ScooterCodeSubmitted>((event, emit) async {
+      emit(ScooterCodeLoading(code: event.code));
+
+      final result = await getScooterByTitleUsecase(event.code);
+
+      switch (result) {
+        case Success(:final data):
+          if (data != null) {
+            final String currentAddress = await getAddressUsecase(
+              data.longitude,
+              data.latitude,
+            );
+
+            final position = await Geolocator.getCurrentPosition(
+              desiredAccuracy: LocationAccuracy.high,
+            );
+
+            final routes = await getPedestrianRoutesUsecase(
+              Point(latitude: position.latitude, longitude: position.longitude),
+              Point(latitude: data.longitude, longitude: data.latitude),
+            );
+
+            final distance =
+                routes?.firstOrNull?.metadata.weight.walkingDistance.value;
+            print("Distance is: $distance");
+            final time = routes?.firstOrNull?.metadata.weight.time.value;
+
+            data.distance = distance;
+            data.timeToTravel = time;
+
+            emit(
+              ScooterCodeSuccess(
+                data,
+                code: event.code,
+                address: currentAddress,
+                distance: distance ?? 0.0,
+              ),
+            );
+          } else {
+            emit(ScooterCodeFailure("Самокат не найден", code: event.code));
+          }
+        case Failure(:final failure):
+          emit(
+            ScooterCodeFailure(
+              failure.message ?? "Неизвестная ошибка",
+              code: event.code,
+            ),
+          );
+      }
+    });
+  }
+}
diff --git a/lib/presentation/viewmodel/scooter_detail_bloc.dart b/lib/presentation/viewmodel/scooter_detail_bloc.dart
index 269445d..adea9a5 100644
--- a/lib/presentation/viewmodel/scooter_detail_bloc.dart
+++ b/lib/presentation/viewmodel/scooter_detail_bloc.dart
@@ -1,37 +1,37 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/usecase/get_scooter_usecase.dart';
-import '../event/scooter_detail_event.dart';
-import '../state/scooter_detail_state.dart';
-
-class ScooterDetailBloc extends Bloc<ScooterDetailEvent, ScooterDetailState> {
-  final GetScooterUsecase _getScooterUsecase;
-
-  ScooterDetailBloc(this._getScooterUsecase) : super(const ScooterDetailState()) {
-    on<LoadScooterDetails>(_onLoadScooterDetails);
-  }
-
-  Future<void> _onLoadScooterDetails(
-      LoadScooterDetails event,
-      Emitter<ScooterDetailState> emit,
-      ) async {
-    emit(state.copyWith(status: ScooterStatus.loading));
-
-    final result = await _getScooterUsecase(event.scooterId);
-
-    if (result is Success<Scooter?>) {
-      print("SCOOTER: ${result.data}");
-      emit(state.copyWith(
-        status: ScooterStatus.success,
-        scooter: result.data,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ScooterStatus.failure,
-        errorMessage: "Не удалось загрузить данные",
-      ));
-    }
-  }
-}
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/usecase/get_scooter_usecase.dart';
+import '../event/scooter_detail_event.dart';
+import '../state/scooter_detail_state.dart';
+
+class ScooterDetailBloc extends Bloc<ScooterDetailEvent, ScooterDetailState> {
+  final GetScooterUsecase _getScooterUsecase;
+
+  ScooterDetailBloc(this._getScooterUsecase) : super(const ScooterDetailState()) {
+    on<LoadScooterDetails>(_onLoadScooterDetails);
+  }
+
+  Future<void> _onLoadScooterDetails(
+      LoadScooterDetails event,
+      Emitter<ScooterDetailState> emit,
+      ) async {
+    emit(state.copyWith(status: ScooterStatus.loading));
+
+    final result = await _getScooterUsecase(event.scooterId);
+
+    if (result is Success<Scooter?>) {
+      print("SCOOTER: ${result.data}");
+      emit(state.copyWith(
+        status: ScooterStatus.success,
+        scooter: result.data,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ScooterStatus.failure,
+        errorMessage: "Не удалось загрузить данные",
+      ));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/scooter_detail_modal_bloc.dart b/lib/presentation/viewmodel/scooter_detail_modal_bloc.dart
index e70eaaa..4348af3 100644
--- a/lib/presentation/viewmodel/scooter_detail_modal_bloc.dart
+++ b/lib/presentation/viewmodel/scooter_detail_modal_bloc.dart
@@ -1,92 +1,92 @@
-import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
-import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:yandex_mapkit/yandex_mapkit.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/scooter.dart';
-import '../../domain/usecase/get_address_by_point_usecase.dart';
-import '../event/scooter_detail_event.dart';
-import '../event/scooter_detail_modal_event.dart';
-import '../state/map_state.dart';
-import '../state/scooter_detail_modal_state.dart';
-
-class ScooterDetailModalBloc
-    extends Bloc<ScooterDetailModalEvent, ScooterDetailModalState> {
-  final GetAddressByPointUsecase _getAddressUsecase;
-  final GetPedestrianRoutesUsecase _getPedestrianRoutesUsecase;
-  final GetScooterUsecase _getScooterUsecase;
-  final Map<int, String> _addressCache = {};
-  final List<Scooter> fetch_scooters = [];
-  double? distance = 0.0;
-
-  ScooterDetailModalBloc(
-    this._getAddressUsecase,
-    this._getScooterUsecase,
-    this._getPedestrianRoutesUsecase,
-  ) : super(
-        ScooterDetailModalState(
-          status: ScooterDetailModalStatus.initial,
-        ),
-      ) {
-    on<ScooterDetailModalStarted>(_onStarted);
-  }
-
-  Future<void> _onStarted(
-      ScooterDetailModalStarted event,
-      Emitter<ScooterDetailModalState> emit,
-      ) async {
-    emit(state.copyWith(status: ScooterDetailModalStatus.loading));
-
-    final List<Scooter> updatedScooters = [];
-    String? firstAddress;
-
-    try {
-      for (var scooter in event.scooters) {
-        final result = await _getScooterUsecase(scooter.id);
-
-        String? currentAddress = _addressCache[scooter.id];
-        if (currentAddress == null) {
-          currentAddress = await _getAddressUsecase(scooter.longitude, scooter.latitude);
-          _addressCache[scooter.id] = currentAddress;
-        }
-
-        firstAddress ??= currentAddress;
-
-        final routes = await _getPedestrianRoutesUsecase(
-          Point(latitude: event.userLatitude, longitude: event.userLongitude),
-          Point(latitude: scooter.longitude, longitude: scooter.latitude),
-        );
-
-        final distance = routes?.firstOrNull?.metadata.weight.walkingDistance.value;
-        print("Distance is: $distance");
-        final time = routes?.firstOrNull?.metadata.weight.time.value;
-
-        if (result is Success<Scooter>) {
-          final data = result.data!;
-          data.distance = distance;
-          data.timeToTravel = time;
-          updatedScooters.add(data);
-        } else {
-          updatedScooters.add(scooter);
-        }
-      }
-
-      emit(
-        state.copyWith(
-          status: ScooterDetailModalStatus.success,
-          scooters: updatedScooters,
-          address: firstAddress ?? "Unknown address",
-          distance: updatedScooters.firstOrNull?.distance,
-        ),
-      );
-    } catch (e) {
-      print('Error in Bloc: $e');
-      emit(state.copyWith(
-        status: ScooterDetailModalStatus.failure,
-        errorMessage: e.toString(),
-      ));
-    }
-  }
-
-}
+import 'package:be_happy/domain/usecase/get_pedestrian_routes_usecase.dart';
+import 'package:be_happy/domain/usecase/get_scooter_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:yandex_mapkit/yandex_mapkit.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/scooter.dart';
+import '../../domain/usecase/get_address_by_point_usecase.dart';
+import '../event/scooter_detail_event.dart';
+import '../event/scooter_detail_modal_event.dart';
+import '../state/map_state.dart';
+import '../state/scooter_detail_modal_state.dart';
+
+class ScooterDetailModalBloc
+    extends Bloc<ScooterDetailModalEvent, ScooterDetailModalState> {
+  final GetAddressByPointUsecase _getAddressUsecase;
+  final GetPedestrianRoutesUsecase _getPedestrianRoutesUsecase;
+  final GetScooterUsecase _getScooterUsecase;
+  final Map<int, String> _addressCache = {};
+  final List<Scooter> fetch_scooters = [];
+  double? distance = 0.0;
+
+  ScooterDetailModalBloc(
+    this._getAddressUsecase,
+    this._getScooterUsecase,
+    this._getPedestrianRoutesUsecase,
+  ) : super(
+        ScooterDetailModalState(
+          status: ScooterDetailModalStatus.initial,
+        ),
+      ) {
+    on<ScooterDetailModalStarted>(_onStarted);
+  }
+
+  Future<void> _onStarted(
+      ScooterDetailModalStarted event,
+      Emitter<ScooterDetailModalState> emit,
+      ) async {
+    emit(state.copyWith(status: ScooterDetailModalStatus.loading));
+
+    final List<Scooter> updatedScooters = [];
+    String? firstAddress;
+
+    try {
+      for (var scooter in event.scooters) {
+        final result = await _getScooterUsecase(scooter.id);
+
+        String? currentAddress = _addressCache[scooter.id];
+        if (currentAddress == null) {
+          currentAddress = await _getAddressUsecase(scooter.longitude, scooter.latitude);
+          _addressCache[scooter.id] = currentAddress;
+        }
+
+        firstAddress ??= currentAddress;
+
+        final routes = await _getPedestrianRoutesUsecase(
+          Point(latitude: event.userLatitude, longitude: event.userLongitude),
+          Point(latitude: scooter.longitude, longitude: scooter.latitude),
+        );
+
+        final distance = routes?.firstOrNull?.metadata.weight.walkingDistance.value;
+        print("Distance is: $distance");
+        final time = routes?.firstOrNull?.metadata.weight.time.value;
+
+        if (result is Success<Scooter>) {
+          final data = result.data!;
+          data.distance = distance;
+          data.timeToTravel = time;
+          updatedScooters.add(data);
+        } else {
+          updatedScooters.add(scooter);
+        }
+      }
+
+      emit(
+        state.copyWith(
+          status: ScooterDetailModalStatus.success,
+          scooters: updatedScooters,
+          address: firstAddress ?? "Unknown address",
+          distance: updatedScooters.firstOrNull?.distance,
+        ),
+      );
+    } catch (e) {
+      print('Error in Bloc: $e');
+      emit(state.copyWith(
+        status: ScooterDetailModalStatus.failure,
+        errorMessage: e.toString(),
+      ));
+    }
+  }
+
+}
diff --git a/lib/presentation/viewmodel/send_photo_bloc.dart b/lib/presentation/viewmodel/send_photo_bloc.dart
index 37a042a..71f12be 100644
--- a/lib/presentation/viewmodel/send_photo_bloc.dart
+++ b/lib/presentation/viewmodel/send_photo_bloc.dart
@@ -1,76 +1,76 @@
-import 'dart:io';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../domain/usecase/finish_ride_usecase.dart';
-import '../../domain/usecase/upload_scooter_photos_usecase.dart';
-import '../event/send_photo_event.dart';
-import '../state/send_photo_state.dart';
-import '../../core/result.dart';
-import '../../core/failures.dart';
-
-class SendPhotoBloc extends Bloc<SendPhotoEvent, SendPhotoState> {
-  final UploadScooterPhotosUsecase uploadScooterPhotosUsecase;
-  final FinishRideUsecase _finishRideUsecase;
-
-
-  SendPhotoBloc(this.uploadScooterPhotosUsecase, this._finishRideUsecase) : super(const SendPhotoState()) {
-    on<PhotoSelected>(_onPhotoSelected);
-    on<PhotoUploadSubmitted>(_onPhotoUploadSubmitted);
-  }
-
-  void _onPhotoSelected(PhotoSelected event, Emitter<SendPhotoState> emit) {
-    emit(state.copyWith(selectedImages: event.imagePaths));
-  }
-
-  Future<void> _onPhotoUploadSubmitted(
-      PhotoUploadSubmitted event, Emitter<SendPhotoState> emit) async {
-    if (state.selectedImages.isEmpty) {
-      emit(state.copyWith(
-        status: SendPhotoStatus.failure,
-        errorMessage: 'Выберите хотя бы одно фото',
-      ));
-      return;
-    }
-
-    emit(state.copyWith(status: SendPhotoStatus.loading));
-
-    final imageFiles = state.selectedImages.map((path) => File(path)).toList();
-
-    final result = await uploadScooterPhotosUsecase(imageFiles);
-
-    switch (result) {
-      case Success<List<int>>():
-        if (result.data == null || result.data!.isEmpty) {
-          emit(state.copyWith(
-            status: SendPhotoStatus.failure,
-            errorMessage: 'Не удалось получить ID загруженных фото',
-          ));
-          return;
-        }
-
-        final finishResult = await _finishRideUsecase(
-            event.orderId,
-            result.data!
-        );
-
-        switch (finishResult) {
-          case Success():
-            emit(state.copyWith(
-              status: SendPhotoStatus.success,
-              recievedPhotoIds: result.data,
-            ));
-          case Failure():
-            print("FINISH ERROR: ${finishResult.failure.message}");
-            emit(state.copyWith(
-              status: SendPhotoStatus.failure,
-              errorMessage: 'Ошибка завершения поездки',
-            ));
-        }
-      case Failure():
-        emit(state.copyWith(
-          status: SendPhotoStatus.failure,
-          errorMessage: 'Ошибка загрузки фото: ${result.failure.message}',
-        ));
-    }
-  }
-}
+import 'dart:io';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../../domain/usecase/finish_ride_usecase.dart';
+import '../../domain/usecase/upload_scooter_photos_usecase.dart';
+import '../event/send_photo_event.dart';
+import '../state/send_photo_state.dart';
+import '../../core/result.dart';
+import '../../core/failures.dart';
+
+class SendPhotoBloc extends Bloc<SendPhotoEvent, SendPhotoState> {
+  final UploadScooterPhotosUsecase uploadScooterPhotosUsecase;
+  final FinishRideUsecase _finishRideUsecase;
+
+
+  SendPhotoBloc(this.uploadScooterPhotosUsecase, this._finishRideUsecase) : super(const SendPhotoState()) {
+    on<PhotoSelected>(_onPhotoSelected);
+    on<PhotoUploadSubmitted>(_onPhotoUploadSubmitted);
+  }
+
+  void _onPhotoSelected(PhotoSelected event, Emitter<SendPhotoState> emit) {
+    emit(state.copyWith(selectedImages: event.imagePaths));
+  }
+
+  Future<void> _onPhotoUploadSubmitted(
+      PhotoUploadSubmitted event, Emitter<SendPhotoState> emit) async {
+    if (state.selectedImages.isEmpty) {
+      emit(state.copyWith(
+        status: SendPhotoStatus.failure,
+        errorMessage: 'Выберите хотя бы одно фото',
+      ));
+      return;
+    }
+
+    emit(state.copyWith(status: SendPhotoStatus.loading));
+
+    final imageFiles = state.selectedImages.map((path) => File(path)).toList();
+
+    final result = await uploadScooterPhotosUsecase(imageFiles);
+
+    switch (result) {
+      case Success<List<int>>():
+        if (result.data == null || result.data!.isEmpty) {
+          emit(state.copyWith(
+            status: SendPhotoStatus.failure,
+            errorMessage: 'Не удалось получить ID загруженных фото',
+          ));
+          return;
+        }
+
+        final finishResult = await _finishRideUsecase(
+            event.orderId,
+            result.data!
+        );
+
+        switch (finishResult) {
+          case Success():
+            emit(state.copyWith(
+              status: SendPhotoStatus.success,
+              recievedPhotoIds: result.data,
+            ));
+          case Failure():
+            print("FINISH ERROR: ${finishResult.failure.message}");
+            emit(state.copyWith(
+              status: SendPhotoStatus.failure,
+              errorMessage: 'Ошибка завершения поездки',
+            ));
+        }
+      case Failure():
+        emit(state.copyWith(
+          status: SendPhotoStatus.failure,
+          errorMessage: 'Ошибка загрузки фото: ${result.failure.message}',
+        ));
+    }
+  }
+}
diff --git a/lib/presentation/viewmodel/splash_bloc.dart b/lib/presentation/viewmodel/splash_bloc.dart
index 932c4de..a65adca 100644
--- a/lib/presentation/viewmodel/splash_bloc.dart
+++ b/lib/presentation/viewmodel/splash_bloc.dart
@@ -1,56 +1,56 @@
-import 'dart:async';
-
-import 'package:be_happy/domain/usecase/refresh_token_usecase.dart';
-import 'package:be_happy/presentation/event/spalsh_event.dart';
-import 'package:be_happy/presentation/state/splash_state.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class SplashBloc extends Bloc<SplashEvent, SplashState> {
-  final RefreshTokenUseCase _refreshTokenUseCase;
-
-  SplashBloc(this._refreshTokenUseCase):
-        super(AuthInitial()) {
-    on<AuthCheckRequested>(_onAuthCheckRequested);
-    on<AuthStarted>(_onAuthStarted);
-    on<PinVerificationSuccess>((event, emit) {
-      emit(AuthPinVerified());
-    });
-    on<AuthLogoutRequested>((event, emit) {
-      emit(AuthUnauthenticated());
-    });
-  }
-
-  Future<void> _onAuthCheckRequested(
-      AuthCheckRequested event,
-      Emitter<SplashState> emit,
-      ) async {
-    print('AuthBloc: Получено событие AuthCheckRequested.');
-    final prefs = await SharedPreferences.getInstance();
-    final bool isFirstLaunch = prefs.getBool('is_first_launch') ?? true;
-
-    if (isFirstLaunch) {
-      await prefs.setBool('is_first_launch', false);
-      emit(AuthFirstLaunch());
-      return;
-    }
-
-    // 2. Если не первый запуск, пытаемся обновить токен
-    try {
-      print('AuthBloc: Пытаюсь обновить токен...');
-      // Здесь вызывается ваш метод refreshToken()
-      await _refreshTokenUseCase.execute();
-      print('AuthBloc: Токен успешно обновлен. Отправляю AuthAuthenticated.');
-      // Если метод выполнился без исключений, значит токен успешно обновлен
-      emit(AuthAuthenticated());
-    } catch (e) {
-      print('AuthBloc: Ошибка при обновлении токена: $e');
-      // Если refreshToken() бросил исключение, значит что-то пошло не так
-      emit(AuthUnauthenticated());
-    }
-  }
-
-  FutureOr<void> _onAuthStarted(AuthStarted event, Emitter<SplashState> emit) {
-    emit(AuthInProgress());
-  }
-}
+import 'dart:async';
+
+import 'package:be_happy/domain/usecase/refresh_token_usecase.dart';
+import 'package:be_happy/presentation/event/spalsh_event.dart';
+import 'package:be_happy/presentation/state/splash_state.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class SplashBloc extends Bloc<SplashEvent, SplashState> {
+  final RefreshTokenUseCase _refreshTokenUseCase;
+
+  SplashBloc(this._refreshTokenUseCase):
+        super(AuthInitial()) {
+    on<AuthCheckRequested>(_onAuthCheckRequested);
+    on<AuthStarted>(_onAuthStarted);
+    on<PinVerificationSuccess>((event, emit) {
+      emit(AuthPinVerified());
+    });
+    on<AuthLogoutRequested>((event, emit) {
+      emit(AuthUnauthenticated());
+    });
+  }
+
+  Future<void> _onAuthCheckRequested(
+      AuthCheckRequested event,
+      Emitter<SplashState> emit,
+      ) async {
+    print('AuthBloc: Получено событие AuthCheckRequested.');
+    final prefs = await SharedPreferences.getInstance();
+    final bool isFirstLaunch = prefs.getBool('is_first_launch') ?? true;
+
+    if (isFirstLaunch) {
+      await prefs.setBool('is_first_launch', false);
+      emit(AuthFirstLaunch());
+      return;
+    }
+
+    // 2. Если не первый запуск, пытаемся обновить токен
+    try {
+      print('AuthBloc: Пытаюсь обновить токен...');
+      // Здесь вызывается ваш метод refreshToken()
+      await _refreshTokenUseCase.execute();
+      print('AuthBloc: Токен успешно обновлен. Отправляю AuthAuthenticated.');
+      // Если метод выполнился без исключений, значит токен успешно обновлен
+      emit(AuthAuthenticated());
+    } catch (e) {
+      print('AuthBloc: Ошибка при обновлении токена: $e');
+      // Если refreshToken() бросил исключение, значит что-то пошло не так
+      emit(AuthUnauthenticated());
+    }
+  }
+
+  FutureOr<void> _onAuthStarted(AuthStarted event, Emitter<SplashState> emit) {
+    emit(AuthInProgress());
+  }
+}
diff --git a/lib/presentation/viewmodel/subscription_list_bloc.dart b/lib/presentation/viewmodel/subscription_list_bloc.dart
index 78a0086..be7ba60 100644
--- a/lib/presentation/viewmodel/subscription_list_bloc.dart
+++ b/lib/presentation/viewmodel/subscription_list_bloc.dart
@@ -1,59 +1,59 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/client_subscription.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-import 'package:be_happy/domain/usecase/get_available_subscriptions_usecase.dart';
-import 'package:be_happy/domain/usecase/get_client_subscriptions_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../event/subscription_list_event.dart';
-import '../state/subscription_list_state.dart';
-
-class SubscriptionListBloc extends Bloc<SubscriptionEvent, SubscriptionState> {
-  final GetAvailableSubscriptionsUsecase getAvailableSubscriptionsUsecase;
-  final GetClientSubscriptionsUsecase getClientSubscriptionsUsecase;
-
-
-  SubscriptionListBloc({
-    required this.getAvailableSubscriptionsUsecase,
-    required this.getClientSubscriptionsUsecase,
-  }) : super(SubscriptionsLoading()) {
-    on<LoadSubscriptionsEvent>((event, emit) async {
-      emit(SubscriptionsLoading());
-      try {
-        final results = await Future.wait([
-          getAvailableSubscriptionsUsecase(),
-          getClientSubscriptionsUsecase(),
-        ]);
-
-        final allResult = results[0];
-        final activeResult = results[1] ;
-
-        if (allResult is Success<List<Subscription>> && activeResult is Success<List<ClientSubscription>>) {
-          final availableSubs = allResult.data ?? [];
-          final clientSubs = activeResult.data ?? [];
-
-          final Map<int, Subscription> combinedSubsMap = {};
-
-          for (var clientSub in clientSubs) {
-            if (clientSub.subscription != null) {
-              combinedSubsMap[clientSub.subscriptionId] = clientSub.subscription;
-            }
-          }
-
-          for (var sub in availableSubs) {
-            combinedSubsMap[sub.id] = sub;
-          }
-
-          emit(SubscriptionsLoaded(
-            subscriptions: combinedSubsMap.values.toList(),
-            activeSubscriptions: clientSubs,
-          ));
-        } else {
-          emit(SubscriptionsError("Не удалось загрузить данные из API"));
-        }
-      } catch (e) {
-        emit(SubscriptionsError(e.toString()));
-      }
-    });
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/client_subscription.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+import 'package:be_happy/domain/usecase/get_available_subscriptions_usecase.dart';
+import 'package:be_happy/domain/usecase/get_client_subscriptions_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../event/subscription_list_event.dart';
+import '../state/subscription_list_state.dart';
+
+class SubscriptionListBloc extends Bloc<SubscriptionEvent, SubscriptionState> {
+  final GetAvailableSubscriptionsUsecase getAvailableSubscriptionsUsecase;
+  final GetClientSubscriptionsUsecase getClientSubscriptionsUsecase;
+
+
+  SubscriptionListBloc({
+    required this.getAvailableSubscriptionsUsecase,
+    required this.getClientSubscriptionsUsecase,
+  }) : super(SubscriptionsLoading()) {
+    on<LoadSubscriptionsEvent>((event, emit) async {
+      emit(SubscriptionsLoading());
+      try {
+        final results = await Future.wait([
+          getAvailableSubscriptionsUsecase(),
+          getClientSubscriptionsUsecase(),
+        ]);
+
+        final allResult = results[0];
+        final activeResult = results[1] ;
+
+        if (allResult is Success<List<Subscription>> && activeResult is Success<List<ClientSubscription>>) {
+          final availableSubs = allResult.data ?? [];
+          final clientSubs = activeResult.data ?? [];
+
+          final Map<int, Subscription> combinedSubsMap = {};
+
+          for (var clientSub in clientSubs) {
+            if (clientSub.subscription != null) {
+              combinedSubsMap[clientSub.subscriptionId] = clientSub.subscription;
+            }
+          }
+
+          for (var sub in availableSubs) {
+            combinedSubsMap[sub.id] = sub;
+          }
+
+          emit(SubscriptionsLoaded(
+            subscriptions: combinedSubsMap.values.toList(),
+            activeSubscriptions: clientSubs,
+          ));
+        } else {
+          emit(SubscriptionsError("Не удалось загрузить данные из API"));
+        }
+      } catch (e) {
+        emit(SubscriptionsError(e.toString()));
+      }
+    });
+  }
+}
diff --git a/lib/presentation/viewmodel/susbcription_details_bloc.dart b/lib/presentation/viewmodel/susbcription_details_bloc.dart
index e331b57..1a17f4f 100644
--- a/lib/presentation/viewmodel/susbcription_details_bloc.dart
+++ b/lib/presentation/viewmodel/susbcription_details_bloc.dart
@@ -1,130 +1,130 @@
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/domain/entities/payment_card.dart';
-import 'package:be_happy/domain/entities/subscription.dart';
-import 'package:be_happy/domain/usecase/activate_subscription_usecase.dart';
-import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
-import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../domain/entities/client_subscription.dart';
-import '../../domain/usecase/get_client_subscriptions_usecase.dart';
-import '../event/subscription_details_event.dart';
-import '../state/susbcription_details_state.dart';
-
-class SubscriptionDetailsBloc
-    extends Bloc<SubscriptionDetailsEvent, SubscriptionDetailsState> {
-  final GetSubscriptionByIdUsecase getSubscriptionByIdUsecase;
-  final GetPaymentCardsUsecase getPaymentCardsUsecase;
-  final ActivateSubscriptionUsecase activateSubscriptionUsecase;
-  final GetClientSubscriptionsUsecase getClientSubscriptionsUsecase;
-
-  SubscriptionDetailsBloc(
-    this.getSubscriptionByIdUsecase,
-    this.getPaymentCardsUsecase,
-    this.activateSubscriptionUsecase,
-    this.getClientSubscriptionsUsecase,
-  ) : super(DetailsLoading()) {
-    on<LoadDetailsEvent>((event, emit) async {
-      emit(DetailsLoading());
-      try {
-        final cardsResult = await getPaymentCardsUsecase();
-
-        final subsResult = await getSubscriptionByIdUsecase(
-          event.subscriptionId,
-        );
-
-        final clientSubsResult = await getClientSubscriptionsUsecase();
-        bool isPurchased = false;
-
-        switch (clientSubsResult) {
-          case Success<List<ClientSubscription>>():
-            isPurchased =
-                clientSubsResult.data?.any(
-                  (element) => element.subscriptionId == event.subscriptionId,
-                ) ??
-                false;
-            break;
-
-          case Failure<List<ClientSubscription>>():
-            isPurchased = false;
-            break;
-        }
-
-        switch (subsResult) {
-          case Success<Subscription>():
-            final sub = subsResult.data;
-            if (sub == null) return;
-
-            List<PaymentCard> loadedCards = [];
-            PaymentCard? defaultCard;
-
-            if (cardsResult is Success<List<PaymentCard>>) {
-              loadedCards = cardsResult.data ?? [];
-              if (loadedCards.isNotEmpty) {
-                defaultCard = loadedCards.firstWhere(
-                  (element) => element.isMain,
-                );
-              }
-            }
-
-            emit(
-              DetailsContentState(
-                subscription: sub,
-                selectedPeriod: sub.options.first,
-                isAlreadyPurchased: isPurchased,
-                cards: loadedCards,
-                selectedCard: defaultCard ?? loadedCards.first,
-              ),
-            );
-            break;
-          case Failure<Subscription>():
-            emit(DetailsError("Ошибка при запросе данных"));
-            break;
-        }
-      } catch (e) {
-        emit(DetailsError("Не удалось загрузить данные"));
-      }
-    });
-
-    on<SelectPeriodEvent>((event, emit) {
-      if (state is DetailsContentState) {
-        emit(
-          (state as DetailsContentState).copyWith(selectedPeriod: event.period),
-        );
-      }
-    });
-
-    on<SelectCardEvent>((event, emit) {
-      if (state is DetailsContentState) {
-        emit((state as DetailsContentState).copyWith(selectedCard: event.card));
-      }
-    });
-
-    on<ToggleAgreementEvent>((event, emit) {
-      if (state is DetailsContentState) {
-        emit((state as DetailsContentState).copyWith(isAgreed: event.value));
-      }
-    });
-
-    on<ActivateSubscriptionPressed>((event, emit) async {
-      switch (state) {
-        case DetailsContentState contentState:
-          if (!contentState.isAgreed || contentState.selectedCard == null) {
-            return;
-          }
-
-          final result = await activateSubscriptionUsecase(
-            contentState.selectedPeriod.id,
-            contentState.selectedCard.id,
-          );
-
-          if (result is Success) {
-            emit(contentState.copyWith(isSuccess: true));
-          } else {}
-          break;
-        default:
-          break;
-      }
-    });
-  }
-}
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/domain/entities/payment_card.dart';
+import 'package:be_happy/domain/entities/subscription.dart';
+import 'package:be_happy/domain/usecase/activate_subscription_usecase.dart';
+import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
+import 'package:be_happy/domain/usecase/get_subscription_by_id_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../domain/entities/client_subscription.dart';
+import '../../domain/usecase/get_client_subscriptions_usecase.dart';
+import '../event/subscription_details_event.dart';
+import '../state/susbcription_details_state.dart';
+
+class SubscriptionDetailsBloc
+    extends Bloc<SubscriptionDetailsEvent, SubscriptionDetailsState> {
+  final GetSubscriptionByIdUsecase getSubscriptionByIdUsecase;
+  final GetPaymentCardsUsecase getPaymentCardsUsecase;
+  final ActivateSubscriptionUsecase activateSubscriptionUsecase;
+  final GetClientSubscriptionsUsecase getClientSubscriptionsUsecase;
+
+  SubscriptionDetailsBloc(
+    this.getSubscriptionByIdUsecase,
+    this.getPaymentCardsUsecase,
+    this.activateSubscriptionUsecase,
+    this.getClientSubscriptionsUsecase,
+  ) : super(DetailsLoading()) {
+    on<LoadDetailsEvent>((event, emit) async {
+      emit(DetailsLoading());
+      try {
+        final cardsResult = await getPaymentCardsUsecase();
+
+        final subsResult = await getSubscriptionByIdUsecase(
+          event.subscriptionId,
+        );
+
+        final clientSubsResult = await getClientSubscriptionsUsecase();
+        bool isPurchased = false;
+
+        switch (clientSubsResult) {
+          case Success<List<ClientSubscription>>():
+            isPurchased =
+                clientSubsResult.data?.any(
+                  (element) => element.subscriptionId == event.subscriptionId,
+                ) ??
+                false;
+            break;
+
+          case Failure<List<ClientSubscription>>():
+            isPurchased = false;
+            break;
+        }
+
+        switch (subsResult) {
+          case Success<Subscription>():
+            final sub = subsResult.data;
+            if (sub == null) return;
+
+            List<PaymentCard> loadedCards = [];
+            PaymentCard? defaultCard;
+
+            if (cardsResult is Success<List<PaymentCard>>) {
+              loadedCards = cardsResult.data ?? [];
+              if (loadedCards.isNotEmpty) {
+                defaultCard = loadedCards.firstWhere(
+                  (element) => element.isMain,
+                );
+              }
+            }
+
+            emit(
+              DetailsContentState(
+                subscription: sub,
+                selectedPeriod: sub.options.first,
+                isAlreadyPurchased: isPurchased,
+                cards: loadedCards,
+                selectedCard: defaultCard ?? loadedCards.first,
+              ),
+            );
+            break;
+          case Failure<Subscription>():
+            emit(DetailsError("Ошибка при запросе данных"));
+            break;
+        }
+      } catch (e) {
+        emit(DetailsError("Не удалось загрузить данные"));
+      }
+    });
+
+    on<SelectPeriodEvent>((event, emit) {
+      if (state is DetailsContentState) {
+        emit(
+          (state as DetailsContentState).copyWith(selectedPeriod: event.period),
+        );
+      }
+    });
+
+    on<SelectCardEvent>((event, emit) {
+      if (state is DetailsContentState) {
+        emit((state as DetailsContentState).copyWith(selectedCard: event.card));
+      }
+    });
+
+    on<ToggleAgreementEvent>((event, emit) {
+      if (state is DetailsContentState) {
+        emit((state as DetailsContentState).copyWith(isAgreed: event.value));
+      }
+    });
+
+    on<ActivateSubscriptionPressed>((event, emit) async {
+      switch (state) {
+        case DetailsContentState contentState:
+          if (!contentState.isAgreed || contentState.selectedCard == null) {
+            return;
+          }
+
+          final result = await activateSubscriptionUsecase(
+            contentState.selectedPeriod.id,
+            contentState.selectedCard.id,
+          );
+
+          if (result is Success) {
+            emit(contentState.copyWith(isSuccess: true));
+          } else {}
+          break;
+        default:
+          break;
+      }
+    });
+  }
+}
diff --git a/lib/presentation/viewmodel/tariff_sheet_bloc.dart b/lib/presentation/viewmodel/tariff_sheet_bloc.dart
index 8d0f9cd..e019574 100644
--- a/lib/presentation/viewmodel/tariff_sheet_bloc.dart
+++ b/lib/presentation/viewmodel/tariff_sheet_bloc.dart
@@ -1,151 +1,151 @@
-import 'dart:async';
-import 'package:be_happy/core/failures.dart';
-import 'package:be_happy/domain/entities/scooter_order.dart';
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:collection/collection.dart';
-
-import 'package:be_happy/domain/entities/payment_card.dart';
-import 'package:be_happy/domain/usecase/book_scooter_usecase.dart';
-import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/tariff.dart';
-import '../../domain/usecase/get_available_tariffs_usecase.dart';
-import '../event/tariff_sheet_event.dart';
-import '../state/tariff_sheet_state.dart';
-
-class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
-  final GetAvailableTariffsUsecase _getAvailableTariffsUsecase;
-  final GetProfileUseCase _getProfileUseCase;
-  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
-  final BookScooterUsecase _bookScooterUsecase;
-
-  TariffSheetBloc(
-    this._getAvailableTariffsUsecase,
-    this._getProfileUseCase,
-    this._getPaymentCardsUsecase,
-    this._bookScooterUsecase,
-  ) : super(TariffSheetState(status: TariffSheetStatus.initial)) {
-    on<TariffSheetStarted>(_onStarted);
-    on<PaymentCardChanged>(_onPaymentCardChanged);
-    on<BookScooterPressed>(_onBookScooterPressed);
-    on<SelectBalancePressed>(_onSelectBalancePressed);
-    on<InsuranceToggled>(_onInsuranceToggled);
-  }
-
-  Future<void> _onStarted(
-    TariffSheetStarted event,
-    Emitter<TariffSheetState> emit,
-  ) async {
-    emit(state.copyWith(status: TariffSheetStatus.loading));
-
-    try {
-      final result = await _getAvailableTariffsUsecase(event.scooterId);
-      final cards_result = await _getPaymentCardsUsecase();
-
-      if (result is Success<List<Tariff>> &&
-          cards_result is Success<List<PaymentCard>>) {
-        emit(
-          state.copyWith(
-            status: TariffSheetStatus.success,
-            tariffs: result.data ?? [],
-            selectedCard: cards_result.data?.firstWhereOrNull(
-              (element) => element.isMain,
-            ),
-          ),
-        );
-      } else {
-        emit(
-          state.copyWith(
-            status: TariffSheetStatus.failure,
-            errorMessage: 'Failed to load tariffs',
-          ),
-        );
-      }
-    } catch (e, stackTrace) {
-      emit(
-        state.copyWith(
-          status: TariffSheetStatus.failure,
-          errorMessage: "ERROR: ${e.toString()} \n $stackTrace",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onPaymentCardChanged(
-    PaymentCardChanged event,
-    Emitter<TariffSheetState> emit,
-  ) {
-    try {
-      emit(
-        state.copyWith(
-          status: TariffSheetStatus.success,
-          selectedCard: event.card,
-          useBalance: false,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: TariffSheetStatus.failure,
-          errorMessage: 'Failed to change card',
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onBookScooterPressed (
-    BookScooterPressed event,
-    Emitter<TariffSheetState> emit,
-  ) async {
-    try {
-      final result = await _bookScooterUsecase(
-        scooterId: event.scooterId,
-        planId: event.planId,
-        cardId: event.cardId,
-        subscriptionId: event.subscriptionId,
-        isBalance: event.isBalance,
-        isInsurance: event.isInsurance,
-      );
-
-      switch (result) {
-
-        case Success<ScooterOrder>():
-          // TODO: Handle this case.
-          throw UnimplementedError();
-        case Failure<ScooterOrder>():
-          if (result is WrongZoneFailure) {
-            emit(
-              state.copyWith(
-                status: TariffSheetStatus.failure,
-                errorMessage: result.failure.message,
-              ),
-            );
-          }
-      }
-
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: TariffSheetStatus.failure,
-          errorMessage: 'Failed to book scooter',
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onSelectBalancePressed(SelectBalancePressed event, Emitter<TariffSheetState> emit) async {
-    final profile = await _getProfileUseCase();
-
-    emit(state.copyWith(
-      useBalance: true,
-      userBalance: profile.balance,
-      selectedCard: null,
-    ));
-  }
-
-  FutureOr<void> _onInsuranceToggled(InsuranceToggled event, Emitter<TariffSheetState> emit) async {
-    emit(state.copyWith(isInsurance: event.isEnabled));
-  }
-}
+import 'dart:async';
+import 'package:be_happy/core/failures.dart';
+import 'package:be_happy/domain/entities/scooter_order.dart';
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:collection/collection.dart';
+
+import 'package:be_happy/domain/entities/payment_card.dart';
+import 'package:be_happy/domain/usecase/book_scooter_usecase.dart';
+import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/tariff.dart';
+import '../../domain/usecase/get_available_tariffs_usecase.dart';
+import '../event/tariff_sheet_event.dart';
+import '../state/tariff_sheet_state.dart';
+
+class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
+  final GetAvailableTariffsUsecase _getAvailableTariffsUsecase;
+  final GetProfileUseCase _getProfileUseCase;
+  final GetPaymentCardsUsecase _getPaymentCardsUsecase;
+  final BookScooterUsecase _bookScooterUsecase;
+
+  TariffSheetBloc(
+    this._getAvailableTariffsUsecase,
+    this._getProfileUseCase,
+    this._getPaymentCardsUsecase,
+    this._bookScooterUsecase,
+  ) : super(TariffSheetState(status: TariffSheetStatus.initial)) {
+    on<TariffSheetStarted>(_onStarted);
+    on<PaymentCardChanged>(_onPaymentCardChanged);
+    on<BookScooterPressed>(_onBookScooterPressed);
+    on<SelectBalancePressed>(_onSelectBalancePressed);
+    on<InsuranceToggled>(_onInsuranceToggled);
+  }
+
+  Future<void> _onStarted(
+    TariffSheetStarted event,
+    Emitter<TariffSheetState> emit,
+  ) async {
+    emit(state.copyWith(status: TariffSheetStatus.loading));
+
+    try {
+      final result = await _getAvailableTariffsUsecase(event.scooterId);
+      final cards_result = await _getPaymentCardsUsecase();
+
+      if (result is Success<List<Tariff>> &&
+          cards_result is Success<List<PaymentCard>>) {
+        emit(
+          state.copyWith(
+            status: TariffSheetStatus.success,
+            tariffs: result.data ?? [],
+            selectedCard: cards_result.data?.firstWhereOrNull(
+              (element) => element.isMain,
+            ),
+          ),
+        );
+      } else {
+        emit(
+          state.copyWith(
+            status: TariffSheetStatus.failure,
+            errorMessage: 'Failed to load tariffs',
+          ),
+        );
+      }
+    } catch (e, stackTrace) {
+      emit(
+        state.copyWith(
+          status: TariffSheetStatus.failure,
+          errorMessage: "ERROR: ${e.toString()} \n $stackTrace",
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onPaymentCardChanged(
+    PaymentCardChanged event,
+    Emitter<TariffSheetState> emit,
+  ) {
+    try {
+      emit(
+        state.copyWith(
+          status: TariffSheetStatus.success,
+          selectedCard: event.card,
+          useBalance: false,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: TariffSheetStatus.failure,
+          errorMessage: 'Failed to change card',
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onBookScooterPressed (
+    BookScooterPressed event,
+    Emitter<TariffSheetState> emit,
+  ) async {
+    try {
+      final result = await _bookScooterUsecase(
+        scooterId: event.scooterId,
+        planId: event.planId,
+        cardId: event.cardId,
+        subscriptionId: event.subscriptionId,
+        isBalance: event.isBalance,
+        isInsurance: event.isInsurance,
+      );
+
+      switch (result) {
+
+        case Success<ScooterOrder>():
+          // TODO: Handle this case.
+          throw UnimplementedError();
+        case Failure<ScooterOrder>():
+          if (result is WrongZoneFailure) {
+            emit(
+              state.copyWith(
+                status: TariffSheetStatus.failure,
+                errorMessage: result.failure.message,
+              ),
+            );
+          }
+      }
+
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: TariffSheetStatus.failure,
+          errorMessage: 'Failed to book scooter',
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onSelectBalancePressed(SelectBalancePressed event, Emitter<TariffSheetState> emit) async {
+    final profile = await _getProfileUseCase();
+
+    emit(state.copyWith(
+      useBalance: true,
+      userBalance: profile.balance,
+      selectedCard: null,
+    ));
+  }
+
+  FutureOr<void> _onInsuranceToggled(InsuranceToggled event, Emitter<TariffSheetState> emit) async {
+    emit(state.copyWith(isInsurance: event.isEnabled));
+  }
+}
diff --git a/lib/presentation/viewmodel/top_up_bloc.dart b/lib/presentation/viewmodel/top_up_bloc.dart
index 19d6bb0..c04f429 100644
--- a/lib/presentation/viewmodel/top_up_bloc.dart
+++ b/lib/presentation/viewmodel/top_up_bloc.dart
@@ -1,101 +1,101 @@
-import 'package:be_happy/domain/usecase/get_certificates_usecase.dart';
-import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
-import 'package:be_happy/domain/usecase/purchase_certificate_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/certificate.dart';
-import '../../domain/entities/payment_card.dart';
-import '../event/top_up_event.dart';
-import '../state/top_up_state.dart';
-
-class TopUpBloc extends Bloc<TopUpEvent, TopUpState> {
-  final GetCertificatesUsecase getCertificatesUsecase;
-  final PurchaseCertificateUsecase purchaseCertificateUsecase;
-  final GetPaymentCardsUsecase getUserCards;
-
-  TopUpBloc({
-    required this.getCertificatesUsecase,
-    required this.purchaseCertificateUsecase,
-    required this.getUserCards,
-  }) : super(const TopUpLoading()) {
-
-    on<LoadTopUpData>((event, emit) async {
-      emit(const TopUpLoading());
-
-      final results = await Future.wait([
-        getCertificatesUsecase(),
-        getUserCards(),
-      ]);
-
-      final certResult = results[0] as Result<List<Certificate>>;
-      final cardResult = results[1] as Result<List<PaymentCard>>;
-
-      switch ((certResult, cardResult)) {
-        case (Success(data: final certs), Success(data: final cards)):
-          emit(
-            TopUpLoaded(
-              certificates: certs ?? [],
-              cards: cards ?? [],
-              selectedTariff: certs != null && certs.length > 1
-                  ? certs[1]
-                  : (certs != null && certs.isNotEmpty ? certs.first : null),
-              selectedCard: cards == null || cards.isEmpty
-                  ? null
-                  : cards.firstWhere(
-                    (c) => c.isMain,
-                orElse: () => cards.first,
-              ),
-            ),
-          );
-        default:
-          emit(const TopUpPaymentFailure('Не удалось загрузить данные'));
-      }
-    });
-
-    on<SelectCertificate>((event, emit) {
-      if (state is TopUpLoaded) {
-        final currentState = state as TopUpLoaded;
-        emit(currentState.copyWith(selectedTariff: event.certificate));
-      }
-    });
-
-    on<SelectCard>((event, emit) {
-      if (state is TopUpLoaded) {
-        final currentState = state as TopUpLoaded;
-        emit(currentState.copyWith(selectedCard: event.card));
-      }
-    });
-
-    on<ToggleAgreement>((event, emit) {
-      if (state is TopUpLoaded) {
-        final currentState = state as TopUpLoaded;
-        emit(currentState.copyWith(isAgreed: event.value));
-      }
-    });
-
-    on<TopUpButtonPressed>((event, emit) async {
-      if (state is TopUpLoaded) {
-        final currentState = state as TopUpLoaded;
-
-        if (currentState.isAgreed &&
-            currentState.selectedTariff != null &&
-            currentState.selectedCard != null) {
-
-          emit(currentState.copyWith(isProcessingPayment: true));
-
-          final result = await purchaseCertificateUsecase(
-            certificateId: currentState.selectedTariff!.id,
-            cardId: currentState.selectedCard!.id,
-          );
-
-          if (result is Success) {
-            emit(const TopUpPaymentSuccess());
-          } else {
-            emit(const TopUpPaymentFailure('Ошибка при оплате'));
-          }
-        }
-      }
-    });
-  }
+import 'package:be_happy/domain/usecase/get_certificates_usecase.dart';
+import 'package:be_happy/domain/usecase/get_payment_cards_usecase.dart';
+import 'package:be_happy/domain/usecase/purchase_certificate_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/certificate.dart';
+import '../../domain/entities/payment_card.dart';
+import '../event/top_up_event.dart';
+import '../state/top_up_state.dart';
+
+class TopUpBloc extends Bloc<TopUpEvent, TopUpState> {
+  final GetCertificatesUsecase getCertificatesUsecase;
+  final PurchaseCertificateUsecase purchaseCertificateUsecase;
+  final GetPaymentCardsUsecase getUserCards;
+
+  TopUpBloc({
+    required this.getCertificatesUsecase,
+    required this.purchaseCertificateUsecase,
+    required this.getUserCards,
+  }) : super(const TopUpLoading()) {
+
+    on<LoadTopUpData>((event, emit) async {
+      emit(const TopUpLoading());
+
+      final results = await Future.wait([
+        getCertificatesUsecase(),
+        getUserCards(),
+      ]);
+
+      final certResult = results[0] as Result<List<Certificate>>;
+      final cardResult = results[1] as Result<List<PaymentCard>>;
+
+      switch ((certResult, cardResult)) {
+        case (Success(data: final certs), Success(data: final cards)):
+          emit(
+            TopUpLoaded(
+              certificates: certs ?? [],
+              cards: cards ?? [],
+              selectedTariff: certs != null && certs.length > 1
+                  ? certs[1]
+                  : (certs != null && certs.isNotEmpty ? certs.first : null),
+              selectedCard: cards == null || cards.isEmpty
+                  ? null
+                  : cards.firstWhere(
+                    (c) => c.isMain,
+                orElse: () => cards.first,
+              ),
+            ),
+          );
+        default:
+          emit(const TopUpPaymentFailure('Не удалось загрузить данные'));
+      }
+    });
+
+    on<SelectCertificate>((event, emit) {
+      if (state is TopUpLoaded) {
+        final currentState = state as TopUpLoaded;
+        emit(currentState.copyWith(selectedTariff: event.certificate));
+      }
+    });
+
+    on<SelectCard>((event, emit) {
+      if (state is TopUpLoaded) {
+        final currentState = state as TopUpLoaded;
+        emit(currentState.copyWith(selectedCard: event.card));
+      }
+    });
+
+    on<ToggleAgreement>((event, emit) {
+      if (state is TopUpLoaded) {
+        final currentState = state as TopUpLoaded;
+        emit(currentState.copyWith(isAgreed: event.value));
+      }
+    });
+
+    on<TopUpButtonPressed>((event, emit) async {
+      if (state is TopUpLoaded) {
+        final currentState = state as TopUpLoaded;
+
+        if (currentState.isAgreed &&
+            currentState.selectedTariff != null &&
+            currentState.selectedCard != null) {
+
+          emit(currentState.copyWith(isProcessingPayment: true));
+
+          final result = await purchaseCertificateUsecase(
+            certificateId: currentState.selectedTariff!.id,
+            cardId: currentState.selectedCard!.id,
+          );
+
+          if (result is Success) {
+            emit(const TopUpPaymentSuccess());
+          } else {
+            emit(const TopUpPaymentFailure('Ошибка при оплате'));
+          }
+        }
+      }
+    });
+  }
 }
\ No newline at end of file
diff --git a/lib/presentation/viewmodel/verify_code_bloc.dart b/lib/presentation/viewmodel/verify_code_bloc.dart
index f5cdb00..4b2f9df 100644
--- a/lib/presentation/viewmodel/verify_code_bloc.dart
+++ b/lib/presentation/viewmodel/verify_code_bloc.dart
@@ -1,143 +1,143 @@
-import 'dart:async';
-
-import 'package:be_happy/core/failures.dart';
-import 'package:be_happy/core/result.dart';
-import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../domain/usecase/verify_code_usecase.dart';
-import '../event/spalsh_event.dart';
-import '../event/verify_code_event.dart';
-import '../state/verify_code_state.dart';
-
-import 'dart:async';
-
-import 'package:be_happy/core/failures.dart';
-import 'package:be_happy/core/result.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../domain/usecase/verify_code_usecase.dart';
-import '../../domain/usecase/login_usecase.dart'; // 🔹 Импортируем LoginUseCase
-import '../event/verify_code_event.dart';
-import '../state/verify_code_state.dart';
-
-class VerifyCodeBloc extends Bloc<VerifyCodeEvent, VerifyCodeState> {
-  final VerifyCodeUseCase _verifyCodeUseCase;
-  final LoginUseCase _loginUseCase;
-  final SplashBloc _splashBloc;
-  Timer? _timer;
-
-  VerifyCodeBloc(this._verifyCodeUseCase, this._loginUseCase, this._splashBloc)
-      : super(VerifyCodeState.initial()) {
-
-    on<VerifyCodeStarted>((event, emit) {
-      emit(state.copyWith(
-        phoneNumber: event.phoneNumber,
-        tempToken: event.tempToken,
-        secondsLeft: 60,
-      ));
-      _startTimer();
-    });
-
-    on<CodeChanged>((event, emit) {
-      emit(state.copyWith(
-        code: event.code,
-        error: null,
-      ));
-    });
-
-    on<ResendCodePressed>((event, emit) async {
-      if (state.secondsLeft == 0 && !state.isSubmitting) {
-        emit(state.copyWith(isSubmitting: true, error: null));
-
-        try {
-          final newTempToken = await _loginUseCase.execute("+${state.phoneNumber}");
-
-          emit(state.copyWith(
-            isSubmitting: false,
-            tempToken: newTempToken,
-            secondsLeft: 60,
-            code: '',
-            error: null,
-            isBlocked: false,
-          ));
-
-          _startTimer();
-        } catch (e) {
-          emit(state.copyWith(
-            isSubmitting: false,
-            error: 'Не удалось повторно отправить код. Попробуйте позже.',
-          ));
-        }
-      }
-    });
-
-    on<TimerTicked>((event, emit) {
-      emit(state.copyWith(secondsLeft: event.secondsLeft));
-    });
-
-    on<VerifyCodeSubmitted>(_onVerifyCodeSubmitted);
-  }
-
-  void _startTimer() {
-    _timer?.cancel();
-    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
-      final currentSeconds = state.secondsLeft;
-      if (currentSeconds <= 1) {
-        timer.cancel();
-        add(TimerTicked(0));
-      } else {
-        add(TimerTicked(currentSeconds - 1));
-      }
-    });
-  }
-
-  Future<void> _onVerifyCodeSubmitted(VerifyCodeSubmitted event,
-      Emitter<VerifyCodeState> emit,) async {
-    if (state.isSubmitting || state.code.length != 6 || state.secondsLeft == 0) return;
-
-    emit(state.copyWith(isSubmitting: true, error: null));
-
-    final result = await _verifyCodeUseCase.execute(state.code, state.tempToken);
-
-    final newState = switch (result) {
-      Success() => (() {
-        _timer?.cancel();
-
-        _splashBloc.add(AuthCheckRequested());
-
-        return state.copyWith(
-          isSubmitting: false,
-          isSuccess: true,
-        );
-      })(),
-      Failure(failure: final f) => switch (f) {
-        AuthFailure(attemptsLeft: final count) => state.copyWith(
-          isSubmitting: false,
-          attemptsLeft: count,
-          error: 'Неверный код. Осталось попыток: $count',
-        ),
-        AuthBlockFailure() => (() {
-          _timer?.cancel();
-          return state.copyWith(
-            isSubmitting: false,
-            isBlocked: true,
-            error: 'Вы заблокированы за слишком частые попытки',
-          );
-        })(),
-        _ => state.copyWith(
-          isSubmitting: false,
-          error: 'Произошла ошибка. Попробуйте позже',
-        ),
-      },
-    };
-
-    emit(newState);
-  }
-
-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
+import 'dart:async';
+
+import 'package:be_happy/core/failures.dart';
+import 'package:be_happy/core/result.dart';
+import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../domain/usecase/verify_code_usecase.dart';
+import '../event/spalsh_event.dart';
+import '../event/verify_code_event.dart';
+import '../state/verify_code_state.dart';
+
+import 'dart:async';
+
+import 'package:be_happy/core/failures.dart';
+import 'package:be_happy/core/result.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../domain/usecase/verify_code_usecase.dart';
+import '../../domain/usecase/login_usecase.dart'; // 🔹 Импортируем LoginUseCase
+import '../event/verify_code_event.dart';
+import '../state/verify_code_state.dart';
+
+class VerifyCodeBloc extends Bloc<VerifyCodeEvent, VerifyCodeState> {
+  final VerifyCodeUseCase _verifyCodeUseCase;
+  final LoginUseCase _loginUseCase;
+  final SplashBloc _splashBloc;
+  Timer? _timer;
+
+  VerifyCodeBloc(this._verifyCodeUseCase, this._loginUseCase, this._splashBloc)
+      : super(VerifyCodeState.initial()) {
+
+    on<VerifyCodeStarted>((event, emit) {
+      emit(state.copyWith(
+        phoneNumber: event.phoneNumber,
+        tempToken: event.tempToken,
+        secondsLeft: 60,
+      ));
+      _startTimer();
+    });
+
+    on<CodeChanged>((event, emit) {
+      emit(state.copyWith(
+        code: event.code,
+        error: null,
+      ));
+    });
+
+    on<ResendCodePressed>((event, emit) async {
+      if (state.secondsLeft == 0 && !state.isSubmitting) {
+        emit(state.copyWith(isSubmitting: true, error: null));
+
+        try {
+          final newTempToken = await _loginUseCase.execute("+${state.phoneNumber}");
+
+          emit(state.copyWith(
+            isSubmitting: false,
+            tempToken: newTempToken,
+            secondsLeft: 60,
+            code: '',
+            error: null,
+            isBlocked: false,
+          ));
+
+          _startTimer();
+        } catch (e) {
+          emit(state.copyWith(
+            isSubmitting: false,
+            error: 'Не удалось повторно отправить код. Попробуйте позже.',
+          ));
+        }
+      }
+    });
+
+    on<TimerTicked>((event, emit) {
+      emit(state.copyWith(secondsLeft: event.secondsLeft));
+    });
+
+    on<VerifyCodeSubmitted>(_onVerifyCodeSubmitted);
+  }
+
+  void _startTimer() {
+    _timer?.cancel();
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      final currentSeconds = state.secondsLeft;
+      if (currentSeconds <= 1) {
+        timer.cancel();
+        add(TimerTicked(0));
+      } else {
+        add(TimerTicked(currentSeconds - 1));
+      }
+    });
+  }
+
+  Future<void> _onVerifyCodeSubmitted(VerifyCodeSubmitted event,
+      Emitter<VerifyCodeState> emit,) async {
+    if (state.isSubmitting || state.code.length != 6 || state.secondsLeft == 0) return;
+
+    emit(state.copyWith(isSubmitting: true, error: null));
+
+    final result = await _verifyCodeUseCase.execute(state.code, state.tempToken);
+
+    final newState = switch (result) {
+      Success() => (() {
+        _timer?.cancel();
+
+        _splashBloc.add(AuthCheckRequested());
+
+        return state.copyWith(
+          isSubmitting: false,
+          isSuccess: true,
+        );
+      })(),
+      Failure(failure: final f) => switch (f) {
+        AuthFailure(attemptsLeft: final count) => state.copyWith(
+          isSubmitting: false,
+          attemptsLeft: count,
+          error: 'Неверный код. Осталось попыток: $count',
+        ),
+        AuthBlockFailure() => (() {
+          _timer?.cancel();
+          return state.copyWith(
+            isSubmitting: false,
+            isBlocked: true,
+            error: 'Вы заблокированы за слишком частые попытки',
+          );
+        })(),
+        _ => state.copyWith(
+          isSubmitting: false,
+          error: 'Произошла ошибка. Попробуйте позже',
+        ),
+      },
+    };
+
+    emit(newState);
+  }
+
+  @override
+  Future<void> close() {
+    _timer?.cancel();
+    return super.close();
+  }
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index fd1da4a..ebb6cd5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.1"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   archive:
     dependency: transitive
     description:
@@ -286,6 +294,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_native_splash:
+    dependency: "direct dev"
+    description:
+      name: flutter_native_splash
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.7"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -901,6 +917,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
   url_launcher:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 5fa8998..46f4767 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: be_happy
 description: ""
 publish_to: 'none'
 
-version: 1.0.0+17
+version: 1.0.0+19
 
 environment:
   sdk: ^3.8.1
@@ -42,11 +42,17 @@ dev_dependencies:
   flutter_lints: ^5.0.0
   flutter_launcher_icons: ^0.14.4
   change_app_package_name: ^1.4.0
+  flutter_native_splash: ^2.4.7
+
+flutter_native_splash:
+  color: "#000000"
+  image: assets/main_logo.png
 
 flutter_launcher_icons:
   android: true
   ios: true
   image_path: "assets/main-logo.png"
+  remove_alpha_channel: true
 
 flutter:
   uses-material-design: true