diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b770b9f..62d791d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
     <application
         android:label="citycards_partner_flutter"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"
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..11ab377
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..5c9e533
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-night-v21/background.png b/android/app/src/main/res/drawable-night-v21/background.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/android/app/src/main/res/drawable-night-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-night-v21/launch_background.xml b/android/app/src/main/res/drawable-night-v21/launch_background.xml
new file mode 100644
index 0000000..3cc4948
--- /dev/null
+++ b/android/app/src/main/res/drawable-night-v21/launch_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <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-night/background.png b/android/app/src/main/res/drawable-night/background.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/android/app/src/main/res/drawable-night/background.png differ
diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml
new file mode 100644
index 0000000..3cc4948
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/launch_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <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-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 0000000..8e21404
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..4e41d65
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..5e96ccb
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..724228d
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..8e21404
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/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
new file mode 100644
index 0000000..f0715f9
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
new file mode 100644
index 0000000..9205131
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
new file mode 100644
index 0000000..c845cb9
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
new file mode 100644
index 0000000..8732a09
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
new file mode 100644
index 0000000..1d15f4d
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.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/app/App_logo.png b/assets/app/App_logo.png
new file mode 100644
index 0000000..e0924df
Binary files /dev/null and b/assets/app/App_logo.png differ
diff --git a/assets/app/profile.png b/assets/app/profile.png
new file mode 100644
index 0000000..adbb4b1
Binary files /dev/null and b/assets/app/profile.png differ
diff --git a/assets/onboarding/bg.png b/assets/onboarding/bg.png
new file mode 100644
index 0000000..f19f22a
Binary files /dev/null and b/assets/onboarding/bg.png differ
diff --git a/assets/onboarding/bg1.jpg b/assets/onboarding/bg1.jpg
deleted file mode 100644
index b46db47..0000000
Binary files a/assets/onboarding/bg1.jpg and /dev/null differ
diff --git a/assets/onboarding/bg2.png b/assets/onboarding/bg2.png
index 4705e7b..fa38baf 100644
Binary files a/assets/onboarding/bg2.png and b/assets/onboarding/bg2.png differ
diff --git a/assets/recurring/Entertainment.png b/assets/recurring/Entertainment.png
new file mode 100644
index 0000000..56c6802
Binary files /dev/null and b/assets/recurring/Entertainment.png differ
diff --git a/assets/recurring/culture.png b/assets/recurring/culture.png
new file mode 100644
index 0000000..1d7c38b
Binary files /dev/null and b/assets/recurring/culture.png differ
diff --git a/assets/recurring/food.png b/assets/recurring/food.png
new file mode 100644
index 0000000..4b48e8a
Binary files /dev/null and b/assets/recurring/food.png differ
diff --git a/assets/recurring/lets-icons_date-fill.png b/assets/recurring/lets-icons_date-fill.png
new file mode 100644
index 0000000..2fc5463
Binary files /dev/null and b/assets/recurring/lets-icons_date-fill.png differ
diff --git a/assets/recurring/musuem.png b/assets/recurring/musuem.png
new file mode 100644
index 0000000..62e495c
Binary files /dev/null and b/assets/recurring/musuem.png differ
diff --git a/assets/recurring/outdoor.png b/assets/recurring/outdoor.png
new file mode 100644
index 0000000..096e85b
Binary files /dev/null and b/assets/recurring/outdoor.png differ
diff --git a/assets/recurring/tourist.png b/assets/recurring/tourist.png
new file mode 100644
index 0000000..3149616
Binary files /dev/null and b/assets/recurring/tourist.png differ
diff --git a/assets/scan/flash.png b/assets/scan/flash.png
new file mode 100644
index 0000000..8a1bde8
Binary files /dev/null and b/assets/scan/flash.png differ
diff --git a/assets/scan/flash_on.png b/assets/scan/flash_on.png
new file mode 100644
index 0000000..91e9ebe
Binary files /dev/null and b/assets/scan/flash_on.png differ
diff --git a/assets/scan/history.png b/assets/scan/history.png
new file mode 100644
index 0000000..9179e32
Binary files /dev/null and b/assets/scan/history.png differ
diff --git a/assets/scan/logo.png b/assets/scan/logo.png
new file mode 100644
index 0000000..1f2e043
Binary files /dev/null and b/assets/scan/logo.png differ
diff --git a/assets/scan/menu.png b/assets/scan/menu.png
new file mode 100644
index 0000000..97519ef
Binary files /dev/null and b/assets/scan/menu.png differ
diff --git a/assets/scan/mobile.png b/assets/scan/mobile.png
new file mode 100644
index 0000000..15ea6f2
Binary files /dev/null and b/assets/scan/mobile.png differ
diff --git a/assets/scan/page.png b/assets/scan/page.png
new file mode 100644
index 0000000..3572853
Binary files /dev/null and b/assets/scan/page.png differ
diff --git a/assets/scan/profile.png b/assets/scan/profile.png
new file mode 100644
index 0000000..f2bab65
Binary files /dev/null and b/assets/scan/profile.png differ
diff --git a/assets/scan/qr.png b/assets/scan/qr.png
new file mode 100644
index 0000000..cfb3660
Binary files /dev/null and b/assets/scan/qr.png differ
diff --git a/assets/scan/setting.png b/assets/scan/setting.png
new file mode 100644
index 0000000..498ef0f
Binary files /dev/null and b/assets/scan/setting.png differ
diff --git a/assets/scan/support.png b/assets/scan/support.png
new file mode 100644
index 0000000..ff1490a
Binary files /dev/null and b/assets/scan/support.png differ
diff --git a/assets/scan/ticket-fill.png b/assets/scan/ticket-fill.png
new file mode 100644
index 0000000..1a339fd
Binary files /dev/null and b/assets/scan/ticket-fill.png differ
diff --git a/assets/scan/ticket.png b/assets/scan/ticket.png
new file mode 100644
index 0000000..06d55cc
Binary files /dev/null and b/assets/scan/ticket.png differ
diff --git a/assets/scan/ticket_qr.png b/assets/scan/ticket_qr.png
new file mode 100644
index 0000000..c8ca2a7
Binary files /dev/null and b/assets/scan/ticket_qr.png differ
diff --git a/assets/splash/bg.png b/assets/splash/bg.png
new file mode 100644
index 0000000..e097bdf
Binary files /dev/null and b/assets/splash/bg.png differ
diff --git a/assets/splash/logo.png b/assets/splash/logo.png
new file mode 100644
index 0000000..47d31ae
Binary files /dev/null and b/assets/splash/logo.png differ
diff --git a/assets/splash_screen/Screen.png b/assets/splash_screen/Screen.png
new file mode 100644
index 0000000..21af135
Binary files /dev/null and b/assets/splash_screen/Screen.png differ
diff --git a/assets/support/icon/upload.png b/assets/support/icon/upload.png
new file mode 100644
index 0000000..fb81d2b
Binary files /dev/null and b/assets/support/icon/upload.png differ
diff --git a/assets/ticket/dubai.jpg b/assets/ticket/dubai.jpg
new file mode 100644
index 0000000..1487d6b
Binary files /dev/null and b/assets/ticket/dubai.jpg differ
diff --git a/assets/ticket/lets-icons_date-fill.png b/assets/ticket/lets-icons_date-fill.png
new file mode 100644
index 0000000..ce821f9
Binary files /dev/null and b/assets/ticket/lets-icons_date-fill.png differ
diff --git a/assets/time/image.png b/assets/time/image.png
new file mode 100644
index 0000000..0e0cc2e
Binary files /dev/null and b/assets/time/image.png differ
diff --git a/assets/time/lets-icons_date-fill.png b/assets/time/lets-icons_date-fill.png
new file mode 100644
index 0000000..2fc5463
Binary files /dev/null and b/assets/time/lets-icons_date-fill.png differ
diff --git a/assets/time/mingcute_time-fill.png b/assets/time/mingcute_time-fill.png
new file mode 100644
index 0000000..60f68a4
Binary files /dev/null and b/assets/time/mingcute_time-fill.png differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 4523e8e..dd957e4 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -428,7 +428,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -485,7 +485,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fa..d0d98aa 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
\ No newline at end of file
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 dc9ada4..3562beb 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 7353c41..cc67963 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 797d452..ccd3025 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 6ed2d93..720a751 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 4cd7b00..a980ad8 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 fe73094..6b801b7 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 321773c..82d2c45 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 797d452..ccd3025 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 502f463..2e9d461 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 0ec3034..b66b623 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
new file mode 100644
index 0000000..d8ddb43
Binary files /dev/null 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
new file mode 100644
index 0000000..81eecaf
Binary files /dev/null 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
new file mode 100644
index 0000000..c2252b9
Binary files /dev/null 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
new file mode 100644
index 0000000..e1cfca4
Binary files /dev/null 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 0ec3034..b66b623 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 e9f5fea..8fa55dd 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
new file mode 100644
index 0000000..c569358
Binary files /dev/null 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
new file mode 100644
index 0000000..ec8a8db
Binary files /dev/null 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 84ac32a..b3fbbd1 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 8953cba..5b8a3f7 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 0467bf1..9864fee 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..8bb185b
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "darkbackground.png",
+      "idiom" : "universal"
+    }
+  ],
+  "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..8e21404
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png
new file mode 100644
index 0000000..e815fd6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.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..5c9e533 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..4e41d65 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..5e96ccb 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..e88241f 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="500" height="1052"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 0ef8bc9..f60fca6 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,49 +1,51 @@
 <?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>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Citycards Partner Flutter</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>citycards_partner_flutter</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>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>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Citycards Partner Flutter</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>citycards_partner_flutter</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>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>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/booking/views/add_time_slot_sheet.dart b/lib/booking/views/add_time_slot_sheet.dart
new file mode 100644
index 0000000..92014ef
--- /dev/null
+++ b/lib/booking/views/add_time_slot_sheet.dart
@@ -0,0 +1,306 @@
+import 'dart:ui';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:google_fonts/google_fonts.dart';
+
+// ------------------ Bloc ------------------
+abstract class TimeSlotEvent {}
+class IncrementCapacity extends TimeSlotEvent {}
+class DecrementCapacity extends TimeSlotEvent {}
+class SelectStartTime extends TimeSlotEvent {
+  final TimeOfDay time;
+  SelectStartTime(this.time);
+}
+class SelectEndTime extends TimeSlotEvent {
+  final TimeOfDay time;
+  SelectEndTime(this.time);
+}
+
+class TimeSlotState {
+  final int capacity;
+  final TimeOfDay startTime;
+  final TimeOfDay endTime;
+
+  TimeSlotState({
+    required this.capacity,
+    required this.startTime,
+    required this.endTime,
+  });
+
+  TimeSlotState copyWith({
+    int? capacity,
+    TimeOfDay? startTime,
+    TimeOfDay? endTime,
+  }) {
+    return TimeSlotState(
+      capacity: capacity ?? this.capacity,
+      startTime: startTime ?? this.startTime,
+      endTime: endTime ?? this.endTime,
+    );
+  }
+}
+
+class TimeSlotBloc extends Bloc<TimeSlotEvent, TimeSlotState> {
+  TimeSlotBloc()
+      : super(TimeSlotState(
+    capacity: 50,
+    startTime: const TimeOfDay(hour: 9, minute: 0),
+    endTime: const TimeOfDay(hour: 12, minute: 0),
+  )) {
+    on<IncrementCapacity>((event, emit) {
+      emit(state.copyWith(capacity: state.capacity + 1));
+    });
+    on<DecrementCapacity>((event, emit) {
+      if (state.capacity > 1) {
+        emit(state.copyWith(capacity: state.capacity - 1));
+      }
+    });
+    on<SelectStartTime>((event, emit) => emit(state.copyWith(startTime: event.time)));
+    on<SelectEndTime>((event, emit) => emit(state.copyWith(endTime: event.time)));
+  }
+}
+
+// ------------------ Dialog ------------------
+class AddTimeSlotDialog extends StatelessWidget {
+  const AddTimeSlotDialog({super.key});
+
+  Future<TimeOfDay?> _pickTime(BuildContext context, TimeOfDay initialTime) async {
+    return await showTimePicker(
+      context: context,
+      initialTime: initialTime,
+      builder: (context, child) {
+        return Theme(
+          data: ThemeData(
+            colorScheme: const ColorScheme.light(primary: Color(0xffF95F62)),
+          ),
+          child: child!,
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => TimeSlotBloc(),
+      child: Dialog(
+        backgroundColor: Colors.transparent,
+        insetPadding: const EdgeInsets.symmetric(horizontal: 24),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(20),
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
+            child: Container(
+              width: 400,
+              padding: const EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(16),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withOpacity(0.1),
+                    blurRadius: 20,
+                    offset: const Offset(0, 6),
+                  ),
+                ],
+              ),
+              child: BlocBuilder<TimeSlotBloc, TimeSlotState>(
+                builder: (context, state) {
+                  final bloc = context.read<TimeSlotBloc>();
+                  return Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Center(
+                        child: Text(
+                          "Add Time Slots",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w700,
+                            fontSize: 24,
+                            color: Colors.black,
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+
+                      // Slot Section
+                      Container(
+                        width: double.infinity,
+                        padding: const EdgeInsets.all(16),
+                        decoration: BoxDecoration(
+                          color: const Color(0xffF6F6F6),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text("Slot 4",
+                                style: GoogleFonts.poppins(
+                                    fontWeight: FontWeight.w500,
+                                    fontSize: 16)),
+                            const SizedBox(height: 10),
+                            Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Expanded(child: _timeBox(context, "Start Time", state.startTime, true, bloc)),
+                                const SizedBox(width: 10),
+                                Expanded(child: _timeBox(context, "End Time", state.endTime, false, bloc)),
+                              ],
+                            ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 20),
+
+                      // Capacity Section
+                      Text("Capacity per Time Slot",
+                          style: GoogleFonts.poppins(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 24,
+                              color: Colors.black)),
+                      const SizedBox(height: 16),
+                      Container(
+                        width: double.infinity,
+                        padding: const EdgeInsets.symmetric(vertical: 10),
+                        decoration: BoxDecoration(
+                          color: const Color(0xffF6F6F6),
+                          borderRadius: BorderRadius.circular(12),
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            _roundButton("-", () => bloc.add(DecrementCapacity())),
+                            Padding(
+                              padding: const EdgeInsets.symmetric(horizontal: 24),
+                              child: Column(
+                                children: [
+                                  Text("${state.capacity}",
+                                      style: GoogleFonts.poppins(
+                                          fontWeight: FontWeight.w600,
+                                          fontSize: 18)),
+                                  Text("people",
+                                      style: GoogleFonts.poppins(
+                                          color: Colors.grey, fontSize: 12)),
+                                ],
+                              ),
+                            ),
+                            _roundButton("+", () => bloc.add(IncrementCapacity())),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 24),
+
+                      // Buttons
+                      SizedBox(
+                        width: double.infinity,
+                        child: ElevatedButton(
+                          onPressed: () => Navigator.pop(context),
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Colors.black,
+                            shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12)),
+                            padding: const EdgeInsets.symmetric(vertical: 14),
+                          ),
+                          child: Text("Create Slot",
+                              style: GoogleFonts.poppins(
+                                  fontWeight: FontWeight.w600,
+                                  fontSize: 15,
+                                  color: Colors.white)),
+                        ),
+                      ),
+                      const SizedBox(height: 10),
+                      SizedBox(
+                        width: double.infinity,
+                        child: OutlinedButton(
+                          onPressed: () => Navigator.pop(context),
+                          style: OutlinedButton.styleFrom(
+                            side: const BorderSide(
+                                color: Color(0xffF95F62), width: 1.5),
+                            shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12)),
+                            padding: const EdgeInsets.symmetric(vertical: 14),
+                          ),
+                          child: Text("Cancel",
+                              style: GoogleFonts.poppins(
+                                  color: const Color(0xffF95F62),
+                                  fontWeight: FontWeight.w600,
+                                  fontSize: 15)),
+                        ),
+                      ),
+                    ],
+                  );
+                },
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _timeBox(BuildContext context, String label, TimeOfDay time,
+      bool isStart, TimeSlotBloc bloc) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: () async {
+          final picked = await _pickTime(context, time);
+          if (picked != null) {
+            if (isStart) {
+              bloc.add(SelectStartTime(picked));
+            } else {
+              bloc.add(SelectEndTime(picked));
+            }
+          }
+        },
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(label,
+                style: GoogleFonts.poppins(
+                    fontSize: 13, color: Colors.black87)),
+            const SizedBox(height: 6),
+            Container(
+              width: double.infinity,
+              padding:
+              const EdgeInsets.symmetric(horizontal: 10, vertical: 12),
+              decoration: BoxDecoration(
+                border: Border.all(color: Colors.grey.shade400),
+                borderRadius: BorderRadius.circular(10),
+                color: Colors.white,
+              ),
+              child: Text(
+                time.format(context),
+                style: GoogleFonts.poppins(
+                    fontWeight: FontWeight.w500, fontSize: 15),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _roundButton(String symbol, VoidCallback onTap) {
+    return Expanded(
+      child: GestureDetector(
+        onTap: onTap,
+        child: Container(
+          width: 46,
+          height: 46,
+          decoration: BoxDecoration(
+            color: const Color(0x22F95F62),
+            border: Border.all(color: const Color(0xffF95F62)),
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: Center(
+            child: Text(symbol,
+                style: GoogleFonts.poppins(
+                    color: const Color(0xffF95F62),
+                    fontSize: 24,
+                    fontWeight: FontWeight.w500)),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/booking/views/booking_bottom_sheet.dart b/lib/booking/views/booking_bottom_sheet.dart
index 46425b1..6402425 100644
--- a/lib/booking/views/booking_bottom_sheet.dart
+++ b/lib/booking/views/booking_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -36,12 +37,17 @@ class BookingBottomSheet extends StatelessWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(formattedDate,
-                      style: GoogleFonts.poppins(
-                          fontWeight: FontWeight.w600, fontSize: 16)),
                   Text(
-                      "${booking.attractions.length} attractions available",
-                      style: GoogleFonts.poppins(color: Colors.black54)),
+                    formattedDate,
+                    style: GoogleFonts.poppins(
+                      fontWeight: FontWeight.w600,
+                      fontSize: 16,
+                    ),
+                  ),
+                  Text(
+                    "${booking.attractions.length} attractions available",
+                    style: GoogleFonts.poppins(color: Colors.black54),
+                  ),
                   const SizedBox(height: 12),
                   Expanded(
                     child: RawScrollbar(
@@ -55,84 +61,109 @@ class BookingBottomSheet extends StatelessWidget {
                       // thumbColor: const MaterialStatePropertyAll(Color(0xffF95F62)),
                       controller: scrollController,
                       child: Padding(
-                        padding: const EdgeInsets.only(right: 20),                        child: ListView.builder(
+                        padding: const EdgeInsets.only(right: 20),
+                        child: ListView.builder(
                           controller: scrollController,
                           itemCount: booking.attractions.length,
                           itemBuilder: (context, index) {
                             final attraction = booking.attractions[index];
-                            final isExpanded = state.expandedAttractions.contains(index);
-                            return Container(
-                              margin: const EdgeInsets.only(bottom: 12),
-                              padding: const EdgeInsets.all(12),
-                              decoration: BoxDecoration(
-                                color: Color(int.parse("0x22${attraction.colorHex.substring(1)}")),
-                                borderRadius: BorderRadius.circular(12),
-                              ),
-                              child: Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Row(
-                                    mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                    children: [
-                                      Row(
-                                        children: [
-                                          Container(
-                                            width: 10,
-                                            height: 10,
-                                            decoration: BoxDecoration(
-                                              color: Color(int.parse(
-                                                  "0xff${attraction.colorHex.substring(1)}")),
-                                              shape: BoxShape.circle,
+                            final isExpanded = state.expandedAttractions
+                                .contains(index);
+                            return InkWell(
+                              onTap: (){
+                                Navigator.pushNamed(context, AppRouter.selectedTimeSlotPage);
+                              },
+                              child: Container(
+                                margin: const EdgeInsets.only(bottom: 12),
+                                padding: const EdgeInsets.all(12),
+                                decoration: BoxDecoration(
+                                  color: Color(
+                                    int.parse(
+                                      "0x22${attraction.colorHex.substring(1)}",
+                                    ),
+                                  ),
+                                  borderRadius: BorderRadius.circular(12),
+                                ),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Row(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
+                                      children: [
+                                        Row(
+                                          children: [
+                                            Container(
+                                              width: 10,
+                                              height: 10,
+                                              decoration: BoxDecoration(
+                                                color: Color(
+                                                  int.parse(
+                                                    "0xff${attraction.colorHex.substring(1)}",
+                                                  ),
+                                                ),
+                                                shape: BoxShape.circle,
+                                              ),
+                                            ),
+                                            const SizedBox(width: 8),
+                                            Text(
+                                              attraction.name,
+                                              style: GoogleFonts.poppins(
+                                                fontWeight: FontWeight.w600,
+                                                fontSize: 13,
+                                              ),
+                                            ),
+                                          ],
+                                        ),
+                                        const Icon(
+                                          Icons.arrow_forward_ios,
+                                          size: 14,
+                                        ),
+                                      ],
+                                    ),
+                                    const SizedBox(height: 8),
+                                    Wrap(
+                                      spacing: 6,
+                                      runSpacing: 6,
+                                      children: List.generate(
+                                        isExpanded
+                                            ? attraction.slots.length
+                                            : (attraction.slots.length > 2
+                                                  ? 2
+                                                  : attraction.slots.length),
+                                        (i) => _slotCard(attraction.slots[i]),
+                                      ),
+                                    ),
+                                    if (attraction.slots.length > 2)
+                                      GestureDetector(
+                                        onTap: () =>
+                                            bloc.add(ToggleSlotExpand(index)),
+                                        child: Container(
+                                          margin: const EdgeInsets.only(top: 8),
+                                          padding: const EdgeInsets.symmetric(
+                                            horizontal: 12,
+                                            vertical: 4,
+                                          ),
+                                          decoration: BoxDecoration(
+                                            color: Colors.grey.shade200,
+                                            borderRadius: BorderRadius.circular(
+                                              8,
                                             ),
                                           ),
-                                          const SizedBox(width: 8),
-                                          Text(attraction.name,
-                                              style: GoogleFonts.poppins(
-                                                  fontWeight: FontWeight.w600,
-                                                  fontSize: 13)),
-                                        ],
-                                      ),
-                                      const Icon(Icons.arrow_forward_ios, size: 14)
-                                    ],
-                                  ),
-                                  const SizedBox(height: 8),
-                                  Wrap(
-                                    spacing: 6,
-                                    runSpacing: 6,
-                                    children: List.generate(
-                                      isExpanded
-                                          ? attraction.slots.length
-                                          : (attraction.slots.length > 2
-                                          ? 2
-                                          : attraction.slots.length),
-                                          (i) => _slotCard(attraction.slots[i]),
-                                    ),
-                                  ),
-                                  if (attraction.slots.length > 2)
-                                    GestureDetector(
-                                      onTap: () =>
-                                          bloc.add(ToggleSlotExpand(index)),
-                                      child: Container(
-                                        margin: const EdgeInsets.only(top: 8),
-                                        padding: const EdgeInsets.symmetric(
-                                            horizontal: 12, vertical: 4),
-                                        decoration: BoxDecoration(
-                                          color: Colors.grey.shade200,
-                                          borderRadius: BorderRadius.circular(8),
-                                        ),
-                                        child: Text(
-                                          isExpanded
-                                              ? "Show less"
-                                              : "+${attraction.slots.length - 2} more",
-                                          style: GoogleFonts.poppins(
+                                          child: Text(
+                                            isExpanded
+                                                ? "Show less"
+                                                : "+${attraction.slots.length - 2} more",
+                                            style: GoogleFonts.poppins(
                                               color: Colors.black54,
                                               fontSize: 12,
-                                              fontWeight: FontWeight.w500),
+                                              fontWeight: FontWeight.w500,
+                                            ),
+                                          ),
                                         ),
                                       ),
-                                    ),
-                                ],
+                                  ],
+                                ),
                               ),
                             );
                           },
@@ -160,19 +191,21 @@ class BookingBottomSheet extends StatelessWidget {
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          Text(slot.time,
-              style: GoogleFonts.poppins(fontSize: 12, color: Colors.black87)),
+          Text(
+            slot.time,
+            style: GoogleFonts.poppins(fontSize: 12, color: Colors.black87),
+          ),
           const SizedBox(width: 6),
           Container(
-            padding:
-            const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
             decoration: BoxDecoration(
               color: Colors.grey.shade200,
               borderRadius: BorderRadius.circular(6),
             ),
-            child: Text("${slot.booked}/${slot.total}",
-                style: GoogleFonts.poppins(
-                    fontSize: 11, color: Colors.black87)),
+            child: Text(
+              "${slot.booked}/${slot.total}",
+              style: GoogleFonts.poppins(fontSize: 11, color: Colors.black87),
+            ),
           ),
         ],
       ),
diff --git a/lib/booking/views/booking_page.dart b/lib/booking/views/booking_page.dart
index 01afe05..087111c 100644
--- a/lib/booking/views/booking_page.dart
+++ b/lib/booking/views/booking_page.dart
@@ -1,3 +1,4 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -34,21 +35,36 @@ class _BookingView extends StatelessWidget {
         builder: (context, state) {
           final bloc = context.read<BookingBloc>();
           return SafeArea(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const SizedBox(height: 20),
-                _buildHeader(),
-                const SizedBox(height: 16),
-                _buildMonthHeader(bloc, state),
-                const SizedBox(height: 10),
-                _buildCalendar(context, bloc, state),
-                const SizedBox(height: 12),
-                _buildAttractionLegend(),
-                const SizedBox(height: 20),
-                _buildRecurringButton(),
-                const SizedBox(height: 10),
-              ],
+            child: SingleChildScrollView(
+              physics: const BouncingScrollPhysics(),
+              child: Padding(
+                padding: const EdgeInsets.only(bottom: 40.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    const SizedBox(height: 20),
+                    _buildHeader(context),
+                    const SizedBox(height: 16),
+                    _buildMonthHeader(bloc, state),
+                    const SizedBox(height: 10),
+
+                    // 🗓️ Scrollable calendar section
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: SizedBox(
+                          width: double.infinity,
+                          height: 350,
+                          child: _buildCalendar(context, bloc, state)),
+                    ),
+                    const SizedBox(height: 20),
+                    _buildAttractionLegend(),
+                    const SizedBox(height: 20),
+
+                    _buildRecurringButton(context),
+                    const SizedBox(height: 20),
+                  ],
+                ),
+              ),
             ),
           );
         },
@@ -56,41 +72,53 @@ class _BookingView extends StatelessWidget {
     );
   }
 
-  Widget _buildHeader() {
+  // ---------------- HEADER ----------------
+  Widget _buildHeader(BuildContext context) {
     return Column(
       children: [
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            Padding(
-              padding: const EdgeInsets.only(left: 24.0),
-              child: CircleAvatar(
-                radius: 20,
-                backgroundColor: const Color(0xffF95F62),
-                child: const Icon(Icons.arrow_back, color: Colors.white, size: 22),
+            InkWell(
+              onTap: () => Navigator.pop(context),
+              child: Padding(
+                padding: const EdgeInsets.only(left: 24.0),
+                child: CircleAvatar(
+                  radius: 20,
+                  backgroundColor: const Color(0xffF95F62),
+                  child:
+                  const Icon(Icons.arrow_back, color: Colors.white, size: 22),
+                ),
               ),
             ),
             Text(
               "Booking",
-              style: GoogleFonts.poppins(fontSize: 32, fontWeight: FontWeight.w600),
+              style: GoogleFonts.poppins(
+                fontSize: 32,
+                fontWeight: FontWeight.w600,
+              ),
             ),
             const SizedBox(width: 25),
           ],
         ),
         const SizedBox(height: 16),
-        Text(
-          "Easily schedule and manage your bookings anytime,\nanywhere. Fast, simple, and secure.",
-          textAlign: TextAlign.center,
-          style: GoogleFonts.poppins(
-            fontSize: 13,
-            color: Colors.black,
-            height: 1.4,
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 24.0),
+          child: Text(
+            "Easily schedule and manage your bookings anytime, anywhere. Fast, simple, and secure.",
+            textAlign: TextAlign.center,
+            style: GoogleFonts.poppins(
+              fontSize: 13,
+              color: Colors.black,
+              height: 1.4,
+            ),
           ),
         ),
       ],
     );
   }
 
+  // ---------------- MONTH HEADER ----------------
   Widget _buildMonthHeader(BookingBloc bloc, BookingState state) {
     final formatter = DateFormat("MMM yyyy");
     return Padding(
@@ -100,8 +128,8 @@ class _BookingView extends StatelessWidget {
         children: [
           GestureDetector(
             onTap: () {
-              final prevMonth = DateTime(
-                  state.focusedMonth.year, state.focusedMonth.month - 1, 1);
+              final prevMonth =
+              DateTime(state.focusedMonth.year, state.focusedMonth.month - 1, 1);
               bloc.add(LoadBookings(prevMonth));
             },
             child: _navButton(Icons.keyboard_arrow_left_rounded),
@@ -115,8 +143,8 @@ class _BookingView extends StatelessWidget {
           ),
           GestureDetector(
             onTap: () {
-              final nextMonth = DateTime(
-                  state.focusedMonth.year, state.focusedMonth.month + 1, 1);
+              final nextMonth =
+              DateTime(state.focusedMonth.year, state.focusedMonth.month + 1, 1);
               bloc.add(LoadBookings(nextMonth));
             },
             child: _navButton(Icons.keyboard_arrow_right_rounded),
@@ -138,135 +166,134 @@ class _BookingView extends StatelessWidget {
     );
   }
 
-  Widget _buildCalendar(BuildContext context, BookingBloc bloc, BookingState state) {
-    return Expanded(
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 20),
-        child: TableCalendar(
-          firstDay: DateTime(2020),
-          lastDay: DateTime(2030),
-          focusedDay: state.focusedMonth,
-          calendarFormat: CalendarFormat.month,
-          headerVisible: false,
-          availableGestures: AvailableGestures.none,
-          startingDayOfWeek: StartingDayOfWeek.monday,
-          daysOfWeekStyle: DaysOfWeekStyle(
-            weekdayStyle: GoogleFonts.poppins(
-              fontSize: 12,
-              color: Colors.black54,
-              fontWeight: FontWeight.w500,
-            ),
-            weekendStyle: GoogleFonts.poppins(
-              fontSize: 12,
-              color: Colors.black54,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-          calendarStyle: CalendarStyle(
-            outsideDaysVisible: false,
-            markersMaxCount: 0,
-            defaultTextStyle: GoogleFonts.poppins(color: Colors.black87,fontSize: 22),
-            weekendTextStyle: GoogleFonts.poppins(color: Colors.black87),
-          ),
-          eventLoader: (day) {
-            return state.bookings
-                .where((b) =>
-            b.date.year == day.year &&
-                b.date.month == day.month &&
-                b.date.day == day.day)
-                .toList();
-          },
-          calendarBuilders: CalendarBuilders(
-            defaultBuilder: (context, date, _) {
-              final bookings = state.bookings
-                  .where((b) =>
-              b.date.year == date.year &&
-                  b.date.month == date.month &&
-                  b.date.day == date.day)
-                  .toList();
+  // ---------------- CALENDAR ----------------
+  Widget _buildCalendar(
+      BuildContext context, BookingBloc bloc, BookingState state) {
+    return TableCalendar(
+      firstDay: DateTime(2020),
+      lastDay: DateTime(2030),
+      focusedDay: state.focusedMonth,
+      calendarFormat: CalendarFormat.month,
+      headerVisible: false,
+      availableGestures: AvailableGestures.none,
+      startingDayOfWeek: StartingDayOfWeek.monday,
+      daysOfWeekStyle: DaysOfWeekStyle(
+        weekdayStyle: GoogleFonts.poppins(
+          fontSize: 12,
+          color: Colors.black54,
+          fontWeight: FontWeight.w500,
+        ),
+        weekendStyle: GoogleFonts.poppins(
+          fontSize: 12,
+          color: Colors.black54,
+          fontWeight: FontWeight.w500,
+        ),
+      ),
+      calendarStyle: CalendarStyle(
+        outsideDaysVisible: false,
+        markersMaxCount: 0,
+        defaultTextStyle:
+        GoogleFonts.poppins(color: Colors.black87, fontSize: 22),
+        weekendTextStyle: GoogleFonts.poppins(color: Colors.black87),
+      ),
+      eventLoader: (day) {
+        return state.bookings
+            .where((b) =>
+        b.date.year == day.year &&
+            b.date.month == day.month &&
+            b.date.day == day.day)
+            .toList();
+      },
+      calendarBuilders: CalendarBuilders(
+        defaultBuilder: (context, date, _) {
+          final bookings = state.bookings
+              .where((b) =>
+          b.date.year == date.year &&
+              b.date.month == date.month &&
+              b.date.day == date.day)
+              .toList();
 
-              return GestureDetector(
-                onTap: () {
-                  if (bookings.isNotEmpty) {
-                    bloc.add(SelectDate(date));
-                    showModalBottomSheet(
-                      context: context,
-                      backgroundColor: Colors.transparent,
-                      isScrollControlled: true,
-                      builder: (_) => BlocProvider.value(
-                        value: bloc,
-                        child: BookingBottomSheet(
-                          date: date,
-                          booking: bookings.first,
-                        ),
-                      ),
-                    );
-                  }
-                },
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    if (bookings.isNotEmpty && bookings.first.attractions.length > 3)
-                      Align(
-                        alignment: Alignment.topRight,
-                        child: Container(
-                          padding:
-                          const EdgeInsets.symmetric(horizontal: 3, vertical: 1),
-                          decoration: BoxDecoration(
-                            color: const Color(0xffF95F62),
-                            borderRadius: BorderRadius.circular(10),
-                          ),
-                          child: Text(
-                            "+${bookings.first.attractions.length - 3}",
-                            style: GoogleFonts.poppins(
-                              color: Colors.white,
-                              fontSize: 8,
-                            ),
-                          ),
-                        ),
-                      ),
-                    const SizedBox(height: 2),
-                    Text(
-                      "${date.day}",
+          return GestureDetector(
+            onTap: () {
+              if (bookings.isNotEmpty) {
+                bloc.add(SelectDate(date));
+                showModalBottomSheet(
+                  context: context,
+                  backgroundColor: Colors.transparent,
+                  isScrollControlled: true,
+                  builder: (_) => BlocProvider.value(
+                    value: bloc,
+                    child: BookingBottomSheet(
+                      date: date,
+                      booking: bookings.first,
+                    ),
+                  ),
+                );
+              }
+            },
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                (bookings.isNotEmpty && bookings.first.attractions.length > 3)
+                    ? Align(
+                  alignment: Alignment.topRight,
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(
+                        horizontal: 3, vertical: 3),
+                    decoration: BoxDecoration(
+                      color: const Color(0xffF95F62),
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Text(
+                      "+${bookings.first.attractions.length - 3}",
                       style: GoogleFonts.poppins(
-                        color: Colors.black,
-                        fontWeight: FontWeight.w500,
-                        fontSize: 13,
+                        color: Colors.white,
+                        fontSize: 8,
                       ),
                     ),
-                    const SizedBox(height: 4),
-                    if (bookings.isNotEmpty)
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          ...List.generate(
-                            bookings.first.attractions.length > 3
-                                ? 3
-                                : bookings.first.attractions.length,
-                                (i) => Container(
-                              margin:
-                              const EdgeInsets.symmetric(horizontal: 2),
-                              width: 5,
-                              height: 5,
-                              decoration: BoxDecoration(
-                                color: Color(int.parse(
-                                    "0xff${bookings.first.attractions[i].colorHex.substring(1)}")),
-                                shape: BoxShape.circle,
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                  ],
+                  ),
+                )
+                    : Container(height: 15),
+                const SizedBox(height: 2),
+                Text(
+                  "${date.day}",
+                  style: GoogleFonts.poppins(
+                    color: Colors.black,
+                    fontWeight: FontWeight.w500,
+                    fontSize: 13,
+                  ),
                 ),
-              );
-            },
-          ),
-        ),
+                const SizedBox(height: 4),
+                if (bookings.isNotEmpty)
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      ...List.generate(
+                        bookings.first.attractions.length > 3
+                            ? 3
+                            : bookings.first.attractions.length,
+                            (i) => Container(
+                          margin: const EdgeInsets.symmetric(horizontal: 2),
+                          width: 5,
+                          height: 5,
+                          decoration: BoxDecoration(
+                            color: Color(int.parse(
+                                "0xff${bookings.first.attractions[i].colorHex.substring(1)}")),
+                            shape: BoxShape.circle,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+              ],
+            ),
+          );
+        },
       ),
     );
   }
 
+  // ---------------- LEGEND ----------------
   Widget _buildAttractionLegend() {
     final legends = [
       {"name": "The Enchanted Garden", "color": "#4CAF50", "percent": "90%"},
@@ -343,13 +370,16 @@ class _BookingView extends StatelessWidget {
     );
   }
 
-  Widget _buildRecurringButton() {
+  // ---------------- BUTTON ----------------
+  Widget _buildRecurringButton(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 20),
       child: SizedBox(
         width: double.infinity,
         child: ElevatedButton(
-          onPressed: () {},
+          onPressed: () {
+            Navigator.pushNamed(context, AppRouter.recurringBlockBasicInfo);
+          },
           style: ElevatedButton.styleFrom(
             backgroundColor: const Color(0xffF95F62),
             shape: RoundedRectangleBorder(
diff --git a/lib/booking/views/selected_time_slot_page.dart b/lib/booking/views/selected_time_slot_page.dart
index b909e92..39cb77f 100644
--- a/lib/booking/views/selected_time_slot_page.dart
+++ b/lib/booking/views/selected_time_slot_page.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'add_time_slot_sheet.dart';
 
 
 
@@ -11,27 +12,33 @@ class SelectedTimeSlotPage extends StatelessWidget {
     return Scaffold(
       backgroundColor: Colors.white,
       body: SafeArea(
-        child: SingleChildScrollView(
-          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              // Header
               Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  CircleAvatar(
-                    radius: 20,
-                    backgroundColor: const Color(0xffF95F62),
-                    child: const Icon(Icons.arrow_back, color: Colors.white),
+                  InkWell(
+                    onTap: (){
+                      Navigator.pop(context);
+                    },
+                    child: CircleAvatar(
+                      radius: 20,
+                      backgroundColor: const Color(0xffF95F62),
+                      child: const Icon(Icons.arrow_back, color: Colors.white),
+                    ),
                   ),
-                  const SizedBox(width: 12),
+
                   Text(
                     "Selected Time Slot",
                     style: GoogleFonts.poppins(
                       fontWeight: FontWeight.w600,
-                      fontSize: 22,
+                      fontSize: 32,
                     ),
                   ),
+                  SizedBox(width: 3,)
                 ],
               ),
               const SizedBox(height: 30),
@@ -59,20 +66,29 @@ class SelectedTimeSlotPage extends StatelessWidget {
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  _sectionHeader("Time Slots Available", true),
-                  Container(
-                    padding:
-                    const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(color: const Color(0xffF95F62)),
-                    ),
-                    child: Text(
-                      "+ Add timing",
-                      style: GoogleFonts.poppins(
-                        color: const Color(0xffF95F62),
-                        fontWeight: FontWeight.w500,
-                        fontSize: 13,
+                  _sectionHeader("Time Slots Available", false),
+                  InkWell(
+                    onTap: (){
+                      showDialog(
+                        context: context,
+                        barrierColor: Colors.black.withOpacity(0.4),
+                        builder: (_) => const AddTimeSlotDialog(),
+                      );
+                    },
+                    child: Container(
+                      padding:
+                      const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
+                      decoration: BoxDecoration(
+                        borderRadius: BorderRadius.circular(8),
+                        border: Border.all(color: const Color(0xffF95F62)),
+                      ),
+                      child: Text(
+                        "+ Add timing",
+                        style: GoogleFonts.poppins(
+                          color: const Color(0xffF95F62),
+                          fontWeight: FontWeight.w500,
+                          fontSize: 13,
+                        ),
                       ),
                     ),
                   ),
@@ -86,54 +102,6 @@ class SelectedTimeSlotPage extends StatelessWidget {
               const SizedBox(height: 20),
 
               // Capacity Used
-              _sectionHeader("Capacity Used", true),
-              const SizedBox(height: 8),
-              Container(
-                padding:
-                const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
-                decoration: BoxDecoration(
-                  color: const Color(0xffF6F6F6),
-                  borderRadius: BorderRadius.circular(10),
-                ),
-                child: Column(
-                  children: [
-                    Row(
-                      children: [
-                        const Icon(Icons.group,
-                            size: 18, color: Colors.green),
-                        const SizedBox(width: 6),
-                        Text(
-                          "45/50",
-                          style: GoogleFonts.poppins(
-                              fontWeight: FontWeight.w600,
-                              fontSize: 13,
-                              color: Colors.black87),
-                        ),
-                        const Spacer(),
-                        Text(
-                          "Available",
-                          style: GoogleFonts.poppins(
-                              color: Colors.green,
-                              fontSize: 13,
-                              fontWeight: FontWeight.w500),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 8),
-                    ClipRRect(
-                      borderRadius: BorderRadius.circular(8),
-                      child: LinearProgressIndicator(
-                        value: 45 / 50,
-                        backgroundColor: const Color(0xffF9E7E1),
-                        valueColor: const AlwaysStoppedAnimation(
-                            Color(0xffF95F62)),
-                        minHeight: 10,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 20),
 
               // Date
               _sectionHeader("Date", true),
@@ -159,9 +127,7 @@ class SelectedTimeSlotPage extends StatelessWidget {
                   ],
                 ),
               ),
-              const SizedBox(height: 40),
-
-              // Save button
+             Spacer(),
               SizedBox(
                 width: double.infinity,
                 child: ElevatedButton(
@@ -216,18 +182,20 @@ class SelectedTimeSlotPage extends StatelessWidget {
 
   Widget _sectionHeader(String title, bool editable) {
     return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
         Text(
           title,
           style: GoogleFonts.poppins(
               fontWeight: FontWeight.w700,
-              fontSize: 16,
+              fontSize: 24,
               color: Colors.black),
         ),
+
         if (editable)
-          const Padding(
-            padding: EdgeInsets.only(left: 6),
-            child: Icon(Icons.edit, color: Color(0xffF95F62), size: 16),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 8.0),
+            child: Image.asset("assets/time/image.png",scale: 4,),
           ),
       ],
     );
@@ -243,14 +211,33 @@ class SelectedTimeSlotPage extends StatelessWidget {
       ),
       child: Row(
         children: [
-          const Icon(Icons.access_time, color: Color(0xffF95F62), size: 18),
+          Image.asset("assets/time/mingcute_time-fill.png",scale: 4,),
           const SizedBox(width: 10),
           Text(
             time,
             style: GoogleFonts.poppins(fontSize: 14, color: Colors.black87),
           ),
           const Spacer(),
-          const Icon(Icons.edit_outlined, color: Colors.black54, size: 18),
+          Container(
+            height: 34,
+            width: 54,
+            decoration: BoxDecoration(
+                color: Color(0xffEBEBEB),
+              borderRadius: BorderRadius.circular(6)
+            ),
+
+            child: Center(
+              child: Row(
+                children: [
+                  const Spacer(),
+                  Text("15",style: TextStyle(color: Color(0xff00B1EE),fontSize: 12,fontWeight: FontWeight.w600),),
+                  Text("/50",style: TextStyle(color: Color(0xff000000),fontSize: 12,fontWeight: FontWeight.w600)), const Spacer(),
+                ],
+              ),
+            ),
+          ),
+          SizedBox(width: 4,),
+          Image.asset("assets/time/image.png",scale: 4,color: Color(0xff626262),)
         ],
       ),
     );
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index 7e051d9..8cfa8c4 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -7,22 +7,32 @@ import '../login/views/otp_verification_page.dart';
 import '../login/views/reset_password_page.dart';
 import '../onboarding/views/onboarding_page.dart';
 import '../profile/views/profile_page.dart';
+import '../recurring/views/recurring_block.dart';
+import '../redemption/view/ticket_redemption_screen.dart';
+import '../scan/view/qr_scan_screen.dart';
+import '../scan_history/views/scan_history_detail_page.dart';
 import '../scan_history/views/scan_history_page.dart';
+import '../splash/splash_view.dart';
 import '../support/view/help_support_page.dart';
 
 class AppRouter {
   static const String onboarding = '/onboarding';
   static const String login = '/login';
   static const String home = '/home';
+  static const String ticketRedemptionScreen = '/ticketRedemptionScreen';
+  static const String qrScanScreen = '/qrScanScreen';
   static const String scanHistory = '/scanHistory';
   static const String forgotPassword = '/forgot_password';
+  static const String splashScreen = '/splashScreen';
   static const String otpVerification = '/otp_verification';
   static const String resetPassword = '/reset_password';
   static const String profileScreen = '/profile_screen';
   static const String bookingPage = '/booking_page';
   static const String selectedTimeSlotPage = '/selected_time_slot_page';
   static const String helpSupportPage = '/help_support_page';
+  static const String scanHistoryDetailPage = '/ScanHistoryDetailPage';
 
+  static const String recurringBlockBasicInfo = '/RecurringBlockBasicInfo';
 
   static Route<dynamic> generateRoute(RouteSettings settings) {
     switch (settings.name) {
@@ -40,12 +50,22 @@ class AppRouter {
         return MaterialPageRoute(builder: (_) => const ResetPasswordPage());
       case profileScreen:
         return MaterialPageRoute(builder: (_) => const ProfileScreen());
-     case selectedTimeSlotPage:
+        case qrScanScreen:
+        return MaterialPageRoute(builder: (_) => const QrScanScreen());
+        case splashScreen:
+        return MaterialPageRoute(builder: (_) => const SplashScreen());
+        case scanHistoryDetailPage:
+        return MaterialPageRoute(builder: (_) => const ScanHistoryDetailPage(passId: 'P214125125',));
+      case selectedTimeSlotPage:
         return MaterialPageRoute(builder: (_) => const SelectedTimeSlotPage());
-     case bookingPage:
+      case bookingPage:
         return MaterialPageRoute(builder: (_) => const BookingPage());
-        case helpSupportPage:
+      case helpSupportPage:
         return MaterialPageRoute(builder: (_) => const HelpSupportPage());
+        case ticketRedemptionScreen:
+        return MaterialPageRoute(builder: (_) => const TicketRedemptionScreen());
+        case recurringBlockBasicInfo:
+        return MaterialPageRoute(builder: (_) => const RecurringBlockPage());
       default:
         return MaterialPageRoute(
           builder: (_) =>
diff --git a/lib/core/ticket_card.dart b/lib/core/ticket_card.dart
new file mode 100644
index 0000000..283c886
--- /dev/null
+++ b/lib/core/ticket_card.dart
@@ -0,0 +1,101 @@
+import 'dart:ui' as ui;
+import 'package:flutter/material.dart';
+
+
+class MaskedTicketImage extends StatefulWidget {
+  final String imagePath;
+  final String maskPath;
+  final double width;
+  final double height;
+
+  const MaskedTicketImage({
+    super.key,
+    required this.imagePath,
+    required this.maskPath,
+    required this.width,
+    required this.height,
+  });
+
+  @override
+  State<MaskedTicketImage> createState() => _MaskedTicketImageState();
+}
+
+class _MaskedTicketImageState extends State<MaskedTicketImage> {
+  ui.Image? image;
+  ui.Image? mask;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadImages();
+  }
+
+  Future<void> _loadImages() async {
+    final img = await _loadAsset(widget.imagePath);
+    final maskImg = await _loadAsset(widget.maskPath);
+    if (mounted) {
+      setState(() {
+        image = img;
+        mask = maskImg;
+      });
+    }
+  }
+
+  Future<ui.Image> _loadAsset(String asset) async {
+    final data = await DefaultAssetBundle.of(context).load(asset);
+    final codec = await ui.instantiateImageCodec(data.buffer.asUint8List());
+    final frame = await codec.getNextFrame();
+    return frame.image;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (image == null || mask == null) {
+      return SizedBox(
+        width: widget.width,
+        height: widget.height,
+        child: const Center(child: CircularProgressIndicator(strokeWidth: 1.5)),
+      );
+    }
+
+    return CustomPaint(
+      size: Size(widget.width, widget.height),
+      painter: _MaskedPainter(image!, mask!),
+    );
+  }
+}
+
+class _MaskedPainter extends CustomPainter {
+  final ui.Image image;
+  final ui.Image mask;
+
+  _MaskedPainter(this.image, this.mask);
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint();
+
+    // Fill background to avoid black transparency
+    canvas.drawColor(Colors.transparent, BlendMode.srcOver);
+
+    // Draw base image
+    canvas.drawImageRect(
+      image,
+      Rect.fromLTWH(0, 0, image.width.toDouble(), image.height.toDouble()),
+      Rect.fromLTWH(0, 0, size.width, size.height),
+      paint,
+    );
+
+    // Apply mask
+    paint.blendMode = BlendMode.dstIn;
+    canvas.drawImageRect(
+      mask,
+      Rect.fromLTWH(0, 0, mask.width.toDouble(), mask.height.toDouble()),
+      Rect.fromLTWH(0, 0, size.width, size.height),
+      paint,
+    );
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
diff --git a/lib/login/views/forgot_password_page.dart b/lib/login/views/forgot_password_page.dart
index f83b640..ba3703c 100644
--- a/lib/login/views/forgot_password_page.dart
+++ b/lib/login/views/forgot_password_page.dart
@@ -156,37 +156,75 @@ class _ForgotPasswordView extends StatelessWidget {
 
                       const SizedBox(height: 148),
 
-                      SizedBox(
-                        width: double.infinity,
-                        child: ElevatedButton(
-                          onPressed: state.isValidEmail && !state.isLoading
-                              ? () => bloc.add(SendResetLink())
-                              : null,
-                          style: ButtonStyle(
-                            backgroundColor:
-                            MaterialStateProperty.resolveWith<Color>(
-                                  (states) {
-                                if (states.contains(MaterialState.disabled)) {
-                                  return const Color(0xFF9C3F42);
-                                }
-                                return const Color(0xFFFF4C4C);
-                              },
-                            ),
-                            padding: MaterialStateProperty.all(
-                              const EdgeInsets.symmetric(vertical: 14),
-                            ),
-                            shape: MaterialStateProperty.all(
-                              RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(12),
+                      // SizedBox(
+                      //   width: double.infinity,
+                      //   child: ElevatedButton(
+                      //     onPressed: state.isValidEmail && !state.isLoading
+                      //         ? () => bloc.add(SendResetLink())
+                      //         : null,
+                      //     style: ButtonStyle(
+                      //       backgroundColor:
+                      //       MaterialStateProperty.resolveWith<Color>(
+                      //             (states) {
+                      //           if (states.contains(MaterialState.disabled)) {
+                      //             return const Color(0xFF9C3F42);
+                      //           }
+                      //           return const Color(0xFFFF4C4C);
+                      //         },
+                      //       ),
+                      //       padding: MaterialStateProperty.all(
+                      //         const EdgeInsets.symmetric(vertical: 14),
+                      //       ),
+                      //       shape: MaterialStateProperty.all(
+                      //         RoundedRectangleBorder(
+                      //           borderRadius: BorderRadius.circular(12),
+                      //         ),
+                      //       ),
+                      //     ),
+                      //     child: Text(
+                      //       "Send Reset Link",
+                      //       style: GoogleFonts.poppins(
+                      //         color: state.isValidEmail?Colors.white:Color(0xff9D9F9F),
+                      //         fontSize: 16,
+                      //         fontWeight: FontWeight.w600,
+                      //       ),
+                      //     ),
+                      //   ),
+                      // ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                        child: SizedBox(
+                          width: double.infinity,
+                          child: ElevatedButton(
+                            onPressed:  () => bloc.add(SendResetLink()),
+                            style: ButtonStyle(
+
+                              backgroundColor:
+                              MaterialStateProperty.resolveWith<Color>(
+                                    (states) {
+                                  if (states.contains(MaterialState.disabled)) {
+                                    return const Color(0xFFFF4C4C);
+                                  }
+                                  return const Color(0xFFFF4C4C);
+                                },
+                              ),
+
+                              padding: MaterialStateProperty.all(
+                                const EdgeInsets.symmetric(vertical: 14),
+                              ),
+                              shape: MaterialStateProperty.all(
+                                RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(12),
+                                ),
                               ),
                             ),
-                          ),
-                          child: Text(
-                            "Send Reset Link",
-                            style: GoogleFonts.poppins(
-                              color: state.isValidEmail?Colors.white:Color(0xff9D9F9F),
-                              fontSize: 16,
-                              fontWeight: FontWeight.w600,
+                            child: Text(
+                              "Send Reset Link",
+                              style: GoogleFonts.poppins(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
                             ),
                           ),
                         ),
diff --git a/lib/login/views/login_page.dart b/lib/login/views/login_page.dart
index 34df939..bf63857 100644
--- a/lib/login/views/login_page.dart
+++ b/lib/login/views/login_page.dart
@@ -20,7 +20,6 @@ class _LoginPageState extends State<LoginPage> {
     return Scaffold(
       body: Stack(
         children: [
-          // Background image
           Positioned.fill(
             child: Image.asset(
               'assets/login/bg.png',
@@ -200,15 +199,12 @@ class _LoginPageState extends State<LoginPage> {
                       ),
                     ),
                   ),
-
                   const SizedBox(height: 68),
-
-                  // Log in button
                   SizedBox(
                     width: double.infinity,
                     child: ElevatedButton(
                       onPressed: () {
-                        Navigator.pushNamed(context, '/home');
+                        Navigator.pushNamed(context, AppRouter.forgotPassword);
                       },
                       style: ElevatedButton.styleFrom(
                         backgroundColor: const Color(0xFFFF4C4C),
diff --git a/lib/login/views/otp_verification_page.dart b/lib/login/views/otp_verification_page.dart
index 786d2ba..2f52ec5 100644
--- a/lib/login/views/otp_verification_page.dart
+++ b/lib/login/views/otp_verification_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_otp_text_field/flutter_otp_text_field.dart';
 import 'package:google_fonts/google_fonts.dart';
+import '../../core/app_router.dart';
 import '../blocs/otp_bloc.dart';
 
 class OtpVerificationPage extends StatelessWidget {
@@ -58,7 +59,7 @@ class OtpVerificationPage extends StatelessWidget {
                           child: BlocConsumer<OtpBloc, OtpState>(
                             listener: (context, state) {
                               if (state.isVerified) {
-                                Navigator.pushNamed(context, '/reset_password');
+                                Navigator.pushNamed(context, AppRouter.resetPassword);
                               } else if (state.message.isNotEmpty &&
                                   !state.isLoading) {
                                 ScaffoldMessenger.of(context).showSnackBar(
diff --git a/lib/login/views/reset_password_page.dart b/lib/login/views/reset_password_page.dart
index 6f47579..740f250 100644
--- a/lib/login/views/reset_password_page.dart
+++ b/lib/login/views/reset_password_page.dart
@@ -193,8 +193,7 @@ class _ResetPasswordView extends StatelessWidget {
                         child: ElevatedButton(
                           onPressed: () {
                             Navigator.pushNamed(
-                                context, AppRouter.otpVerification);
-                            // Navigate or show success
+                                context, AppRouter.qrScanScreen);
                           },
                           style: ElevatedButton.styleFrom(
                             backgroundColor: const Color(0xFFFF4C4C),
diff --git a/lib/main.dart b/lib/main.dart
index 75c3e76..6eacab0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,6 +15,7 @@ void main() {
 
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
diff --git a/lib/onboarding/views/onboarding_page.dart b/lib/onboarding/views/onboarding_page.dart
index 8c08b51..3937a24 100644
--- a/lib/onboarding/views/onboarding_page.dart
+++ b/lib/onboarding/views/onboarding_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import '../../login/views/login_page.dart';
 import '../models/onboarding_model.dart';
 import 'widgets/glass_card.dart';
 
@@ -9,52 +10,47 @@ class OnboardingPage extends StatefulWidget {
   State<OnboardingPage> createState() => _OnboardingPageState();
 }
 
-class _OnboardingPageState extends State<OnboardingPage>
-    with SingleTickerProviderStateMixin {
+class _OnboardingPageState extends State<OnboardingPage> {
   int currentIndex = 0;
 
   final List<OnboardingModel> onboardingData = [
     OnboardingModel(
-      image: 'assets/onboarding/bg1.jpg',
+      image: 'assets/onboarding/bg.png',
       title: 'What we do',
       description:
-          'Easily manage and promote your attractions while connecting with travelers and handling bookings in one place.',
+      'Easily manage and promote your attractions while connecting with travelers and handling bookings in one place.',
     ),
     OnboardingModel(
       image: 'assets/onboarding/bg2.png',
       title: 'Manage Booking Seamlessly',
       description:
-          'Track and manage all your bookings in real-time from one easy-to-use dashboard.',
+      'Track and manage all your bookings in real-time from one easy-to-use dashboard.',
     ),
   ];
 
-  late AnimationController _controller;
-  late Animation<double> _fadeAnimation;
 
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 800),
+
+  void _nextPage() {
+    if (currentIndex == onboardingData.length - 1) {
+      // 👇 Navigate to LoginPage after last screen
+      Navigator.pushReplacement(
+        context,
+        MaterialPageRoute(builder: (context) => const LoginPage()),
+      );
+    } else {
+      setState(() {
+        currentIndex++;
+      });
+    }
+  }
+
+  void _skip() {
+    // 👇 Navigate to LoginPage when skipping
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(builder: (context) => const LoginPage()),
     );
-    _fadeAnimation = Tween<double>(begin: 1.0, end: 0.0).animate(_controller);
   }
-
-  void _nextPage() async {
-    await _controller.forward();
-    setState(() {
-      currentIndex = (currentIndex + 1) % onboardingData.length;
-    });
-    _controller.reverse();
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final current = onboardingData[currentIndex];
@@ -63,32 +59,29 @@ class _OnboardingPageState extends State<OnboardingPage>
       body: Stack(
         fit: StackFit.expand,
         children: [
-          FadeTransition(
-            opacity: _fadeAnimation.drive(Tween(begin: 0.1, end: 1.0)),
-            child: Image.asset(current.image, fit: BoxFit.cover),
-          ),
+          Image.asset(current.image, fit: BoxFit.cover),
           current.title == "Manage Booking Seamlessly"
               ? Container()
               : SafeArea(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Align(
-                      alignment: Alignment.topRight,
-                      child: OutlinedButton(
-                        onPressed: () {},
-                        style: OutlinedButton.styleFrom(
-                          side: const BorderSide(color: Colors.white),
-                          foregroundColor: Colors.white,
-                          padding: const EdgeInsets.symmetric(
-                            horizontal: 20,
-                            vertical: 8,
-                          ),
-                        ),
-                        child: const Text("Skip"),
-                      ),
+            child: Padding(
+              padding: const EdgeInsets.all(16.0),
+              child: Align(
+                alignment: Alignment.topRight,
+                child: OutlinedButton(
+                  onPressed: () {},
+                  style: OutlinedButton.styleFrom(
+                    side: const BorderSide(color: Colors.white),
+                    foregroundColor: Colors.white,
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 20,
+                      vertical: 8,
                     ),
                   ),
+                  child: const Text("Skip"),
                 ),
+              ),
+            ),
+          ),
           Align(
             alignment: Alignment.bottomCenter,
             child: Padding(
diff --git a/lib/profile/views/profile_page.dart b/lib/profile/views/profile_page.dart
index bb513c8..0632dac 100644
--- a/lib/profile/views/profile_page.dart
+++ b/lib/profile/views/profile_page.dart
@@ -23,7 +23,7 @@ class ProfileScreen extends StatelessWidget {
                 return Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    _buildHeaderSection(),
+                    _buildHeaderSection( context),
                     SizedBox(height: 32),
                     _buildCustomerDetailsSection(state),
                     SizedBox(height: 24),
@@ -42,7 +42,7 @@ class ProfileScreen extends StatelessWidget {
     );
   }
 
-  Widget _buildHeaderSection() {
+  Widget _buildHeaderSection( BuildContext context) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -61,6 +61,9 @@ class ProfileScreen extends StatelessWidget {
                   ),
                   child: const Icon(Icons.arrow_back, color: Colors.white),
                 ),
+                onTap: (){
+                  Navigator.pop(context);
+                },
               ),
               Text(
                 'Profile',
diff --git a/lib/recurring.zip b/lib/recurring.zip
new file mode 100644
index 0000000..ee89c9e
Binary files /dev/null and b/lib/recurring.zip differ
diff --git a/lib/recurring/models/recurring_block_model.dart b/lib/recurring/models/recurring_block_model.dart
new file mode 100644
index 0000000..08e8cff
--- /dev/null
+++ b/lib/recurring/models/recurring_block_model.dart
@@ -0,0 +1,26 @@
+class RecurringBlockModel {
+  String? selectedCategory;
+  DateTime? startDate;
+  DateTime? endDate;
+  String attractionName;
+  String location;
+  String description;
+
+  RecurringBlockModel({
+    this.selectedCategory,
+    this.startDate,
+    this.endDate,
+    this.attractionName = '',
+    this.location = '',
+    this.description = '',
+  });
+}
+
+
+class TimeSlot {
+  final String startTime;
+  final String endTime;
+  final int capacity;
+
+  TimeSlot(this.startTime, this.endTime, this.capacity);
+}
\ No newline at end of file
diff --git a/lib/recurring/viewmodels/recurring_block_viewmodel.dart b/lib/recurring/viewmodels/recurring_block_viewmodel.dart
new file mode 100644
index 0000000..f0ec353
--- /dev/null
+++ b/lib/recurring/viewmodels/recurring_block_viewmodel.dart
@@ -0,0 +1,150 @@
+import 'package:flutter/material.dart';
+import '../models/recurring_block_model.dart';
+
+class RecurringBlockViewModel extends ChangeNotifier {
+  final RecurringBlockModel _model = RecurringBlockModel();
+
+  int _currentStep = 0;
+  String? _selectedCategory;
+  String? _selectedRecurrence;
+  Set<String> _selectedDays = {};
+  int _repeatWeek = 1;
+  DateTime _focusedMonth = DateTime.now();
+  Set<int> _selectedDates = {};
+  int _capacity = 50;
+  List<TimeSlot> _timeSlots = [];
+
+  // ---------- Getters ----------
+  int get currentStep => _currentStep;
+  String? get selectedCategory => _selectedCategory;
+  String? get selectedRecurrence => _selectedRecurrence;
+  Set<String> get selectedDays => _selectedDays;
+  int get repeatWeek => _repeatWeek;
+  DateTime get focusedMonth => _focusedMonth;
+  Set<int> get selectedDates => _selectedDates;
+  int get capacity => _capacity;
+  List<TimeSlot> get timeSlots => _timeSlots;
+  RecurringBlockModel get model => _model;
+
+  // ---------- Step Navigation ----------
+  void nextStep() {
+    if (_currentStep < 3) {
+      _currentStep++;
+      notifyListeners();
+    }
+  }
+
+  void previousStep(BuildContext context) {
+    if (_currentStep > 0) {
+      _currentStep--;
+      notifyListeners();
+    } else {
+      Navigator.pop(context);
+    }
+  }
+
+  // ---------- Category ----------
+  void selectCategory(String category) {
+    _selectedCategory = category;
+    notifyListeners();
+  }
+
+  // ---------- Recurrence Type ----------
+  void selectRecurrence(String type) {
+    // ✅ Single-choice only (cannot deselect, always one active)
+    if (_selectedRecurrence != type) {
+      _selectedRecurrence = type;
+      notifyListeners();
+    }
+  }
+
+  // ---------- Weekly Day Selection ----------
+  void toggleDay(String day) {
+    if (_selectedDays.contains(day)) {
+      _selectedDays.remove(day);
+    } else {
+      _selectedDays.add(day);
+    }
+    notifyListeners();
+  }
+
+  // ---------- Week Repeat Increment/Decrement ----------
+  void incrementWeek() {
+    _repeatWeek++;
+    notifyListeners();
+  }
+
+  void decrementWeek() {
+    if (_repeatWeek > 1) {
+      _repeatWeek--;
+      notifyListeners();
+    }
+  }
+
+  // ---------- Month Navigation ----------
+  void changeMonth(int offset) {
+    _focusedMonth = DateTime(
+      _focusedMonth.year,
+      _focusedMonth.month + offset,
+    );
+    notifyListeners();
+  }
+
+  // ---------- Monthly Date Selection ----------
+  void toggleDate(int day) {
+    if (_selectedDates.contains(day)) {
+      _selectedDates.remove(day);
+    } else {
+      _selectedDates.add(day);
+    }
+    notifyListeners();
+  }
+
+  // ---------- Time Slots ----------
+  void addTimeSlot(String start, String end, int capacity) {
+    _timeSlots.add(TimeSlot(start, end, capacity));
+    notifyListeners();
+  }
+
+  void clearSlots() {
+    _timeSlots.clear();
+    notifyListeners();
+  }
+
+  // ---------- Capacity ----------
+  void incrementCapacity() {
+    _capacity++;
+    notifyListeners();
+  }
+
+  void decrementCapacity() {
+    if (_capacity > 1) _capacity--;
+    notifyListeners();
+  }
+
+  // ---------- Model Field Updates ----------
+  void updateAttractionName(String value) {
+    _model.attractionName = value;
+    notifyListeners();
+  }
+
+  void updateLocation(String value) {
+    _model.location = value;
+    notifyListeners();
+  }
+
+  void updateDescription(String value) {
+    _model.description = value;
+    notifyListeners();
+  }
+
+  void updateStartDate(DateTime date) {
+    _model.startDate = date;
+    notifyListeners();
+  }
+
+  void updateEndDate(DateTime date) {
+    _model.endDate = date;
+    notifyListeners();
+  }
+}
diff --git a/lib/recurring/views/recurring_block.dart b/lib/recurring/views/recurring_block.dart
new file mode 100644
index 0000000..7e04771
--- /dev/null
+++ b/lib/recurring/views/recurring_block.dart
@@ -0,0 +1,1211 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:provider/provider.dart';
+import 'package:syncfusion_flutter_datepicker/datepicker.dart';
+import '../viewmodels/recurring_block_viewmodel.dart';
+
+class RecurringBlockPage extends StatelessWidget {
+  const RecurringBlockPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (_) => RecurringBlockViewModel(),
+      child: Consumer<RecurringBlockViewModel>(
+        builder: (context, viewModel, _) {
+          final step = viewModel.currentStep;
+          return Scaffold(
+            backgroundColor: Colors.white,
+            body: SafeArea(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  _buildHeader(context, viewModel),
+                  const SizedBox(height: 42),
+                  _buildProgressIndicator(step),
+                  const SizedBox(height: 24),
+
+                  Expanded(
+                    child: AnimatedSwitcher(
+                      duration: const Duration(milliseconds: 400),
+                      transitionBuilder: (child, animation) {
+                        final offsetAnimation = Tween<Offset>(
+                          begin: const Offset(0.2, 0),
+                          end: Offset.zero,
+                        ).animate(animation);
+                        return SlideTransition(
+                          position: offsetAnimation,
+                          child: FadeTransition(
+                            opacity: animation,
+                            child: child,
+                          ),
+                        );
+                      },
+
+                      // 👇 This prevents the default centering and pins content to the top
+                      layoutBuilder: (currentChild, previousChildren) {
+                        return Stack(
+                          alignment: Alignment.topCenter,
+                          children: <Widget>[
+                            ...previousChildren,
+                            if (currentChild != null)
+                              Positioned.fill(
+                                child: Align(
+                                  alignment: Alignment.topCenter,
+                                  child: currentChild,
+                                ),
+                              ),
+                          ],
+                        );
+                      },
+
+                      // 👇 also top-align the active child itself
+                      child: Align(
+                        alignment: Alignment.topCenter,
+                        child: _buildStep(step, viewModel),
+                      ),
+                    ),
+                  ),
+                  step == 3
+                      ? Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 20,
+                      vertical: 14,
+                    ),
+                    child: Row(
+                      children: [
+                        Expanded(
+                          child: OutlinedButton(
+                            onPressed: () {},
+                            style: OutlinedButton.styleFrom(
+                              side: const BorderSide(
+                                color: Color(0xffF95F62),
+                              ),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              padding: const EdgeInsets.symmetric(
+                                vertical: 16,
+                              ),
+                            ),
+                            child: Text(
+                              "Cancel",
+                              style: GoogleFonts.poppins(
+                                fontWeight: FontWeight.w600,
+                                fontSize: 15,
+                                color: const Color(0xffF95F62),
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 10),
+                        Expanded(
+                          child: ElevatedButton(
+                            onPressed: () {},
+                            style: ElevatedButton.styleFrom(
+                              backgroundColor: const Color(0xffF95F62),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(12),
+                              ),
+                              padding: const EdgeInsets.symmetric(
+                                vertical: 16,
+                              ),
+                            ),
+                            child: Text(
+                              "Create Block",
+                              style: GoogleFonts.poppins(
+                                fontWeight: FontWeight.w600,
+                                fontSize: 15,
+                                color: Colors.white,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  )
+                      : Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 20,
+                      vertical: 10,
+                    ),
+                    child: SizedBox(
+                      width: double.infinity,
+                      child: ElevatedButton(
+                        onPressed: viewModel.nextStep,
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: const Color(0xffF95F62),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(16),
+                          ),
+                          padding: const EdgeInsets.symmetric(
+                            vertical: 16,
+                          ),
+                        ),
+                        child: Text(
+                          "Next",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 15,
+                            color: Colors.white,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildHeader(BuildContext context, RecurringBlockViewModel viewModel) {
+    return Column(
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(left: 20.0),
+              child: GestureDetector(
+                onTap: () {
+                  viewModel.previousStep(context);
+                },
+                child: CircleAvatar(
+                  radius: 20,
+                  backgroundColor: const Color(0xffF95F62),
+                  child: const Icon(Icons.arrow_back, color: Colors.white),
+                ),
+              ),
+            ),
+            Text(
+              "Recurring block",
+              style: GoogleFonts.poppins(
+                fontWeight: FontWeight.w600,
+                fontSize: 32,
+                color: Colors.black,
+              ),
+            ),
+            SizedBox(width: 26),
+          ],
+        ),
+        SizedBox(height: 6),
+        Align(
+          alignment: Alignment.center,
+          child: Text(
+            viewModel.currentStep == 0
+                ? "Basic Information"
+                : viewModel.currentStep == 1
+                ? "Recurrence Pattern"
+                : viewModel.currentStep == 2
+                ? "Time Slots"
+                : viewModel.currentStep == 3
+                ? "Review & Confirm"
+                : "",
+            style: GoogleFonts.poppins(
+              fontWeight: FontWeight.w400,
+              fontSize: 16,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildProgressIndicator(int step) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: List.generate(4, (index) {
+        final isActive = index == step;
+        return AnimatedContainer(
+          duration: const Duration(milliseconds: 300),
+          margin: const EdgeInsets.symmetric(horizontal: 4),
+          width: 59,
+          height: 10,
+          decoration: BoxDecoration(
+            color: isActive ? const Color(0xffF95F62) : const Color(0xffFCE7E7),
+            borderRadius: BorderRadius.circular(6),
+          ),
+        );
+      }),
+    );
+  }
+
+  Widget _buildStep(int step, RecurringBlockViewModel viewModel) {
+    switch (step) {
+      case 0:
+        return _buildBasicInfo();
+      case 1:
+        return _buildRecurrenceType();
+      case 2:
+        return _buildTimeSlots();
+      case 3:
+        return _buildReviewConfirm();
+      default:
+        return const SizedBox.shrink();
+    }
+  }
+
+  Widget _buildBasicInfo() {
+    final categories = [
+      "Tourist Attraction",
+      "Museum & Gallery",
+      "Outdoor Activity",
+      "Entertainment",
+      "Food Experience",
+      "Cultural Site",
+    ];
+    final imagePath = [
+      "assets/recurring/culture.png",
+      "assets/recurring/Entertainment.png",
+      "assets/recurring/food.png",
+      "assets/recurring/musuem.png",
+      "assets/recurring/outdoor.png",
+      "assets/recurring/tourist.png",
+    ];
+    return Consumer<RecurringBlockViewModel>(builder: (context, viewModel, _) {
+      return SingleChildScrollView(key: const ValueKey("basic_info"),
+        padding: const EdgeInsets.symmetric(horizontal: 20),
+        child: Column(crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text("Category", style: GoogleFonts.poppins(
+              fontWeight: FontWeight.w600, fontSize: 24,),),
+            const SizedBox(height: 10),
+            GridView.builder(shrinkWrap: true,
+              physics: const NeverScrollableScrollPhysics(),
+              itemCount: categories.length,
+              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: 2,
+                crossAxisSpacing: 10,
+                mainAxisSpacing: 10,
+                childAspectRatio: 2.8,),
+              itemBuilder: (context, index) {
+                final category = categories[index];
+                final image = imagePath[index];
+                final isSelected = viewModel.selectedCategory == category;
+                return GestureDetector(
+                  onTap: () => viewModel.selectCategory(category),
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 24),
+                    decoration: BoxDecoration(color: isSelected ? const Color(
+                        0xffFFEDE6) : Colors.white,
+                      borderRadius: BorderRadius.circular(10),
+                      border: Border.all(color: isSelected ? const Color(
+                          0xffFFEDE6) : Colors.grey.shade300, width: 1.5,),),
+                    child: Row(mainAxisAlignment: MainAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Padding(padding: const EdgeInsets.only(right: 8.0),
+                          child: Image.asset(image, width: 32, height: 32,),),
+                        Expanded(child: Text(
+                          category, textAlign: TextAlign.left,
+                          maxLines: 2,
+                          overflow: TextOverflow.visible,
+                          style: GoogleFonts.poppins(fontSize: 16.0,
+                            fontWeight: FontWeight.w500,
+                            color: Colors.black,
+                            height: 1.2,),),),
+                      ],),),);
+              },),
+            const SizedBox(height: 20),
+            _inputField("Attraction Name", "Enter attraction name"),
+            _inputField("Location", "Enter location"),
+            _inputField(
+              "Description (Optional)", "Brief description", maxLines: 3,),
+            const SizedBox(height: 12),
+            Row(children: [
+              Expanded(child: _dateField("Start Date")),
+              const SizedBox(width: 10),
+              Expanded(child: _dateField("End Date")),
+            ],),
+          ],),);
+    },);
+  }
+
+  // --- Step 1: Recurrence Type ---
+  Widget _buildRecurrenceType() {
+    final days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+
+    return Consumer<RecurringBlockViewModel>(
+      builder: (context, viewModel, _) {
+        return SingleChildScrollView(
+          key: const ValueKey("recurrence_type"),
+          padding: const EdgeInsets.symmetric(horizontal: 20),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                "Recurrence Type",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 24,
+                ),
+              ),
+              const SizedBox(height: 10),
+
+              // Recurrence Options (Daily, Weekly, Monthly)
+              ...["Daily", "Weekly", "Monthly"].map((type) {
+                final subtitle = type == "Daily"
+                    ? "Every Day"
+                    : type == "Weekly"
+                    ? "Specific days of the week"
+                    : "Same dates each month";
+
+                final isSelected = viewModel.selectedRecurrence == type;
+
+                return SingleChildScrollView(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      GestureDetector(
+                        onTap: () => viewModel.selectRecurrence(type),
+                        child: Container(
+                          margin: const EdgeInsets.only(bottom: 12),
+                          padding: const EdgeInsets.all(16),
+                          decoration: BoxDecoration(
+                            color: isSelected
+                                ? const Color(0xFFFFF1EE)
+                                : Colors.white,
+                            border: Border.all(
+                              color: isSelected
+                                  ? const Color(0xffF95F62)
+                                  : Colors.grey.shade300,
+                            ),
+                            borderRadius: BorderRadius.circular(10),
+                          ),
+                          child: Row(
+                            children: [
+                              Image.asset(
+                                "assets/recurring/lets-icons_date-fill.png",
+                                scale: 4,
+                              ),
+                              const SizedBox(width: 12),
+                              Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    type,
+                                    style: GoogleFonts.poppins(
+                                      fontWeight: FontWeight.w500,
+                                      fontSize: 16,
+                                    ),
+                                  ),
+                                  Text(
+                                    subtitle,
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.w400,
+                                      color: Colors.black54,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+
+                      // 🟩 WEEKLY SECTION (appears directly under Weekly card)
+                      if (isSelected && type == "Weekly") ...[
+                        const SizedBox(height: 8),
+                        Text(
+                          "Select Days",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 24,
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Wrap(
+                          spacing: 8,
+                          runSpacing: 8,
+                          children: days.map((day) {
+                            final isDaySelected = viewModel.selectedDays
+                                .contains(day);
+                            return GestureDetector(
+                              onTap: () => viewModel.toggleDay(day),
+                              child: Container(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 14,
+                                  vertical: 8,
+                                ),
+                                decoration: BoxDecoration(
+                                  color: isDaySelected
+                                      ? const Color(0xFFFFF1EE)
+                                      : Colors.white,
+                                  border: Border.all(
+                                    color: isDaySelected
+                                        ? const Color(0xffF95F62)
+                                        : Colors.grey.shade400,
+                                  ),
+                                  borderRadius: BorderRadius.circular(8),
+                                ),
+                                child: Text(
+                                  day,
+                                  style: GoogleFonts.poppins(
+                                    fontSize: 15,
+                                    fontWeight: FontWeight.w500,
+                                    color: isDaySelected
+                                        ? const Color(0xffF95F62)
+                                        : Colors.black,
+                                  ),
+                                ),
+                              ),
+                            );
+                          }).toList(),
+                        ),
+                        const SizedBox(height: 16),
+                        SizedBox(
+                          child: Text(
+                            "Every ${viewModel.repeatWeek} week(s)",
+                            style: GoogleFonts.poppins(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 24,
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 10,
+                          ),
+                          decoration: BoxDecoration(
+                            color: const Color(0xffF6F6F6),
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Row(
+                            children: [
+                              _roundButton(
+                                Icons.remove,
+                                viewModel.decrementWeek,
+                              ),
+                              Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 12.0,
+                                ),
+                                child: Center(
+                                  child: Text(
+                                    "${viewModel.repeatWeek}",
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              _roundButton(Icons.add, viewModel.incrementWeek),
+                              const SizedBox(width: 8),
+                              Text(
+                                "repeats 1 ",
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  color: Colors.black54,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        const SizedBox(height: 20),
+                      ],
+
+                      // 🟦 MONTHLY SECTION (calendar starts immediately under Monthly card)
+                      if (isSelected && type == "Monthly") ...[
+                        const SizedBox(height: 8),
+                        Text(
+                          "Select Dates",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 24,
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Container(
+                          decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(12),
+                            color: Colors.white,
+                            boxShadow: [
+                              BoxShadow(
+                                color: Colors.grey.withOpacity(0.1),
+                                spreadRadius: 1,
+                                blurRadius: 2,
+                                offset: const Offset(0, 1),
+                              ),
+                            ],
+                          ),
+                          child: SfDateRangePicker(
+                            // 🔴 Selection & Range Colors
+                            startRangeSelectionColor: const Color(0xffF95F62),
+                            endRangeSelectionColor: const Color(0xffF95F62),
+                            rangeSelectionColor: const Color(0xFFFFF1EE),
+                            selectionTextStyle: GoogleFonts.poppins(
+                              color: Colors.white,
+                              fontWeight: FontWeight.w600,
+                            ),
+                            selectionMode: DateRangePickerSelectionMode.range,
+                            // 🧭 Navigation & Layout
+                            backgroundColor: Colors.white,
+                            showNavigationArrow: true,
+                            initialDisplayDate: viewModel.focusedMonth,
+                            toggleDaySelection: false,
+                            todayHighlightColor: const Color(0xffF95F62),
+                            minDate: DateTime(2020),
+                            maxDate: DateTime(2030),
+
+                            // 📅 Header (Month / Year)
+                            headerStyle: DateRangePickerHeaderStyle(
+                              backgroundColor: Colors.white,
+                              textAlign: TextAlign.center,
+                              textStyle: GoogleFonts.poppins(
+                                color: Colors.black,
+                                fontWeight: FontWeight.w700,
+                                fontSize: 18,
+                              ),
+                            ),
+
+                            // 📆 Month View Settings
+                            monthViewSettings:
+                            const DateRangePickerMonthViewSettings(
+                              // firstDayOfWeek: 1,
+                              viewHeaderStyle:
+                              DateRangePickerViewHeaderStyle(
+                                textStyle: TextStyle(
+                                  fontWeight: FontWeight.w600,
+                                  fontSize: 14,
+                                  color: Colors.black,
+                                ),
+                              ),
+                              showTrailingAndLeadingDates: true,
+                            ),
+
+                            // 🗓️ Customize Month Cells
+                            monthCellStyle: DateRangePickerMonthCellStyle(
+                              todayTextStyle: GoogleFonts.poppins(
+                                color: const Color(0xffF95F62),
+                                fontWeight: FontWeight.w600,
+                              ),
+                              textStyle: GoogleFonts.poppins(
+                                color: Colors.black,
+                                fontWeight: FontWeight.w500,
+                              ),
+                              trailingDatesTextStyle: GoogleFonts.poppins(
+                                color: Colors.grey.shade400,
+                                fontWeight: FontWeight.w400,
+                              ),
+                              leadingDatesTextStyle: GoogleFonts.poppins(
+                                color: Colors.grey.shade400,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+
+                            // 🔁 Handle Selections
+                            onSelectionChanged: (args) {
+                              if (args.value is PickerDateRange) {
+                                viewModel.selectedDates.clear();
+
+                                final PickerDateRange range = args.value;
+                                final start = range.startDate;
+                                final end = range.endDate ?? start;
+
+                                // if (start != null && end != null) {
+                                //   for (var date = start;
+                                //   date.isBefore(end.add(const Duration(days: 1)));
+                                //   date = date.add(const Duration(days: 1))) {
+                                //     viewModel.selectedDates.add(date);
+                                //   }
+                                // }
+
+                                viewModel.notifyListeners();
+                              } else if (args.value is DateTime) {
+                                viewModel.selectedDates.clear();
+                                viewModel.selectedDates.add(args.value);
+                                viewModel.notifyListeners();
+                              }
+                            },
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          "Every ${viewModel.repeatWeek} Month(s)",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 24,
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 10,
+                          ),
+                          decoration: BoxDecoration(
+                            color: const Color(0xffF6F6F6),
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Row(
+                            children: [
+                              _roundButton(
+                                Icons.remove,
+                                viewModel.decrementWeek,
+                              ),
+                              Center(
+                                child: Padding(
+                                  padding: const EdgeInsets.symmetric(
+                                    horizontal: 12.0,
+                                  ),
+                                  child: Text(
+                                    "${viewModel.repeatWeek}",
+                                    style: GoogleFonts.poppins(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.w600,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              _roundButton(Icons.add, viewModel.incrementWeek),
+                              const SizedBox(width: 8),
+                              Text(
+                                "repeats 1 Month",
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  color: Colors.black54,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        const SizedBox(height: 20),
+                      ],
+                    ],
+                  ),
+                );
+              }),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _roundButton(IconData icon, VoidCallback onPressed) {
+    return GestureDetector(
+      onTap: onPressed,
+      child: Container(
+        width: 36,
+        height: 36,
+        decoration: const BoxDecoration(
+          color: Color(0xffF95F62),
+          shape: BoxShape.circle,
+        ),
+        child: Icon(icon, color: Colors.white, size: 20),
+      ),
+    );
+  }
+
+  // --- Step 2: Time Slots ---
+  Widget _buildTimeSlots() {
+    return Consumer<RecurringBlockViewModel>(
+      builder: (context, viewModel, _) {
+        return SingleChildScrollView(
+          key: const ValueKey("time_slots"),
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // ---------------- Title & Add Timing ----------------
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    "Time Slots Available",
+                    style: GoogleFonts.poppins(
+                      fontWeight: FontWeight.w600,
+                      fontSize: 20,
+                      color: Colors.black,
+                    ),
+                  ),
+                  Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 14,
+                      vertical: 6,
+                    ),
+                    decoration: BoxDecoration(
+                      border: Border.all(color: const Color(0xffF95F62)),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    child: Text(
+                      "+ Add timing",
+                      style: GoogleFonts.poppins(
+                        color: const Color(0xffF95F62),
+                        fontWeight: FontWeight.w600,
+                        fontSize: 14,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 20),
+
+              // ---------------- Slot Card ----------------
+              Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(16),
+                decoration: BoxDecoration(
+                  color: const Color(0xffF6F6F6),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      "Slot 1",
+                      style: GoogleFonts.poppins(
+                        fontWeight: FontWeight.w500,
+                        fontSize: 16,
+                        color: Colors.black,
+                      ),
+                    ),
+                    const SizedBox(height: 10),
+                    Row(
+                      children: [
+                        Expanded(child: _timeBox("Start Time", "9:00 AM")),
+                        const SizedBox(width: 12),
+                        Expanded(child: _timeBox("End Time", "12:00 PM")),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+
+              const SizedBox(height: 24),
+
+              // ---------------- Capacity ----------------
+              Text(
+                "Capacity per Time Slot",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 20,
+                  color: Colors.black,
+                ),
+              ),
+              const SizedBox(height: 12),
+              Container(
+                width: double.infinity,
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 20,
+                  vertical: 16,
+                ),
+                decoration: BoxDecoration(
+                  color: const Color(0xffF6F6F6),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Expanded(child: _capacityButton(Icons.remove, () {})),
+                    const SizedBox(width: 24),
+                    Column(
+                      children: [
+                        Text(
+                          "50",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 18,
+                            color: Colors.black,
+                          ),
+                        ),
+                        Text(
+                          "people",
+                          style: GoogleFonts.poppins(
+                            color: Colors.black45,
+                            fontSize: 13,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(width: 24),
+                    Expanded(child: _capacityButton(Icons.add, () {})),
+                  ],
+                ),
+              ),
+
+              const SizedBox(height: 20),
+
+              // ---------------- Create Slot Button ----------------
+              SizedBox(
+                width: double.infinity,
+                child: ElevatedButton(
+                  onPressed: () {},
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Colors.black,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    padding: const EdgeInsets.symmetric(vertical: 16),
+                  ),
+                  child: Text(
+                    "Create Slot",
+                    style: GoogleFonts.poppins(
+                      color: Colors.white,
+                      fontWeight: FontWeight.w600,
+                      fontSize: 15,
+                    ),
+                  ),
+                ),
+              ),
+
+              const SizedBox(height: 24),
+              Text(
+                "Preview",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 20,
+                  color: Colors.black,
+                ),
+              ),
+              const SizedBox(height: 12),
+              Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(16),
+                decoration: BoxDecoration(
+                  color: const Color(0xffEAF8EF),
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        const CircleAvatar(
+                          radius: 6,
+                          backgroundColor: Color(0xff4CAF50),
+                        ),
+                        const SizedBox(width: 8),
+                        Text(
+                          "The Enchanted Garden Adventure Park",
+                          style: GoogleFonts.poppins(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 14,
+                            color: Colors.black,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 12,
+                        vertical: 6,
+                      ),
+                      decoration: BoxDecoration(
+                        color: Colors.white,
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Text(
+                            "9:00am - 12:00pm    ",
+                            style: GoogleFonts.poppins(
+                              fontSize: 13,
+                              color: Colors.black,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                          Container(
+                            decoration: BoxDecoration(
+                              color: Color(0xffF0F0F0),
+                              borderRadius: BorderRadius.circular(6),
+                            ),
+                            child: Padding(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 12.0,
+                                vertical: 8,
+                              ),
+                              child: Text(
+                                "0/50",
+                                style: GoogleFonts.poppins(
+                                  fontSize: 13,
+                                  color: Colors.black,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _inputField(String label, String hint, {int maxLines = 1}) {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16), child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(label, style: GoogleFonts.poppins(
+          fontWeight: FontWeight.w700, fontSize: 24,),),
+        const SizedBox(height: 6),
+        TextField(
+          maxLines: maxLines, decoration: InputDecoration(
+          hintText: hint,
+          hintStyle: GoogleFonts.poppins(color: Colors.grey, fontSize: 13),
+          filled: true,
+          fillColor: const Color(0xffF6F6F6),
+          contentPadding: const EdgeInsets.symmetric(
+            horizontal: 12, vertical: 14,),
+          border: OutlineInputBorder(
+            borderRadius: BorderRadius.circular(10),
+            borderSide: BorderSide.none,),),),
+      ],),);
+  }
+
+  Widget _dateField(String label) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(label, style: GoogleFonts.poppins(
+            fontWeight: FontWeight.w600, fontSize: 24),),
+        const SizedBox(height: 6),
+        Container(
+          width: double.infinity,
+          padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14),
+          decoration: BoxDecoration(
+            color: const Color(0xffF6F6F6),
+            borderRadius: BorderRadius.circular(10),),
+          child: Text("mm/dd/yyyy", style: GoogleFonts.poppins(fontSize: 14,
+              color: Colors.black87,
+              fontWeight: FontWeight.w600),),),
+      ],);
+  }
+}
+
+// ---------------- Reusable UI Helpers ----------------
+Widget _timeBox(String label, String value) {
+  return Column(
+    crossAxisAlignment: CrossAxisAlignment.start,
+    children: [
+      Text(
+        label,
+        style: GoogleFonts.poppins(
+          fontWeight: FontWeight.w500,
+          color: Colors.black54,
+          fontSize: 13,
+        ),
+      ),
+      const SizedBox(height: 6),
+      Container(
+        height: 48,
+        alignment: Alignment.centerLeft,
+        padding: const EdgeInsets.symmetric(horizontal: 14),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(color: Colors.grey.shade300),
+        ),
+        child: Text(
+          value,
+          style: GoogleFonts.poppins(
+            color: Colors.black,
+            fontWeight: FontWeight.w600,
+            fontSize: 14,
+          ),
+        ),
+      ),
+    ],
+  );
+}
+
+Widget _capacityButton(IconData icon, VoidCallback onTap) {
+  return GestureDetector(
+    onTap: onTap,
+    child: Container(
+      width: 48,
+      height: 36,
+      alignment: Alignment.center,
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFF1EE),
+        border: Border.all(color: const Color(0xffF95F62)),
+        borderRadius: BorderRadius.circular(8),
+      ),
+      child: Icon(icon, color: const Color(0xffF95F62), size: 20),
+    ),
+  );
+}
+
+// --- Step 3: Review & Confirm ---
+Widget _buildReviewConfirm() {
+  return SingleChildScrollView(
+    key: const ValueKey("review_confirm"),
+    padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+    child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Basic Information
+        Container(
+          width: double.infinity,
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            color: const Color(0xffF6F6F6),
+            borderRadius: BorderRadius.circular(12),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                "Basic Information",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w500,
+                  fontSize: 16,
+                ),
+              ),
+              const SizedBox(height: 12),
+              _reviewRow("Name:", "The Enchanted Garden"),
+              _reviewRow("Location:", "Dubai"),
+              _reviewRow("Category:", "Tourist Attraction"),
+              _reviewRow("Duration:", "01/02/2025 to 02/02/2025"),
+            ],
+          ),
+        ),
+        const SizedBox(height: 16),
+
+        // Schedule Information
+        Container(
+          width: double.infinity,
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            color: const Color(0xffF6F6F6),
+            borderRadius: BorderRadius.circular(12),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                "Schedule Information",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w500,
+                  fontSize: 16,
+                ),
+              ),
+              const SizedBox(height: 12),
+              _reviewRow("Pattern:", "Weekly"),
+              _reviewRow("Days:", "Sun, Mon, Tues"),
+              _reviewRow("Time Slots:", "1 slot"),
+              _reviewRow("Capacity:", "50 people per slot"),
+            ],
+          ),
+        ),
+        const SizedBox(height: 16),
+
+        // Preview Section
+        Container(
+          width: double.infinity,
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(
+            color: const Color(0xffF6F6F6),
+            borderRadius: BorderRadius.circular(12),
+          ),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                "Preview (First 10 days)",
+                style: GoogleFonts.poppins(
+                  fontWeight: FontWeight.w500,
+                  fontSize: 16,
+                ),
+              ),
+              const SizedBox(height: 12),
+              Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                children:
+                [
+                  "Dec 4",
+                  "Dec 7",
+                  "Dec 8",
+                  "Dec 9",
+                  "Dec 10",
+                  "Dec 11",
+                  "Dec 12",
+                  "Dec 13",
+                  "Dec 14",
+                  "Dec 15",
+                ]
+                    .map(
+                      (date) =>
+                      Container(
+                        padding: const EdgeInsets.symmetric(
+                          horizontal: 14,
+                          vertical: 8,
+                        ),
+                        decoration: BoxDecoration(
+                          color: Colors.white,
+                          border: Border.all(color: Colors.grey.shade300),
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                        child: Text(
+                          date,
+                          style: GoogleFonts.poppins(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w500,
+                            color: Colors.black,
+                          ),
+                        ),
+                      ),
+                )
+                    .toList(),
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(height: 30),
+
+        // Bottom Buttons (Cancel / Create Block)
+        const SizedBox(height: 20),
+      ],
+    ),
+  );
+}
+
+Widget _reviewRow(String label, String value) {
+  return Padding(
+    padding: const EdgeInsets.only(bottom: 6),
+    child: Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SizedBox(
+          width: 90,
+          child: Text(
+            label,
+            style: GoogleFonts.poppins(
+              fontSize: 14,
+              fontWeight: FontWeight.w400,
+              color: Colors.black,
+            ),
+          ),
+        ),
+        Expanded(
+          child: Text(
+            value,
+            style: GoogleFonts.poppins(
+              fontWeight: FontWeight.w400,
+              fontSize: 14,
+              color: Color(0xff767676),
+            ),
+          ),
+        ),
+      ],
+    ),
+  );
+}
diff --git a/lib/recurring/widgets/progress_indicator_dashes.dart b/lib/recurring/widgets/progress_indicator_dashes.dart
new file mode 100644
index 0000000..baaf10a
--- /dev/null
+++ b/lib/recurring/widgets/progress_indicator_dashes.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+class ProgressIndicatorDashes extends StatelessWidget {
+  final int total;
+  final int active;
+
+  const ProgressIndicatorDashes({
+    super.key,
+    required this.total,
+    required this.active,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: List.generate(total, (index) {
+        return Container(
+          margin: const EdgeInsets.symmetric(horizontal: 4),
+          width: 40,
+          height: 6,
+          decoration: BoxDecoration(
+            color: index < active
+                ? const Color(0xffF95F62)
+                : const Color(0xffFCE7E7),
+            borderRadius: BorderRadius.circular(6),
+          ),
+        );
+      }),
+    );
+  }
+}
diff --git a/lib/redemption/bloc/redemption_bloc.dart b/lib/redemption/bloc/redemption_bloc.dart
new file mode 100644
index 0000000..af586e7
--- /dev/null
+++ b/lib/redemption/bloc/redemption_bloc.dart
@@ -0,0 +1,62 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'redemption_event.dart';
+import 'redemption_state.dart';
+
+class RedemptionBloc extends Bloc<RedemptionEvent, RedemptionState> {
+  RedemptionBloc() : super(const RedemptionState()) {
+    on<LoadRecentRedemptions>(_onLoadRecent);
+    on<ManualTicketSearched>(_onManualSearch);
+    on<ApproveRedemption>(_onApprove);
+    on<DisapproveRedemption>(_onDisapprove);
+  }
+
+  void _onLoadRecent(
+      LoadRecentRedemptions event, Emitter<RedemptionState> emit) {
+    emit(state.copyWith(
+      status: RedemptionStatus.success,
+      recentRedemptions: [
+        {
+          'title': 'Melbourne Ultimate Pass',
+          'image': 'assets/login/bg.png',
+          'status': true
+        },
+        {
+          'title': 'Dubai Lite Pass',
+          'image': 'assets/login/bg.png',
+          'status': true
+        },
+        {
+          'title': 'Tokyo Ultimate Pass',
+          'image': 'assets/login/bg.png',
+          'status': false
+        },
+      ],
+    ));
+  }
+
+  void _onManualSearch(
+      ManualTicketSearched event, Emitter<RedemptionState> emit) {
+    emit(state.copyWith(
+      status: RedemptionStatus.success,
+      selectedRedemption: {
+        'name': 'Lila Heart',
+        'phone': '(+971) 050 421 4456',
+        'email': 'lila12@gmail.com',
+        'cardType': 'Selective Pass',
+        'validity': 'Valid until December 31, 2024',
+        'attraction': 'The Enchanted Garden',
+        'city': 'Dubai',
+        'date': 'November 15, 2024',
+        'time': '10:00AM - 9:00PM',
+      },
+    ));
+  }
+
+  void _onApprove(ApproveRedemption event, Emitter<RedemptionState> emit) {
+    emit(state.copyWith(status: RedemptionStatus.success));
+  }
+
+  void _onDisapprove(DisapproveRedemption event, Emitter<RedemptionState> emit) {
+    emit(state.copyWith(status: RedemptionStatus.failed));
+  }
+}
diff --git a/lib/redemption/bloc/redemption_event.dart b/lib/redemption/bloc/redemption_event.dart
new file mode 100644
index 0000000..acfe20e
--- /dev/null
+++ b/lib/redemption/bloc/redemption_event.dart
@@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+
+abstract class RedemptionEvent extends Equatable {
+  const RedemptionEvent();
+  @override
+  List<Object?> get props => [];
+}
+
+class LoadRecentRedemptions extends RedemptionEvent {}
+
+class ManualTicketSearched extends RedemptionEvent {
+  final String ticketId;
+  const ManualTicketSearched(this.ticketId);
+
+  @override
+  List<Object?> get props => [ticketId];
+}
+
+class ApproveRedemption extends RedemptionEvent {}
+
+class DisapproveRedemption extends RedemptionEvent {}
diff --git a/lib/redemption/bloc/redemption_state.dart b/lib/redemption/bloc/redemption_state.dart
new file mode 100644
index 0000000..ad103a0
--- /dev/null
+++ b/lib/redemption/bloc/redemption_state.dart
@@ -0,0 +1,30 @@
+import 'package:equatable/equatable.dart';
+
+enum RedemptionStatus { initial, loading, success, failed }
+
+class RedemptionState extends Equatable {
+  final RedemptionStatus status;
+  final List<Map<String, dynamic>> recentRedemptions;
+  final Map<String, dynamic>? selectedRedemption;
+
+  const RedemptionState({
+    this.status = RedemptionStatus.initial,
+    this.recentRedemptions = const [],
+    this.selectedRedemption,
+  });
+
+  RedemptionState copyWith({
+    RedemptionStatus? status,
+    List<Map<String, dynamic>>? recentRedemptions,
+    Map<String, dynamic>? selectedRedemption,
+  }) {
+    return RedemptionState(
+      status: status ?? this.status,
+      recentRedemptions: recentRedemptions ?? this.recentRedemptions,
+      selectedRedemption: selectedRedemption ?? this.selectedRedemption,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, recentRedemptions, selectedRedemption];
+}
diff --git a/lib/redemption/view/manual_entry_screen.dart b/lib/redemption/view/manual_entry_screen.dart
new file mode 100644
index 0000000..d2b6f6e
--- /dev/null
+++ b/lib/redemption/view/manual_entry_screen.dart
@@ -0,0 +1,173 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../bloc/redemption_bloc.dart';
+import '../viewmodel/redemption_view_model.dart';
+import 'redemption_details_screen.dart';
+
+class ManualEntryScreen extends StatelessWidget {
+  const ManualEntryScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final controller = TextEditingController();
+    final vm = RedemptionViewModel(context.read<RedemptionBloc>());
+
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      backgroundColor: Colors.white,
+      // appBar: AppBar(
+      //   backgroundColor: Colors.white,
+      //   elevation: 0,
+      //   leading: IconButton(
+      //     icon: const Icon(Icons.arrow_back, color: Colors.black),
+      //     onPressed: () => Navigator.pop(context),
+      //   ),
+      //   title: const Text("Manual Entry",
+      //       style: TextStyle(color: Colors.black, fontWeight: FontWeight.w600)),
+      // ),
+      body: GestureDetector(
+        onTap: () => FocusScope.of(context).unfocus(),
+        child: SafeArea(
+          bottom: false,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                _buildHeaderSection(context),
+                const SizedBox(height: 68),
+                const Text("Enter Ticket ID",
+                    style: TextStyle(fontWeight: FontWeight.w600, fontSize: 18)),
+                const SizedBox(height: 8),
+                TextField(
+                  controller: controller,
+                  decoration: InputDecoration(
+                    hintText: "eg: CT2144FAZFQWR",
+                    filled: true,
+                    fillColor: Color(0xffF0F1F5),
+                    enabledBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    disabledBorder: OutlineInputBorder(
+                      borderSide:    BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide:    BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.all(12),
+                  decoration: BoxDecoration(
+                    color: Colors.red[50],
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: const Text(
+                    "Where to find your ticket ID?\n• On your printed ticket or receipt\n• In your booking confirmation email\n• On your mobile ticket in your email\n• Usually starts with CTK, TIX, or PASS",
+                    style: TextStyle(fontSize: 13),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                const Text("Recent Searches",
+                    style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16)),
+                const SizedBox(height: 10),
+                ...List.generate(
+                  3,
+                      (i) => Container(
+                        width:double.infinity,
+                    margin: const EdgeInsets.only(bottom: 8),
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: Colors.grey[100],
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Text("CTK214125215$i"),
+                  ),
+                ),
+                const Spacer(),
+                ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Color(0xffF95F62),
+                    foregroundColor: Colors.white,
+                    minimumSize: const Size.fromHeight(50),
+                    shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12)),
+                  ),
+                  onPressed: () {
+                    vm.searchTicket(controller.text);
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (_) => BlocProvider.value(
+                          value: context.read<RedemptionBloc>(),
+                          child: const RedemptionDetailsScreen(),
+                        ),
+                      ),
+                    );
+                  },
+                  child: const Text("Search Ticket",
+                      style: TextStyle(fontWeight: FontWeight.w600)),
+                ),
+                SizedBox(
+                  height: 60,
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+
+  Widget _buildHeaderSection( BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 14.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+
+                child: Container(
+                  width: 44,
+                  height: 44,
+                  decoration: const BoxDecoration(
+                    color: Color(0xFFF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(Icons.arrow_back, color: Colors.white),
+                ),
+                onTap: (){
+                  Navigator.pop(context);
+                },
+              ),
+              Text(
+                'Manual Entry',
+                style: const TextStyle(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 28,
+                ),
+              ),
+              SizedBox(
+                width: 40,
+              )
+            ],
+          ),
+        ),
+        SizedBox(height: 8),
+      ],
+    );
+  }
+}
diff --git a/lib/redemption/view/redemption_details_screen.dart b/lib/redemption/view/redemption_details_screen.dart
new file mode 100644
index 0000000..8e4abdf
--- /dev/null
+++ b/lib/redemption/view/redemption_details_screen.dart
@@ -0,0 +1,165 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../bloc/redemption_bloc.dart';
+import '../bloc/redemption_state.dart';
+import '../viewmodel/redemption_view_model.dart';
+
+class RedemptionDetailsScreen extends StatelessWidget {
+  const RedemptionDetailsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final vm = RedemptionViewModel(context.read<RedemptionBloc>());
+    return BlocBuilder<RedemptionBloc, RedemptionState>(
+      builder: (context, state) {
+        final data = state.selectedRedemption ?? {};
+        return Scaffold(
+          backgroundColor: Colors.white,
+          // appBar: AppBar(
+          //   backgroundColor: Colors.white,
+          //   elevation: 0,
+          //   leading: IconButton(
+          //     icon: const Icon(Icons.arrow_back, color: Colors.black),
+          //     onPressed: () => Navigator.pop(context),
+          //   ),
+          //   title: const Text("Redemption",
+          //       style: TextStyle(
+          //           color: Colors.black, fontWeight: FontWeight.w600)),
+          // ),
+          body: SafeArea(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  _buildHeaderSection(context),
+                  const Text(
+                    "Customer Details",
+                    style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
+                  ),
+                  const SizedBox(height: 8),
+                  _infoRow("Name", data['name']),
+                  _infoRow("Phone", data['phone']),
+                  _infoRow("Email", data['email']),
+                  const Divider(height: 24),
+                  const Text(
+                    "City Card Details",
+                    style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
+                  ),
+                  _infoRow("Card Type", data['cardType']),
+                  _infoRow("Validity", data['validity']),
+                  const Divider(height: 24),
+                  const Text(
+                    "Partner Details",
+                    style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
+                  ),
+                  _infoRow("Attraction booked", data['attraction']),
+                  _infoRow("City", data['city']),
+                  _infoRow("Booking Date", data['date']),
+                  _infoRow("Timeslot", data['time']),
+                  Spacer(),
+                  ElevatedButton(
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Color(0xffF95F62),
+                      foregroundColor: Colors.white,
+                      minimumSize: const Size.fromHeight(50),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
+                    onPressed: vm.approve,
+                    child: const Text(
+                      "Approve",
+                      style: TextStyle(fontWeight: FontWeight.w600),
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  OutlinedButton(
+                    style: OutlinedButton.styleFrom(
+                      side: const BorderSide(color: Colors.redAccent),
+                      minimumSize: const Size.fromHeight(50),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(12),
+                      ),
+                    ),
+                    onPressed: vm.disapprove,
+                    child: const Text(
+                      "Disapprove",
+                      style: TextStyle(
+                        color: Colors.redAccent,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 20),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildHeaderSection(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 14.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+
+                child: Container(
+                  width: 44,
+                  height: 44,
+                  decoration: const BoxDecoration(
+                    color: Color(0xFFF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(Icons.arrow_back, color: Colors.white),
+                ),
+                onTap: () {
+                  Navigator.pop(context);
+                },
+              ),
+              Text(
+                'Redemption',
+                style: const TextStyle(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 28,
+                ),
+              ),
+              SizedBox(width: 40),
+            ],
+          ),
+        ),
+        SizedBox(height: 35),
+      ],
+    );
+  }
+
+  Widget _infoRow(String label, String? value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Row(
+        children: [
+          Expanded(
+            child: Text(
+              label,
+              style: const TextStyle(color: Colors.black54, fontSize: 14),
+            ),
+          ),
+          Expanded(
+            child: Text(
+              value ?? '',
+              style: const TextStyle(color: Colors.black87, fontSize: 14),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/redemption/view/ticket_redemption_screen.dart b/lib/redemption/view/ticket_redemption_screen.dart
new file mode 100644
index 0000000..68ef960
--- /dev/null
+++ b/lib/redemption/view/ticket_redemption_screen.dart
@@ -0,0 +1,305 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../bloc/redemption_bloc.dart';
+import '../bloc/redemption_event.dart';
+import '../bloc/redemption_state.dart';
+import '../viewmodel/redemption_view_model.dart';
+import 'manual_entry_screen.dart';
+
+
+class TicketRedemptionScreen extends StatelessWidget {
+  const TicketRedemptionScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => RedemptionBloc()..add(LoadRecentRedemptions()),
+      child: Builder(
+        builder: (context) {
+          final vm = RedemptionViewModel(context.read<RedemptionBloc>());
+          return BlocBuilder<RedemptionBloc, RedemptionState>(
+            builder: (context, state) {
+              return Scaffold(
+                backgroundColor: Colors.white,
+                // appBar: AppBar(
+                //   backgroundColor: Colors.white,
+                //   elevation: 0,
+                //   leading: IconButton(
+                //     icon: const Icon(Icons.arrow_back, color: Colors.black),
+                //     onPressed: () => Navigator.pop(context),
+                //   ),
+                //   title: const Text(
+                //     "Ticket Redemption",
+                //     style: TextStyle(
+                //       color: Colors.black,
+                //       fontWeight: FontWeight.w600,
+                //     ),
+                //   ),
+                // ),
+                body: SafeArea(
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        _buildHeaderSection(context),
+                        const SizedBox(height: 68),
+                        const Text(
+                          "Recent Redemptions",
+                          style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        const SizedBox(height: 12),
+                        Expanded(
+                          child: ListView.builder(
+                            itemCount: state.recentRedemptions.length,
+                            itemBuilder: (context, i) {
+                              final item = state.recentRedemptions[i];
+                              return Padding(
+                                padding: const EdgeInsets.only(bottom: 12.0),
+                                child: Container(
+                                  height: 111,
+                                  decoration: BoxDecoration(
+                                    color: const Color(0xffF5F5F5),
+                                    borderRadius: BorderRadius.circular(12),
+                                  ),
+                                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                                  child: Row(
+                                    crossAxisAlignment: CrossAxisAlignment.center,
+                                    children: [
+                                      /// 🧾 Left Content (Title + Subtitle Row)
+                                      Expanded(
+                                        child: Column(
+                                          crossAxisAlignment: CrossAxisAlignment.start,
+                                          mainAxisAlignment: MainAxisAlignment.center,
+                                          children: [
+                                            /// Title
+                                            Text(
+                                              item['title'],
+                                              style: const TextStyle(
+                                                fontSize: 16,
+                                                fontWeight: FontWeight.w600,
+                                                color: Colors.black,
+                                              ),
+                                            ),
+                                            const SizedBox(height: 6),
+
+                                            /// Subtitle Row (Date + Status)
+                                            Row(
+                                              children: [
+                                                Image.asset(
+                                                  "assets/ticket/lets-icons_date-fill.png",
+                                                  scale: 4,
+                                                ),
+                                                const SizedBox(width: 8),
+                                                const Text(
+                                                  "Today, 2:53 PM",
+                                                  style: TextStyle(
+                                                    fontSize: 13,
+                                                    color: Colors.black87,
+                                                  ),
+                                                ),
+                                                const SizedBox(width: 8),
+                                                Icon(
+                                                  Icons.circle,
+                                                  size: 10,
+                                                  color: item['status'] ? Colors.green : Colors.red,
+                                                ),
+                                              ],
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+
+                                      /// 🎟️ Trailing Ticket Image Section
+                                      Container(
+                                        height: 74,
+                                        width: 92,
+                                        decoration: const BoxDecoration(
+                                          borderRadius: BorderRadius.all(
+                                            Radius.circular(20),
+                                          ),
+                                          color: Colors.white,
+                                        ),
+                                        child: ClipRRect(
+                                          borderRadius: const BorderRadius.all(Radius.circular(17)),
+                                          child: Stack(
+                                            fit: StackFit.expand,
+                                            children: [
+                                              /// Background image
+                                              Image.asset(
+                                                "assets/ticket/dubai.jpg",
+                                                fit: BoxFit.cover,
+                                              ),
+
+                                              /// Decorative vertical cutouts (aligned to right)
+                                              Align(
+                                                alignment: const FractionalOffset(0.7, 0.5),
+                                                child: Column(
+                                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                                  children: [
+                                                    Container(
+                                                      height: 6,
+                                                      width: 10,
+                                                      decoration: const BoxDecoration(
+                                                        borderRadius: BorderRadius.only(
+                                                          bottomLeft: Radius.circular(20),
+                                                          bottomRight: Radius.circular(20),
+                                                        ),
+                                                        color: Color(0xffF5F5F5),
+                                                      ),
+                                                    ),
+                                                    Container(
+                                                      height: 12,
+                                                      width: 8,
+                                                      decoration: const BoxDecoration(
+                                                        borderRadius: BorderRadius.all(Radius.circular(20)),
+                                                        color: Color(0xffF5F5F5),
+                                                      ),
+                                                    ),
+                                                    Container(
+                                                      height: 12,
+                                                      width: 8,
+                                                      decoration: const BoxDecoration(
+                                                        borderRadius: BorderRadius.all(Radius.circular(20)),
+                                                        color: Color(0xffF5F5F5),
+                                                      ),
+                                                    ),
+                                                    Container(
+                                                      height: 6,
+                                                      width: 8,
+                                                      decoration: const BoxDecoration(
+                                                        borderRadius: BorderRadius.only(
+                                                          topRight: Radius.circular(20),
+                                                          topLeft: Radius.circular(20),
+                                                        ),
+                                                        color: Color(0xffF5F5F5),
+                                                      ),
+                                                    ),
+                                                  ],
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              );
+
+                            },
+                          ),
+                        ),
+                        const SizedBox(height: 12),
+                        ElevatedButton(
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Color(0xffF95F62),
+                            foregroundColor: Colors.white,
+                            minimumSize: const Size.fromHeight(50),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(12),
+                            ),
+                          ),
+                          onPressed: () {},
+                          child: const Text(
+                            "Scan New Ticket",
+                            style: TextStyle(fontWeight: FontWeight.w600),
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        OutlinedButton(
+                          style: OutlinedButton.styleFrom(
+                            side: const BorderSide(color: Colors.redAccent),
+                            minimumSize: const Size.fromHeight(50),
+                            shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(12),
+                            ),
+                          ),
+                          onPressed: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (_) => BlocProvider(
+                                  create: (_) => RedemptionBloc(),
+                                  child: const ManualEntryScreen(),
+                                ),
+                              ),
+                            );
+                          },
+                          child: const Text(
+                            "Manual Ticket Entry",
+                            style: TextStyle(
+                              color: Colors.redAccent,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 5),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+
+
+  Widget _buildHeaderSection(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 14.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+                onTap: () {
+                  Navigator.pop(context);
+                },
+                child: Container(
+                  width: 44,
+                  height: 44,
+                  decoration: const BoxDecoration(
+                    color: Color(0xFFF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(Icons.arrow_back, color: Colors.white),
+                ),
+              ),
+              Text(
+                'Ticket Redemption',
+                style: const TextStyle(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 28,
+                ),
+              ),
+              SizedBox(
+                width: 40,
+              )
+            ],
+          ),
+        ),
+        SizedBox(height: 8),
+        Align(
+          alignment: Alignment.center,
+          child: Text(
+            'Redeem your passes at partner locations',
+            style: TextStyle(
+              fontSize: 14,
+              color: Colors.grey[600],
+              height: 1.4,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/redemption/viewmodel/redemption_view_model.dart b/lib/redemption/viewmodel/redemption_view_model.dart
new file mode 100644
index 0000000..6593edc
--- /dev/null
+++ b/lib/redemption/viewmodel/redemption_view_model.dart
@@ -0,0 +1,13 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import '../bloc/redemption_bloc.dart';
+import '../bloc/redemption_event.dart';
+
+class RedemptionViewModel {
+  final RedemptionBloc bloc;
+  RedemptionViewModel(this.bloc);
+
+  void loadRecent() => bloc.add(LoadRecentRedemptions());
+  void searchTicket(String id) => bloc.add(ManualTicketSearched(id));
+  void approve() => bloc.add(ApproveRedemption());
+  void disapprove() => bloc.add(DisapproveRedemption());
+}
diff --git a/lib/scan/bloc/qr_scan_bloc.dart b/lib/scan/bloc/qr_scan_bloc.dart
new file mode 100644
index 0000000..86e04d9
--- /dev/null
+++ b/lib/scan/bloc/qr_scan_bloc.dart
@@ -0,0 +1,41 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'qr_scan_event.dart';
+import 'qr_scan_state.dart';
+
+class QrScanBloc extends Bloc<QrScanEvent, QrScanState> {
+  QrScanBloc() : super(const QrScanState()) {
+    on<QrCodeDetected>(_onQrDetected);
+    on<ManualCodeEntered>(_onManualEntry);
+    on<ResetQrScanEvent>(_onReset); // ✅ added reset handler
+  }
+
+  void _onQrDetected(QrCodeDetected event, Emitter<QrScanState> emit) {
+    final code = event.code.trim();
+    if (code.isEmpty) return;
+    emit(state.copyWith(
+      scannedCode: code,
+      status: code.contains("123") ? QrScanStatus.success : QrScanStatus.failed,
+      isLocked: true, // ✅ lock bottom sheet after scanning
+    ));
+
+  }
+
+  void _onManualEntry(ManualCodeEntered event, Emitter<QrScanState> emit) {
+    final code = event.code.trim();
+    emit(state.copyWith(
+      scannedCode: code,
+      status: code.contains("123") ? QrScanStatus.success : QrScanStatus.failed,
+      isLocked: true, // ✅ lock bottom sheet after scanning
+    ));
+
+  }
+
+
+  void _onReset(ResetQrScanEvent event, Emitter<QrScanState> emit) {
+    emit(state.copyWith(
+      status: QrScanStatus.idle,
+      isLocked: false,
+      scannedCode: '',
+    ));
+  }
+}
\ No newline at end of file
diff --git a/lib/scan/bloc/qr_scan_event.dart b/lib/scan/bloc/qr_scan_event.dart
new file mode 100644
index 0000000..a683fec
--- /dev/null
+++ b/lib/scan/bloc/qr_scan_event.dart
@@ -0,0 +1,23 @@
+import 'package:equatable/equatable.dart';
+
+abstract class QrScanEvent extends Equatable {
+  const QrScanEvent();
+  @override
+  List<Object?> get props => [];
+}
+
+class QrCodeDetected extends QrScanEvent {
+  final String code;
+  const QrCodeDetected(this.code);
+  @override
+  List<Object?> get props => [code];
+}
+
+class ManualCodeEntered extends QrScanEvent {
+  final String code;
+  const ManualCodeEntered(this.code);
+  @override
+  List<Object?> get props => [code];
+}
+
+class ResetQrScanEvent extends QrScanEvent {}
diff --git a/lib/scan/bloc/qr_scan_state.dart b/lib/scan/bloc/qr_scan_state.dart
new file mode 100644
index 0000000..7609a81
--- /dev/null
+++ b/lib/scan/bloc/qr_scan_state.dart
@@ -0,0 +1,25 @@
+enum QrScanStatus { idle, success, failed }
+
+class QrScanState {
+  final QrScanStatus status;
+  final String? scannedCode;
+  final bool isLocked; // 🔒 Added field
+
+  const QrScanState({
+    this.status = QrScanStatus.idle,
+    this.scannedCode,
+    this.isLocked = false,
+  });
+
+  QrScanState copyWith({
+    QrScanStatus? status,
+    String? scannedCode,
+    bool? isLocked,
+  }) {
+    return QrScanState(
+      status: status ?? this.status,
+      scannedCode: scannedCode ?? this.scannedCode,
+      isLocked: isLocked ?? this.isLocked,
+    );
+  }
+}
diff --git a/lib/scan/view/qr_scan_screen.dart b/lib/scan/view/qr_scan_screen.dart
new file mode 100644
index 0000000..8b821f4
--- /dev/null
+++ b/lib/scan/view/qr_scan_screen.dart
@@ -0,0 +1,722 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:mobile_scanner/mobile_scanner.dart';
+import '../bloc/qr_scan_bloc.dart';
+import '../bloc/qr_scan_event.dart';
+import '../bloc/qr_scan_state.dart';
+import '../viewmodel/qr_scan_view_model.dart';
+
+class QrScanScreen extends StatefulWidget {
+  const QrScanScreen({super.key});
+
+  @override
+  State<QrScanScreen> createState() => _QrScanScreenState();
+}
+
+class _QrScanScreenState extends State<QrScanScreen>
+    with WidgetsBindingObserver {
+  late MobileScannerController _cameraController;
+  final ValueNotifier<bool> _isTorchOn = ValueNotifier(false);
+
+  final collapsedKey = GlobalKey();
+  final ValueNotifier<double> sheetExtent = ValueNotifier(0.5);
+  final ValueNotifier<double> initialSize = ValueNotifier(0.5);
+  final DraggableScrollableController sheetController =
+      DraggableScrollableController();
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    _cameraController = MobileScannerController();
+    _cameraController.addListener(() {
+      final torchState = _cameraController.value.torchState;
+      _isTorchOn.value = (torchState == TorchState.on);
+    });
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _cameraController.dispose();
+    super.dispose();
+  }
+
+  /// Manage camera when app state changes
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (!mounted) return;
+    if (state == AppLifecycleState.paused) {
+      _cameraController.stop();
+    } else if (state == AppLifecycleState.resumed) {
+      _safeStartCamera();
+    }
+  }
+
+  void _safeStartCamera() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (mounted) {
+        try {
+          await _cameraController.start();
+        } catch (_) {}
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Offset scanCenter = Offset(
+      MediaQuery.of(context).size.width / 2,
+      MediaQuery.of(context).size.height / 2 - 78,
+    );
+
+    return BlocProvider(
+      create: (_) => QrScanBloc(),
+      child: Builder(
+        builder: (context) {
+          final viewModel = QrScanViewModel(context.read<QrScanBloc>());
+
+          return BlocBuilder<QrScanBloc, QrScanState>(
+            builder: (context, state) {
+              WidgetsBinding.instance.addPostFrameCallback((_) {
+                final RenderBox? box =
+                    collapsedKey.currentContext?.findRenderObject()
+                        as RenderBox?;
+                if (box != null) {
+                  final height = box.size.height;
+                  final screenHeight = MediaQuery.of(context).size.height;
+                  final fraction = (height / screenHeight).clamp(0.42, 0.55);
+                  if (initialSize.value != fraction) {
+                    initialSize.value = fraction;
+                  }
+                }
+              });
+
+              return ValueListenableBuilder<double>(
+                valueListenable: initialSize,
+                builder: (context, initFraction, _) {
+                  return Scaffold(
+                    backgroundColor: Colors.black,
+                    body: Stack(
+                      children: [
+                        /// 📷 QR Scanner
+                        MobileScanner(
+                          controller: _cameraController,
+                          fit: BoxFit.cover,
+                          onDetect: (capture) {
+                            final barcode =
+                                capture.barcodes.first.rawValue ?? '';
+                            if (barcode.isNotEmpty && !state.isLocked) {
+                              viewModel.onQrDetected(barcode);
+                            }
+                          },
+                        ),
+
+                        /// 🔲 Scanner Frame
+                        Positioned(
+                          left: scanCenter.dx - 125,
+                          top: scanCenter.dy - 200,
+                          child: CustomPaint(
+                            size: const Size(250, 250),
+                            painter: CornerBorderPainter(
+                              const LinearGradient(
+                                colors: [
+                                  Colors.white,
+                                  Colors.white,
+                                  Colors.white,
+                                ],
+                              ),
+                              strokeWidth: 4,
+                            ),
+                          ),
+                        ),
+
+                        /// 🧾 Draggable Bottom Sheet
+                        SafeArea(
+                          bottom: false,
+                          child:
+                              NotificationListener<
+                                DraggableScrollableNotification
+                              >(
+                                onNotification: (notification) {
+                                  final value = notification.extent;
+                                  sheetExtent.value = value;
+
+                                  if (value >= 0.9) {
+                                    _cameraController.stop();
+                                  } else if (value <= initFraction + 0.02) {
+                                    _safeStartCamera();
+                                  }
+
+                                  return false;
+                                },
+                                child: DraggableScrollableSheet(
+                                  controller: sheetController,
+                                  initialChildSize: initFraction,
+                                  minChildSize: initFraction,
+                                  maxChildSize: state.isLocked
+                                      ? initFraction
+                                      : 1.0,
+                                  snap: true,
+                                  snapSizes: [
+                                    initFraction,
+                                    if (!state.isLocked && 1.0 > initFraction)
+                                      1.0,
+                                  ],
+                                  builder: (context, scrollController) {
+                                    return ValueListenableBuilder<double>(
+                                      valueListenable: sheetExtent,
+                                      builder: (context, extent, _) {
+                                        final isExpanded = extent > 0.7;
+                                        final double radius = isExpanded
+                                            ? 0
+                                            : 24;
+
+                                        return AnimatedContainer(
+                                          duration: const Duration(
+                                            milliseconds: 250,
+                                          ),
+                                          padding: const EdgeInsets.all(20),
+                                          decoration: BoxDecoration(
+                                            color: Colors.white,
+                                            borderRadius: BorderRadius.vertical(
+                                              top: Radius.circular(radius),
+                                            ),
+                                            boxShadow: [
+                                              BoxShadow(
+                                                color: Colors.black.withOpacity(
+                                                  0.1,
+                                                ),
+                                                blurRadius: 8,
+                                                offset: const Offset(0, -2),
+                                              ),
+                                            ],
+                                          ),
+                                          child: SingleChildScrollView(
+                                            controller: scrollController,
+                                            physics:
+                                                const BouncingScrollPhysics(),
+                                            child: Column(
+                                              crossAxisAlignment:
+                                                  CrossAxisAlignment.start,
+                                              children: [
+                                                _headerIcons(
+                                                  context,
+                                                  isExpanded,
+                                                  state.status,
+                                                  _cameraController,
+                                                  sheetController,
+                                                  initFraction,
+                                                ),
+                                                const SizedBox(height: 20),
+
+                                                if (state.status ==
+                                                    QrScanStatus.success)
+                                                  _successLayout()
+                                                else if (state.status ==
+                                                    QrScanStatus.failed)
+                                                  _failedLayout(context)
+                                                else
+                                                  (isExpanded
+                                                      ? _expandedLayout(
+                                                          context,
+                                                          initFraction,
+                                                        )
+                                                      : _collapsedLayout(
+                                                          context,
+                                                          initFraction,
+                                                          key: collapsedKey,
+                                                        )),
+                                              ],
+                                            ),
+                                          ),
+                                        );
+                                      },
+                                    );
+                                  },
+                                ),
+                              ),
+                        ),
+                      ],
+                    ),
+                  );
+                },
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+  Widget _headerIcons(
+      BuildContext context,
+      bool isExpanded,
+      QrScanStatus status,
+      MobileScannerController controller,
+      DraggableScrollableController sheetController,
+      double initFraction,
+      ) {
+    final icons = [
+      {'img': 'assets/scan/flash.png', 'route': '/flash'},
+      {'img': 'assets/scan/menu.png', 'route': '/menu'},
+      {'img': 'assets/scan/logo.png', 'route': '/home'},
+      {'img': 'assets/scan/history.png', 'route': AppRouter.scanHistory},
+      {'img': 'assets/scan/profile.png', 'route': AppRouter.profileScreen},
+    ];
+
+    return ValueListenableBuilder<MobileScannerState>(
+      valueListenable: controller,
+      builder: (context, state, _) {
+        final isTorchOn = state.torchState == TorchState.on;
+
+        return Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: icons.map((e) {
+            final isFlash = e['route'] == '/flash';
+            final isMenu = e['route'] == '/menu';
+            final isHome = e['route'] == '/home';
+            final isIdle = status == QrScanStatus.idle;
+
+            // 🔙 Show Back Button when expanded or after scan
+            if ((isFlash && isExpanded) || (isFlash && !isIdle)) {
+              return GestureDetector(
+                onTap: () async {
+                  if (!isIdle) {
+                    context.read<QrScanBloc>().add(ResetQrScanEvent());
+                  } else if (sheetController.isAttached) {
+                    await sheetController.animateTo(
+                      initFraction,
+                      duration: const Duration(milliseconds: 300),
+                      curve: Curves.easeOut,
+                    );
+                  }
+                },
+                child: const Icon(
+                  Icons.arrow_back,
+                  color: Colors.redAccent,
+                  size: 28,
+                ),
+              );
+            }
+
+            // 🚫 Hide menu button
+            if (isMenu) return const SizedBox.shrink();
+
+            if (isFlash) {
+              return GestureDetector(
+                onTap: () async {
+                  await controller.toggleTorch();
+                },
+                child: Image.asset(
+                  isTorchOn
+                      ? 'assets/scan/flash_on.png'
+                      : 'assets/scan/flash.png',
+                  scale: 4,
+                ),
+              );
+            }
+
+            // 🏠 Other navigation icons
+            return GestureDetector(
+              onTap: () async {
+                if (!isHome) {
+                  await controller.stop();
+                  await Navigator.pushNamed(context, e['route']!);
+                  _safeStartCamera();
+                  if (sheetController.isAttached) {
+                    await sheetController.animateTo(
+                      initFraction,
+                      duration: const Duration(milliseconds: 300),
+                      curve: Curves.easeOut,
+                    );
+                  }
+                }
+              },
+              child: Image.asset(e['img']!, scale: 4),
+            );
+          }).toList(),
+        );
+      },
+    );
+  }
+
+
+  /// ✅ Success Layout
+  Widget _successLayout() => Card(
+    color: Colors.green[50],
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+    child: Padding(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Customer Name: Ashley Johnson",
+            style: TextStyle(fontWeight: FontWeight.w500),
+          ),
+          Text("Pass Type: Selective Pass", style: TextStyle()),
+          Text("Valid until: 31 December, 2024", style: TextStyle()),
+          Text("Time of scan: 06/11/24 at 11:00 PM", style: TextStyle()),
+          const SizedBox(height: 12),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                "Success",
+                style: TextStyle(
+                  color: Colors.green[700],
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              const Icon(Icons.check_circle, color: Colors.green, size: 32),
+            ],
+          ),
+        ],
+      ),
+    ),
+  );
+
+  /// ❌ Failed Layout
+  Widget _failedLayout(BuildContext context) => Card(
+    color: Colors.red[50],
+    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+    child: Padding(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Reason: Already Used",
+            style: TextStyle(
+              fontWeight: FontWeight.w600,
+              color: Colors.black87,
+            ),
+          ),
+          Text(
+            "Suggested Action: Inform the guest this pass has already been redeemed.",
+            style: TextStyle(color: Colors.black87),
+          ),
+          const SizedBox(height: 12),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                "Failed",
+                style: TextStyle(
+                  color: Colors.red[700],
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+              const Icon(Icons.cancel, color: Colors.red, size: 32),
+            ],
+          ),
+        ],
+      ),
+    ),
+  );
+
+  /// 📱 Collapsed Layout
+  Widget _collapsedLayout(
+    BuildContext context,
+    double initFraction, {
+    Key? key,
+  }) {
+    return Column(
+      key: key,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Center(child: Image.asset("assets/scan/mobile.png", scale: 6)),
+        const SizedBox(height: 10),
+        Center(
+          child: Text(
+            "Position your phone to make sure the QR code is within the frame",
+            textAlign: TextAlign.center,
+            style: TextStyle(fontSize: 14, color: Colors.black87),
+          ),
+        ),
+        const SizedBox(height: 25),
+        Text(
+          "Quick Links",
+          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
+        ),
+        const SizedBox(height: 10),
+        Row(
+          children: [
+            Expanded(
+              child: _quickLink(
+                context,
+                "Redemption",
+                "assets/scan/ticket-fill.png",
+                AppRouter.ticketRedemptionScreen,
+                initFraction,
+              ),
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: _quickLink(
+                context,
+                "Support",
+                "assets/scan/support.png",
+                AppRouter.helpSupportPage,
+                initFraction,
+              ),
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: _quickLink(
+                context,
+                "Booking",
+                "assets/scan/page.png",
+                AppRouter.bookingPage,
+                initFraction,
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  /// 🔼 Expanded Layout
+  Widget _expandedLayout(BuildContext context, double initFraction) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          "Manual Entry",
+          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
+        ),
+        const SizedBox(height: 6),
+        Text("Enter 10-digit redemption code", style: TextStyle(fontSize: 13)),
+        const SizedBox(height: 8),
+        TextField(
+          keyboardType: TextInputType.number,
+          maxLength: 10,
+          decoration: InputDecoration(
+            hintText: "eg: 1234-567-890",
+            counterText: "",
+            border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
+          ),
+        ),
+        const SizedBox(height: 20),
+        Text(
+          "Recent Scans",
+          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 24),
+        ),
+        const SizedBox(height: 10),
+        _scanCard(
+          "Last Scan",
+          "Failed",
+          Colors.red,
+          const Color(0xFFFFE5E5),
+          reason: "Already Used",
+        ),
+        const SizedBox(height: 10),
+        _scanCard(
+          "Previous Scan",
+          "Success",
+          Colors.green,
+          const Color(0xFFE5F9E7),
+        ),
+        const SizedBox(height: 25),
+        Text(
+          "Quick Links",
+          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 16),
+        ),
+        const SizedBox(height: 10),
+        Row(
+          children: [
+            Expanded(
+              child: _quickLink(
+                context,
+                "Support",
+                "assets/scan/support.png",
+                AppRouter.helpSupportPage,
+                initFraction,
+              ),
+            ),
+            const SizedBox(width: 10),
+            Expanded(
+              child: _quickLink(
+                context,
+                "Booking",
+                "assets/scan/page.png",
+                AppRouter.bookingPage,
+                initFraction,
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 10),
+        Row(
+          children: [
+            Expanded(
+              child: _quickLink(
+                context,
+                "Redemption",
+                "assets/scan/ticket-fill.png",
+                AppRouter.ticketRedemptionScreen,
+                initFraction,
+              ),
+            ),
+            const SizedBox(width: 10),
+            Expanded(
+              child: _quickLink(
+                context,
+                "Scan Image",
+                "assets/scan/qr.png",
+                AppRouter.qrScanScreen,
+                initFraction,
+              ),
+            ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  /// 🔘 Scan Card
+  Widget _scanCard(
+    String title,
+    String status,
+    Color color,
+    Color bgColor, {
+    String? reason,
+  }) {
+    return Card(
+      color: bgColor,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12),
+        side: BorderSide(color: color),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Icon(
+              status == "Failed" ? Icons.cancel : Icons.check_circle,
+              color: color,
+              size: 20,
+            ),
+            const SizedBox(width: 8),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    title,
+                    style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14),
+                  ),
+                  Text(
+                    status,
+                    style: TextStyle(fontWeight: FontWeight.w600, color: color),
+                  ),
+                  if (reason != null)
+                    Text("Reason: $reason", style: TextStyle(fontSize: 13)),
+                ],
+              ),
+            ),
+            Image.asset("assets/scan/ticket_qr.png", scale: 4),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _quickLink(
+    BuildContext context,
+    String label,
+    String icon,
+    String route,
+    double initFraction,
+  ) {
+    return InkWell(
+      onTap: () async {
+        if (label == "Scan Image") {
+          if (sheetController.isAttached) {
+            await sheetController.animateTo(
+              initFraction,
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.easeOut,
+            );
+          }
+        } else {
+          await _cameraController.stop();
+          await Navigator.pushNamed(context, route);
+          _safeStartCamera();
+        }
+      },
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.red[100],
+          borderRadius: BorderRadius.circular(10),
+        ),
+        padding: const EdgeInsets.symmetric(vertical: 10),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Image.asset(icon, scale: 4),
+            const SizedBox(height: 6),
+            Text(
+              label,
+              style: TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class CornerBorderPainter extends CustomPainter {
+  final LinearGradient gradient;
+  final double strokeWidth;
+  final double lineLength;
+
+  CornerBorderPainter(
+    this.gradient, {
+    this.strokeWidth = 4.0,
+    this.lineLength = 45.0,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()
+      ..strokeWidth = strokeWidth
+      ..style = PaintingStyle.stroke
+      ..strokeCap = StrokeCap.round;
+
+    final path = Path();
+    paint.shader = gradient.createShader(
+      Rect.fromLTWH(0, 0, lineLength, lineLength),
+    );
+    path.moveTo(0, lineLength);
+    path.lineTo(0, 0);
+    path.lineTo(lineLength, 0);
+    canvas.drawPath(path, paint);
+    path.reset();
+
+    path.moveTo(size.width - lineLength, 0);
+    path.lineTo(size.width, 0);
+    path.lineTo(size.width, lineLength);
+    canvas.drawPath(path, paint);
+    path.reset();
+
+    path.moveTo(0, size.height - lineLength);
+    path.lineTo(0, size.height);
+    path.lineTo(lineLength, size.height);
+    canvas.drawPath(path, paint);
+    path.reset();
+
+    path.moveTo(size.width - lineLength, size.height);
+    path.lineTo(size.width, size.height);
+    path.lineTo(size.width, size.height - lineLength);
+    canvas.drawPath(path, paint);
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+}
diff --git a/lib/scan/viewmodel/qr_scan_view_model.dart b/lib/scan/viewmodel/qr_scan_view_model.dart
new file mode 100644
index 0000000..d80c289
--- /dev/null
+++ b/lib/scan/viewmodel/qr_scan_view_model.dart
@@ -0,0 +1,23 @@
+
+import '../bloc/qr_scan_bloc.dart';
+import '../bloc/qr_scan_event.dart';
+
+class QrScanViewModel {
+  final QrScanBloc bloc;
+
+  QrScanViewModel(this.bloc);
+
+  /// Called when a QR code is detected
+  void onQrDetected(String code) {
+    final trimmedCode = code.trim();
+    if (trimmedCode.isEmpty) return;
+    bloc.add(QrCodeDetected(trimmedCode));
+  }
+
+  /// Called when user manually enters code
+  void onManualEntry(String code) {
+    final trimmedCode = code.trim();
+    if (trimmedCode.isEmpty) return;
+    bloc.add(ManualCodeEntered(trimmedCode));
+  }
+}
diff --git a/lib/scan_history/views/scan_history_detail_page.dart b/lib/scan_history/views/scan_history_detail_page.dart
index 0ba2271..64096fa 100644
--- a/lib/scan_history/views/scan_history_detail_page.dart
+++ b/lib/scan_history/views/scan_history_detail_page.dart
@@ -1,3 +1,4 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -10,21 +11,21 @@ class ScanHistoryDetailPage extends StatelessWidget {
   const ScanHistoryDetailPage({super.key, required this.passId});
 
   TextStyle _headerStyle() => const TextStyle(
-    fontFamily: 'Poppins',
+
     fontWeight: FontWeight.w600,
     fontSize: 24,
     height: 1.0,
   );
 
   TextStyle _labelStyle() => const TextStyle(
-    fontFamily: 'Poppins',
+
     fontWeight: FontWeight.w500,
     fontSize: 14,
     color: Color(0xFF9E9E9E),
   );
 
   TextStyle _valueStyle() => const TextStyle(
-    fontFamily: 'Poppins',
+
     fontWeight: FontWeight.w400,
     fontSize: 12,
     color: Colors.black,
@@ -80,13 +81,12 @@ class ScanHistoryDetailPage extends StatelessWidget {
                 final vm = PassDetailViewModel.fromMap(state.data);
                 return Column(
                   children: [
-                    // ======= HEADER =======
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 14.0),
                       child: Row(
                         children: [
                           GestureDetector(
-                            // onTap: () => Navigator.pop(context),
+                            onTap: () => Navigator.pop(context),
                             child: Container(
                               width: 44,
                               height: 44,
@@ -103,7 +103,7 @@ class ScanHistoryDetailPage extends StatelessWidget {
                               child: Text(
                                 '#${vm.displayPassId}',
                                 style: const TextStyle(
-                                  fontFamily: 'Poppins',
+
                                   fontWeight: FontWeight.w700,
                                   fontSize: 28,
                                 ),
@@ -111,15 +111,11 @@ class ScanHistoryDetailPage extends StatelessWidget {
                             ),
                           ),
                           const SizedBox(width: 12),
-                          Container(
-                            width: 24,
-                            height: 24,
-                            decoration: BoxDecoration(
-                              border: Border.all(color: const Color(0xFFF06969), width: 2),
-                              shape: BoxShape.circle,
-                            ),
-                            child: const Icon(Icons.person_outline, size: 16, color: Color(0xFFF06969)),
-                          ),
+                         InkWell(
+                             onTap: (){
+                               Navigator.pushNamed(context, AppRouter.profileScreen);
+                             },
+                             child: Image.asset("assets/app/profile.png",scale: 4)),
                         ],
                       ),
                     ),
diff --git a/lib/scan_history/views/scan_history_page.dart b/lib/scan_history/views/scan_history_page.dart
index 4ca86dc..7212ced 100644
--- a/lib/scan_history/views/scan_history_page.dart
+++ b/lib/scan_history/views/scan_history_page.dart
@@ -1,3 +1,4 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -33,23 +34,35 @@ class _ScanHistoryView extends StatelessWidget {
         centerTitle: true,
         title: Text(
           "Scan History",
-          style: GoogleFonts.poppins(
-            fontWeight: FontWeight.w700,
+          style: TextStyle(
+            fontWeight: FontWeight.w600,
+            fontSize: 32,
             color: Colors.black,
           ),
         ),
-        leading: const Padding(
+        leading:  Padding(
           padding: EdgeInsets.only(left: 12),
-          child: CircleAvatar(
-            maxRadius: 44,
-            backgroundColor: Color(0xffF95F62),
-              child: Icon(Icons.arrow_back, color: Colors.white)),
-        ),
-        actions: const [
-          Padding(
-            padding: EdgeInsets.only(right: 12),
-            child: Icon(Icons.account_circle, color: Color(0xffF95F62)),
+          child: InkWell(
+            onTap: () {
+              Navigator.pop(context);
+            },
+            child: CircleAvatar(
+              maxRadius: 44,
+              backgroundColor: Color(0xffF95F62),
+                child: Icon(Icons.arrow_back, color: Colors.white)),
           ),
+        ),
+        actions: [
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 8.0),
+            child: InkWell(
+              onTap: (){
+                  Navigator.pushNamed(context, AppRouter.profileScreen);
+                },
+              child: Image.asset("assets/app/profile.png",scale: 4),
+            ),
+          ),
+          SizedBox(width: 2,)
         ],
       ),
       body: Padding(
@@ -63,7 +76,7 @@ class _ScanHistoryView extends StatelessWidget {
               children: [
                 Text(
                   "View a detailed log of all scanned QR codes, including timestamps, results, and customer details for easy tracking and verification.",
-                  style: GoogleFonts.poppins(
+                  style: TextStyle(
                     fontSize: 14,
                     color: Colors.black,fontWeight: FontWeight.w400
                   ),
@@ -99,7 +112,7 @@ class _ScanHistoryView extends StatelessWidget {
                         child: Row(
                           children: [
                             Text("Date",
-                                style: GoogleFonts.poppins(
+                                style: TextStyle(
                                     fontSize: 13, color: Colors.black,fontWeight: FontWeight.w400)),
                             const SizedBox(width: 12),
                             Container(
@@ -115,7 +128,7 @@ class _ScanHistoryView extends StatelessWidget {
                                   const SizedBox(width: 8),
                                   Text(
                                     "${state.selectedDate.day.toString().padLeft(2, '0')}/${state.selectedDate.month.toString().padLeft(2, '0')}/${state.selectedDate.year.toString().substring(2)}",
-                                    style: GoogleFonts.poppins(fontSize: 13),
+                                    style: TextStyle(fontSize: 13),
                                   ),
                                 ],
                               ),
@@ -125,17 +138,16 @@ class _ScanHistoryView extends StatelessWidget {
                       ),
                     ),
                     const SizedBox(width: 16),
-
-                    // Status Dropdown
                     Expanded(
                       child: Row(
                         children: [
                           Text("Status",
-                              style: GoogleFonts.poppins(
+                              style: TextStyle(
                                   fontSize: 14, color: Colors.black,fontWeight: FontWeight.w400)),
                           const SizedBox(width: 12),
                           Expanded(
                             child: Container(
+                              height: 35,
                               decoration: BoxDecoration(
                                 color: const Color(0xffF8F8F8),
                                 borderRadius: BorderRadius.circular(50),
@@ -161,7 +173,7 @@ class _ScanHistoryView extends StatelessWidget {
                                   onChanged: (val) {
                                     if (val != null) bloc.add(UpdateStatus(val));
                                   },
-                                  style: GoogleFonts.poppins(
+                                  style: TextStyle(
                                       fontSize: 14, color: Colors.black,fontWeight: FontWeight.w400),
                                 ),
                               ),
@@ -176,7 +188,7 @@ class _ScanHistoryView extends StatelessWidget {
                 const SizedBox(height: 20),
 
                 // Data Section
-                Expanded(child: _buildStateUI(state)),
+                Expanded(child: _buildStateUI(state,context)),
               ],
             );
           },
@@ -185,7 +197,7 @@ class _ScanHistoryView extends StatelessWidget {
     );
   }
 
-  Widget _buildStateUI(ScanHistoryState state) {
+  Widget _buildStateUI(ScanHistoryState state,BuildContext context) {
     if (state.isLoading) {
       return const Center(
         child: CircularProgressIndicator(color: Color(0xffF95F62)),
@@ -195,7 +207,7 @@ class _ScanHistoryView extends StatelessWidget {
     } else if (state.history.isEmpty) {
       return Center(
         child: Text("No records found",
-            style: GoogleFonts.poppins(color: Colors.black54)),
+            style: TextStyle(color: Colors.black54)),
       );
     }
 
@@ -203,67 +215,72 @@ class _ScanHistoryView extends StatelessWidget {
       itemCount: state.history.length,
       itemBuilder: (context, index) {
         final item = state.history[index];
-        return _buildCard(item);
+        return _buildCard(item,context);
       },
     );
   }
 
-  Widget _buildCard(ScanHistoryModel item) {
+  Widget _buildCard(ScanHistoryModel item,BuildContext context) {
     final isSuccess = item.status == "Success";
-    return Container(
-      margin: const EdgeInsets.only(bottom: 12),
-      padding: const EdgeInsets.all(12),
-      decoration: BoxDecoration(
-        color: isSuccess ? const Color(0xffE9F9EF) : const Color(0xffFCEAEA),
-        borderRadius: BorderRadius.circular(12),
-        border: Border.all(
-            color: isSuccess ? const Color(0xffB5E5C1) : const Color(0xffF5B1B1)),
-      ),
-      child: Row(
-        children: [
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text("Pass ID: ${item.passId}",
-                    style: GoogleFonts.poppins(
-                        fontWeight: FontWeight.w600, fontSize: 13)),
-                if (item.reason != null) ...[
-                  const SizedBox(height: 4),
-                  Text("Reason: ${item.reason!}",
-                      style: GoogleFonts.poppins(
-                          fontSize: 12, color: Colors.black87)),
-                ],
-                const SizedBox(height: 4),
-                Text("Time: ${item.time}",
-                    style: GoogleFonts.poppins(
-                        fontSize: 12, color: Colors.black87)),
-                const SizedBox(height: 8),
-                Row(
-                  children: [
-                    Icon(
-                      isSuccess ? Icons.check_circle : Icons.cancel,
-                      color: isSuccess
-                          ? const Color(0xff2DCC70)
-                          : const Color(0xffF95F62),
-                      size: 20,
-                    ),
-                    const SizedBox(width: 6),
-                    Text(
-                      item.status,
-                      style: GoogleFonts.poppins(
-                        color: Colors.black,
-                        fontWeight: FontWeight.w600,
-                        fontSize: 24,
-                      ),
-                    ),
+    return InkWell(
+      onTap: (){
+        Navigator.pushNamed(context, AppRouter.scanHistoryDetailPage);
+      },
+      child: Container(
+        margin: const EdgeInsets.only(bottom: 12),
+        padding: const EdgeInsets.all(12),
+        decoration: BoxDecoration(
+          color: isSuccess ? const Color(0xffE9F9EF) : const Color(0xffFCEAEA),
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(
+              color: isSuccess ? const Color(0xffB5E5C1) : const Color(0xffF5B1B1)),
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text("Pass ID: ${item.passId}",
+                      style: TextStyle(
+                          fontWeight: FontWeight.w600, fontSize: 13)),
+                  if (item.reason != null) ...[
+                    const SizedBox(height: 4),
+                    Text("Reason: ${item.reason!}",
+                        style: TextStyle(
+                            fontSize: 12, color: Colors.black87)),
                   ],
-                ),
-              ],
+                  const SizedBox(height: 4),
+                  Text("Time: ${item.time}",
+                      style: TextStyle(
+                          fontSize: 12, color: Colors.black87)),
+                  const SizedBox(height: 8),
+                  Row(
+                    children: [
+                      Icon(
+                        isSuccess ? Icons.check_circle : Icons.cancel,
+                        color: isSuccess
+                            ? const Color(0xff2DCC70)
+                            : const Color(0xffF95F62),
+                        size: 20,
+                      ),
+                      const SizedBox(width: 6),
+                      Text(
+                        item.status,
+                        style: TextStyle(
+                          color: Colors.black,
+                          fontWeight: FontWeight.w600,
+                          fontSize: 24,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
             ),
-          ),
-          const Icon(Icons.qr_code_2_sharp, size: 78, color: Colors.black45),
-        ],
+            const Icon(Icons.qr_code_2_sharp, size: 78, color: Colors.black45),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/splash/splash_view.dart b/lib/splash/splash_view.dart
new file mode 100644
index 0000000..19823d2
--- /dev/null
+++ b/lib/splash/splash_view.dart
@@ -0,0 +1,72 @@
+import 'package:citycards_partner_flutter/core/app_router.dart';
+import 'package:flutter/material.dart';
+import 'dart:async';
+
+class SplashScreen extends StatefulWidget {
+  const SplashScreen({super.key});
+
+  @override
+  State<SplashScreen> createState() => _SplashScreenState();
+}
+
+class _SplashScreenState extends State<SplashScreen>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _fadeAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 2),
+    );
+
+    _fadeAnimation = CurvedAnimation(
+      parent: _controller,
+      curve: Curves.easeInOut,
+    );
+
+    _controller.forward();
+    Timer(const Duration(seconds: 3), () {
+      Navigator.pushReplacementNamed(context, AppRouter.onboarding);
+    });
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Stack(
+        fit: StackFit.expand,
+        children: [
+          /// 🌄 Background Image
+          Image.asset(
+            "assets/splash/bg.png", // your full-screen background
+            fit: BoxFit.cover,
+          ),
+
+          /// 🏙️ Logo Fade-in
+          FadeTransition(
+            opacity: _fadeAnimation,
+            child: Align(
+              alignment: Alignment.topCenter,
+              child: Padding(
+                padding: const EdgeInsets.only(top: 213), // 👈 adjust height here
+                child: Image.asset(
+                  "assets/splash/logo.png",scale: 4,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/support/blocs/help_support_bloc.dart b/lib/support/blocs/help_support_bloc.dart
index f9718e6..76cee36 100644
--- a/lib/support/blocs/help_support_bloc.dart
+++ b/lib/support/blocs/help_support_bloc.dart
@@ -40,12 +40,12 @@ class HelpSupportBloc extends Bloc<HelpSupportEvent, HelpSupportState> {
     emit(state.copyWith(isLoading: true));
     await Future.delayed(const Duration(milliseconds: 500));
     final data = [
-      SupportItem("How to redeem passes?", "assets/icon/material-symbols_policy-rounded.png", "Guide"),
-      SupportItem("Refund Policy", "assets/icon/mingcute_information-fill.png", "Policy"),
-      SupportItem("Payment Issues", "assets/icon/solar_dollar-bold.png", "Billing and Payments"),
-      SupportItem("How to redeem passes?", "assets/icon/material-symbols_policy-rounded.png", "Guide"),
-      SupportItem("Refund Policy", "assets/icon/mingcute_information-fill.png", "Policy"),
-      SupportItem("Payment Issues", "assets/icon/solar_dollar-bold.png", "Billing and Payments"),
+      SupportItem("How to redeem passes?", "assets/support/icon/material-symbols_policy-rounded.png", "Guide"),
+      SupportItem("Refund Policy", "assets/support/icon/mingcute_information-fill.png", "Policy"),
+      SupportItem("Payment Issues", "assets/support/icon/solar_dollar-bold.png", "Billing and Payments"),
+      SupportItem("How to redeem passes?", "assets/support/icon/material-symbols_policy-rounded.png", "Guide"),
+      SupportItem("Refund Policy", "assets/support/icon/mingcute_information-fill.png", "Policy"),
+      SupportItem("Payment Issues", "assets/support/icon/solar_dollar-bold.png", "Billing and Payments"),
     ];
     emit(state.copyWith(isLoading: false, faqs: data));
   }
diff --git a/lib/support/view/help_support_page.dart b/lib/support/view/help_support_page.dart
index 079bacc..ecc372a 100644
--- a/lib/support/view/help_support_page.dart
+++ b/lib/support/view/help_support_page.dart
@@ -24,123 +24,153 @@ class _HelpSupportView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar:
-
-      AppBar(
-        backgroundColor: Colors.white,
-        elevation: 0,
-        leading:  Padding(
-          padding: EdgeInsetsGeometry.symmetric(horizontal: 8),
-          child: Container(
-            width: 36,
-            height: 36,
-            decoration: const BoxDecoration(
-              color: Color(0xFFF06969),
-              shape: BoxShape.circle,
-            ),
-            child: const Icon(Icons.arrow_back, color: Colors.white),
-          ),
+      body: SafeArea(
+        child: BlocBuilder<HelpSupportBloc, HelpSupportState>(
+          builder: (context, state) {
+            if (state.isLoading) {
+              return const Center(child: CircularProgressIndicator(color: Color(0xffF95F62)));
+            }
+            return Padding(
+              padding: const EdgeInsets.only(left: 16,right: 16,bottom: 16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  _buildHeaderSection( context),
+                  Align(
+                    alignment: Alignment.center,
+                    child: Text("Get assistance with your CityCards experience",
+                        style: TextStyle(color: Colors.black54,fontSize: 14,fontWeight: FontWeight.w400)),
+                  ),
+                  const SizedBox(height: 16),
+                  Text("Common Questions",
+                      style: TextStyle(fontWeight: FontWeight.w600, fontSize: 24)),
+                  const SizedBox(height: 16),
+                  Expanded(
+                    child: ListView.builder(
+                      itemCount: state.faqs.length,
+                      itemBuilder: (context, index) {
+                        final faq = state.faqs[index];
+                        return GestureDetector(
+                          onTap: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(builder: (_) => const SupportFormPage()),
+                            );
+                          },
+                          child: Container(
+                            margin: const EdgeInsets.only(bottom: 12),
+                            padding: const EdgeInsets.all(14),
+                            decoration: BoxDecoration(
+                              color: Colors.grey.shade100,
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text(faq.title,
+                                    style: TextStyle(
+                                        fontWeight: FontWeight.w400, fontSize: 16,)),
+                                Row(
+                                  children: [
+                                    Image.asset(faq.icon, width: 18, color: const Color(0xffF95F62)),
+                                    const SizedBox(width: 6),
+                                    Text(faq.tag,
+                                        style: TextStyle(
+                                            fontSize: 12, color: Colors.black.withOpacity(0.40))),
+                                  ],
+                                )
+                              ],
+                            ),
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                  ElevatedButton(
+                    onPressed: () => Navigator.push(
+                      context,
+                      MaterialPageRoute(builder: (_) => const SupportFormPage()),
+                    ),
+                    style: ElevatedButton.styleFrom(
+                        backgroundColor: const Color(0xffF95F62),
+                        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16))),
+                    child: SizedBox(
+                      height: 52,
+                      width: double.infinity,
+                      child: Center(
+                        child: Text("Contact Support",
+                            style: TextStyle(
+                                fontWeight: FontWeight.w600, color: Colors.white,fontSize: 20)),
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 10),
+                  OutlinedButton(
+                    onPressed: () {},
+                    style: OutlinedButton.styleFrom(
+                      side: const BorderSide(color: Color(0xffF95F62)),
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+                    ),
+                    child: SizedBox(
+                      height: 52,
+                      width: double.infinity,
+                      child: Center(
+                        child: Text("Browse FAQ",
+                            style: TextStyle(
+                                color: const Color(0xffF95F62),
+                                fontWeight: FontWeight.w600,fontSize: 20)),
+                      ),
+                    ),
+                  )
+                ],
+              ),
+            );
+          },
         ),
-        centerTitle: true,
-        title: Text("Help & Support",
-            style: GoogleFonts.poppins(fontWeight: FontWeight.w700, color: Colors.black)),
-      ),
-      body: BlocBuilder<HelpSupportBloc, HelpSupportState>(
-        builder: (context, state) {
-          if (state.isLoading) {
-            return const Center(child: CircularProgressIndicator(color: Color(0xffF95F62)));
-          }
-          return Padding(
-            padding: const EdgeInsets.all(16),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text("Get assistance with your CityCards experience",
-                    style: GoogleFonts.poppins(color: Colors.black54)),
-                const SizedBox(height: 16),
-                Text("Common Questions",
-                    style: GoogleFonts.poppins(fontWeight: FontWeight.w700, fontSize: 16)),
-                const SizedBox(height: 16),
-                Expanded(
-                  child: ListView.builder(
-                    itemCount: state.faqs.length,
-                    itemBuilder: (context, index) {
-                      final faq = state.faqs[index];
-                      return GestureDetector(
-                        onTap: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(builder: (_) => const SupportFormPage()),
-                          );
-                        },
-                        child: Container(
-                          margin: const EdgeInsets.only(bottom: 12),
-                          padding: const EdgeInsets.all(14),
-                          decoration: BoxDecoration(
-                            color: Colors.grey.shade100,
-                            borderRadius: BorderRadius.circular(10),
-                          ),
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text(faq.title,
-                                  style: GoogleFonts.poppins(
-                                      fontWeight: FontWeight.w500, fontSize: 14)),
-                              Row(
-                                children: [
-                                  Image.asset(faq.icon, width: 18, color: const Color(0xffF95F62)),
-                                  const SizedBox(width: 6),
-                                  Text(faq.tag,
-                                      style: GoogleFonts.poppins(
-                                          fontSize: 12, color: Colors.black54)),
-                                ],
-                              )
-                            ],
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                ),
-                ElevatedButton(
-                  onPressed: () => Navigator.push(
-                    context,
-                    MaterialPageRoute(builder: (_) => const SupportFormPage()),
-                  ),
-                  style: ElevatedButton.styleFrom(
-                      backgroundColor: const Color(0xffF95F62),
-                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50))),
-                  child: Container(
-                    width: double.infinity,
-                    child: Center(
-                      child: Text("Contact Support",
-                          style: GoogleFonts.poppins(
-                              fontWeight: FontWeight.w600, color: Colors.white)),
-                    ),
-                  ),
-                ),
-                const SizedBox(height: 10),
-                OutlinedButton(
-                  onPressed: () {},
-                  style: OutlinedButton.styleFrom(
-                    side: const BorderSide(color: Color(0xffF95F62)),
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
-                  ),
-                  child: Container(
-                    width: double.infinity,
-                    child: Center(
-                      child: Text("Browse FAQ",
-                          style: GoogleFonts.poppins(
-                              color: const Color(0xffF95F62),
-                              fontWeight: FontWeight.w600)),
-                    ),
-                  ),
-                )
-              ],
-            ),
-          );
-        },
       ),
     );
   }
+
+
+
+  Widget _buildHeaderSection( BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 14.0),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+                child: Container(
+                  width: 44,
+                  height: 44,
+                  decoration: const BoxDecoration(
+                    color: Color(0xFFF95F62),
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Icon(Icons.arrow_back, color: Colors.white),
+                ),
+                onTap: (){
+                  Navigator.pop(context);
+                },
+              ),
+              Text(
+                'Help & Support',
+                style: const TextStyle(
+                  fontWeight: FontWeight.w700,
+                  fontSize: 32,
+                ),
+              ),
+              SizedBox(
+                width: 40,
+              )
+            ],
+          ),
+        ),
+        SizedBox(height: 8),
+      ],
+    );
+  }
 }
\ No newline at end of file
diff --git a/lib/support/view/support_form_page.dart b/lib/support/view/support_form_page.dart
index 9434300..5787f9d 100644
--- a/lib/support/view/support_form_page.dart
+++ b/lib/support/view/support_form_page.dart
@@ -22,7 +22,6 @@ class _SupportFormView extends StatelessWidget {
   Widget build(BuildContext context) {
     final bloc = context.read<TicketBloc>();
     return Scaffold(
-
       backgroundColor: Colors.white,
       bottomNavigationBar:  BlocBuilder<TicketBloc, TicketState>(
         builder: (context, state) {return
@@ -32,6 +31,7 @@ class _SupportFormView extends StatelessWidget {
              padding: const EdgeInsets.all(16.0),
              child: SizedBox(
               width: double.infinity,
+              height: 52,
               child: ElevatedButton(
                 onPressed: state.isLoading
                     ? null
@@ -44,8 +44,9 @@ class _SupportFormView extends StatelessWidget {
                 child: state.isLoading
                     ? const CircularProgressIndicator(color: Colors.white)
                     : Text("Submit Ticket",
-                    style: GoogleFonts.poppins(
+                    style: TextStyle(
                         color: Colors.white,
+                        fontSize: 20,
                         fontWeight: FontWeight.w600)),
               ),
                      ),
@@ -57,19 +58,25 @@ class _SupportFormView extends StatelessWidget {
         elevation: 0,
         leading: Padding(
           padding: EdgeInsetsGeometry.symmetric(horizontal: 8),
-          child: Container(
-            width: 36,
-            height: 36,
-            decoration: const BoxDecoration(
-              color: Color(0xFFF06969),
-              shape: BoxShape.circle,
+          child: InkWell(
+            onTap: (){
+              Navigator.pop(context);
+            },
+            child: Container(
+              width: 44,
+              height: 44,
+              decoration: const BoxDecoration(
+                color: Color(0xFFF95F62),
+                shape: BoxShape.circle,
+              ),
+              child: const Icon(Icons.arrow_back, color: Colors.white),
             ),
-            child: const Icon(Icons.arrow_back, color: Colors.white),
           ),
         ),
+        forceMaterialTransparency: true,
         centerTitle: true,
         title: Text("Support",
-            style: GoogleFonts.poppins(fontWeight: FontWeight.w700, color: Colors.black)),
+            style: TextStyle(fontWeight: FontWeight.w700, color: Colors.black,fontSize: 32)),
       ),
       body: BlocBuilder<TicketBloc, TicketState>(
         builder: (context, state) {
@@ -78,12 +85,16 @@ class _SupportFormView extends StatelessWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
-                  "Need help? We’re here for you. Raise a ticket and our support team will get back to you shortly",
-                  style: GoogleFonts.poppins(color: Colors.black54, fontSize: 13),
+                Align(
+                  alignment: Alignment.center,
+                  child: Text(
+                    textAlign: TextAlign.center,
+                    "Need help? We’re here for you. Raise a ticket and our support team will get back to you shortly",
+                    style: TextStyle(color: Colors.black, fontSize: 13,),
+                  ),
                 ),
                 const SizedBox(height: 20),
-                Text("Subject", style: GoogleFonts.poppins(fontWeight: FontWeight.w600)),
+                Text("Subject", style: TextStyle(fontWeight: FontWeight.w500,fontSize: 14)),
                 const SizedBox(height: 6),
                 TextField(
                   onChanged: (v) => bloc.add(SubjectChanged(v)),
@@ -91,11 +102,26 @@ class _SupportFormView extends StatelessWidget {
                     fillColor: Colors.black.withOpacity(0.04),
                     hintText: "Enter Subject",
                     filled: true,
-                    border: OutlineInputBorder(),
+                    enabledBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    disabledBorder: OutlineInputBorder(
+                      borderSide:    BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide:    BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
                   ),
                 ),
                 const SizedBox(height: 20),
-                Text("Description", style: GoogleFonts.poppins(fontWeight: FontWeight.w600)),
+                Text("Description", style: TextStyle(fontWeight: FontWeight.w500,fontSize: 14)),
                 const SizedBox(height: 6),
                 TextField(
                   onChanged: (v) => bloc.add(DescriptionChanged(v)),
@@ -104,11 +130,26 @@ class _SupportFormView extends StatelessWidget {
                     fillColor: Colors.black.withOpacity(0.04),
                     hintText: "Enter Description",
                     filled: true,
-                    border: OutlineInputBorder(),
+                    enabledBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    disabledBorder: OutlineInputBorder(
+                      borderSide:   BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide:    BorderSide(color: Colors.black.withOpacity(0.24), width: 1.0),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
                   ),
                 ),
                 const SizedBox(height: 20),
-                Text("File upload", style: GoogleFonts.poppins(fontWeight: FontWeight.w600)),
+                Text("File upload", style: TextStyle(fontWeight: FontWeight.w500,fontSize: 14)),
                 const SizedBox(height: 6),
                 GestureDetector(
                   onTap: () => bloc.add(UploadFile()),
@@ -128,22 +169,25 @@ class _SupportFormView extends StatelessWidget {
                             state.selectedFile != null
                                 ? state.selectedFile!.name
                                 : "Upload File",
-                            style: GoogleFonts.poppins(
+                            style: TextStyle(
                               color: state.selectedFile != null
                                   ? Colors.black
                                   : Colors.black54,
                             ),
                           ),
                         ),
-                        const Icon(Icons.upload_outlined, color: Colors.black54),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                          child: Image.asset("assets/support/icon/upload.png",scale: 4,),
+                        ),
                       ],
                     ),
                   ),
                 ),
                 const SizedBox(height: 30),
                 Text("Contact Details",
-                    style: GoogleFonts.poppins(
-                        fontWeight: FontWeight.w700, fontSize: 15)),
+                    style: TextStyle(
+                        fontWeight: FontWeight.w600, fontSize: 24)),
                 const SizedBox(height: 12),
                 Divider(),
                 Row(
@@ -154,7 +198,7 @@ class _SupportFormView extends StatelessWidget {
                         children: [
                           const Icon(Icons.email_outlined, color: Colors.black87),
                           const SizedBox(width: 12),
-                          Text("Email", style: GoogleFonts.poppins(fontSize: 13)),
+                          Text("Email", style: TextStyle(fontSize: 13)),
                         ],
                       ),
                     ),
@@ -164,7 +208,7 @@ class _SupportFormView extends StatelessWidget {
                         mainAxisAlignment: MainAxisAlignment.start,
                         children: [
                           const SizedBox(width: 12),
-                          Text("Lila Hart", style: GoogleFonts.poppins(fontSize: 13,color: Colors.black)),
+                          Text("Lila Hart", style: TextStyle(fontSize: 13,color: Colors.black)),
                         ],
                       ),
                     ),
@@ -184,7 +228,7 @@ class _SupportFormView extends StatelessWidget {
                         children: [
                           const Icon(Icons.phone_outlined, color: Colors.black87),
                           const SizedBox(width: 12),
-                          Text("Phone", style: GoogleFonts.poppins(fontSize: 13)),
+                          Text("Phone", style: TextStyle(fontSize: 13)),
                         ],
                       ),
                     ),
@@ -195,7 +239,7 @@ class _SupportFormView extends StatelessWidget {
                         children: [
                           const SizedBox(width: 12),
                           Text("(+971) 050 4245 564",
-                              style: GoogleFonts.poppins(fontSize: 13)),
+                              style: TextStyle(fontSize: 13)),
                         ],
                       ),
                     ),
diff --git a/pubspec.lock b/pubspec.lock
index e95b2d1..ac7ec00 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,6 +1,22 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.7"
   args:
     dependency: transitive
     description:
@@ -41,6 +57,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -73,6 +105,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.6"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -89,6 +129,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.11"
+  equatable:
+    dependency: "direct main"
+    description:
+      name: equatable
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -126,6 +174,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "9.1.1"
+  flutter_launcher_icons:
+    dependency: "direct main"
+    description:
+      name: flutter_launcher_icons
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -134,6 +190,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
+  flutter_native_splash:
+    dependency: "direct main"
+    description:
+      name: flutter_native_splash
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.7"
   flutter_otp_text_field:
     dependency: "direct main"
     description:
@@ -168,6 +232,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.3.2"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
   http:
     dependency: transitive
     description:
@@ -184,6 +256,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.4"
   intl:
     dependency: "direct main"
     description:
@@ -192,6 +272,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.20.2"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -248,6 +336,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.16.0"
+  mobile_scanner:
+    dependency: "direct main"
+    description:
+      name: mobile_scanner
+      sha256: "023a71afb4d7cfb5529d0f2636aa8b43db66257905b9486d702085989769c5f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.1.3"
   nested:
     dependency: transitive
     description:
@@ -336,6 +432,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  posix:
+    dependency: transitive
+    description:
+      name: posix
+      sha256: "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.3"
   provider:
     dependency: transitive
     description:
@@ -389,6 +493,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  syncfusion_flutter_core:
+    dependency: transitive
+    description:
+      name: syncfusion_flutter_core
+      sha256: d03c43f577cdbe020d1632bece00cbf8bec4a7d0ab123923b69141b5fec35420
+      url: "https://pub.dev"
+    source: hosted
+    version: "31.2.3"
+  syncfusion_flutter_datepicker:
+    dependency: "direct main"
+    description:
+      name: syncfusion_flutter_datepicker
+      sha256: f6277bd71a6d04785d7359c8caf373acae07132f1cc453b835173261dbd5ddb6
+      url: "https://pub.dev"
+    source: hosted
+    version: "31.2.3"
   table_calendar:
     dependency: "direct main"
     description:
@@ -421,6 +541,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
@@ -469,6 +597,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.6.1"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
 sdks:
   dart: ">=3.9.2 <4.0.0"
-  flutter: ">=3.35.0"
+  flutter: ">=3.35.1"
diff --git a/pubspec.yaml b/pubspec.yaml
index 4f29a90..ce3c7ba 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -40,6 +40,11 @@ dependencies:
   intl: ^0.20.2
   table_calendar: ^3.2.0
   file_picker: ^10.3.3
+  syncfusion_flutter_datepicker: any
+  flutter_native_splash: any
+  mobile_scanner: any
+  equatable: ^2.0.7
+  flutter_launcher_icons: ^0.14.4
 
 dev_dependencies:
   flutter_test:
@@ -52,6 +57,21 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^5.0.0
 
+flutter_native_splash:
+  color: "#ffffff"
+  color_dark: "#000000"
+  image: "assets/splash_screen/Screen.png"  # path to your image
+  android: true
+  ios: true
+
+
+flutter_launcher_icons:
+  android: "launcher_icon"
+  ios: true
+  image_path: "assets/app/App_logo.png"
+  remove_alpha_ios: true
+  min_sdk_android: 21
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -67,7 +87,14 @@ flutter:
   assets:
     - assets/onboarding/
     - assets/login/
-    - assets/support/
+    - assets/support/icon/
+    - assets/recurring/
+    - assets/splash_screen/
+    - assets/scan/
+    - assets/ticket/
+    - assets/app/
+    - assets/splash/
+    - assets/time/
 
 
   # An image asset can refer to one or more resolution-specific "variants", see