Sensitivity Start from 1

fetchDevices by projectUuid
Fixed list issue in the manage home screen
2026-03-11 01:51:45 +00:00 · 2025-02-23 16:30:50 +03:00 · 2025-02-20 16:02:25 +03:00 · 2025-02-20 10:50:47 +03:00 · 2025-02-20 04:13:37 +03:00 · 2025-02-16 20:55:13 +04:00
144 changed files with 7278 additions and 2756 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,2 +1,3 @@
 ENV_NAME=development
-BASE_URL=https://syncrow-dev.azurewebsites.net
+BASE_URL=https://syncrow-dev.azurewebsites.net
+PROJECT_ID=0e62577c-06fa-41b9-8a92-99a21fbaf51c
--- a/.env.prod
+++ b/.env.prod
@ -1,2 +1,3 @@
 ENV_NAME=production
-BASE_URL=https://syncrow-staging.azurewebsites.net
+BASE_URL=https://syncrow-staging.azurewebsites.net
+PROJECT_ID=bcda711e-9fc2-4168-a05e-171b4026d1ff
--- a/.env.staging
+++ b/.env.staging
@ -1,2 +1,3 @@
 ENV_NAME=staging
-BASE_URL=https://syncrow-staging.azurewebsites.net
+BASE_URL=https://syncrow-staging.azurewebsites.net
+PROJECT_ID=bcda711e-9fc2-4168-a05e-171b4026d1ff
--- a/.gitignore
+++ b/.gitignore
@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/

 # IntelliJ related
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.0'
    repositories {
        google()
        mavenCentral()
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 #Wed Apr 03 23:37:40 EET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -23,7 +23,7 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version '8.3.0' apply false
    // START: FlutterFire Configuration
    id "com.google.gms.google-services" version "4.3.15" apply false
    id "com.google.firebase.crashlytics" version "2.8.1" apply false
--- a/assets/icons/bathroom.svg
+++ b/assets/icons/bathroom.svg
@ -0,0 +1,28 @@
+<svg width="21" height="25" viewBox="0 0 21 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.9628 0C15.5449 0 14.3965 1.15256 14.3965 2.56632C14.3965 2.78191 14.5748 2.96018 14.7903 2.96018C15.0059 2.96018 15.1842 2.78191 15.1842 2.56632C15.1842 1.58374 15.9844 0.787724 16.9628 0.787724C17.9454 0.787724 18.7414 1.58789 18.7414 2.56632V15.1782C18.7414 15.3938 18.9197 15.5721 19.1353 15.5721C19.3509 15.5721 19.5291 15.3938 19.5291 15.1782V2.56632C19.5291 1.15256 18.3766 0 16.9628 0Z" fill="#C3BEC6"/>
+<path d="M6.95808 7.69098H5.2168V3.41654C5.2168 3.18852 5.40336 3.00195 5.63139 3.00195H6.54349C6.77152 3.00195 6.95808 3.18852 6.95808 3.41654V7.69098Z" fill="#A7CCF9"/>
+<path d="M6.53841 3.00195H5.63875C5.58485 3.00195 5.53096 3.01439 5.48535 3.03097C5.6429 3.09316 5.75069 3.24242 5.75069 3.42069V7.69098H6.95715V3.42069C6.95715 3.19267 6.77059 3.00195 6.53841 3.00195Z" fill="#8CBDF9"/>
+<path d="M5.21973 4.34912H6.96101V5.13685H5.21973V4.34912Z" fill="#4C5E71"/>
+<path d="M3.47957 7.69102H1.73828V2.54594C1.73828 2.31791 1.92485 2.13135 2.15287 2.13135H3.06497C3.293 2.13135 3.47957 2.31791 3.47957 2.54594V7.69102Z" fill="#A7DDA7"/>
+<path d="M3.06185 2.13525H2.16219C2.10829 2.13525 2.05439 2.14769 2.00879 2.16428C2.16633 2.22646 2.27413 2.37572 2.27413 2.55399V7.69078H3.48059V2.55399C3.48059 2.32182 3.29402 2.13525 3.06185 2.13525Z" fill="#8ACE9B"/>
+<path d="M1.73828 3.479H3.47957V4.26673H1.73828V3.479Z" fill="#4C5E71"/>
+<path d="M11.3064 15.1788C11.3064 14.2004 10.5021 13.4127 9.51952 13.4417H7.47559V15.3695H11.3064V15.1788Z" fill="#EABC73"/>
+<path d="M15.2205 24.7462L14.7852 23.0049V22.582H16.9618V24.9991H15.2329L15.2205 24.7462Z" fill="#C3BEC6"/>
+<path d="M5.6512 24.7462L6.08652 23.0049V22.582H3.91406V24.9991H5.64291L5.6512 24.7462Z" fill="#C3BEC6"/>
+<path d="M20.0045 16.3267H0.871094V16.9195L1.87855 21.6334C2.04853 22.4336 2.75749 23.0099 3.57838 23.0099H17.2931C18.114 23.0099 18.8229 22.4377 18.9929 21.6334L20.0045 16.9195V16.3267Z" fill="#E2DFE2"/>
+<path d="M18.7983 16.3267V16.9195L17.7867 21.6334C17.6168 22.4336 16.9078 23.0099 16.0869 23.0099H17.2934C18.1143 23.0099 18.8232 22.4377 18.9932 21.6334L20.0048 16.9195V16.3267H18.7983Z" fill="#D3CED5"/>
+<path d="M0.870642 16.9195C0.389716 16.9195 0 16.5298 0 16.0489C0 15.5679 0.389716 15.1782 0.870642 15.1782H20.004C20.485 15.1782 20.8747 15.5679 20.8747 16.0489C20.8747 16.5298 20.485 16.9195 20.004 16.9195H0.870642Z" fill="#F4F2F4"/>
+<path d="M20.0053 15.1782H18.7988C19.2798 15.1782 19.6695 15.5679 19.6695 16.0489C19.6695 16.5298 19.2798 16.9195 18.7988 16.9195H20.0053C20.4862 16.9195 20.8759 16.5298 20.8759 16.0489C20.8759 15.5679 20.4862 15.1782 20.0053 15.1782Z" fill="#E2DFE2"/>
+<path d="M19.5466 19.0509L19.7124 18.2632H1.15527L1.32526 19.0509H19.5466Z" fill="#C3BEC6"/>
+<path d="M5.22175 13.4424C4.2599 13.4424 3.48047 14.2218 3.48047 15.1837V19.9681C3.48047 20.2085 3.67533 20.4034 3.91579 20.4034H7.39421C7.63468 20.4034 7.82953 20.2085 7.82953 19.9681V15.2168C7.82953 14.2674 8.57165 13.4673 9.52107 13.4424H5.22175Z" fill="#EFD27C"/>
+<path d="M3.48047 16.9214H7.82954V18.6627H3.48047V16.9214Z" fill="#EAA96A"/>
+<path d="M16.5265 4.3072C16.5265 3.34535 15.7471 2.56592 14.7852 2.56592C13.8234 2.56592 13.0439 3.34535 13.0439 4.3072V4.80471H16.5224L16.5265 4.3072Z" fill="#E2DFE2"/>
+<path d="M14.785 2.56592C14.5735 2.56592 14.3704 2.60323 14.1797 2.67371C14.843 2.91832 15.3157 3.55679 15.3157 4.3072V4.80471H16.5221V4.3072C16.5263 3.34535 15.7468 2.56592 14.785 2.56592Z" fill="#D3CED5"/>
+<path d="M16.5268 6.0489C17.0077 6.0489 17.3974 5.65919 17.3974 5.17826C17.3974 4.69733 17.0077 4.30762 16.5268 4.30762H13.0484C12.5675 4.30762 12.1777 4.69733 12.1777 5.17826C12.1777 5.65919 12.5675 6.0489 13.0484 6.0489H16.5268Z" fill="#F4F2F4"/>
+<path d="M16.5268 4.30762H15.3203C15.8012 4.30762 16.191 4.69733 16.191 5.17826C16.191 5.65919 15.8012 6.0489 15.3203 6.0489H16.5268C17.0077 6.0489 17.3974 5.65919 17.3974 5.17826C17.3974 4.69733 17.0077 4.30762 16.5268 4.30762Z" fill="#E2DFE2"/>
+<path d="M13.0491 9.05046C12.8335 9.05046 12.6553 8.87218 12.6553 8.65659V7.78595C12.6553 7.57036 12.8335 7.39209 13.0491 7.39209C13.2647 7.39209 13.443 7.57036 13.443 7.78595V8.65659C13.443 8.87218 13.2647 9.05046 13.0491 9.05046Z" fill="#A7CCF9"/>
+<path d="M14.7845 9.05046C14.5689 9.05046 14.3906 8.87218 14.3906 8.65659V7.78595C14.3906 7.57036 14.5689 7.39209 14.7845 7.39209C15.0001 7.39209 15.1783 7.57036 15.1783 7.78595V8.65659C15.1783 8.87218 15.0042 9.05046 14.7845 9.05046Z" fill="#A7CCF9"/>
+<path d="M16.5277 9.05046C16.3121 9.05046 16.1338 8.87218 16.1338 8.65659V7.78595C16.1338 7.57036 16.3121 7.39209 16.5277 7.39209C16.7432 7.39209 16.9215 7.57036 16.9215 7.78595V8.65659C16.9215 8.87218 16.7432 9.05046 16.5277 9.05046Z" fill="#A7CCF9"/>
+<path d="M8.28354 9.09236H0.414592C0.186566 9.09236 0 8.90579 0 8.67777V7.76567C0 7.53764 0.186566 7.35107 0.414592 7.35107H8.28354C8.51157 7.35107 8.69813 7.53764 8.69813 7.76567V8.67777C8.69813 8.90579 8.51157 9.09236 8.28354 9.09236Z" fill="#EAA96A"/>
+<path d="M8.2758 7.35107H7.06934C7.30151 7.35107 7.48807 7.53764 7.48807 7.76981V8.66948C7.48807 8.90165 7.30151 9.08821 7.06934 9.08821H8.2758C8.50797 9.08821 8.69453 8.90165 8.69453 8.66948V7.76981C8.69868 7.54179 8.50797 7.35107 8.2758 7.35107Z" fill="#E5935D"/>
+</svg>
--- a/assets/icons/bedroom.svg
+++ b/assets/icons/bedroom.svg
@ -0,0 +1,33 @@
+<svg width="25" height="20" viewBox="0 0 25 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.91701 6.80859H2.18457V10.1036H2.91701V6.80859Z" fill="#78A7AF"/>
+<path d="M3.52837 11.1936V10.1333C3.52837 9.98345 3.40576 9.86084 3.2559 9.86084H1.84766C1.69781 9.86084 1.5752 9.98345 1.5752 10.1333V11.1936H3.52837Z" fill="#ABCCD3"/>
+<path d="M4.40077 7.0244C4.53906 7.0244 4.62153 6.91546 4.58398 6.78235L3.7531 3.83726C3.71555 3.70415 3.57165 3.59521 3.43332 3.59521H1.67048C1.53215 3.59521 1.38825 3.70415 1.3507 3.83726L0.519819 6.78235C0.482269 6.91546 0.564693 7.0244 0.703026 7.0244H4.40077Z" fill="#FCC96C"/>
+<path opacity="0.1" d="M1.59445 6.78235L2.42533 3.83726C2.46288 3.70415 2.60678 3.59521 2.74512 3.59521H1.67048C1.53215 3.59521 1.38825 3.70415 1.3507 3.83726L0.519819 6.78235C0.482269 6.91546 0.564693 7.0244 0.703026 7.0244H1.77761C1.63933 7.0244 1.5569 6.91546 1.59445 6.78235Z" fill="black"/>
+<path d="M22.8164 6.80859H22.084V10.1036H22.8164V6.80859Z" fill="#78A7AF"/>
+<path d="M23.4249 11.1936V10.1333C23.4249 9.98345 23.3022 9.86084 23.1524 9.86084H21.7441C21.5943 9.86084 21.4717 9.98345 21.4717 10.1333V11.1936H23.4249Z" fill="#ABCCD3"/>
+<path d="M24.2973 7.02445C24.4356 7.02445 24.518 6.91551 24.4805 6.7824L23.6496 3.83726C23.612 3.7041 23.4681 3.59521 23.3298 3.59521H21.5669C21.4286 3.59521 21.2847 3.7041 21.2471 3.83726L20.4163 6.7824C20.3788 6.91551 20.4612 7.02445 20.5996 7.02445H24.2973Z" fill="#FCC96C"/>
+<path opacity="0.1" d="M21.5628 6.7824L22.3936 3.83726C22.4312 3.7041 22.5751 3.59521 22.7134 3.59521H21.5669C21.4286 3.59521 21.2847 3.7041 21.2471 3.83726L20.4163 6.7824C20.3788 6.91551 20.4612 7.02445 20.5996 7.02445H21.7461C21.6077 7.02445 21.5253 6.91551 21.5628 6.7824Z" fill="black"/>
+<path d="M3.39173 15.325C3.39173 15.1866 3.50492 15.0734 3.64325 15.0734H3.83798V13.7245C3.83798 13.3095 4.17754 12.97 4.59254 12.97H5.28821V11.048C5.28455 11.0479 5.28113 11.0469 5.27747 11.0469H0.25152C0.113186 11.0469 0 11.1601 0 11.2984V15.8435C0 15.9819 0.113186 16.095 0.25152 16.095H3.39178L3.39173 15.325Z" fill="#CB7C52"/>
+<path d="M4.59249 12.97H5.28821V11.048C5.28455 11.0479 5.28113 11.0469 5.27747 11.0469H0.25152C0.113186 11.0469 0 11.1601 0 11.2984V13.03H4.2984C4.38892 12.9914 4.48829 12.97 4.59249 12.97Z" fill="#FFBB4A"/>
+<path opacity="0.1" d="M1.08587 15.8435V11.2984C1.08587 11.1601 1.19905 11.0469 1.33739 11.0469H0.25152C0.113186 11.0469 0 11.1601 0 11.2984V15.8435C0 15.9819 0.113186 16.095 0.25152 16.095H1.33739C1.19905 16.095 1.08587 15.9818 1.08587 15.8435Z" fill="black"/>
+<path d="M2.76563 12.3745C2.66895 12.3745 2.57471 12.3355 2.50635 12.2676C2.43848 12.1992 2.39941 12.105 2.39941 12.0088C2.39941 11.9121 2.43848 11.8179 2.50635 11.7495C2.57471 11.6816 2.66895 11.6426 2.76563 11.6426C2.86183 11.6426 2.95607 11.6816 3.02443 11.7495C3.0923 11.8179 3.13185 11.9121 3.13185 12.0088C3.13185 12.105 3.09235 12.1992 3.02443 12.2676C2.95607 12.3355 2.86183 12.3745 2.76563 12.3745Z" fill="white"/>
+<path d="M24.7476 11.0469H19.7216C19.7089 11.0469 19.6968 11.0488 19.6846 11.0506V12.97H20.3803C20.7953 12.97 21.1348 13.3095 21.1348 13.7245V15.0734H21.3296C21.4679 15.0734 21.5811 15.1866 21.5811 15.3249V16.095H24.7476C24.886 16.095 24.9992 15.9819 24.9992 15.8435V11.2984C24.9991 11.1601 24.8859 11.0469 24.7476 11.0469Z" fill="#CB7C52"/>
+<path d="M24.7476 11.0469H19.7216C19.7089 11.0469 19.6968 11.0488 19.6846 11.0506V12.97H20.3803C20.4845 12.97 20.5839 12.9914 20.6744 13.03H24.9991V11.2984C24.9991 11.1601 24.8859 11.0469 24.7476 11.0469Z" fill="#FFBB4A"/>
+<path d="M22.2354 12.375C22.1392 12.375 22.0449 12.3355 21.9766 12.2676C21.9087 12.1992 21.8691 12.105 21.8691 12.0083C21.8691 11.9121 21.9087 11.8179 21.9766 11.7495C22.0449 11.6816 22.1392 11.6426 22.2354 11.6426C22.332 11.6426 22.4263 11.6816 22.4946 11.7495C22.5625 11.8179 22.6021 11.9121 22.6021 12.0083C22.6021 12.105 22.5625 12.1992 22.4946 12.2676C22.4263 12.3355 22.332 12.375 22.2354 12.375Z" fill="white"/>
+<path d="M19.9184 13.1712V9.67632C19.9184 9.53799 19.8052 9.4248 19.6669 9.4248H5.33257C5.19424 9.4248 5.08105 9.53799 5.08105 9.67632V13.1712H19.9184Z" fill="#FF9F3D"/>
+<path opacity="0.1" d="M6.1636 13.1712V9.67632C6.1636 9.53799 6.27679 9.4248 6.41512 9.4248H5.33257C5.19424 9.4248 5.08105 9.53799 5.08105 9.67632V13.1712H6.1636Z" fill="black"/>
+<path d="M11.9437 13.171V12.0422C11.9437 11.6272 11.6041 11.2876 11.1891 11.2876H7.27702C6.86207 11.2876 6.52246 11.6272 6.52246 12.0422V13.171H11.9437Z" fill="white"/>
+<path d="M18.636 13.171V12.0422C18.636 11.6272 18.2965 11.2876 17.8815 11.2876H13.9694C13.5544 11.2876 13.2148 11.6272 13.2148 12.0422V13.171H18.636Z" fill="white"/>
+<path d="M21.3677 15.2937V13.7253C21.3677 13.3103 21.0282 12.9707 20.6132 12.9707H4.38444C3.96944 12.9707 3.62988 13.3103 3.62988 13.7253V15.2937H21.3677Z" fill="#FFCFAB"/>
+<path opacity="0.1" d="M5.00365 15.2937V13.7253C5.00365 13.3103 5.34321 12.9707 5.75821 12.9707H4.38444C3.96944 12.9707 3.62988 13.3103 3.62988 13.7253V15.2937H5.00365Z" fill="black"/>
+<path d="M5.16518 19.1609C5.30352 19.1609 5.4167 19.0477 5.4167 18.9094V17.5694C5.4167 17.4311 5.52989 17.3179 5.66822 17.3179H19.3331C19.4714 17.3179 19.5846 17.4311 19.5846 17.5694V18.9094C19.5846 19.0477 19.6978 19.1609 19.8361 19.1609H21.5643C21.7026 19.1609 21.8158 19.0477 21.8158 18.9094V15.3257C21.8158 15.1874 21.7026 15.0742 21.5643 15.0742H3.43707C3.29873 15.0742 3.18555 15.1874 3.18555 15.3257V18.9094C3.18555 19.0477 3.29873 19.1609 3.43707 19.1609H5.16518Z" fill="#FF9F3D"/>
+<g opacity="0.1">
+<path d="M4.28118 18.9089V15.3253C4.28118 15.1869 4.39437 15.0737 4.5327 15.0737H3.43511C3.29678 15.0737 3.18359 15.1869 3.18359 15.3253V18.9089C3.18359 19.0472 3.29678 19.1604 3.43511 19.1604H4.5327C4.39437 19.1604 4.28118 19.0472 4.28118 18.9089Z" fill="black"/>
+</g>
+<path d="M18.0893 6.21186C18.0893 6.35019 17.9761 6.46338 17.8378 6.46338H7.16265C7.02432 6.46338 6.91113 6.35019 6.91113 6.21186V0.617731C6.91113 0.479397 7.02432 0.366211 7.16265 0.366211H17.8378C17.9761 0.366211 18.0893 0.479397 18.0893 0.617731V6.21186Z" fill="#B1E8FF"/>
+<path opacity="0.1" d="M8.01238 6.21186V0.617731C8.01238 0.479397 8.12557 0.366211 8.2639 0.366211H7.16265C7.02432 0.366211 6.91113 0.479397 6.91113 0.617731V6.21191C6.91113 6.35024 7.02432 6.46343 7.16265 6.46343H8.2639C8.12557 6.46333 8.01238 6.35019 8.01238 6.21186Z" fill="black"/>
+<path d="M12.2235 2.33252L9.83887 6.46284H14.6082L12.2235 2.33252Z" fill="#86D5B5"/>
+<path d="M12.7314 6.46345H17.8379C17.9763 6.46345 18.0894 6.35027 18.0894 6.21193V5.80025L15.6018 1.4917L12.7314 6.46345Z" fill="#FCC96C"/>
+<path d="M17.8388 6.82956H7.16364C6.823 6.82956 6.5459 6.55245 6.5459 6.21182V0.61774C6.5459 0.277106 6.823 0 7.16364 0H17.8388C18.1794 0 18.4565 0.277106 18.4565 0.61774V6.21192C18.4565 6.55245 18.1794 6.82956 17.8388 6.82956ZM7.27839 6.09712H17.7241V0.73244H7.27839V6.09712Z" fill="#CB7C52"/>
+<path d="M9.31653 3.35424C9.8144 3.35424 10.218 2.95063 10.218 2.45276C10.218 1.95488 9.8144 1.55127 9.31653 1.55127C8.81865 1.55127 8.41504 1.95488 8.41504 2.45276C8.41504 2.95063 8.81865 3.35424 9.31653 3.35424Z" fill="white"/>
+</svg>
--- a/assets/icons/dyi.svg
+++ b/assets/icons/dyi.svg
@ -0,0 +1,13 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.6477 18.1286L14.5695 16.9625L14.5381 16.5231L16.7995 14.2617L17.2592 14.2729L18.4253 15.351L18.531 15.6845L16.0777 18.1378L15.6477 18.1286Z" fill="#9DE4FB"/>
+<path d="M21.0627 1.25136C21.36 0.954133 21.36 0.467791 21.0627 0.170566C20.5522 -0.0791971 19.9499 -0.0533175 19.4627 0.239367L17.8536 1.206C16.9222 1.76553 16.4706 2.86478 16.7228 3.92175C16.9226 4.75917 16.6735 5.64059 16.0645 6.24964L16.6364 6.30048C17.2244 5.86531 17.9823 5.71853 18.7089 5.88914C19.131 5.98821 19.5596 5.97283 19.9571 5.85876L20.2488 5.31134L19.4473 4.50975C19.3068 4.36927 19.226 4.18001 19.2217 3.98137L19.21 3.44029C19.2055 3.23013 19.287 3.02719 19.4356 2.8785L21.0627 1.25136Z" fill="#9DE4FB"/>
+<path d="M6.73692 15.5776C5.0442 17.2704 3.21412 15.8824 1.26475 17.8318C0.124481 18.972 -0.210539 20.6126 0.259592 22.0469C0.259836 22.0463 0.26008 22.0458 0.260276 22.0453L0.554425 22.3394C1.20913 22.5533 1.91218 22.4551 2.61679 22.3364L2.69584 22.0944L2.3972 21.7957C2.26219 21.6607 2.18631 21.4776 2.18631 21.2866V20.2244C2.18631 20.0335 2.26219 19.8504 2.3972 19.7154L3.1483 18.9643C3.28331 18.8292 3.46647 18.7534 3.65739 18.7534H4.71958C4.91055 18.7534 5.09366 18.8292 5.22868 18.9642L5.52644 19.262L5.92421 19.0998C6.02919 18.4761 5.98173 17.3544 6.61944 16.3753L6.73692 15.5776Z" fill="#9DE4FB"/>
+<path d="M24.7746 3.88015C24.4774 3.58292 23.9911 3.58292 23.6938 3.88015L22.0483 5.5257C21.9105 5.66345 21.7257 5.74397 21.531 5.751L21.0555 5.76814C20.8416 5.77585 20.6341 5.69426 20.4827 5.54289L20.2504 5.31065C19.7111 5.63151 19.0563 5.74455 18.4163 5.59431C17.5859 5.39938 16.7146 5.61887 16.1028 6.20975C16.0904 6.22274 16.0788 6.23627 16.066 6.24901C15.861 6.45405 6.762 15.553 6.73842 15.5766C6.72137 15.5937 6.70399 15.6096 6.68675 15.626C5.67012 16.6895 5.75328 18.0817 5.63155 18.8046C5.60572 18.958 5.5709 19.1104 5.52793 19.261L5.98122 19.7143C6.11623 19.8493 6.19211 20.0325 6.19211 20.2234V21.2856C6.19211 21.4765 6.11623 21.6597 5.98122 21.7947L5.23012 22.5458C5.09511 22.6808 4.91195 22.7567 4.72102 22.7567H3.65884C3.46786 22.7567 3.28475 22.6808 3.14974 22.5458L2.69729 22.0933C1.90097 22.3186 1.04929 22.3015 0.261719 22.0442C0.463043 22.6591 0.811197 23.2365 1.30853 23.72C2.87869 25.2466 5.40669 25.2743 7.008 23.7803C9.10421 21.8246 7.64269 19.9312 9.36784 18.206C9.3922 18.1817 18.4983 9.0756 18.7037 8.87018C19.3169 8.25708 20.2038 8.02787 21.048 8.22602C22.096 8.47202 23.184 8.01327 23.7391 7.08932L24.7057 5.48024C24.9985 4.99297 25.0244 4.39066 24.7746 3.88015Z" fill="#7BD9EC"/>
+<path d="M7.84826 17.0949C7.70162 16.9482 7.70162 16.7105 7.84826 16.5639L17.1039 7.30818C17.2505 7.1616 17.4883 7.1616 17.6349 7.30818C17.7816 7.45487 17.7816 7.69257 17.6349 7.83925L8.37928 17.0949C8.23259 17.2416 7.99489 17.2415 7.84826 17.0949Z" fill="#9DE4FB"/>
+<path d="M15.6484 18.1282L18.4261 15.3506L24.5753 21.0359C25.1252 21.5442 25.1421 22.4078 24.6126 22.9373L23.2352 24.3147C22.7057 24.8442 21.8421 24.8273 21.3338 24.2774L15.6484 18.1282Z" fill="#F9BC66"/>
+<path d="M14.5721 16.9625L17.2618 14.2729L7.34683 5.10596L5.40527 7.04756L14.5721 16.9625Z" fill="#43B5C3"/>
+<path d="M1.59863 8.09863L3.72729 5.96998L5.7503 7.99299L3.62165 10.1216L1.59863 8.09863Z" fill="#43B5C3"/>
+<path d="M9.69327 2.70391C9.56329 2.50937 9.41045 2.32582 9.23437 2.15736L7.91231 0.892578L7.6668 0.914844C6.58571 1.58352 6.19688 2.19393 3.02331 5.30428C2.76827 5.55931 2.76827 5.9728 3.02331 6.22784L5.59853 8.80306C5.84185 9.04637 6.23639 9.04637 6.47971 8.80306L9.11616 6.1666C9.56646 5.7163 9.73868 5.06438 9.59102 4.44492C9.45323 3.86669 9.50674 3.4134 9.68766 3.03946C9.71652 2.9798 9.69327 2.70391 9.69327 2.70391Z" fill="#9DE4FB"/>
+<path d="M12.4915 1.11902C11.0321 -0.0662658 9.32021 -0.113826 7.66602 0.915305L9.10219 2.28927C9.33872 2.51555 9.5333 2.76907 9.68692 3.03988C10.1761 2.00879 11.5877 1.66479 12.3709 1.55175C12.5824 1.52123 12.6575 1.25374 12.4915 1.11902Z" fill="#7BD9EC"/>
+<path d="M0.996513 7.33135L0.189263 8.1386C-0.0630877 8.39095 -0.0630877 8.8001 0.189263 9.05245L2.75301 11.6162C3.00536 11.8685 3.4145 11.8685 3.66685 11.6162L4.4741 10.8089C4.72645 10.5566 4.72645 10.1474 4.4741 9.8951L1.91036 7.33135C1.65801 7.079 1.24886 7.079 0.996513 7.33135Z" fill="#7BD9EC"/>
+</svg>
--- a/assets/icons/offToggleSwitchSmall.svg
+++ b/assets/icons/offToggleSwitchSmall.svg
@ -0,0 +1,18 @@
+<svg width="47" height="37" viewBox="0 0 47 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="6" y="1" width="41" height="25" rx="12.5" fill="#E9E9E9"/>
+<g filter="url(#filter0_d_6419_4507)">
+<circle cx="18.5" cy="13.5" r="10.5" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_6419_4507" x="0" y="0" width="37" height="37" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="5"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6419_4507"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6419_4507" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/assets/icons/office.svg
+++ b/assets/icons/office.svg
@ -0,0 +1,39 @@
+<svg width="25" height="23" viewBox="0 0 25 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.9152 9.49653V6.93262H17.4302C17.2913 6.93262 17.1787 7.04521 17.1787 7.18413V9.49653H23.9152Z" fill="#FED402"/>
+<path d="M23.7237 6.88413H18.3818L18.2641 6.93296H17.4302C17.2913 6.93296 17.1787 7.04556 17.1787 7.18447V8.19053H23.9152V6.93296L23.7514 6.88135C23.7422 6.88257 23.7332 6.88413 23.7237 6.88413Z" fill="#FE6C55"/>
+<path d="M10.4375 6.52441H11.9465V8.08906H10.4375V6.52441Z" fill="#918291"/>
+<path d="M13.959 9.49687V8.79409C13.959 8.37739 13.6212 8.03955 13.2044 8.03955H9.18032C8.76362 8.03955 8.42578 8.37734 8.42578 8.79409V9.49687H13.959Z" fill="#A79BA7"/>
+<path d="M10.0266 9.448V8.79409C10.0266 8.37739 10.3644 8.03955 10.7812 8.03955H9.18032C8.76362 8.03955 8.42578 8.37734 8.42578 8.79409V9.448H10.0266Z" fill="#918291"/>
+<path d="M15.7282 6.20679H6.65918C6.52437 6.20679 6.41504 6.09746 6.41504 5.96265V0.610352C6.41504 0.475537 6.52437 0.366211 6.65918 0.366211H15.7282C15.863 0.366211 15.9724 0.475537 15.9724 0.610352V5.96265C15.9724 6.09751 15.8631 6.20679 15.7282 6.20679Z" fill="#EAF6FF"/>
+<path d="M8.4271 5.95527V0.617725C8.4271 0.478809 8.5397 0.366211 8.67861 0.366211H6.66655C6.52764 0.366211 6.41504 0.478809 6.41504 0.617725V5.95532C6.41504 6.09424 6.52764 6.20684 6.66655 6.20684H8.67861C8.5397 6.20679 8.4271 6.09419 8.4271 5.95527Z" fill="#D8ECFE"/>
+<path d="M15.718 6.573H6.66362C6.323 6.573 6.0459 6.2959 6.0459 5.95527V0.617724C6.0459 0.2771 6.323 0 6.66362 0H15.7253C16.0619 0 16.3356 0.273779 16.3356 0.610351V5.95527C16.3357 6.2959 16.0585 6.573 15.718 6.573ZM6.77832 5.84058H15.6032V0.732422H6.77832V5.84058Z" fill="#A79BA7"/>
+<path d="M1.88359 8.06533V7.69912H1.2311C1.01699 7.69912 0.842773 7.52495 0.842773 7.31079V6.80776C0.842773 6.59365 1.01694 6.41943 1.2311 6.41943H1.88355V5.68701H1.2311C0.613135 5.68701 0.110352 6.1898 0.110352 6.80776V7.31079C0.110352 7.92876 0.613086 8.43154 1.2311 8.43154H1.92603C1.89858 8.31377 1.88359 8.19131 1.88359 8.06533Z" fill="#EAF6FF"/>
+<path d="M2.65684 9.49746H4.33486C4.82593 9.20913 5.15581 8.67593 5.15581 8.06533V5.93115C5.15581 5.79634 5.04648 5.68701 4.91167 5.68701H1.83594V8.06533C1.83594 8.67593 2.16582 9.20913 2.65684 9.49746Z" fill="#EAF6FF"/>
+<path d="M2.57842 9.44863H3.83784C3.3896 9.15146 3.09346 8.64341 3.09346 8.06533V5.68701H1.83594V8.06533C1.83594 8.64282 2.13101 9.15127 2.57842 9.44863Z" fill="#D8ECFE"/>
+<path d="M17.1787 8.19141H19.6977V9.44897H17.1787V8.19141Z" fill="#FAC600"/>
+<path d="M19.9492 6.93262H17.4302C17.2913 6.93262 17.1787 7.04521 17.1787 7.18413V8.19019H19.6977V7.18413C19.6977 7.04521 19.8103 6.93262 19.9492 6.93262Z" fill="#FD544D"/>
+<path d="M24.7477 6.93384H18.2627V5.92778C18.2627 5.78887 18.3753 5.67627 18.5142 5.67627H24.7477C24.8866 5.67627 24.9992 5.78887 24.9992 5.92778V6.68232C24.9992 6.82124 24.8866 6.93384 24.7477 6.93384Z" fill="#00C27A"/>
+<path d="M20.6018 5.67627H18.5142C18.3753 5.67627 18.2627 5.78887 18.2627 5.92778V6.93384H20.3502V5.92778C20.3502 5.78887 20.4629 5.67627 20.6018 5.67627Z" fill="#09A755"/>
+<path d="M2.26367 10.7251H14.0313V15.6865H2.26367V10.7251Z" fill="#FFBD86"/>
+<path d="M2.31348 10.7734H3.56406V15.686H2.31348V10.7734Z" fill="#F6A96C"/>
+<path d="M13.9854 10.7241V13.5457L14.1291 13.5945H22.5894L22.7364 13.5457V10.7241H13.9854Z" fill="#EA9B58"/>
+<path d="M13.9854 10.7729H15.5196V13.5457H13.9854V10.7729Z" fill="#D88A55"/>
+<path d="M18.9885 12.519H17.6807C17.4784 12.519 17.3145 12.3551 17.3145 12.1528C17.3145 11.9506 17.4784 11.7866 17.6807 11.7866H18.9885C19.1908 11.7866 19.3547 11.9506 19.3547 12.1528C19.3547 12.3551 19.1908 12.519 18.9885 12.519Z" fill="#D88A55"/>
+<path d="M13.9854 13.5464V16.3191L14.0939 16.3679H22.6279L22.7364 16.3191V13.5464H13.9854Z" fill="#F6A96C"/>
+<path d="M13.9854 13.5464H15.5196V16.3191H13.9854V13.5464Z" fill="#EA9B58"/>
+<path d="M18.9885 15.291H17.6807C17.4784 15.291 17.3145 15.1271 17.3145 14.9248C17.3145 14.7226 17.4784 14.5586 17.6807 14.5586H18.9885C19.1908 14.5586 19.3547 14.7226 19.3547 14.9248C19.3547 15.1271 19.1908 15.291 18.9885 15.291Z" fill="#D88A55"/>
+<path d="M22.7364 16.3188H13.9854V19.7856C13.9854 19.9245 14.0979 20.0371 14.2369 20.0371H22.7364V16.3188Z" fill="#EA9B58"/>
+<path d="M15.5196 19.7856V16.3188H13.9854V19.7856C13.9854 19.9245 14.0979 20.0371 14.2369 20.0371H15.7711C15.6322 20.0371 15.5196 19.9245 15.5196 19.7856Z" fill="#D88A55"/>
+<path d="M18.9885 18.064H17.6807C17.4784 18.064 17.3145 17.9 17.3145 17.6978C17.3145 17.4955 17.4784 17.3315 17.6807 17.3315H18.9885C19.1908 17.3315 19.3547 17.4955 19.3547 17.6978C19.3547 17.9 19.1908 18.064 18.9885 18.064Z" fill="#D88A55"/>
+<path d="M0.804688 10.7251V21.773C0.804688 21.912 0.917285 22.0246 1.0562 22.0246H2.06226C2.20117 22.0246 2.31377 21.912 2.31377 21.773V10.7251H0.804688Z" fill="#A79BA7"/>
+<path d="M1.4647 21.773V10.7251H0.804688V21.773C0.804688 21.912 0.917285 22.0246 1.0562 22.0246H1.71621C1.5773 22.0246 1.4647 21.912 1.4647 21.773Z" fill="#918291"/>
+<path d="M22.6875 10.7251V21.773C22.6875 21.912 22.8001 22.0246 22.939 22.0246H23.9451C24.084 22.0246 24.1966 21.912 24.1966 21.773V10.7251H22.6875Z" fill="#A79BA7"/>
+<path d="M23.3475 21.773V10.7251H22.6875V21.773C22.6875 21.912 22.8001 22.0246 22.939 22.0246H23.599C23.4601 22.0246 23.3475 21.912 23.3475 21.773Z" fill="#918291"/>
+<path d="M24.7485 9.44873H0.251514C0.112598 9.44873 0 9.56133 0 9.70024V10.522C0 10.6609 0.112598 10.7735 0.251514 10.7735H24.7485C24.8874 10.7735 25 10.6609 25 10.522V9.70024C25 9.56133 24.8874 9.44873 24.7485 9.44873Z" fill="#F6A96C"/>
+<path d="M3.41797 10.522V9.70024C3.41797 9.56133 3.53057 9.44873 3.66948 9.44873H0.251514C0.112598 9.44873 0 9.56133 0 9.70024V10.522C0 10.6609 0.112598 10.7735 0.251514 10.7735H3.66948C3.53057 10.7735 3.41797 10.6609 3.41797 10.522Z" fill="#EA9B58"/>
+<path d="M14.3078 2.30615H10.5352C10.3329 2.30615 10.1689 2.14219 10.1689 1.93994C10.1689 1.7377 10.3329 1.57373 10.5352 1.57373H14.3078C14.5101 1.57373 14.674 1.7377 14.674 1.93994C14.674 2.14219 14.5101 2.30615 14.3078 2.30615Z" fill="#0593FC"/>
+<path d="M9.37915 2.30566H8.07129C7.86904 2.30566 7.70508 2.1417 7.70508 1.93945C7.70508 1.73721 7.86904 1.57324 8.07129 1.57324H9.37915C9.5814 1.57324 9.74536 1.73721 9.74536 1.93945C9.74536 2.1417 9.5814 2.30566 9.37915 2.30566Z" fill="#0593FC"/>
+<path d="M14.3078 3.61475H13.1006C12.8983 3.61475 12.7344 3.45078 12.7344 3.24854C12.7344 3.04629 12.8983 2.88232 13.1006 2.88232H14.3078C14.5101 2.88232 14.674 3.04629 14.674 3.24854C14.674 3.45078 14.5101 3.61475 14.3078 3.61475Z" fill="#0593FC"/>
+<path d="M11.7936 3.61426H8.07129C7.86904 3.61426 7.70508 3.45029 7.70508 3.24805C7.70508 3.0458 7.86904 2.88184 8.07129 2.88184H11.7936C11.9959 2.88184 12.1598 3.0458 12.1598 3.24805C12.1598 3.45029 11.9959 3.61426 11.7936 3.61426Z" fill="#0593FC"/>
+<path d="M10.2846 4.92236H8.07129C7.86904 4.92236 7.70508 4.7584 7.70508 4.55615C7.70508 4.35391 7.86904 4.18994 8.07129 4.18994H10.2846C10.4868 4.18994 10.6508 4.35391 10.6508 4.55615C10.6508 4.7584 10.4868 4.92236 10.2846 4.92236Z" fill="#0593FC"/>
+</svg>
--- a/assets/icons/parlour.svg
+++ b/assets/icons/parlour.svg
@ -0,0 +1,29 @@
+<svg width="25" height="22" viewBox="0 0 25 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.05824 9.95946C8.90674 9.92645 8.73888 9.90869 8.55508 9.90869H3.02024C2.03877 9.90869 1.51074 10.4155 1.51074 11.0408V14.9798L9.56141 15.483L9.05824 9.95946Z" fill="#D273B3"/>
+<path d="M10.0646 11.0403C10.0646 10.5321 9.71578 10.1022 9.05824 9.95898V14.602C9.05824 14.8104 8.88928 14.9793 8.68087 14.9793H4.02658C4.02658 14.4711 3.58802 14.0412 2.93048 13.898V14.9793H1.51074V16.659H10.5677C10.5677 16.659 10.0646 11.6656 10.0646 11.0403Z" fill="#CA59A6"/>
+<path d="M18.1152 5.37996L17.6121 0H1.88812C1.67971 0 1.51074 0.168963 1.51074 0.377375V5.37996H18.1152Z" fill="#FFE07D"/>
+<path d="M17.6104 0V5.37996H18.1135L18.6167 1.5095V0.377375C18.6167 0.168963 18.4477 0 18.2393 0H17.6104Z" fill="#FFC250"/>
+<path d="M17.6121 2.07861C16.0781 2.99101 15.0219 3.81972 15.0219 3.81972C15.0219 3.81972 13.1458 2.57202 11.989 2.57202C9.76353 2.57202 8.06293 5.37954 1.51074 5.37954V5.88271L18.1152 6.38587L17.6121 2.07861Z" fill="#FFF0AF"/>
+<path d="M17.2347 5.88339H1.51074V6.51235C1.51074 6.72076 1.67971 6.88973 1.88812 6.88973H18.241C18.4495 6.88973 18.6184 6.72076 18.6184 6.51235V1.50977C18.2658 1.69886 17.929 1.89081 17.6121 2.07935V5.50607C17.6121 5.71443 17.4431 5.88339 17.2347 5.88339Z" fill="#FFE07D"/>
+<path d="M17.611 9.95946C17.4595 9.92645 17.2916 9.90869 17.1078 9.90869H11.573C10.5915 9.90869 10.0635 10.4155 10.0635 11.0408V14.9798L18.1141 15.483L17.611 9.95946Z" fill="#D273B3"/>
+<path d="M17.611 9.95898V14.602C17.611 14.8104 17.442 14.9793 17.2336 14.9793H10.0635V16.659H18.6173C18.6173 16.659 18.6173 11.6656 18.6173 11.0403C18.6173 10.5321 18.2685 10.1022 17.611 9.95898Z" fill="#CA59A6"/>
+<path d="M16.1014 16.489L14.5836 15.9858H10.9613C10.3775 15.9858 10.0635 16.2873 10.0635 16.6592V16.9922L18.1147 17.4953L16.1014 16.489Z" fill="#DA8BC1"/>
+<path d="M16.1015 16.4888V16.6146C16.1015 16.823 15.9325 16.9919 15.7241 16.9919H10.0635V18.5014H18.6173V16.4888H16.1015Z" fill="#D273B3"/>
+<path d="M9.0573 15.9858H4.02563L3.52246 17.4953H9.56046L9.0573 15.9858Z" fill="#DA8BC1"/>
+<path d="M10.0646 16.6592C10.0646 16.2873 9.7505 15.9858 9.16678 15.9858H9.05824V16.6148C9.05824 16.8232 8.88928 16.9922 8.68087 16.9922H4.02658V15.9858H1.51074V18.5017H10.5677C10.5677 18.5017 10.0646 17.0311 10.0646 16.6592Z" fill="#D273B3"/>
+<path d="M19.1203 12.9785C18.9688 12.9455 18.801 12.9277 18.6172 12.9277C17.6357 12.9277 17.1077 13.4346 17.1077 14.0599V18.2504H3.019L2.01267 12.9785C1.86116 12.9455 1.69331 12.9277 1.5095 12.9277C0.528023 12.9277 0 13.4346 0 14.0599V19.5084L19.6235 20.0115L19.1203 12.9785Z" fill="#DA8BC1"/>
+<path d="M3.02001 18.25C3.02001 18.25 3.02001 14.6847 3.02001 14.0594C3.02001 13.5512 2.67121 13.1212 2.01367 12.978V17.9984L3.02001 18.25Z" fill="#DA8BC1"/>
+<path d="M19.1203 12.978V19.1305C19.1203 19.3389 18.9514 19.5079 18.743 19.5079H0V20.1368C0 20.3452 0.168963 20.5142 0.377375 20.5142H19.7493C19.9577 20.5142 20.1267 20.3452 20.1267 20.1368V14.0594C20.1267 13.5512 19.7779 13.1212 19.1203 12.978Z" fill="#D273B3"/>
+<path d="M10.2412 20.0115C8.73172 20.0115 6.03877 20.0115 4.52927 20.0115C3.01977 20.0115 2.5166 19.4172 2.5166 19.0051C2.5166 18.7272 2.74187 18.502 3.01977 18.502H11.7507C12.0286 18.502 12.2539 18.7272 12.2539 19.0051C12.2539 19.4172 11.7507 20.0115 10.2412 20.0115Z" fill="#D273B3"/>
+<path d="M20.1267 18.25H14.4951C15.2643 19.2151 16.9145 19.8487 18.8263 19.8487C19.277 19.8487 19.7132 19.8116 20.1267 19.7422V18.25Z" fill="#D273B3"/>
+<path d="M3.90931 18.1172L2.92104 21.2378C2.85809 21.4365 2.96819 21.6486 3.16689 21.7115C3.36559 21.7745 3.57767 21.6644 3.64057 21.4657L4.62884 18.345L3.90931 18.1172Z" fill="#DCE6EB"/>
+<path d="M9.13379 18.345L10.1221 21.4657C10.185 21.6644 10.3971 21.7744 10.5957 21.7115C10.7944 21.6486 10.9045 21.4365 10.8416 21.2378L9.85332 18.1172L9.13379 18.345Z" fill="#DCE6EB"/>
+<path d="M11.2477 17.4956H2.51684C2.23894 17.4956 2.01367 17.7209 2.01367 17.9988C2.01367 18.0778 2.03234 18.1635 2.07289 18.2504C2.07289 18.2504 7.89574 18.6026 9.38607 18.6026C10.8955 18.6026 11.2477 17.4956 11.2477 17.4956Z" fill="#E0BBA4"/>
+<path d="M11.2481 17.4956C11.2481 17.4956 10.8959 18.2504 9.38642 18.2504C7.89609 18.2504 3.63402 18.2504 2.07324 18.2504C2.24412 18.6168 2.80656 19.0051 4.02669 19.0051H9.73859C9.73859 19.0051 11.7513 18.4108 11.7513 17.9988C11.7513 17.7209 11.526 17.4956 11.2481 17.4956Z" fill="#CF9875"/>
+<path d="M15.9337 18.1172L14.9455 21.2378C14.8825 21.4365 14.9926 21.6486 15.1913 21.7115C15.39 21.7745 15.6021 21.6644 15.665 21.4657L16.6533 18.345L15.9337 18.1172Z" fill="#DCE6EB"/>
+<path d="M21.2432 17.5306L22.4893 21.4653C22.5522 21.664 22.7643 21.774 22.9629 21.7111C23.1616 21.6482 23.2717 21.4361 23.2088 21.2374L21.9627 17.3027L21.2432 17.5306Z" fill="#DCE6EB"/>
+<path d="M21.3791 16.4893L23.786 7.40723C23.2671 7.46846 22.8111 7.79472 22.5903 8.27755L19.6694 14.6637C19.3009 15.4694 18.4963 15.9862 17.6104 15.9862L21.3791 16.4893Z" fill="#FFE07D"/>
+<path d="M24.2456 7.39551H23.9652C23.9054 7.39551 23.8465 7.39994 23.7881 7.40683L20.6881 14.1845C20.3144 15.0017 20.1277 15.4717 19.4238 15.9857L21.3812 16.4889L24.7274 7.56985C24.5968 7.46117 24.4291 7.39551 24.2456 7.39551Z" fill="#FFC250"/>
+<path d="M21.4367 17.4869C22.9619 16.5631 24.1083 13.6303 24.1083 8.9209L21.4815 14.6639C21.113 15.4697 20.3084 15.9864 19.4224 15.9864C19.0923 15.9864 17.611 15.9864 17.611 15.9864H14.583C13.9515 15.9864 13.5979 16.7167 13.9916 17.2106C14.5624 17.7568 16.1091 18.3398 18.0209 18.3398C19.3581 18.3398 20.5673 18.0134 21.4367 17.4869Z" fill="#E0BBA4"/>
+<path d="M24.7265 7.56982L24.1089 8.92017C23.7576 13.438 22.4593 16.0592 20.9341 16.983C20.0648 17.5095 18.8555 17.8359 17.5183 17.8359C15.6065 17.8359 14.4859 17.4952 13.9922 17.2099C14.7613 18.175 16.4116 18.8423 18.3234 18.8423C19.6606 18.8423 20.8699 18.5158 21.7392 17.9893C23.4525 16.9516 24.8794 13.7722 24.9994 8.16859C25.0045 7.92828 24.8974 7.71212 24.7265 7.56982Z" fill="#CF9875"/>
+</svg>
--- a/assets/icons/password_unvisibility.svg
+++ b/assets/icons/password_unvisibility.svg
@ -0,0 +1,3 @@
+<svg width="17" height="8" viewBox="0 0 17 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.1551 2.33183C15.4564 2.0013 15.6902 1.64372 15.8445 1.26438C15.9791 0.93308 15.7945 0.564752 15.4321 0.441634C15.0698 0.318517 14.6666 0.487195 14.5319 0.818495C14.2555 1.49824 13.533 2.13013 12.4974 2.59786C11.3781 3.10342 9.9584 3.38183 8.50002 3.38183C7.04165 3.38183 5.62204 3.10342 4.50267 2.59786C3.4671 2.13017 2.74455 1.49829 2.46811 0.818581C2.33341 0.487323 1.93051 0.318601 1.56797 0.441762C1.20557 0.56488 1.02099 0.933251 1.15569 1.26455C1.30993 1.64384 1.54371 2.00138 1.84496 2.33187L0.205067 3.83074C-0.0683557 4.08065 -0.0683557 4.48579 0.205067 4.73569C0.341779 4.86065 0.520918 4.9231 0.700103 4.9231C0.879288 4.9231 1.05847 4.86065 1.19514 4.73569L2.87865 3.19694C3.33414 3.49453 3.85618 3.75417 4.43008 3.96875L3.77375 6.02617C3.66551 6.36545 3.87875 6.72068 4.24993 6.81961C4.31534 6.83706 4.38129 6.84533 4.44619 6.84533C4.74941 6.84533 5.02883 6.66386 5.11798 6.38439L5.76259 4.36365C6.40253 4.50861 7.08297 4.60375 7.78919 4.64214V6.76146C7.78919 7.11486 8.10266 7.40137 8.48931 7.40137C8.87597 7.40137 9.18944 7.11486 9.18944 6.76146V4.64338C9.90329 4.60575 10.5911 4.51011 11.2375 4.3637L11.8821 6.38443C11.9713 6.6639 12.2507 6.84538 12.5539 6.84538C12.6188 6.84538 12.6848 6.83706 12.7502 6.81965C13.1214 6.72072 13.3346 6.36549 13.2263 6.02621L12.57 3.96879C13.1438 3.75421 13.6659 3.49458 14.1214 3.19698L15.8049 4.73574C15.9416 4.86069 16.1207 4.92314 16.2999 4.92314C16.479 4.92314 16.6582 4.86065 16.7949 4.73574C17.0684 4.48583 17.0684 4.08069 16.7949 3.83078L15.1551 2.33183Z" fill="#D5D5D5"/>
+</svg>
--- a/assets/icons/password_visibility.svg
+++ b/assets/icons/password_visibility.svg
@ -0,0 +1,3 @@
+<svg width="15" height="13" viewBox="0 0 15 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6809 10.3829C14.394 10.5298 14.0409 10.4175 13.8928 10.1291H13.8928C12.9943 8.37829 10.609 5.86828 7.49997 5.86828C4.71173 5.86828 2.23389 7.93348 1.10719 10.1291C0.958976 10.4164 0.606008 10.5299 0.318459 10.3821C0.0309393 10.2344 -0.0828497 9.88216 0.0644257 9.5944C1.35894 7.06664 4.20568 4.69641 7.49997 4.69641C11.257 4.69641 13.9478 7.6657 14.9355 9.5944C15.083 9.88245 14.969 10.2355 14.6809 10.3829ZM0.227668 4.08996L1.53267 5.26723C1.77437 5.48528 2.14474 5.46346 2.36022 5.22463C2.57695 4.98434 2.55791 4.61385 2.31762 4.39708L1.01262 3.21981C0.772414 3.00311 0.401926 3.02209 0.18507 3.26241C-0.0316681 3.5027 -0.0126251 3.87319 0.227668 4.08996ZM13.4672 5.26723L14.7722 4.08996C15.0125 3.87319 15.0316 3.5027 14.8148 3.26241C14.598 3.02215 14.2276 3.00305 13.9873 3.21981L12.6823 4.39708C12.442 4.61382 12.423 4.98434 12.6397 5.22463C12.8554 5.46372 13.2258 5.48502 13.4672 5.26723ZM7.49994 2.93127C7.82356 2.93127 8.08588 2.66892 8.08588 2.34533V0.585937C8.08588 0.262354 7.82356 0 7.49994 0C7.17633 0 6.914 0.262354 6.914 0.585937V2.34533C6.91403 2.66895 7.17636 2.93127 7.49994 2.93127ZM10.3784 9.86136C10.3784 11.4509 9.0871 12.7441 7.49997 12.7441C5.91284 12.7441 4.62158 11.4509 4.62158 9.86136C4.62158 8.2718 5.91284 6.97857 7.49997 6.97857C9.0871 6.97857 10.3784 8.2718 10.3784 9.86136ZM9.20651 9.86136C9.20651 8.91797 8.44099 8.15045 7.5 8.15045C6.55901 8.15045 5.79346 8.91797 5.79346 9.86136C5.79346 10.8047 6.55899 11.5723 7.49997 11.5723C8.44096 11.5723 9.20651 10.8047 9.20651 9.86136Z" fill="#D5D5D5"/>
+</svg>
--- a/assets/icons/toggleSwitchSmall.svg
+++ b/assets/icons/toggleSwitchSmall.svg
@ -0,0 +1,18 @@
+<svg width="47" height="37" viewBox="0 0 47 37" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect y="1" width="41" height="25" rx="12.5" fill="#023DFE" fill-opacity="0.7"/>
+<g filter="url(#filter0_d_6689_981)">
+<circle cx="28.5" cy="13.5" r="10.5" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_6689_981" x="10" y="0" width="37" height="37" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="5"/>
+<feGaussianBlur stdDeviation="4"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6689_981"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6689_981" result="shape"/>
+</filter>
+</defs>
+</svg>
--- a/assets/icons/verification_icon.svg
+++ b/assets/icons/verification_icon.svg
@ -0,0 +1,10 @@
+<svg width="107" height="100" viewBox="0 0 107 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M36.8625 65.1775C39.1819 62.9069 40.625 59.7444 40.625 56.25C40.625 49.3575 35.0175 43.75 28.125 43.75C21.2325 43.75 15.625 49.3575 15.625 56.25C15.625 59.7444 17.0681 62.9069 19.3875 65.1775C15.2348 67.9887 12.5 72.7435 12.5 78.125V84.375C12.5 86.1008 13.8992 87.5 15.625 87.5H40.625C42.3508 87.5 43.75 86.1008 43.75 84.375V78.125C43.75 72.7435 41.0152 67.9887 36.8625 65.1775ZM28.125 50C31.5712 50 34.375 52.8038 34.375 56.25C34.375 59.6962 31.5712 62.5 28.125 62.5C24.6788 62.5 21.875 59.6962 21.875 56.25C21.875 52.8038 24.6788 50 28.125 50ZM37.5 81.25H18.75V78.125C18.75 72.9556 22.9556 68.75 28.125 68.75C33.2944 68.75 37.5 72.9556 37.5 78.125V81.25Z" fill="#D5D5D5"/>
+<path d="M72.291 62.5C74.0169 62.5 75.416 61.1009 75.416 59.375C75.416 57.6491 74.0169 56.25 72.291 56.25C70.5651 56.25 69.166 57.6491 69.166 59.375C69.166 61.1009 70.5651 62.5 72.291 62.5Z" fill="#D5D5D5"/>
+<path d="M84.791 62.5C86.5169 62.5 87.916 61.1009 87.916 59.375C87.916 57.6491 86.5169 56.25 84.791 56.25C83.0651 56.25 81.666 57.6491 81.666 59.375C81.666 61.1009 83.0651 62.5 84.791 62.5Z" fill="#D5D5D5"/>
+<path d="M59.791 62.5C61.5169 62.5 62.916 61.1009 62.916 59.375C62.916 57.6491 61.5169 56.25 59.791 56.25C58.0651 56.25 56.666 57.6491 56.666 59.375C56.666 61.1009 58.0651 62.5 59.791 62.5Z" fill="#D5D5D5"/>
+<path d="M84.791 68.75H59.791C58.0652 68.75 56.666 70.1492 56.666 71.875C56.666 73.6008 58.0652 75 59.791 75H84.791C86.5168 75 87.916 73.6008 87.916 71.875C87.916 70.1492 86.5168 68.75 84.791 68.75Z" fill="#D5D5D5"/>
+<path d="M84.791 81.25H59.791C58.0652 81.25 56.666 82.6492 56.666 84.375C56.666 86.1008 58.0652 87.5 59.791 87.5H84.791C86.5168 87.5 87.916 86.1008 87.916 84.375C87.916 82.6492 86.5168 81.25 84.791 81.25Z" fill="#D5D5D5"/>
+<path d="M93.2507 16.5405C92.0305 15.3199 90.0517 15.3199 88.8315 16.5403L78.5411 26.8307L74.5007 22.7903C73.2805 21.5699 71.3017 21.5699 70.0813 22.7903C68.8609 24.0107 68.8609 25.9892 70.0813 27.2097L76.3313 33.4597C76.9415 34.0701 77.7413 34.3751 78.5411 34.3751C79.3409 34.3751 80.1407 34.0701 80.7507 33.4599L93.2507 20.9599C94.4711 19.7395 94.4711 17.7609 93.2507 16.5405Z" fill="#D5D5D5"/>
+<path d="M81.6667 0C67.8817 0 56.6667 11.215 56.6667 25H9.375C4.20563 25 0 29.2056 0 34.375V90.625C0 95.7944 4.20563 100 9.375 100H91.0417C96.211 100 100.417 95.7944 100.417 90.625V41.5165C104.304 37.1085 106.667 31.3254 106.667 25C106.667 11.215 95.4517 0 81.6667 0ZM94.1667 90.625C94.1667 92.3481 92.7648 93.75 91.0417 93.75H9.375C7.65188 93.75 6.25 92.3481 6.25 90.625V34.375C6.25 32.6519 7.65188 31.25 9.375 31.25H57.4577C60.24 42.0206 70.039 50 81.6667 50C86.2173 50 90.4873 48.7773 94.1667 46.644V90.625ZM81.6667 43.75C71.3279 43.75 62.9167 35.3387 62.9167 25C62.9167 14.6613 71.3279 6.25 81.6667 6.25C92.0054 6.25 100.417 14.6613 100.417 25C100.417 35.3387 92.0054 43.75 81.6667 43.75Z" fill="#D5D5D5"/>
+</svg>
--- a/ios/Podfile
+++ b/ios/Podfile
@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+platform :ios, '15.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,155 +1,153 @@
 PODS:
  - device_info_plus (0.0.1):
    - Flutter
-  - Firebase/Analytics (10.25.0):
+  - Firebase/Analytics (11.6.0):
    - Firebase/Core
-  - Firebase/Core (10.25.0):
+  - Firebase/Core (11.6.0):
    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 10.25.0)
-  - Firebase/CoreOnly (10.25.0):
-    - FirebaseCore (= 10.25.0)
-  - Firebase/Crashlytics (10.25.0):
+    - FirebaseAnalytics (~> 11.6.0)
+  - Firebase/CoreOnly (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+  - Firebase/Crashlytics (11.6.0):
    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 10.25.0)
-  - Firebase/Database (10.25.0):
+    - FirebaseCrashlytics (~> 11.6.0)
+  - Firebase/Database (11.6.0):
    - Firebase/CoreOnly
-    - FirebaseDatabase (~> 10.25.0)
-  - firebase_analytics (10.8.7):
-    - Firebase/Analytics (= 10.25.0)
+    - FirebaseDatabase (~> 11.6.0)
+  - firebase_analytics (11.4.0):
+    - Firebase/Analytics (= 11.6.0)
    - firebase_core
    - Flutter
-  - firebase_core (2.32.0):
-    - Firebase/CoreOnly (= 10.25.0)
+  - firebase_core (3.10.0):
+    - Firebase/CoreOnly (= 11.6.0)
    - Flutter
-  - firebase_crashlytics (3.4.16):
-    - Firebase/Crashlytics (= 10.25.0)
+  - firebase_crashlytics (4.3.0):
+    - Firebase/Crashlytics (= 11.6.0)
    - firebase_core
    - Flutter
-  - firebase_database (10.5.7):
-    - Firebase/Database (= 10.25.0)
+  - firebase_database (11.3.0):
+    - Firebase/Database (= 11.6.0)
    - firebase_core
    - Flutter
-  - FirebaseAnalytics (10.25.0):
-    - FirebaseAnalytics/AdIdSupport (= 10.25.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (10.25.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleAppMeasurement (= 10.25.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - FirebaseAppCheckInterop (10.29.0)
-  - FirebaseCore (10.25.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.12)
-    - GoogleUtilities/Logger (~> 7.12)
-  - FirebaseCoreExtension (10.29.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseCoreInternal (10.29.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseCrashlytics (10.25.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseInstallations (~> 10.0)
-    - FirebaseRemoteConfigInterop (~> 10.23)
-    - FirebaseSessions (~> 10.5)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.8)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (~> 2.1)
-  - FirebaseDatabase (10.25.0):
-    - FirebaseAppCheckInterop (~> 10.17)
-    - FirebaseCore (~> 10.0)
-    - FirebaseSharedSwift (~> 10.0)
-    - GoogleUtilities/UserDefaults (~> 7.13)
+  - FirebaseAnalytics (11.6.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.6.0)
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAnalytics/AdIdSupport (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleAppMeasurement (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - FirebaseAppCheckInterop (11.6.0)
+  - FirebaseCore (11.6.0):
+    - FirebaseCoreInternal (~> 11.6.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/Logger (~> 8.0)
+  - FirebaseCoreExtension (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+  - FirebaseCoreInternal (11.6.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+  - FirebaseCrashlytics (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - FirebaseRemoteConfigInterop (~> 11.0)
+    - FirebaseSessions (~> 11.0)
+    - GoogleDataTransport (~> 10.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - FirebaseDatabase (11.6.0):
+    - FirebaseAppCheckInterop (~> 11.0)
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseSharedSwift (~> 11.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
    - leveldb-library (~> 1.22)
-  - FirebaseInstallations (10.29.0):
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.1)
-  - FirebaseRemoteConfigInterop (10.29.0)
-  - FirebaseSessions (10.29.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseCoreExtension (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.13)
-    - GoogleUtilities/UserDefaults (~> 7.13)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebaseInstallations (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - FirebaseRemoteConfigInterop (11.6.0)
+  - FirebaseSessions (11.6.0):
+    - FirebaseCore (~> 11.6.0)
+    - FirebaseCoreExtension (~> 11.6.0)
+    - FirebaseInstallations (~> 11.0)
+    - GoogleDataTransport (~> 10.0)
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - nanopb (~> 3.30910.0)
    - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (10.29.0)
+  - FirebaseSharedSwift (11.6.0)
  - Flutter (1.0.0)
  - flutter_secure_storage (6.0.0):
    - Flutter
-  - GoogleAppMeasurement (10.25.0):
-    - GoogleAppMeasurement/AdIdSupport (= 10.25.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.25.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.25.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.25.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.11)
-    - GoogleUtilities/MethodSwizzler (~> 7.11)
-    - GoogleUtilities/Network (~> 7.11)
-    - "GoogleUtilities/NSData+zlib (~> 7.11)"
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-  - GoogleDataTransport (9.4.1):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30911.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
+  - GoogleAppMeasurement (11.6.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/AdIdSupport (11.6.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.6.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
+    - GoogleUtilities/MethodSwizzler (~> 8.0)
+    - GoogleUtilities/Network (~> 8.0)
+    - "GoogleUtilities/NSData+zlib (~> 8.0)"
+    - nanopb (~> 3.30910.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleUtilities/AppDelegateSwizzler (8.0.2):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.3):
+  - GoogleUtilities/Environment (8.0.2):
    - GoogleUtilities/Privacy
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.13.3):
+  - GoogleUtilities/Logger (8.0.2):
    - GoogleUtilities/Environment
    - GoogleUtilities/Privacy
-  - GoogleUtilities/MethodSwizzler (7.13.3):
+  - GoogleUtilities/MethodSwizzler (8.0.2):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.3):
+  - GoogleUtilities/Network (8.0.2):
    - GoogleUtilities/Logger
    - "GoogleUtilities/NSData+zlib"
    - GoogleUtilities/Privacy
    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.3)":
+  - "GoogleUtilities/NSData+zlib (8.0.2)":
    - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.3)
-  - GoogleUtilities/Reachability (7.13.3):
+  - GoogleUtilities/Privacy (8.0.2)
+  - GoogleUtilities/Reachability (8.0.2):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.3):
+  - GoogleUtilities/UserDefaults (8.0.2):
    - GoogleUtilities/Logger
    - GoogleUtilities/Privacy
  - image_picker_ios (0.0.1):
    - Flutter
-  - leveldb-library (1.22.5)
-  - nanopb (2.30910.0):
-    - nanopb/decode (= 2.30910.0)
-    - nanopb/encode (= 2.30910.0)
-  - nanopb/decode (2.30910.0)
-  - nanopb/encode (2.30910.0)
+  - leveldb-library (1.22.6)
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
  - onesignal_flutter (5.2.0):
    - Flutter
    - OneSignalXCFramework (= 5.2.0)
@ -291,42 +289,42 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/url_launcher_ios/ios"

 SPEC CHECKSUMS:
-  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
-  Firebase: 0312a2352584f782ea56f66d91606891d4607f06
-  firebase_analytics: 3a9263fedec72970e6bd30a7132bbdd386de2c14
-  firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197
-  firebase_crashlytics: 0b7cb41f5fb3b6889d0fb408cfce3cc7a4247061
-  firebase_database: 2713033e426b176d4fe5e7195f3d19aa1b549a91
-  FirebaseAnalytics: ec00fe8b93b41dc6fe4a28784b8e51da0647a248
-  FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07
-  FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
-  FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
-  FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
-  FirebaseCrashlytics: 4b96efb0ce73b38b2a85e8b8bd1bd8f63f09d015
-  FirebaseDatabase: faa489a42f5f868d23a55dd442d6e2099348458e
-  FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
-  FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
-  FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
-  FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
+  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
+  firebase_analytics: 07bd7cfbac54bfcdccf2bb2530f9a65486f7ef3f
+  firebase_core: feb37e79f775c2bd08dd35e02d83678291317e10
+  firebase_crashlytics: 609a5f6f4a2f5af9e40a68182e0c1be3ca2a02f6
+  firebase_database: adc9efd0b70cdc8d1e6f3c9f6bb054a625c4f45d
+  FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
+  FirebaseAppCheckInterop: 347aa09a805219a31249b58fc956888e9fcb314b
+  FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
+  FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361
+  FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
+  FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300
+  FirebaseDatabase: ce3a83a39ab50559a85c5add54f6f285544433b8
+  FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
+  FirebaseRemoteConfigInterop: e75e348953352a000331eb77caf01e424248e176
+  FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b
+  FirebaseSharedSwift: a4e5dfca3e210633bb3a3dfb94176c019211948b
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  GoogleAppMeasurement: 9abf64b682732fed36da827aa2a68f0221fd2356
-  GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+  GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  leveldb-library: e8eadf9008a61f9e1dde3978c086d2b6d9b9dc28
-  nanopb: 438bc412db1928dac798aa6fd75726007be04262
+  leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
  onesignal_flutter: 5ce68a29861960168e81101cb1bd685d264361de
  OneSignalXCFramework: bdf74fdc06888f9466dc21e826fe1549ed143095
  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe

-PODFILE CHECKSUM: 4243bd7f9184f79552dd731a7c9d5cad03bd2706
+PODFILE CHECKSUM: deba6d843ff3cf709e6e9051ce6601a587b24105

-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -547,6 +547,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -739,6 +740,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -769,6 +771,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -856,6 +859,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -959,6 +963,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -1057,6 +1062,7 @@
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Syncrow;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@ -1,7 +1,7 @@
 import UIKit
 import Flutter

-@UIApplicationMain
+@main
@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -38,5 +38,10 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 	</array>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+  	<string>sms</string>
+  	<string>tel</string>
+	</array>
 </dict>
 </plist>
--- a/lib/features/app_layout/bloc/home_cubit.dart
+++ b/lib/features/app_layout/bloc/home_cubit.dart
@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@ -6,10 +7,11 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:onesignal_flutter/onesignal_flutter.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:share_plus/share_plus.dart';
+import 'package:syncrow_app/features/app_layout/model/permission_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdown.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/user_model.dart';
-import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/devices_view_body.dart';
@ -27,25 +29,33 @@ import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/profile_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
-
 part 'home_state.dart';

 class HomeCubit extends Cubit<HomeState> {
  HomeCubit._() : super(HomeInitial()) {
    // checkIfNotificationPermissionGranted();
-    fetchUserInfo();
-    if (selectedSpace == null) {
-      fetchUnitsByUserId();
-      // .then((value) {
-      //   if (selectedSpace != null) {
-      //     fetchRoomsByUnitId(selectedSpace!);
-      //   }
-      // });
-    }
+    fetchUserInfo().then(
+      (value) {
+        if (selectedSpace == null) {
+          fetchUnitsByUserId();
+          fetchPermissions();
+
+          // .then((value) {
+          //   if (selectedSpace != null) {
+          //     fetchRoomsByUnitId(selectedSpace!);
+          //   }
+          // });
+        }
+      },
+    );
  }
  static UserModel? user;
+
+  List<PermissionModel>? permissionModel = [];
+
  static HomeCubit? _instance;
  static HomeCubit getInstance() {
    // If an instance already exists, return it
@ -55,14 +65,90 @@ class HomeCubit extends Cubit<HomeState> {

  Future fetchUserInfo() async {
    try {
-      var uuid=await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      emit(HomeLoading());
+      var uuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
      user = await ProfileApi().fetchUserInfo(uuid);
-      emit(HomeUserInfoLoaded(user!)); // Emit state after fetching user info
+      project = user?.project;
+
+      emit(HomeUserInfoLoaded(user!));
    } catch (e) {
      return;
    }
  }

+  static bool manageSupSpace = false;
+  static bool manageScene = false;
+  static bool manageDeviceLocation = false;
+  static bool visitorPasswordManagement = false;
+  String errorMsg = '';
+
+  Future<void> fetchPermissions() async {
+    try {
+      emit(HomeLoading());
+      final response = await ProfileApi().fetchPermissions(user!.role!.uuid);
+      permissionModel = PermissionModel.fromJsonList(response);
+      hasViewPermission();
+      emit(PermissionsRoleLoaded(permissionModel!));
+    } catch (e) {
+      emit(HomeError(e.toString()));
+    }
+  }
+
+  void hasViewPermission() {
+    emit(HomeLoading());
+
+    manageSupSpace = hasPermission(
+      permissionModel!,
+      'SPACE_MANAGEMENT',
+      'MANAGE_SPACE',
+      'ASSIGN_USER_TO_SPACE',
+    );
+    manageScene = hasPermission(
+      permissionModel!,
+      'AUTOMATION_MANAGEMENT',
+      'MANAGE_SCENES',
+      'UPDATE',
+    );
+    manageDeviceLocation = hasPermission(
+      permissionModel!,
+      'DEVICE_MANAGEMENT',
+      'MANAGE_DEVICE',
+      'LOCATION_UPDATE',
+    );
+    visitorPasswordManagement = hasPermission(
+      permissionModel!,
+      'VISITOR_PASSWORD_MANAGEMENT',
+      'MANAGE_VISITOR_PASSWORD',
+      'VIEW',
+    );
+    emit(HomePermissionUpdated());
+  }
+
+  bool hasPermission(List<PermissionModel> permissions, String mainTitle,
+      String subTitle, String finalTitle) {
+    try {
+      final mainOption = permissions.firstWhere(
+        (perm) => perm.title == mainTitle,
+      );
+
+      final subOption = mainOption.subOptions.firstWhere(
+        (sub) => sub.title == subTitle,
+      );
+
+      if (subOption.subOptions == null) {
+        return false;
+      }
+
+      final finalOption = subOption.subOptions!.firstWhere(
+        (finalSub) => finalSub.title == finalTitle,
+      );
+      return finalOption.isChecked == true;
+    } catch (e) {
+      return false;
+    }
+  }
+
  void emitSafe(HomeState newState) {
    final cubit = this;
    if (!cubit.isClosed) {
@ -87,12 +173,14 @@ class HomeCubit extends Cubit<HomeState> {

  static HomeCubit get(context) => BlocProvider.of(context);

-  List<SpaceModel>? spaces;
+  List<SpaceModel> spaces = [];

  SpaceModel? selectedSpace;

  SubSpaceModel? selectedRoom;

+  Project? project;
+
  PageController devicesPageController = PageController();

  PageController roomsPageController = PageController();
@ -180,8 +268,10 @@ class HomeCubit extends Cubit<HomeState> {

    if (index == 0) {
      unselectRoom();
+    } else if (index == 1) {
+      unselectRoom1();
    } else {
-      selectedRoom = selectedSpace!.subspaces[index - 1];
+      selectedRoom = selectedSpace!.subspaces[index - 2];
      emitSafe(RoomSelected(selectedRoom!));
    }
  }
@ -195,8 +285,10 @@ class HomeCubit extends Cubit<HomeState> {

    if (index <= 0) {
      unselectRoom();
+    } else if (index == 1) {
+      unselectRoom1();
    } else {
-      selectedRoom = selectedSpace!.subspaces[index - 1];
+      selectedRoom = selectedSpace!.subspaces[index - 2];
      emitSafe(RoomSelected(selectedRoom!));
    }
  }
@ -218,11 +310,28 @@ class HomeCubit extends Cubit<HomeState> {
    emitSafe(RoomUnSelected());
  }

+  unselectRoom1() {
+    // selectedRoom = null;
+    devicesPageController.animateToPage(
+      1,
+      duration: duration,
+      curve: Curves.linear,
+    );
+
+    roomsPageController.animateToPage(
+      1,
+      duration: duration,
+      curve: Curves.linear,
+    );
+
+    emitSafe(RoomUnSelected());
+  }
+
 //////////////////////////////////////// API ////////////////////////////////////////
  generateInvitation(SpaceModel unit) async {
    try {
-      final invitationCode =
-          await SpacesAPI.generateInvitationCode(unit.id, unit.community.uuid);
+      final invitationCode = await SpacesAPI.generateInvitationCode(unit.id,
+          unit.community.uuid, project?.uuid ?? TempConst.projectIdDev);
      if (invitationCode.isNotEmpty) {
        Share.share('The invitation code is $invitationCode');
        CustomSnackBar.displaySnackBar(
@ -259,15 +368,16 @@ class HomeCubit extends Cubit<HomeState> {
    emitSafe(GetSpacesLoading());
    try {
      spaces = await SpacesAPI.getSpacesByUserId();
+      emitSafe(GetSpacesSuccess(spaces));
    } catch (failure) {
      emitSafe(GetSpacesError("No units found"));
      return;
    }

-    if (spaces != null && spaces!.isNotEmpty) {
-      selectedSpace = spaces!.first;
+    if (spaces.isNotEmpty) {
+      selectedSpace = spaces.first;
      await fetchRoomsByUnitId(selectedSpace!);
-      emitSafe(GetSpacesSuccess(spaces!));
+      emitSafe(GetSpacesSuccess(spaces));
    } else {
      emitSafe(GetSpacesError("No spaces found"));
    }
@ -276,8 +386,10 @@ class HomeCubit extends Cubit<HomeState> {
  fetchRoomsByUnitId(SpaceModel space) async {
    emitSafe(GetSpaceRoomsLoading());
    try {
-      space.subspaces =
-          await SpacesAPI.getSubSpaceBySpaceId(space.community.uuid, space.id);
+      space.subspaces = await SpacesAPI.getSubSpaceBySpaceId(
+          space.community.uuid,
+          space.id,
+          project?.uuid ?? TempConst.projectIdDev);
    } catch (failure) {
      emitSafe(GetSpaceRoomsError(failure.toString()));
      return;
@ -289,36 +401,59 @@ class HomeCubit extends Cubit<HomeState> {
    }
  }

+  activationCode(activationCode) async {
+    try {
+      emitSafe(GetSpaceRoomsLoading());
+      var uuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var res = await SpacesAPI.activationCodeSpace(
+          activationCode: activationCode, userUuid: uuid);
+
+      if (res['success'] == true) {
+        fetchUserInfo();
+        fetchUnitsByUserId();
+      }
+      emitSafe(GetSpacesSuccess(spaces!));
+
+      return res['success'];
+    } on DioException catch (e) {
+      final errorMessage = e.response?.data['error']['message'];
+      errorMsg = e.response?.data['error']['message'];
+      emitSafe(ActivationError(errMessage: errorMsg));
+      return false;
+    }
+  }
+
  /////////////////////////////////////// Nav ///////////////////////////////////////

  static int pageIndex = 0;

  static Map<String, List<Widget>> appBarActions = {
-    'Dashboard': [
-      // IconButton(
-      //   icon: const Icon(
-      //     Icons.add,
-      //     size: 25,
-      //   ),
-      //   style: ButtonStyle(
-      //     foregroundColor: WidgetStateProperty.all(ColorsManager.textPrimaryColor),
-      //   ),
-      //   onPressed: () {
-      //     Navigator.push(
-      //       NavigationService.navigatorKey.currentContext!,
-      //       CustomPageRoute(
-      //         builder: (context) => CurtainView(
-      //           curtain: DeviceModel(
-      //             name: "Curtain",
-      //             status: [StatusModel(code: "awd", value: 1)],
-      //             productType: DeviceType.Curtain,
-      //           ),
-      //         ),
-      //       ),
-      //     );
-      //   },
-      // ),
-    ],
+    // 'Dashboard': [
+    //   // IconButton(
+    //   //   icon: const Icon(
+    //   //     Icons.add,
+    //   //     size: 25,
+    //   //   ),
+    //   //   style: ButtonStyle(
+    //   //     foregroundColor: WidgetStateProperty.all(ColorsManager.textPrimaryColor),
+    //   //   ),
+    //   //   onPressed: () {
+    //   //     Navigator.push(
+    //   //       NavigationService.navigatorKey.currentContext!,
+    //   //       CustomPageRoute(
+    //   //         builder: (context) => CurtainView(
+    //   //           curtain: DeviceModel(
+    //   //             name: "Curtain",
+    //   //             status: [StatusModel(code: "awd", value: 1)],
+    //   //             productType: DeviceType.Curtain,
+    //   //           ),
+    //   //         ),
+    //   //       ),
+    //   //     );
+    //   //   },
+    //   // ),
+    // ],
    'Devices': [
      //TODO: to be checked
      // IconButton(
@ -353,68 +488,70 @@ class HomeCubit extends Cubit<HomeState> {
      //   ),
      //   onPressed: () {},
      // ),
-      IconButton(
-        icon: const Icon(
-          Icons.add,
-          size: 32,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              WidgetStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {
-          Navigator.pushNamed(
-            NavigationService.navigatorKey.currentContext!,
-            Routes.sceneTasksRoute,
-            arguments: SceneSettingsRouteArguments(
-              sceneType: '',
-              sceneId: '',
-              sceneName: '',
-            ),
-          );
-          NavigationService.navigatorKey.currentContext!
-              .read<CreateSceneBloc>()
-              .add(const ClearTaskListEvent());
-          NavigationService.navigatorKey.currentContext!
-              .read<CreateSceneBloc>()
-              .add(const SceneTypeEvent(CreateSceneEnum.none));
-          NavigationService.navigatorKey.currentContext!
-              .read<SmartSceneSelectBloc>()
-              .add(const SmartSceneClearEvent());
-          BlocProvider.of<EffectPeriodBloc>(
-                  NavigationService.navigatorKey.currentState!.context)
-              .add(ResetEffectivePeriod());
-          NavigationService.navigatorKey.currentContext!
-              .read<CreateSceneBloc>()
-              .add(const ClearTabToRunSetting());
-        },
-      ),
-      IconButton(
-        icon: const Icon(
-          Icons.more_vert,
-          size: 28,
-        ),
-        style: ButtonStyle(
-          foregroundColor:
-              WidgetStateProperty.all(ColorsManager.textPrimaryColor),
-        ),
-        onPressed: () {},
-      ),
+      manageScene
+          ? IconButton(
+              icon: const Icon(
+                Icons.add,
+                size: 32,
+              ),
+              style: ButtonStyle(
+                foregroundColor:
+                    WidgetStateProperty.all(ColorsManager.textPrimaryColor),
+              ),
+              onPressed: () {
+                Navigator.pushNamed(
+                  NavigationService.navigatorKey.currentContext!,
+                  Routes.sceneTasksRoute,
+                  arguments: SceneSettingsRouteArguments(
+                    sceneType: '',
+                    sceneId: '',
+                    sceneName: '',
+                  ),
+                );
+                NavigationService.navigatorKey.currentContext!
+                    .read<CreateSceneBloc>()
+                    .add(const ClearTaskListEvent());
+                NavigationService.navigatorKey.currentContext!
+                    .read<CreateSceneBloc>()
+                    .add(const SceneTypeEvent(CreateSceneEnum.none));
+                NavigationService.navigatorKey.currentContext!
+                    .read<SmartSceneSelectBloc>()
+                    .add(const SmartSceneClearEvent());
+                BlocProvider.of<EffectPeriodBloc>(
+                        NavigationService.navigatorKey.currentState!.context)
+                    .add(ResetEffectivePeriod());
+                NavigationService.navigatorKey.currentContext!
+                    .read<CreateSceneBloc>()
+                    .add(const ClearTabToRunSetting());
+              },
+            )
+          : const SizedBox(),
+      // IconButton(
+      //   icon: const Icon(
+      //     Icons.more_vert,
+      //     size: 28,
+      //   ),
+      //   style: ButtonStyle(
+      //     foregroundColor:
+      //         WidgetStateProperty.all(ColorsManager.textPrimaryColor),
+      //   ),
+      //   onPressed: () {},
+      // ),
    ],
    'Menu': [
-      IconButton(
-        icon: SvgPicture.asset(
-          Assets.assetsIconsScan,
-          height: 20,
-          width: 20,
-        ),
-        onPressed: () {},
-      ),
+      // IconButton(
+      //   icon: SvgPicture.asset(
+      //     Assets.assetsIconsScan,
+      //     height: 20,
+      //     width: 20,
+      //   ),
+      //   onPressed: () {},
+      // ),
    ],
  };

  static Map<String, Widget?> appBarLeading = {
-    'Dashboard': const AppBarHomeDropdown(),
+    // 'Dashboard': const AppBarHomeDropdown(),
    'Devices': const AppBarHomeDropdown(),
    'Routine': const AppBarHomeDropdown(),
    'Menu': Padding(
@ -429,8 +566,7 @@ class HomeCubit extends Cubit<HomeState> {
  };

  static var bottomNavItems = [
-    defaultBottomNavBarItem(
-        icon: Assets.assetsIconsDashboard, label: 'Dashboard'),
+    // defaultBottomNavBarItem(icon: Assets.assetsIconsDashboard, label: 'Dashboard'),
    // defaultBottomNavBarItem(icon: Assets.assetsIconslayout, label: 'Layout'),
    defaultBottomNavBarItem(icon: Assets.assetsIconsDevices, label: 'Devices'),
    defaultBottomNavBarItem(icon: Assets.assetsIconsRoutines, label: 'Routine'),
@ -438,7 +574,7 @@ class HomeCubit extends Cubit<HomeState> {
  ];

  final List<Widget> pages = [
-    const DashboardView(),
+    // const DashboardView(),
    // const LayoutPage(),
    BlocProvider(
      create: (context) => DevicesCubit.getInstance(),
@ -479,3 +615,28 @@ BottomNavigationBarItem defaultBottomNavBarItem(
    label: label,
  );
 }
+
+
+// class PermissionUtils {
+//   // Check if the "VIEW" permission exists in "MANAGE_SUBSPACE"
+//   static bool hasViewPermission(List<dynamic> permissions) {
+//     return _hasPermission(permissions, 'MANAGE_SUBSPACE', 'VIEW');
+//   }
+
+//   // Generalized permission checker
+//   static bool _hasPermission(
+//       List<dynamic> permissions, String mainTitle, String subTitle) {
+//     final mainOption = permissions.firstWhere(
+//       (perm) => perm['title'] == mainTitle,
+//       orElse: () => null,
+//     );
+//     if (mainOption != null) {
+//       final subOption = mainOption['subOptions'].firstWhere(
+//         (sub) => sub['title'] == subTitle,
+//         orElse: () => null,
+//       );
+//       return subOption != null && subOption['isChecked'] == true;
+//     }
+//     return false;
+//   }
+// }
--- a/lib/features/app_layout/bloc/home_state.dart
+++ b/lib/features/app_layout/bloc/home_state.dart
@ -15,8 +15,8 @@ class HomeError extends HomeState {

 class HomeSuccess extends HomeState {}

-///specific states
-//get spaces
+class ActivationSuccess extends HomeState {}
+
 class GetSpacesLoading extends HomeLoading {}

 class GetSpacesSuccess extends HomeSuccess {
@ -32,6 +32,12 @@ class GetSpacesError extends HomeError {
 //get rooms
 class GetSpaceRoomsLoading extends HomeLoading {}

+class ActivationError extends HomeLoading {
+  final String errMessage;
+
+  ActivationError({this.errMessage = ''});
+}
+
 class GetSpaceRoomsSuccess extends HomeSuccess {
  final List<SubSpaceModel> rooms;

@ -58,9 +64,16 @@ class RoomSelected extends HomeState {
 class RoomUnSelected extends HomeState {}

 class NavChangePage extends HomeState {}
-// Define new state classes
+
+class HomePermissionUpdated extends HomeState {}
+
 class HomeUserInfoLoaded extends HomeState {
  final UserModel user;

  HomeUserInfoLoaded(this.user);
 }
+
+class PermissionsRoleLoaded extends HomeState {
+  final List<PermissionModel> permissionModel;
+  PermissionsRoleLoaded(this.permissionModel);
+}
--- a/lib/features/app_layout/model/permission_model.dart
+++ b/lib/features/app_layout/model/permission_model.dart
@ -0,0 +1,39 @@
+class PermissionModel {
+  final String title;
+  final List<PermissionAttributes> subOptions;
+
+  PermissionModel({required this.title, required this.subOptions});
+
+  factory PermissionModel.fromJson(Map<String, dynamic> json) {
+    return PermissionModel(
+      title: json['title'],
+      subOptions: (json['subOptions'] as List)
+          .map((e) => PermissionAttributes.fromJson(e))
+          .toList(),
+    );
+  }
+
+  static List<PermissionModel> fromJsonList(List<dynamic> jsonList) {
+    return jsonList.map((json) => PermissionModel.fromJson(json)).toList();
+  }
+}
+
+class PermissionAttributes {
+  final String title;
+  final List<PermissionAttributes>? subOptions;
+  final bool? isChecked;
+
+  PermissionAttributes({required this.title, this.subOptions, this.isChecked});
+
+  factory PermissionAttributes.fromJson(Map<String, dynamic> json) {
+    return PermissionAttributes(
+      title: json['title'],
+      isChecked: json['isChecked'],
+      subOptions: json['subOptions'] != null
+          ? (json['subOptions'] as List)
+              .map((e) => PermissionAttributes.fromJson(e))
+              .toList()
+          : null,
+    );
+  }
+}
--- a/lib/features/app_layout/view/app_layout.dart
+++ b/lib/features/app_layout/view/app_layout.dart
@ -17,7 +17,10 @@ class AppLayout extends StatelessWidget {
      child: BlocBuilder<HomeCubit, HomeState>(
        builder: (context, state) {
          return DefaultScaffold(
-            appBar: HomeCubit.getInstance().spaces != null ? const DefaultAppBar() : null,
+            appBar: HomeCubit.getInstance().spaces != null &&
+                    HomeCubit.getInstance().spaces!.isNotEmpty
+                ? const DefaultAppBar()
+                : null,
            bottomNavBar: const DefaultNavBar(),
            child: const AppBody(),
          );
--- a/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart
+++ b/lib/features/app_layout/view/widgets/app_bar_home_dropdown.dart
@ -12,62 +12,65 @@ class AppBarHomeDropdown extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return BlocBuilder<HomeCubit, HomeState>(
-      builder: (context, state) {
-        return Padding(
-          padding: const EdgeInsets.only(left: 10, right: 10),
-          child: DropdownButton(
-            icon: const Icon(
-              Icons.expand_more,
-              color: ColorsManager.textPrimaryColor,
-              size: 16,
-            ),
-            underline: const SizedBox.shrink(),
-            padding: EdgeInsets.zero,
-            borderRadius: BorderRadius.circular(20),
-            value: HomeCubit.getInstance().selectedSpace!.id,
-            items: HomeCubit.getInstance().spaces!.map((space) {
-              return DropdownMenuItem(
-                alignment: AlignmentDirectional.centerStart,
-                value: space.id,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
-                    SvgPicture.asset(
-                      Assets.assetsIconsHome,
-                      width: 25,
-                      height: 25,
-                      colorFilter: const ColorFilter.mode(
-                        ColorsManager.textPrimaryColor,
-                        BlendMode.srcIn,
+    return HomeCubit.getInstance().spaces != null || HomeCubit.getInstance().spaces!.isNotEmpty
+        ? BlocBuilder<HomeCubit, HomeState>(
+            builder: (context, state) {
+              return Padding(
+                padding: const EdgeInsets.only(left: 10, right: 10),
+                child: DropdownButton(
+                  icon: const Icon(
+                    Icons.expand_more,
+                    color: ColorsManager.textPrimaryColor,
+                    size: 16,
+                  ),
+                  underline: const SizedBox.shrink(),
+                  padding: EdgeInsets.zero,
+                  borderRadius: BorderRadius.circular(20),
+                  value: HomeCubit.getInstance().selectedSpace?.id ?? '',
+                  items: HomeCubit.getInstance().spaces!.map((space) {
+                    return DropdownMenuItem(
+                      alignment: AlignmentDirectional.centerStart,
+                      value: space.id,
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        mainAxisSize: MainAxisSize.min,
+                        children: <Widget>[
+                          SvgPicture.asset(
+                            Assets.assetsIconsHome,
+                            width: 25,
+                            height: 25,
+                            colorFilter: const ColorFilter.mode(
+                              ColorsManager.textPrimaryColor,
+                              BlendMode.srcIn,
+                            ),
+                          ),
+                          const SizedBox(width: 5),
+                          Flexible(
+                            child: BodyMedium(
+                              text: space.name,
+                              style: context.bodyMedium.copyWith(
+                                fontSize: 15,
+                                color: ColorsManager.textPrimaryColor,
+                                overflow: TextOverflow.ellipsis,
+                              ),
+                            ),
+                          ),
+                          const SizedBox(width: 5),
+                        ],
                      ),
-                    ),
-                    const SizedBox(width: 5),
-                    Flexible(
-                      child: BodyMedium(
-                        text: space.name,
-                        style: context.bodyMedium.copyWith(
-                          fontSize: 15,
-                          color: ColorsManager.textPrimaryColor,
-                          overflow: TextOverflow.ellipsis,
-                        ),
-                      ),
-                    ),
-                    const SizedBox(width: 5),
-                  ],
+                    );
+                  }).toList(),
+                  onChanged: (value) {
+                    if (value != null) {
+                      HomeCubit.getInstance().changeSelectedSpace(HomeCubit.getInstance()
+                          .spaces!
+                          .firstWhere((element) => element.id == value));
+                    }
+                  },
                ),
              );
-            }).toList(),
-            onChanged: (value) {
-              if (value != null) {
-                HomeCubit.getInstance().changeSelectedSpace(
-                    HomeCubit.getInstance().spaces!.firstWhere((element) => element.id == value));
-              }
            },
-          ),
-        );
-      },
-    );
+          )
+        : Container();
  }
 }
--- a/lib/features/app_layout/view/widgets/default_app_bar.dart
+++ b/lib/features/app_layout/view/widgets/default_app_bar.dart
@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';

 class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
@ -19,10 +22,23 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
              backgroundColor: Colors.transparent,
              leadingWidth: 200,
              toolbarHeight: Constants.appBarHeight,
-              leading: HomeCubit.getInstance().spaces!.isNotEmpty
-                  ? HomeCubit.appBarLeading[HomeCubit.bottomNavItems[HomeCubit.pageIndex].label]!
+              leading: InkWell(
+                onTap: () {
+                  final spaces = HomeCubit.getInstance().spaces!;
+                  showSpaceBottomSheet(context, spaces);
+                },
+                child: HomeCubit.getInstance().spaces!.isNotEmpty
+                    ? AbsorbPointer(
+                        absorbing: true,
+                        child: HomeCubit.appBarLeading[HomeCubit
+                            .bottomNavItems[HomeCubit.pageIndex].label]!,
+                      )
+                    : null,
+              ),
+              actions: HomeCubit.manageScene
+                  ? HomeCubit.appBarActions[
+                      HomeCubit.bottomNavItems[HomeCubit.pageIndex].label]
                  : null,
-              actions: HomeCubit.appBarActions[HomeCubit.bottomNavItems[HomeCubit.pageIndex].label],
            ));
      },
    );
@ -31,3 +47,83 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
  @override
  Size get preferredSize => Size.fromHeight(Constants.appBarHeight);
 }
+
+void showSpaceBottomSheet(BuildContext context, List<SpaceModel> spaces) {
+  showModalBottomSheet(
+    isScrollControlled: true,
+    context: context,
+    builder: (BuildContext context) {
+      return StatefulBuilder(
+        builder: (BuildContext context, StateSetter setModalState) {
+          String? selectedSpaceId = HomeCubit.getInstance().selectedSpace?.id;
+          final bool shouldLimitHeight = spaces.length > 5;
+          return Container(
+            constraints: shouldLimitHeight
+                ? BoxConstraints(
+                    maxHeight: MediaQuery.of(context).size.height * 0.5,
+                  )
+                : const BoxConstraints(),
+            child: SingleChildScrollView(
+              child: Column(
+                children: [
+                  const SizedBox(height: 10),
+                  Container(
+                    decoration: const BoxDecoration(color: Colors.black12),
+                    height: 5,
+                    width: 50,
+                  ),
+                  ListView.separated(
+                    shrinkWrap: true,
+                    physics: const NeverScrollableScrollPhysics(),
+                    itemCount: spaces.length,
+                    itemBuilder: (BuildContext context, int index) {
+                      final space = spaces[index];
+                      return Padding(
+                        padding: const EdgeInsets.only(left: 30, right: 30),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Row(
+                              children: [
+                                Text(space.name),
+                              ],
+                            ),
+                            Radio<String>(
+                              value: space.id,
+                              groupValue: selectedSpaceId,
+                              onChanged: (String? newValue) {
+                                if (newValue != null) {
+                                  setModalState(() {
+                                    selectedSpaceId = newValue;
+                                  });
+                                  HomeCubit.getInstance().changeSelectedSpace(
+                                    spaces.firstWhere((s) => s.id == newValue),
+                                  );
+                                  Navigator.of(context).pop();
+                                }
+                              },
+                            ),
+                          ],
+                        ),
+                      );
+                    },
+                    separatorBuilder: (BuildContext context, int index) {
+                      return Container(
+                        padding: const EdgeInsets.symmetric(horizontal: 50),
+                        child: const Divider(
+                          color: Colors.grey,
+                          thickness: 0.5,
+                        ),
+                      );
+                    },
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      );
+    },
+  );
+}
--- a/lib/features/auth/bloc/auth_cubit.dart
+++ b/lib/features/auth/bloc/auth_cubit.dart
@ -204,6 +204,7 @@ class AuthCubit extends Cubit<AuthState> {
      const FlutterSecureStorage().write(
          key: UserModel.userUuidKey,
          value: Token.decodeToken(token.accessToken)['uuid'].toString());
+
      user = UserModel.fromToken(token);
      emailController.clear();
      passwordController.clear();
@ -220,6 +221,7 @@ class AuthCubit extends Cubit<AuthState> {
      List<String> userFullName = fullName.split(' ');
      response = await AuthenticationAPI.signUp(
        model: SignUpModel(
+            hasAcceptedAppAgreement: true,
            email: email.toLowerCase(),
            password: signUpPassword,
            firstName: userFullName[0],
--- a/lib/features/auth/model/project_model.dart
+++ b/lib/features/auth/model/project_model.dart
@ -0,0 +1,27 @@
+class Project {
+  final String uuid;
+  final String name;
+  final String description;
+
+  const Project({
+    required this.uuid,
+    required this.name,
+    required this.description,
+  });
+
+  factory Project.fromJson(Map<String, dynamic> json) {
+    return Project(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'description': description,
+    };
+  }
+}
--- a/lib/features/auth/model/signup_model.dart
+++ b/lib/features/auth/model/signup_model.dart
@ -3,10 +3,12 @@ class SignUpModel {
  final String password;
  final String firstName;
  final String lastName;
+  final bool hasAcceptedAppAgreement;

  SignUpModel(
      {required this.email,
      required this.password,
+      required this.hasAcceptedAppAgreement,
      required this.firstName,
      required this.lastName});

@ -15,7 +17,8 @@ class SignUpModel {
        email: json['email'],
        password: json['password'],
        firstName: json['firstName'],
-        lastName: json['lastName']);
+        lastName: json['lastName'],
+        hasAcceptedAppAgreement: true);
  }

  Map<String, dynamic> toJson() {
@ -24,6 +27,7 @@ class SignUpModel {
      'password': password,
      'firstName': firstName,
      'lastName': lastName,
+      "hasAcceptedAppAgreement": hasAcceptedAppAgreement
    };
  }
 }
--- a/lib/features/auth/model/user_model.dart
+++ b/lib/features/auth/model/user_model.dart
@ -1,6 +1,6 @@
 import 'dart:convert';
-
 import 'package:flutter/foundation.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/token.dart';

 class UserModel {
@ -14,7 +14,14 @@ class UserModel {
  final bool? isEmailVerified;
  final String? regionName;
  final String? timeZone;
+  final String? regionUuid;
  final bool? isAgreementAccepted;
+  final bool? hasAcceptedWebAgreement;
+  final DateTime? webAgreementAcceptedAt;
+  final bool? hasAcceptedAppAgreement;
+  final DateTime? appAgreementAcceptedAt;
+  final Role? role;
+  final Project? project;

  UserModel({
    required this.uuid,
@ -24,10 +31,16 @@ class UserModel {
    required this.profilePicture,
    required this.phoneNumber,
    required this.isEmailVerified,
+    required this.regionUuid,
    required this.isAgreementAccepted,
-    required this.regionName, // Add this line
-    required this.timeZone, // Add this line
-
+    required this.regionName,
+    required this.timeZone,
+    required this.hasAcceptedWebAgreement,
+    required this.webAgreementAcceptedAt,
+    required this.hasAcceptedAppAgreement,
+    required this.appAgreementAcceptedAt,
+    required this.role,
+    required this.project,
  });

  factory UserModel.fromJson(Map<String, dynamic> json) {
@ -40,26 +53,47 @@ class UserModel {
      phoneNumber: json['phoneNumber'],
      isEmailVerified: json['isEmailVerified'],
      isAgreementAccepted: json['isAgreementAccepted'],
-      regionName: json['region']?['regionName'], // Extract regionName
-      timeZone: json['timeZone']?['timeZoneOffset'], // Extract regionName
+      regionName: json['region']?['regionName'],
+      timeZone: json['timeZone']?['timeZoneOffset'],
+      regionUuid: json['region']?['uuid'],
+      hasAcceptedWebAgreement: json['hasAcceptedWebAgreement'],
+      webAgreementAcceptedAt: json['webAgreementAcceptedAt'] != null
+          ? DateTime.parse(json['webAgreementAcceptedAt'])
+          : null,
+      hasAcceptedAppAgreement: json['hasAcceptedAppAgreement'],
+      appAgreementAcceptedAt: json['appAgreementAcceptedAt'] != null
+          ? DateTime.parse(json['appAgreementAcceptedAt'])
+          : null,
+      role: json['role'] != null ? Role.fromJson(json['role']) : null,
+      project:
+          json['project'] != null ? Project.fromJson(json['project']) : null,
    );
  }
-  //uuid to json
-  //from token
-  factory UserModel.fromToken(Token token)  {
+
+  factory UserModel.fromToken(Token token) {
    Map<String, dynamic> tempJson = Token.decodeToken(token.accessToken);
    return UserModel(
-      uuid: tempJson['uuid'].toString(),
-      email: tempJson['email'],
-      lastName: tempJson['lastName'],
-      firstName:tempJson['firstName'] ,
-      profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
-      phoneNumber: null,
-      isEmailVerified: null,
-      isAgreementAccepted: null,
-      regionName: tempJson['region']?['regionName'],
-      timeZone: tempJson['timezone']?['timeZoneOffset'],
-    );
+        uuid: tempJson['uuid'].toString(),
+        email: tempJson['email'],
+        lastName: tempJson['lastName'],
+        firstName: tempJson['firstName'],
+        profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
+        phoneNumber: null,
+        isEmailVerified: null,
+        isAgreementAccepted: null,
+        regionUuid: null,
+        regionName: tempJson['region']?['regionName'],
+        timeZone: tempJson['timezone']?['timeZoneOffset'],
+        hasAcceptedWebAgreement: tempJson['hasAcceptedWebAgreement'],
+        webAgreementAcceptedAt: tempJson['webAgreementAcceptedAt'] != null
+            ? DateTime.parse(tempJson['webAgreementAcceptedAt'])
+            : null,
+        hasAcceptedAppAgreement: tempJson['hasAcceptedAppAgreement'],
+        appAgreementAcceptedAt: tempJson['appAgreementAcceptedAt'] != null
+            ? DateTime.parse(tempJson['appAgreementAcceptedAt'])
+            : null,
+        role: tempJson['role'] != null ? Role.fromJson(tempJson['role']) : null,
+        project: null);
  }

  static Uint8List? decodeBase64Image(String? base64String) {
@ -71,14 +105,57 @@ class UserModel {

  Map<String, dynamic> toJson() {
    return {
-      'id': uuid,
+      'uuid': uuid,
      'email': email,
-      'lastName': lastName,
      'firstName': firstName,
-      'photoUrl': profilePicture,
+      'lastName': lastName,
+      'profilePicture':
+          profilePicture != null ? base64.encode(profilePicture!) : null,
      'phoneNumber': phoneNumber,
      'isEmailVerified': isEmailVerified,
+      'regionUuid': regionUuid,
      'isAgreementAccepted': isAgreementAccepted,
+      'regionName': regionName,
+      'timeZone': timeZone,
+      'hasAcceptedWebAgreement': hasAcceptedWebAgreement,
+      'webAgreementAcceptedAt': webAgreementAcceptedAt?.toIso8601String(),
+      'hasAcceptedAppAgreement': hasAcceptedAppAgreement,
+      'appAgreementAcceptedAt': appAgreementAcceptedAt?.toIso8601String(),
+      'role': role?.toJson(),
+    };
+  }
+}
+
+class Role {
+  final String? uuid;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;
+  final String? type;
+
+  Role({
+    required this.uuid,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.type,
+  });
+
+  factory Role.fromJson(Map<String, dynamic> json) {
+    return Role(
+      uuid: json['uuid'],
+      createdAt:
+          json['createdAt'] != null ? DateTime.parse(json['createdAt']) : null,
+      updatedAt:
+          json['updatedAt'] != null ? DateTime.parse(json['updatedAt']) : null,
+      type: json['type'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'createdAt': createdAt?.toIso8601String(),
+      'updatedAt': updatedAt?.toIso8601String(),
+      'type': type,
    };
  }
 }
--- a/lib/features/auth/view/login_view.dart
+++ b/lib/features/auth/view/login_view.dart
@ -31,8 +31,7 @@ class LoginView extends StatelessWidget {
          //     content: Text(state.message),
          //   ),
          // );
-        }
-        else if (state is AuthLoginSuccess) {
+        } else if (state is AuthLoginSuccess) {
          Navigator.popAndPushNamed(context, Routes.homeRoute);
        }
      },
@ -96,8 +95,8 @@ class LoginView extends StatelessWidget {
                            height: 20,
                          ),
                          const LoginForm(),
-                          const LoginDivider(),
-                          const LoginWithGoogleFacebook(),
+                          // const LoginDivider(),
+                          // const LoginWithGoogleFacebook(),
                          const DontHaveAnAccount(),
                        ],
                      ),
--- a/lib/features/auth/view/sign_up_view.dart
+++ b/lib/features/auth/view/sign_up_view.dart
@ -3,12 +3,15 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_app/features/auth/bloc/auth_cubit.dart';
+import 'package:syncrow_app/features/menu/bloc/privacy_policy.dart';
+import 'package:syncrow_app/features/menu/bloc/user_agreement.dart';
 import 'package:syncrow_app/features/shared_widgets/default_button.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
 import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/styles_manager.dart';
@ -202,6 +205,93 @@ class SignUpView extends StatelessWidget {
                                        hint: "At least 8 characters"),
                                  ),
                                  const SizedBox(height: 40),
+                                  Center(
+                                    child: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                          horizontal: 16.0),
+                                      child: Text.rich(
+                                        TextSpan(
+                                          text:
+                                              'By signing up you agree to our ',
+                                          style: Theme.of(context)
+                                              .textTheme
+                                              .bodyMedium!
+                                              .copyWith(
+                                                fontSize: 16,
+                                                color: ColorsManager
+                                                    .onPrimaryColor,
+                                              ),
+                                          children: [
+                                            WidgetSpan(
+                                              child: GestureDetector(
+                                                onTap: () {
+                                                  Navigator.of(context)
+                                                      .push(MaterialPageRoute(
+                                                    builder: (context) =>
+                                                        const UserAgreement(),
+                                                  ));
+                                                },
+                                                child: BodyMedium(
+                                                  text: 'Terms & Conditions',
+                                                  style: Theme.of(context)
+                                                      .textTheme
+                                                      .bodyMedium
+                                                      ?.copyWith(
+                                                          decoration:
+                                                              TextDecoration
+                                                                  .underline,
+                                                          decorationColor:
+                                                              ColorsManager
+                                                                  .onPrimaryColor,
+                                                          color: ColorsManager
+                                                              .onPrimaryColor,
+                                                          fontSize: 16),
+                                                ),
+                                              ),
+                                            ),
+                                            TextSpan(
+                                                text: ' and ',
+                                                style: Theme.of(context)
+                                                    .textTheme
+                                                    .bodyMedium!
+                                                    .copyWith(
+                                                      fontSize: 16,
+                                                      color: ColorsManager
+                                                          .onPrimaryColor,
+                                                    )),
+                                            WidgetSpan(
+                                              child: GestureDetector(
+                                                onTap: () {
+                                                  Navigator.of(context)
+                                                      .push(MaterialPageRoute(
+                                                    builder: (context) =>
+                                                        const PrivacyPolicy(),
+                                                  ));
+                                                },
+                                                child: BodyMedium(
+                                                  text: 'Privacy Policy',
+                                                  style: Theme.of(context)
+                                                      .textTheme
+                                                      .bodySmall
+                                                      ?.copyWith(
+                                                          decoration:
+                                                              TextDecoration
+                                                                  .underline,
+                                                          decorationColor:
+                                                              Colors.white,
+                                                          color: ColorsManager
+                                                              .onPrimaryColor,
+                                                          fontSize: 16),
+                                                ),
+                                              ),
+                                            ),
+                                          ],
+                                        ),
+                                        textAlign: TextAlign.center,
+                                      ),
+                                    ),
+                                  ),
+                                  const SizedBox(height: 40),
                                  Row(
                                    mainAxisAlignment: MainAxisAlignment.center,
                                    children: [
--- a/lib/features/common/bloc/project_cubit.dart
+++ b/lib/features/common/bloc/project_cubit.dart
@ -0,0 +1,19 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class ProjectCubit extends Cubit<String?> {
+  final FlutterSecureStorage storage;
+  static const String projectKey = "selected_project_uuid";
+
+  ProjectCubit(this.storage) : super(null);
+
+  Future<void> setProjectUUID(String newUUID) async {
+    await storage.write(key: projectKey, value: newUUID);
+    emit(newUUID);
+  }
+
+  Future<void> clearProjectUUID() async {
+    await storage.delete(key: projectKey);
+    emit(null);
+  }
+}
--- a/lib/features/dashboard/view/dashboard_view.dart
+++ b/lib/features/dashboard/view/dashboard_view.dart
@ -7,7 +7,7 @@ import 'package:syncrow_app/features/shared_widgets/create_unit.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';

-import 'widgets/energy_usage.dart';
+// import 'widgets/energy_usage.dart';

 class DashboardView extends StatelessWidget {
  const DashboardView({super.key});
@ -29,7 +29,7 @@ class DashboardView extends StatelessWidget {
                ),
                const LiveMonitorTab(),
                const SizedBox(height: 10),
-                const EnergyUsage(),
+                // const EnergyUsage(),
                Container(
                  padding: const EdgeInsets.only(top: 20),
                  constraints: const BoxConstraints(
--- a/lib/features/dashboard/view/widgets/energy_usage.dart
+++ b/lib/features/dashboard/view/widgets/energy_usage.dart
@ -1,178 +1,178 @@
-import 'package:fl_chart/fl_chart.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_app/features/dashboard/view/widgets/energy_usage_header.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
-import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+// import 'package:fl_chart/fl_chart.dart';
+// import 'package:flutter/material.dart';
+// import 'package:syncrow_app/features/dashboard/view/widgets/energy_usage_header.dart';
+// import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
+// import 'package:syncrow_app/utils/resource_manager/color_manager.dart';

-class EnergyUsage extends StatelessWidget {
-  const EnergyUsage({
-    super.key,
-  });
+// class EnergyUsage extends StatelessWidget {
+//   const EnergyUsage({
+//     super.key,
+//   });

-  @override
-  Widget build(BuildContext context) {
-    return DecoratedBox(
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(15),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            const EnergyUsageHeader(),
-            ConstrainedBox(
-              constraints: const BoxConstraints(
-                maxHeight: 150,
-                minHeight: 150,
-              ),
-              child: LineChart(
-                LineChartData(
-                  gridData: FlGridData(
-                    show: true,
-                    drawHorizontalLine: true,
-                    horizontalInterval: 2,
-                    drawVerticalLine: false,
-                    getDrawingHorizontalLine: (value) {
-                      return FlLine(
-                        color: Colors.grey.withOpacity(.5),
-                        strokeWidth: 1,
-                      );
-                    },
-                  ),
-                  titlesData: FlTitlesData(
-                    show: true,
-                    rightTitles: AxisTitles(
-                      sideTitles: SideTitles(
-                        showTitles: true,
-                        interval: 1,
-                        getTitlesWidget: leftTitleWidgets,
-                        reservedSize: 25,
-                      ),
-                    ),
-                    topTitles: const AxisTitles(
-                      sideTitles: SideTitles(showTitles: false),
-                    ),
-                    bottomTitles: AxisTitles(
-                      sideTitles: SideTitles(
-                        showTitles: true,
-                        reservedSize: 30,
-                        interval: 12,
-                        getTitlesWidget: (value, meta) {
-                          switch (value.toInt()) {
-                            case 0:
-                              return SideTitleWidget(
-                                axisSide: meta.axisSide,
-                                child: const BodySmall(text: '1'),
-                              );
+//   @override
+//   Widget build(BuildContext context) {
+//     return DecoratedBox(
+//       decoration: BoxDecoration(
+//         color: Colors.white,
+//         borderRadius: BorderRadius.circular(15),
+//       ),
+//       child: Padding(
+//         padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+//         child: Column(
+//           mainAxisAlignment: MainAxisAlignment.start,
+//           crossAxisAlignment: CrossAxisAlignment.start,
+//           children: [
+//             const EnergyUsageHeader(),
+//             ConstrainedBox(
+//               constraints: const BoxConstraints(
+//                 maxHeight: 150,
+//                 minHeight: 150,
+//               ),
+//               child: LineChart(
+//                 LineChartData(
+//                   gridData: FlGridData(
+//                     show: true,
+//                     drawHorizontalLine: true,
+//                     horizontalInterval: 2,
+//                     drawVerticalLine: false,
+//                     getDrawingHorizontalLine: (value) {
+//                       return FlLine(
+//                         color: Colors.grey.withOpacity(.5),
+//                         strokeWidth: 1,
+//                       );
+//                     },
+//                   ),
+//                   titlesData: FlTitlesData(
+//                     show: true,
+//                     rightTitles: AxisTitles(
+//                       sideTitles: SideTitles(
+//                         showTitles: true,
+//                         interval: 1,
+//                         getTitlesWidget: leftTitleWidgets,
+//                         reservedSize: 25,
+//                       ),
+//                     ),
+//                     topTitles: const AxisTitles(
+//                       sideTitles: SideTitles(showTitles: false),
+//                     ),
+//                     bottomTitles: AxisTitles(
+//                       sideTitles: SideTitles(
+//                         showTitles: true,
+//                         reservedSize: 30,
+//                         interval: 12,
+//                         getTitlesWidget: (value, meta) {
+//                           switch (value.toInt()) {
+//                             case 0:
+//                               return SideTitleWidget(
+//                                 axisSide: meta.axisSide,
+//                                 child: const BodySmall(text: '1'),
+//                               );

-                            case 11:
-                              return SideTitleWidget(
-                                axisSide: meta.axisSide,
-                                child: const BodySmall(text: '28'),
-                              );
-                            default:
-                              return Container();
-                          }
-                        },
-                      ),
-                    ),
-                    leftTitles: const AxisTitles(
-                      sideTitles: SideTitles(showTitles: false),
-                    ),
-                  ),
-                  minX: 0,
-                  maxX: 11,
-                  minY: 0,
-                  maxY: 6,
-                  lineBarsData: [
-                    LineChartBarData(
-                      spots: const [
-                        FlSpot(0, 3),
-                        FlSpot(2.6, 2),
-                        FlSpot(4.9, 5),
-                        FlSpot(6.8, 3.1),
-                        FlSpot(8, 4),
-                        FlSpot(9.5, 3),
-                        FlSpot(11, 4),
-                      ],
-                      isCurved: true,
-                      gradient: LinearGradient(
-                        colors: [
-                          ColorsManager.primaryColor,
-                          ColorsManager.primaryColor.withOpacity(0.3),
-                        ],
-                      ),
-                      barWidth: 5,
-                      isStrokeCapRound: true,
-                      dotData: const FlDotData(
-                        show: false,
-                      ),
-                      belowBarData: BarAreaData(
-                        show: true,
-                        gradient: LinearGradient(
-                          colors: [
-                            ColorsManager.primaryColor.withOpacity(0.5),
-                            ColorsManager.primaryColor.withOpacity(0.1),
-                          ],
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
+//                             case 11:
+//                               return SideTitleWidget(
+//                                 axisSide: meta.axisSide,
+//                                 child: const BodySmall(text: '28'),
+//                               );
+//                             default:
+//                               return Container();
+//                           }
+//                         },
+//                       ),
+//                     ),
+//                     leftTitles: const AxisTitles(
+//                       sideTitles: SideTitles(showTitles: false),
+//                     ),
+//                   ),
+//                   minX: 0,
+//                   maxX: 11,
+//                   minY: 0,
+//                   maxY: 6,
+//                   lineBarsData: [
+//                     LineChartBarData(
+//                       spots: const [
+//                         FlSpot(0, 3),
+//                         FlSpot(2.6, 2),
+//                         FlSpot(4.9, 5),
+//                         FlSpot(6.8, 3.1),
+//                         FlSpot(8, 4),
+//                         FlSpot(9.5, 3),
+//                         FlSpot(11, 4),
+//                       ],
+//                       isCurved: true,
+//                       gradient: LinearGradient(
+//                         colors: [
+//                           ColorsManager.primaryColor,
+//                           ColorsManager.primaryColor.withOpacity(0.3),
+//                         ],
+//                       ),
+//                       barWidth: 5,
+//                       isStrokeCapRound: true,
+//                       dotData: const FlDotData(
+//                         show: false,
+//                       ),
+//                       belowBarData: BarAreaData(
+//                         show: true,
+//                         gradient: LinearGradient(
+//                           colors: [
+//                             ColorsManager.primaryColor.withOpacity(0.5),
+//                             ColorsManager.primaryColor.withOpacity(0.1),
+//                           ],
+//                         ),
+//                       ),
+//                     ),
+//                   ],
+//                 ),
+//               ),
+//             )
+//           ],
+//         ),
+//       ),
+//     );
+//   }

-  Widget leftTitleWidgets(double value, TitleMeta meta) {
-    String text;
-    switch (value.toInt()) {
-      case 1:
-        text = '1K';
-        break;
-      case 3:
-        text = '3k';
-        break;
-      case 5:
-        text = '5k';
-        break;
-      default:
-        return Container();
-    }
+//   Widget leftTitleWidgets(double value, TitleMeta meta) {
+//     String text;
+//     switch (value.toInt()) {
+//       case 1:
+//         text = '1K';
+//         break;
+//       case 3:
+//         text = '3k';
+//         break;
+//       case 5:
+//         text = '5k';
+//         break;
+//       default:
+//         return Container();
+//     }

-    return Center(child: BodySmall(text: text));
-  }
+//     return Center(child: BodySmall(text: text));
+//   }

-  Widget bottomTitleWidgets(double value, TitleMeta meta) {
-    // const style = TextStyle(
-    //   fontWeight: FontWeight.bold,
-    //   fontSize: 16,
-    // );
-    // Widget text;
-    // switch (value.toInt()) {
-    //   case 2:
-    //     text = const Text('MAR', style: style);
-    //     break;
-    //   case 5:
-    //     text = const Text('JUN', style: style);
-    //     break;
-    //   case 8:
-    //     text = const Text('SEP', style: style);
-    //     break;
-    //   default:
-    //     text = const Text('', style: style);
-    //     break;
-    // }
+//   Widget bottomTitleWidgets(double value, TitleMeta meta) {
+//     // const style = TextStyle(
+//     //   fontWeight: FontWeight.bold,
+//     //   fontSize: 16,
+//     // );
+//     // Widget text;
+//     // switch (value.toInt()) {
+//     //   case 2:
+//     //     text = const Text('MAR', style: style);
+//     //     break;
+//     //   case 5:
+//     //     text = const Text('JUN', style: style);
+//     //     break;
+//     //   case 8:
+//     //     text = const Text('SEP', style: style);
+//     //     break;
+//     //   default:
+//     //     text = const Text('', style: style);
+//     //     break;
+//     // }

-    return SideTitleWidget(
-      axisSide: meta.axisSide,
-      child: const BodySmall(text: 'Feb'),
-    );
-  }
-}
+//     return SideTitleWidget(
+//       axisSide: meta.axisSide,
+//       child: const BodySmall(text: 'Feb'),
+//     );
+//   }
+// }
--- a/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart
+++ b/lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart
@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_event.dart';
 import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@ -16,6 +17,7 @@ import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/scene_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';

 class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
@ -112,8 +114,9 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
      FetchRoomsEvent event, Emitter<SixSceneState> emit) async {
    try {
      emit(SixSceneLoadingState());
+      Project? project = HomeCubit.getInstance().project;
      roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid, event.unit.id, project?.uuid ?? TempConst.projectIdDev);
      emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
    } catch (e) {
      emit(SixSceneFailedState(errorMessage: e.toString()));
@ -125,12 +128,14 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
    try {
      emit(SixSceneLoadingState());
      if (_hasSelectionChanged) {
+        Project? project = HomeCubit.getInstance().project;
        await HomeManagementAPI.assignDeviceToRoom(
-            event.unit.community.uuid, event.unit.id, event.roomId, sixSceneId);
+            event.unit.community.uuid, event.unit.id, event.roomId, sixSceneId, project?.uuid ?? TempConst.projectIdDev);
        final devicesList = await DevicesAPI.getDevicesByRoomId(
            communityUuid: event.unit.community.uuid,
            spaceUuid: event.unit.id,
-            roomId: event.roomId);
+            roomId: event.roomId,
+            projectId: project?.uuid ?? TempConst.projectIdDev);
        List<String> allDevicesIds = [];
        allDevices.forEach((element) {
          allDevicesIds.add(element.uuid!);
@ -341,8 +346,10 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
    emit(SixSceneLoadingState());

    try {
+            Project? project = HomeCubit.getInstance().project;
+
      allScenes = await SceneApi.getScenesByUnitId(
-          event.unitId, event.unit.community.uuid,
+          event.unitId, event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
          showInDevice: event.showInDevice);

      filteredScenes = allScenes;
--- a/lib/features/devices/bloc/acs_bloc/acs_bloc.dart
+++ b/lib/features/devices/bloc/acs_bloc/acs_bloc.dart
@ -14,6 +14,7 @@ import 'package:syncrow_app/utils/resource_manager/constants.dart';
 class ACsBloc extends Bloc<AcsEvent, AcsState> {
  final String acId;
  AcStatusModel deviceStatus = AcStatusModel(
+      countdown1: 0,
      uuid: '',
      acSwitch: true,
      modeString: 'hot',
@ -26,7 +27,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
  bool allAcsPage = false;
  bool allAcsOn = true;
  bool allTempSame = true;
-  int globalTemp = 25;
+  int globalTemp = 250;
  Timer? _timer;

  ACsBloc({required this.acId}) : super(AcsInitialState()) {
@ -41,6 +42,12 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    on<IncreaseAllTemp>(_increaseAllTemp);
    on<DecreaseAllTemp>(_decreaseAllTemp);
    on<AcUpdated>(_onAcUpdated);
+    on<OnClose>(_onClose);
+    on<GetCounterEvent>(_getCounterValue);
+    on<SetCounterValue>(_setCounterValue);
+    on<TickTimer>(_onTickTimer);
+
+    // on<SetTimeOutValue>(_setTimeOutAlarm);
  }

  void _fetchAcsStatus(AcsInitial event, Emitter<AcsState> emit) async {
@ -107,7 +114,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
      for (var status in response['status']) {
        statusModelList.add(StatusModel.fromJson(status));
      }
-      deviceStatusList.add(AcStatusModel.fromJson(response['productUuid'], statusModelList));
+      deviceStatusList.add(AcStatusModel.fromJson(devicesList[i].uuid ?? '', statusModelList));
    }
    _setAllAcsTempsAndSwitches();
  }
@ -117,10 +124,11 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    if (allAcsPage) {
      emit(AcsLoadingState());
      for (AcStatusModel ac in deviceStatusList) {
-        if (ac.uuid == event.productId) {
+        if (ac.uuid == event.deviceId) {
          ac.acSwitch = acSwitchValue;
        }
      }
+
      _setAllAcsTempsAndSwitches();
      _emitAcsStatus(emit);
    } else {
@ -206,7 +214,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    if (allAcsPage) {
      emit(AcsLoadingState());
      for (AcStatusModel ac in deviceStatusList) {
-        if (ac.uuid == event.productId) {
+        if (ac.uuid == event.deviceId) {
          ac.tempSet = value;
        }
      }
@ -234,7 +242,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    if (allAcsPage) {
      emit(AcsLoadingState());
      for (AcStatusModel ac in deviceStatusList) {
-        if (ac.uuid == event.productId) {
+        if (ac.uuid == event.deviceId) {
          ac.tempSet = value;
        }
      }
@ -254,7 +262,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    if (allAcsPage) {
      emit(AcsLoadingState());
      for (AcStatusModel ac in deviceStatusList) {
-        if (ac.uuid == event.productId) {
+        if (ac.uuid == event.deviceId) {
          ac.modeString = getACModeString(tempMode);
          ac.acMode = AcStatusModel.getACMode(getACModeString(tempMode));
        }
@ -279,7 +287,7 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    if (allAcsPage) {
      emit(AcsLoadingState());
      for (AcStatusModel ac in deviceStatusList) {
-        if (ac.uuid == event.productId) {
+        if (ac.uuid == event.deviceId) {
          ac.fanSpeedsString = getNextFanSpeedKey(fanSpeed);
          ac.acFanSpeed = AcStatusModel.getFanSpeed(getNextFanSpeedKey(fanSpeed));
        }
@ -312,17 +320,15 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
    allAcsOn = true;
    allTempSame = true;
    if (deviceStatusList.isNotEmpty) {
-      int temp = deviceStatusList[0].tempSet;
-      deviceStatusList.firstWhere((element) {
+      int temp = deviceStatusList.first.tempSet;
+      for (var element in deviceStatusList) {
        if (!element.acSwitch) {
          allAcsOn = false;
        }
        if (element.tempSet != temp) {
          allTempSame = false;
        }
-
-        return true;
-      });
+      }
      if (allTempSame) {
        globalTemp = temp;
      }
@ -396,4 +402,74 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
        allTempSame: allTempSame,
        temp: globalTemp));
  }
+
+  void _setCounterValue(SetCounterValue event, Emitter<AcsState> emit) async {
+    emit(AcsLoadingState());
+    int seconds = 0;
+    try {
+      seconds = event.seconds;
+      final response = await DevicesAPI.controlDevice(
+          DeviceControlModel(deviceId: acId, code: 'countdown_time', value: event.duration), acId);
+
+      if (response['success'] ?? false) {
+        deviceStatus.countdown1 = seconds;
+      } else {
+        emit(const AcsFailedState(errorMessage: 'Something went wrong'));
+        return;
+      }
+    } catch (e) {
+      emit(AcsFailedState(errorMessage: e.toString()));
+      return;
+    }
+    if (event.duration > 0) {
+      _onStartTimer(seconds);
+    } else {
+      _timer?.cancel();
+      emit(TimerRunComplete());
+    }
+  }
+
+  void _getCounterValue(GetCounterEvent event, Emitter<AcsState> emit) async {
+    emit(AcsLoadingState());
+    var response = await DevicesAPI.getDeviceStatus(acId);
+    List<StatusModel> statusModelList = [];
+    for (var status in response['status']) {
+      statusModelList.add(StatusModel.fromJson(status));
+    }
+    deviceStatus = AcStatusModel.fromJson(response['productUuid'], statusModelList);
+    deviceStatus.countdown1;
+    var duration;
+    if (deviceStatus.countdown1 == 5) {
+      duration = const Duration(minutes: 30);
+      var countNum = duration.inSeconds;
+      _onStartTimer(countNum);
+    } else if (deviceStatus.countdown1 > 5) {
+      duration = Duration(minutes: deviceStatus.countdown1 * 6);
+      var countNum = duration.inSeconds;
+      _onStartTimer(countNum);
+    } else {
+      _timer?.cancel();
+      emit(TimerRunComplete());
+    }
+  }
+
+  void _onStartTimer(int seconds) {
+    _timer?.cancel();
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      add(TickTimer(remainingTime: seconds - timer.tick));
+    });
+  }
+
+  void _onTickTimer(TickTimer event, Emitter<AcsState> emit) {
+    if (event.remainingTime > 0) {
+      emit(TimerRunInProgress(event.remainingTime));
+    } else {
+      _timer?.cancel();
+      emit(TimerRunComplete());
+    }
+  }
+
+  void _onClose(OnClose event, Emitter<AcsState> emit) {
+    _timer?.cancel(); // Cancel the timer
+  }
 }
--- a/lib/features/devices/bloc/acs_bloc/acs_event.dart
+++ b/lib/features/devices/bloc/acs_bloc/acs_event.dart
@ -14,7 +14,8 @@ class AcSwitch extends AcsEvent {
  final bool acSwitch;
  final String deviceId;
  final String productId;
-  const AcSwitch({required this.acSwitch, this.deviceId = '', this.productId = ''});
+  const AcSwitch(
+      {required this.acSwitch, this.deviceId = '', this.productId = ''});

  @override
  List<Object> get props => [acSwitch, deviceId, productId];
@ -35,7 +36,8 @@ class IncreaseCoolToTemp extends AcsEvent {
  final double value;
  final String deviceId;
  final String productId;
-  const IncreaseCoolToTemp({required this.value, this.deviceId = '', this.productId = ''});
+  const IncreaseCoolToTemp(
+      {required this.value, this.deviceId = '', this.productId = ''});

  @override
  List<Object> get props => [value, deviceId];
@ -46,7 +48,8 @@ class DecreaseCoolToTemp extends AcsEvent {
  final String deviceId;
  final String productId;

-  const DecreaseCoolToTemp({required this.value, this.deviceId = '', this.productId = ''});
+  const DecreaseCoolToTemp(
+      {required this.value, this.deviceId = '', this.productId = ''});

  @override
  List<Object> get props => [value, deviceId];
@ -56,7 +59,8 @@ class ChangeAcMode extends AcsEvent {
  final TempModes tempModes;
  final String deviceId;
  final String productId;
-  const ChangeAcMode({required this.tempModes, this.deviceId = '', this.productId = ''});
+  const ChangeAcMode(
+      {required this.tempModes, this.deviceId = '', this.productId = ''});

  @override
  List<Object> get props => [tempModes, deviceId, productId];
@ -67,7 +71,8 @@ class ChangeFanSpeed extends AcsEvent {
  final String deviceId;
  final String productId;

-  const ChangeFanSpeed({required this.fanSpeeds, this.deviceId = '', this.productId = ''});
+  const ChangeFanSpeed(
+      {required this.fanSpeeds, this.deviceId = '', this.productId = ''});

  @override
  List<Object> get props => [fanSpeeds, deviceId, productId];
@ -104,3 +109,52 @@ class DecreaseAllTemp extends AcsEvent {
  @override
  List<Object> get props => [value];
 }
+
+class SetCounterValue extends AcsEvent {
+  final int duration;
+  final String deviceCode;
+  final int seconds;
+  const SetCounterValue(
+      {required this.duration,
+      required this.deviceCode,
+      required this.seconds});
+  @override
+  List<Object> get props => [duration, deviceCode, seconds];
+}
+
+class SetTimeOutValue extends AcsEvent {
+  final Duration duration;
+  final String deviceCode;
+  const SetTimeOutValue({required this.duration, required this.deviceCode});
+  @override
+  List<Object> get props => [duration, deviceCode];
+}
+
+class StartTimer extends AcsEvent {
+  final int duration;
+
+  const StartTimer(this.duration);
+
+  @override
+  List<Object> get props => [duration];
+}
+
+class TickTimer extends AcsEvent {
+  final int remainingTime;
+
+  const TickTimer({required this.remainingTime});
+
+  @override
+  List<Object> get props => [remainingTime];
+}
+
+class StopTimer extends AcsEvent {}
+
+class GetCounterEvent extends AcsEvent {
+  final String deviceCode;
+  const GetCounterEvent({required this.deviceCode});
+  @override
+  List<Object> get props => [deviceCode];
+}
+
+class OnClose extends AcsEvent {}
--- a/lib/features/devices/bloc/acs_bloc/acs_state.dart
+++ b/lib/features/devices/bloc/acs_bloc/acs_state.dart
@ -63,3 +63,22 @@ class AcsFailedState extends AcsState {
  @override
  List<Object> get props => [errorMessage];
 }
+
+class UpdateTimerState extends AcsState {
+  final int seconds;
+  const UpdateTimerState({required this.seconds});
+
+  @override
+  List<Object> get props => [seconds];
+}
+
+class TimerRunInProgress extends AcsState {
+  final int remainingTime;
+
+  const TimerRunInProgress(this.remainingTime);
+
+  @override
+  List<Object> get props => [remainingTime];
+}
+
+class TimerRunComplete extends AcsState {}
--- a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart
+++ b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart
@ -1,3 +1,6 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_event.dart';
@ -5,6 +8,7 @@ import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_st
 import 'package:syncrow_app/features/devices/model/ceiling_sensor_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/status_model.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';

@ -17,9 +21,11 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
    on<InitialEvent>(_fetchCeilingSensorStatus);
    on<ChangeValueEvent>(_changeValue);
    on<CeilingSensorUpdated>(_onCeilingSensorUpdated);
+    on<ReportLogsInitial>(fetchLogsForLastMonth);
  }

-  void _fetchCeilingSensorStatus(InitialEvent event, Emitter<CeilingSensorState> emit) async {
+  void _fetchCeilingSensorStatus(
+      InitialEvent event, Emitter<CeilingSensorState> emit) async {
    emit(LoadingInitialState());
    try {
      var response = await DevicesAPI.getDeviceStatus(deviceId);
@ -38,15 +44,18 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {

  _listenToChanges() {
    try {
-      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
      Stream<DatabaseEvent> stream = ref.onValue;

      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
        List<StatusModel> statusList = [];

        usersMap['status'].forEach((element) {
-          statusList.add(StatusModel(code: element['code'], value: element['value']));
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
        });

        deviceStatus = CeilingSensorModel.fromJson(statusList);
@ -55,20 +64,62 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
    } catch (_) {}
  }

-  _onCeilingSensorUpdated(CeilingSensorUpdated event, Emitter<CeilingSensorState> emit) {
+  _onCeilingSensorUpdated(
+      CeilingSensorUpdated event, Emitter<CeilingSensorState> emit) {
    emit(UpdateState(ceilingSensorModel: deviceStatus));
  }

-  void _changeValue(ChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
+  void _changeValue(
+      ChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
    emit(LoadingNewSate(ceilingSensorModel: deviceStatus));
    try {
      final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: deviceId, code: event.code, value: event.value), deviceId);
-
+          DeviceControlModel(
+              deviceId: deviceId, code: event.code, value: event.value),
+          deviceId);
      if (response['success'] ?? false) {
-        deviceStatus.sensitivity = event.value;
-      }
+        if (event.type == 'Sensitivity') {
+          deviceStatus.sensitivity = event.value;
+        } else if (event.type == 'Maximum Distance') {
+          deviceStatus.movingMaxDis = event.value;
+        } else if (event.type == 'Nobody Time') {
+          deviceStatus.nobodyTime = event.value;
+        } else if (event.type == 'Space Type') {
+          deviceStatus.spaceType = SpaceTypes.values.firstWhere(
+            (e) => e.name == event.value,
+            orElse: () => SpaceTypes.none,
+          );
+        }
+      } //scene
+      emit(UpdateState(ceilingSensorModel: deviceStatus));
    } catch (_) {}
-    emit(UpdateState(ceilingSensorModel: deviceStatus));
+  }
+
+  DeviceReport recordGroups =
+      DeviceReport(startTime: '0', endTime: '0', data: []);
+
+  Future<void> fetchLogsForLastMonth(
+      ReportLogsInitial event, Emitter<CeilingSensorState> emit) async {
+    DateTime now = DateTime.now();
+
+    DateTime lastMonth = DateTime(now.year, now.month - 1, now.day);
+    int startTime = lastMonth.millisecondsSinceEpoch;
+    int endTime = now.millisecondsSinceEpoch;
+    try {
+      emit(LoadingInitialState());
+      var response = await DevicesAPI.getReportLogs(
+        startTime: startTime.toString(),
+        endTime: endTime.toString(),
+        deviceUuid: deviceId,
+        code: 'presence_state',
+      );
+      recordGroups = response;
+      // print('---${jsonEncode(recordGroups.data.first.)}');
+      emit(FitchData());
+    } on DioException catch (e) {
+      final errorData = e.response!.data;
+      String errorMessage = errorData['message'];
+      emit(FailedState(error: errorMessage));
+    }
  }
 }
--- a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_event.dart
+++ b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_event.dart
@ -14,10 +14,16 @@ class InitialEvent extends CeilingSensorEvent {}
 class CeilingSensorUpdated extends CeilingSensorEvent {}

 class ChangeValueEvent extends CeilingSensorEvent {
-  final int value;
+  final dynamic value;
  final String code;
-  const ChangeValueEvent({required this.value, required this.code});
+  final String type;
+
+  const ChangeValueEvent({required this.value, required this.code,required this.type});

  @override
-  List<Object> get props => [value, code];
+  List<Object> get props => [value, code,type];
+}
+
+class ReportLogsInitial extends CeilingSensorEvent {
+  const ReportLogsInitial();
 }
--- a/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart
+++ b/lib/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart
@ -10,6 +10,8 @@ class CeilingSensorState extends Equatable {

 class InitialState extends CeilingSensorState {}

+class FitchData extends CeilingSensorState {}
+
 class LoadingInitialState extends CeilingSensorState {}

 class UpdateState extends CeilingSensorState {
--- a/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
+++ b/lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart
@ -2,13 +2,18 @@ import 'dart:async';

 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';

 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_event.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_state.dart';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';

 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
+import 'package:syncrow_app/utils/resource_manager/constants.dart';

 class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
  DeviceManagerBloc() : super(DeviceManagerState.initial()) {
@ -29,10 +34,13 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
      FetchAllDevices event, Emitter<DeviceManagerState> emit) async {
    emit(state.copyWith(loading: true));
    try {
-      final allDevices = await HomeManagementAPI.fetchDevicesByUnitId();
-      emit(state.copyWith(devices: allDevices, loading: false));
+      Project? project = HomeCubit.getInstance().project;
+
+      final allDevices = await HomeManagementAPI.fetchDevicesByUnitId(
+          project?.uuid ?? TempConst.projectIdDev);
+      emit(state.copyWith(
+          devices: _getOnlyImplementedDevices(allDevices), loading: false));
    } catch (e) {
-      print(e);
      emit(state.copyWith(error: e.toString(), loading: false));
    }
  }
@ -41,12 +49,16 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
      FetchDevicesByRoomId event, Emitter<DeviceManagerState> emit) async {
    emit(state.copyWith(loading: true));
    try {
+      Project? project = HomeCubit.getInstance().project;
+
      final devices = await DevicesAPI.getDevicesByRoomId(
-        communityUuid: event.unit.community.uuid,
-        spaceUuid: event.unit.id,
-        roomId: event.roomId,
-      );
-      emit(state.copyWith(devices: devices, loading: false));
+          communityUuid: event.unit.community.uuid,
+          spaceUuid: event.unit.id,
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
+
+      emit(state.copyWith(
+          devices: _getOnlyImplementedDevices(devices), loading: false));
    } catch (e) {
      emit(state.copyWith(error: e.toString(), loading: false));
    }
@ -156,4 +168,19 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
      emit(state.copyWith(functionsLoading: false, error: e.toString()));
    }
  }
+
+  _getOnlyImplementedDevices(List<DeviceModel> devices) {
+    List<DeviceModel> implementedDevices = [];
+    for (int i = 0; i < devices.length; i++) {
+      if (devices[i].productType == DeviceType.AC ||
+          devices[i].productType == DeviceType.DoorLock ||
+          devices[i].productType == DeviceType.Gateway ||
+          devices[i].productType == DeviceType.WallSensor ||
+          devices[i].productType == DeviceType.CeilingSensor ||
+          devices[i].productType == DeviceType.ThreeGang) {
+        implementedDevices.add(devices[i]);
+      }
+    }
+    return implementedDevices;
+  }
 }
--- a/lib/features/devices/bloc/device_settings_bloc/device_scene_bloc.dart
+++ b/lib/features/devices/bloc/device_settings_bloc/device_scene_bloc.dart
@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/device_settings_bloc/device_scene_event.dart';
 import 'package:syncrow_app/features/devices/bloc/device_settings_bloc/device_scene_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@ -18,6 +19,7 @@ import 'package:syncrow_app/generated/assets.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';

 class DeviceSettingBloc extends Bloc<DeviceSettingEvent, DeviceSettingState> {
@ -349,13 +351,20 @@ class DeviceSettingBloc extends Bloc<DeviceSettingEvent, DeviceSettingState> {
      AssignRoomEvent event, Emitter<DeviceSettingState> emit) async {
    try {
      emit(DeviceSettingLoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
      if (_hasSelectionChanged) {
        await HomeManagementAPI.assignDeviceToRoom(
-            event.unit.community.uuid, event.unit.id, event.roomId, deviceId);
+            event.unit.community.uuid,
+            event.unit.id,
+            event.roomId,
+            deviceId,
+            project?.uuid ?? TempConst.projectIdDev);
        final devicesList = await DevicesAPI.getDevicesByRoomId(
            communityUuid: event.unit.community.uuid,
            spaceUuid: event.unit.id,
-            roomId: event.roomId);
+            roomId: event.roomId,
+            projectId: project?.uuid ?? TempConst.projectIdDev);
        List<String> allDevicesIds = [];
        allDevices.forEach((element) {
          allDevicesIds.add(element.uuid!);
@ -375,8 +384,12 @@ class DeviceSettingBloc extends Bloc<DeviceSettingEvent, DeviceSettingState> {
      FetchRoomsEvent event, Emitter<DeviceSettingState> emit) async {
    try {
      emit(DeviceSettingLoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
      roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid,
+          event.unit.id,
+          project?.uuid ?? TempConst.projectIdDev);
      emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
    } catch (e) {
      emit(
--- a/lib/features/devices/bloc/devices_cubit.dart
+++ b/lib/features/devices/bloc/devices_cubit.dart
@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@ -19,6 +20,7 @@ import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/network_exception.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 part 'devices_state.dart';

@ -31,6 +33,7 @@ class DevicesCubit extends Cubit<DevicesState> {

    // Fetch groups based on the selected space ID
    await fetchGroups(selectedSpace.id);
+    await fetchAllDevices(selectedSpace);
  }

  DevicesCubit._() : super(DevicesInitial()) {
@ -109,17 +112,6 @@ class DevicesCubit extends Cubit<DevicesState> {
  }

  // Getter to retrieve all devices from HomeCubit
-  List<DeviceModel> get allDevices {
-    List<DeviceModel> devices = [];
-    if (HomeCubit.getInstance().selectedSpace != null) {
-      for (var room in HomeCubit.getInstance().selectedSpace!.subspaces) {
-        if (room.devices != null) {
-          devices.addAll(room.devices!);
-        }
-      }
-    }
-    return devices;
-  }

  // DevicesCategoryModel? get chosenCategory {
  //   for (var category in allCategories!) {
@ -267,36 +259,36 @@ class DevicesCubit extends Cubit<DevicesState> {
  }

 ///////////////////////// API CALLS //////////////////////////
-  deviceControl(DeviceControlModel control, String deviceId) async {
-    emitSafe(DeviceControlLoading(
-      code: control.code,
-    ));
-    try {
-      var response = await DevicesAPI.controlDevice(control, deviceId);
+  // deviceControl(DeviceControlModel control, String deviceId) async {
+  //   emitSafe(DeviceControlLoading(
+  //     code: control.code,
+  //   ));
+  //   try {
+  //     var response = await DevicesAPI.controlDevice(control, deviceId);

-      if (response['success'] ?? false) {
-        emitSafe(DeviceControlSuccess(code: control.code));
-        //this delay is to give tuya server time to update the status
-        // Future.delayed(const Duration(milliseconds: 400), () {
-        fetchDevicesStatues(
-            deviceId,
-            HomeCubit.getInstance()
-                .selectedSpace!
-                .subspaces
-                .indexOf(HomeCubit.getInstance().selectedRoom!),
-            code: control.code);
-        // });
-      } else {
-        emitSafe(DeviceControlError('Failed to control the device'));
-      }
-    } catch (failure) {
-      emitSafe(DeviceControlError(failure.toString()));
-      return;
-    }
-  }
+  //     if (response['success'] ?? false) {
+  //       emitSafe(DeviceControlSuccess(code: control.code));
+  //       //this delay is to give tuya server time to update the status
+  //       // Future.delayed(const Duration(milliseconds: 400), () {
+  //       fetchDevicesStatues(
+  //           deviceId,
+  //           HomeCubit.getInstance()
+  //               .selectedSpace!
+  //               .subspaces
+  //               .indexOf(HomeCubit.getInstance().selectedRoom!),
+  //           code: control.code);
+  //       // });
+  //     } else {
+  //       emitSafe(DeviceControlError('Failed to control the device'));
+  //     }
+  //   } catch (failure) {
+  //     emitSafe(DeviceControlError(failure.toString()));
+  //     return;
+  //   }
+  // }

  fetchGroups(String spaceId) async {
-    emitSafe(DevicesCategoriesLoading());
+    emitSafe(GetDevicesLoading());
    try {
      allCategories = await DevicesAPI.fetchGroups(spaceId);
    } catch (e) {
@ -319,14 +311,20 @@ class DevicesCubit extends Cubit<DevicesState> {
        .subspaces
        .indexWhere((element) => element.id == roomId);
    try {
+      Project? project = HomeCubit.getInstance().project;
+
      HomeCubit.getInstance().selectedSpace!.subspaces[roomIndex].devices =
          await DevicesAPI.getDevicesByRoomId(
-              communityUuid: unit!.community.uuid, spaceUuid: unit.id, roomId: roomId);
+              communityUuid: unit!.community.uuid,
+              spaceUuid: unit.id,
+              roomId: roomId,
+              projectId: project?.uuid ?? TempConst.projectIdDev);
    } catch (e) {
      emitSafe(GetDevicesError(e.toString()));
      return;
    }
-    final devices = HomeCubit.getInstance().selectedSpace!.subspaces[roomIndex].devices;
+    final devices =
+        HomeCubit.getInstance().selectedSpace!.subspaces[roomIndex].devices;
    emitSafe(GetDevicesSuccess(devices));

    //get status for each device
@ -356,8 +354,11 @@ class DevicesCubit extends Cubit<DevicesState> {
      emitSafe(GetDeviceStatusError(e.toString()));
      return;
    }
-    HomeCubit.getInstance().selectedSpace!.subspaces[roomIndex].devices![deviceIndex].status =
-        statuses;
+    HomeCubit.getInstance()
+        .selectedSpace!
+        .subspaces[roomIndex]
+        .devices![deviceIndex]
+        .status = statuses;
    emitSafe(GetDeviceStatusSuccess(code: code));
  }

@ -406,6 +407,343 @@ class DevicesCubit extends Cubit<DevicesState> {
 //     emitSafe(LightBrightnessChanged(value));
 //   }
 // }
+  // List<DeviceModel> _fetchedDevices = [];
+
+  // List<DeviceModel> get allDevices => _fetchedDevices;
+  List<DeviceModel> allDevices = [];
+
+  Future<void> fetchAllDevices(SpaceModel? unit) async {
+    emitSafe(GetDevicesLoading());
+    try {
+      Project? project = HomeCubit.getInstance().project;
+
+      final devices = await DevicesAPI.getAllDevices(
+          communityUuid: unit!.community.uuid,
+          spaceUuid: unit.id,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
+      allDevices = devices;
+      emitSafe(GetDevicesSuccess(allDevices));
+    } catch (e) {
+      emitSafe(GetDevicesError(e.toString()));
+    }
+  }
+
+  bool isDeviceOn(DeviceModel device) {
+    final switchStatuses = device.status.where(
+      (s) => (s.code?.startsWith('switch') ?? false),
+    );
+    final anySwitchFalse = switchStatuses.any((s) => s.value == false);
+    return !anySwitchFalse;
+  }
+
+  void updateDeviceStatus(String deviceId, bool newToggleStatus) {
+    emitSafe(GetDevicesLoading());
+
+    // Create a fresh copy of the device list.
+    final updatedDevices = List<DeviceModel>.from(allDevices);
+
+    for (int i = 0; i < updatedDevices.length; i++) {
+      final device = updatedDevices[i];
+      if (device.uuid == deviceId) {
+        updatedDevices[i] = DeviceModel(
+          activeTime: device.activeTime,
+          localKey: device.localKey,
+          model: device.model,
+          name: device.name,
+          icon: device.icon,
+          categoryName: device.categoryName,
+          type: device.type,
+          isOnline: device.isOnline,
+          status: device.status, // Make sure to keep the same status list
+          productName: device.productName,
+          timeZone: device.timeZone,
+          updateTime: device.updateTime,
+          uuid: device.uuid,
+          productUuid: device.productUuid,
+          productType: device.productType,
+          subspace: device.subspace,
+          toggleStatus: newToggleStatus,
+        );
+        break;
+      }
+    }
+    emit(GetDevicesSuccess(updatedDevices));
+  }
+
+  Future<void> threeGangToggle(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+      final switches = ['switch_1', 'switch_2', 'switch_3'];
+      for (final switchCode in switches) {
+        final statusIndex =
+            device.status.indexWhere((s) => s.code == switchCode);
+        if (statusIndex != -1) {
+          final toggledValue = control.value;
+          final controlRequest = DeviceControlModel(
+              code: switchCode, value: toggledValue, deviceId: deviceUuid);
+          final response =
+              await DevicesAPI.controlDevice(controlRequest, deviceUuid);
+          if (response['success'] != true) {
+            throw Exception('Failed to toggle $switchCode');
+          }
+          device.status[statusIndex].value = toggledValue;
+        }
+      }
+      final anySwitchOff = device.status.any(
+        (s) => (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+      );
+      device.toggleStatus = !anySwitchOff;
+      allDevices[deviceIndex] = device;
+      emit(DeviceControlSuccess(code: control.code));
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> towGangToggle(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+      final switches = [
+        'switch_1',
+        'switch_2',
+      ];
+      for (final switchCode in switches) {
+        final statusIndex =
+            device.status.indexWhere((s) => s.code == switchCode);
+        if (statusIndex != -1) {
+          final toggledValue = control.value;
+          final controlRequest = DeviceControlModel(
+              code: switchCode, value: toggledValue, deviceId: deviceUuid);
+          final response =
+              await DevicesAPI.controlDevice(controlRequest, deviceUuid);
+
+          device.status[statusIndex].value = response['result'];
+        }
+      }
+      final anySwitchOff = device.status.any(
+        (s) => (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+      );
+      device.toggleStatus = !anySwitchOff;
+      allDevices[deviceIndex] = device;
+      emit(DeviceControlSuccess(code: control.code));
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> towGTGangToggle(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+      final switches = [
+        'switch_1',
+        'switch_2',
+      ];
+      for (final switchCode in switches) {
+        final statusIndex =
+            device.status.indexWhere((s) => s.code == switchCode);
+        if (statusIndex != -1) {
+          final toggledValue = control.value;
+          final controlRequest = DeviceControlModel(
+              code: switchCode, value: toggledValue, deviceId: deviceUuid);
+          final response =
+              await DevicesAPI.controlDevice(controlRequest, deviceUuid);
+
+          device.status[statusIndex].value = response['result'];
+        }
+      }
+      final anySwitchOff = device.status.any(
+        (s) => (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+      );
+      device.toggleStatus = !anySwitchOff;
+      allDevices[deviceIndex] = device;
+      emit(DeviceControlSuccess(code: control.code));
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> oneGangToggle(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+
+      final statusIndex = device.status.indexWhere((s) => s.code == 'switch_1');
+      if (statusIndex != -1) {
+        final toggledValue = control.value;
+        final controlRequest = DeviceControlModel(
+            code: 'switch_1', value: toggledValue, deviceId: deviceUuid);
+        final response =
+            await DevicesAPI.controlDevice(controlRequest, deviceUuid);
+        print(response);
+        if (response['result'] != true) {
+          throw Exception('Failed to toggle switch_1');
+        }
+        device.status[statusIndex].value = response['result'];
+      }
+
+      final anySwitchOff = device.status.any(
+        (s) => (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+      );
+      device.toggleStatus = !anySwitchOff;
+      allDevices[deviceIndex] = device;
+      emit(DeviceControlSuccess(code: control.code));
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> oneGTGangToggle(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+
+      final statusIndex = device.status.indexWhere((s) => s.code == 'switch_1');
+      if (statusIndex != -1) {
+        final currentValue = device.status[statusIndex].value ?? false;
+        final toggledValue = !currentValue;
+        final controlRequest = DeviceControlModel(
+            code: 'switch_1', value: toggledValue, deviceId: deviceUuid);
+        final response =
+            await DevicesAPI.controlDevice(controlRequest, deviceUuid);
+        if (response['result'] != true) {
+          throw Exception('Failed to toggle switch_1');
+        }
+        device.status[statusIndex].value = response['result'];
+      }
+
+      final anySwitchOff = device.status.any(
+        (s) => (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+      );
+      device.toggleStatus = !anySwitchOff;
+      allDevices[deviceIndex] = device;
+      emit(DeviceControlSuccess(code: control.code));
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> deviceControl(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final response = await DevicesAPI.controlDevice(control, deviceUuid);
+      if (response['success'] == true) {
+        final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+        if (deviceIndex != -1) {
+          final device = allDevices[deviceIndex];
+          final statusIndex =
+              device.status.indexWhere((s) => s.code == control.code);
+          if (statusIndex != -1) {
+            device.status[statusIndex].value = control.value;
+          }
+          final anySwitchOff = device.status.any(
+            (s) =>
+                (s.code?.startsWith('switch_') ?? false) && (s.value == false),
+          );
+          device.toggleStatus = !anySwitchOff;
+          allDevices[deviceIndex] = device;
+        }
+        emit(DeviceControlSuccess(code: control.code));
+      } else {
+        emit(DeviceControlError('Failed to control the device'));
+      }
+    } catch (failure) {
+      emit(DeviceControlError(failure.toString()));
+    }
+  }
+
+  Future<void> changeCurtainSwitch(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+      final isOpen = control.value == "open";
+      final newValue = isOpen ? 0 : 100;
+      final response = await DevicesAPI.deviceBatchController(
+        code: 'percent_control',
+        devicesUuid: [deviceUuid],
+        value: newValue,
+      );
+      if (response['success'] == true) {
+        final statusIndex =
+            device.status.indexWhere((s) => s.code == 'percent_control');
+        if (statusIndex != -1) {
+          device.status[statusIndex].value = newValue;
+        }
+        allDevices[deviceIndex] = device;
+
+        emit(DeviceControlSuccess(code: control.code));
+      } else {
+        emit(DeviceControlError('Failed to toggle curtain.'));
+      }
+    } catch (error) {
+      emit(DeviceControlError(error.toString()));
+    }
+  }
+
+  Future<void> changeGarageSwitch(
+      DeviceControlModel control, String deviceUuid) async {
+    emit(SwitchControlLoading(code: control.code));
+    try {
+      final deviceIndex = allDevices.indexWhere((d) => d.uuid == deviceUuid);
+      if (deviceIndex == -1) {
+        throw Exception('Device not found');
+      }
+      final device = allDevices[deviceIndex];
+      final isOpen = control.value == "open";
+      final newValue = isOpen ? 0 : 100;
+      final response = await DevicesAPI.deviceBatchController(
+        code: 'percent_control',
+        devicesUuid: [deviceUuid],
+        value: newValue,
+      );
+      if (response['success'] == true) {
+        final statusIndex =
+            device.status.indexWhere((s) => s.code == 'percent_control');
+        if (statusIndex != -1) {
+          device.status[statusIndex].value = newValue;
+        }
+        allDevices[deviceIndex] = device;
+        emit(DeviceControlSuccess(code: control.code));
+      } else {
+        emit(DeviceControlError('Failed to toggle curtain.'));
+      }
+    } catch (error) {
+      emit(DeviceControlError(error.toString()));
+    }
+  }
 }

 enum LightMode {
--- a/lib/features/devices/bloc/devices_state.dart
+++ b/lib/features/devices/bloc/devices_state.dart
@ -34,6 +34,7 @@ class GetDeviceStatusError extends DevicesState {
 }

 class GetDevicesLoading extends DevicesState {}
+class RoomLoading extends DevicesState {}

 class GetDevicesSuccess extends DevicesState {
  GetDevicesSuccess(this.devices);
@ -55,10 +56,16 @@ class DeviceSwitchChanged extends DevicesState {}
 class DeviceSelected extends DevicesState {}

 // Device Control
-class DeviceControlLoading extends DevicesState {
-  final String? code;
+// class DeviceControlLoading extends DevicesState {
+//   final String? code;

-  DeviceControlLoading({this.code});
+//   DeviceControlLoading({this.code});
+// }
+class SwitchControlLoading extends DevicesState {
+  final String? code;
+  final String? deviceId;
+
+  SwitchControlLoading({this.deviceId, this.code});
 }

 class DeviceControlSuccess extends DevicesState {
--- a/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart
+++ b/lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart
@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_event.dart';
 import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@ -14,6 +16,7 @@ import 'package:syncrow_app/features/devices/model/subspace_model.dart';
 import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/scene_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';

 class FourSceneBloc extends Bloc<FourSceneEvent, FourSceneState> {
@ -299,9 +302,11 @@ class FourSceneBloc extends Bloc<FourSceneEvent, FourSceneState> {
      LoadScenes event, Emitter<FourSceneState> emit) async {
    emit(FourSceneLoadingState());
    try {
+      Project? project = HomeCubit.getInstance().project;
+
      if (event.unitId.isNotEmpty) {
        allScenes = await SceneApi.getScenesByUnitId(
-            event.unitId, event.unit.community.uuid,
+            event.unitId, event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
            showInDevice: event.showInDevice);

        filteredScenes = allScenes;
--- a/lib/features/devices/bloc/garage_door_bloc/garage_door_bloc.dart
+++ b/lib/features/devices/bloc/garage_door_bloc/garage_door_bloc.dart
@ -65,7 +65,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    batteryPercentage: 0,
  );

-  void _fetchStatus(GarageDoorInitial event, Emitter<GarageDoorSensorState> emit) async {
+  void _fetchStatus(
+      GarageDoorInitial event, Emitter<GarageDoorSensorState> emit) async {
    emit(GarageDoorLoadingState());
    try {
      var response = await DevicesAPI.getDeviceStatus(GDId);
@ -113,8 +114,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _toggleClosingReminder(
-      ToggleClosingReminderEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _toggleClosingReminder(ToggleClosingReminderEvent event,
+      Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    try {
      closingReminder = event.isClosingReminderEnabled;
@ -132,7 +133,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _toggleDoorAlarm(ToggleDoorAlarmEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _toggleDoorAlarm(
+      ToggleDoorAlarmEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    try {
      doorAlarm = event.isDoorAlarmEnabled;
@ -150,7 +152,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  DeviceReport recordGroups = DeviceReport(startTime: '0', endTime: '0', data: []);
+  DeviceReport recordGroups =
+      DeviceReport(startTime: '0', endTime: '0', data: []);

  Future<void> fetchLogsForLastMonth(
      ReportLogsInitial event, Emitter<GarageDoorSensorState> emit) async {
@ -179,14 +182,16 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {

  _listenToChanges() {
    try {
-      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$GDId');
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$GDId');
      Stream<DatabaseEvent> stream = ref.onValue;

      stream.listen((DatabaseEvent event) async {
        if (_timer != null) {
          await Future.delayed(const Duration(seconds: 2));
        }
-        Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
        List<StatusModel> statusList = [];
        usersMap['status'].forEach((element) {
          statusList.add(StatusModel(code: element['code'], value: true));
@ -261,7 +266,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
        deviceId: GDId,
      );
      List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
      emit(UpdateState(garageSensor: deviceStatus));
    } on DioException catch (e) {
      final errorData = e.response!.data;
@ -272,12 +278,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {

  int? getTimeStampWithoutSeconds(DateTime? dateTime) {
    if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
    return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
  }

-  Future toggleChange(ToggleScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
+  Future toggleChange(
+      ToggleScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
    try {
      emit(GarageDoorLoadingState());
      final response = await DevicesAPI.changeSchedule(
@ -295,7 +302,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<GarageDoorSensorState> emit) async {
    try {
      emit(GarageDoorLoadingState());
      final response = await DevicesAPI.deleteSchedule(
@ -314,13 +322,15 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<GarageDoorSensorState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<GarageDoorSensorState> emit) {
    emit(GarageDoorLoadingState());
    selectedTabIndex = event.index;
    emit(ChangeSlidingSegmentState(value: selectedTabIndex));
  }

-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<GarageDoorSensorState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<GarageDoorSensorState> emit) {
    emit(GarageDoorLoadingState());
    createSchedule = !createSchedule;
    selectedDays.clear();
@ -337,13 +347,16 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {

  int secondSelected = 0;
  bool toggleDoor = false;
-  Future<void> selectSeconds(SelectSecondsEvent event, Emitter<GarageDoorSensorState> emit) async {
+  Future<void> selectSeconds(
+      SelectSecondsEvent event, Emitter<GarageDoorSensorState> emit) async {
    try {
      emit(GarageDoorLoadingState());
      secondSelected = event.seconds;

      await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: GDId, code: 'tr_timecon', value: secondSelected), GDId);
+          DeviceControlModel(
+              deviceId: GDId, code: 'tr_timecon', value: secondSelected),
+          GDId);
      emit(UpdateState(garageSensor: deviceStatus));
    } on DioException catch (e) {
      final errorData = e.response!.data;
@ -352,12 +365,15 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  openCloseGarageDoor(ToggleDoorEvent event, Emitter<GarageDoorSensorState> emit) async {
+  openCloseGarageDoor(
+      ToggleDoorEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(GarageDoorLoadingState());
    try {
      toggleDoor = !event.toggle;
      await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: GDId, code: 'switch_1', value: toggleDoor), GDId);
+          DeviceControlModel(
+              deviceId: GDId, code: 'switch_1', value: toggleDoor),
+          GDId);
      add(const GarageDoorInitial());
      emit(UpdateState(garageSensor: deviceStatus));
    } on DioException catch (e) {
@ -367,13 +383,16 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _setCounterValue(SetCounterValue event, Emitter<GarageDoorSensorState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    int seconds = 0;
    try {
      seconds = event.duration.inSeconds;
      final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: GDId, code: 'countdown_1', value: seconds), GDId);
+          DeviceControlModel(
+              deviceId: GDId, code: 'countdown_1', value: seconds),
+          GDId);

      if (response['success'] ?? false) {
        deviceStatus.countdown1 = seconds;
@ -393,7 +412,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _getCounterValue(GetCounterEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingInitialState());
    try {
      var response = await DevicesAPI.getDeviceStatus(GDId);
@ -434,7 +454,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
  List<GroupGarageModel> groupList = [];
  bool allSwitchesOn = true;

-  void _fetchWizardStatus(InitialWizardEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _fetchWizardStatus(
+      InitialWizardEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingInitialState());
    try {
      devicesList = [];
@ -444,7 +465,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
          HomeCubit.getInstance().selectedSpace?.id ?? '', 'GD');

      for (int i = 0; i < devicesList.length; i++) {
-        var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+        var response =
+            await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
        List<StatusModel> statusModelList = [];
        for (var status in response['status']) {
          statusModelList.add(StatusModel.fromJson(status));
@ -473,7 +495,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _groupAllOn(GroupAllOnEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _groupAllOn(
+      GroupAllOnEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    try {
      // Set all switches (firstSwitch and secondSwitch) based on the event value (on/off)
@ -485,7 +508,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
      emit(UpdateGroupState(garageList: groupList, allSwitches: true));

      // Get a list of all device IDs
-      List<String> allDeviceIds = groupList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupList.map((device) => device.deviceId).toList();

      // First call for switch_1
      final response = await DevicesAPI.deviceBatchController(
@ -505,7 +529,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _groupAllOff(GroupAllOffEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _groupAllOff(
+      GroupAllOffEvent event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    try {
      // Set all switches (firstSwitch and secondSwitch) based on the event value (on/off)
@ -517,7 +542,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
      emit(UpdateGroupState(garageList: groupList, allSwitches: false));

      // Get a list of all device IDs
-      List<String> allDeviceIds = groupList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupList.map((device) => device.deviceId).toList();

      // First call for switch_1
      final response = await DevicesAPI.deviceBatchController(
@ -538,8 +564,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _changeFirstWizardSwitch(
-      ChangeFirstWizardSwitchStatusEvent event, Emitter<GarageDoorSensorState> emit) async {
+  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
+      Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    try {
      bool allSwitchesValue = true;
@ -552,7 +578,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
        }
      });

-      emit(UpdateGroupState(garageList: groupList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          garageList: groupList, allSwitches: allSwitchesValue));

      final response = await DevicesAPI.deviceBatchController(
        code: 'switch_1',
@ -568,13 +595,16 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorSensorState> {
    }
  }

-  void _setTimeOutAlarm(SetTimeOutValue event, Emitter<GarageDoorSensorState> emit) async {
+  void _setTimeOutAlarm(
+      SetTimeOutValue event, Emitter<GarageDoorSensorState> emit) async {
    emit(LoadingNewSate(doorSensor: deviceStatus));
    int seconds = 0;
    try {
      seconds = event.duration.inSeconds;
      final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: GDId, code: 'countdown_alarm', value: seconds), GDId);
+          DeviceControlModel(
+              deviceId: GDId, code: 'countdown_alarm', value: seconds),
+          GDId);

      if (response['success'] ?? false) {
        deviceStatus.countdownAlarm = seconds;
--- a/lib/features/devices/bloc/sos_bloc/sos_bloc.dart
+++ b/lib/features/devices/bloc/sos_bloc/sos_bloc.dart
@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_event.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@ -19,6 +20,7 @@ import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';

 class SosBloc extends Bloc<SosEvent, SosState> {
@ -184,8 +186,12 @@ class SosBloc extends Bloc<SosEvent, SosState> {
      FetchRoomsEvent event, Emitter<SosState> emit) async {
    try {
      emit(SosLoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
      roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid,
+          event.unit.id,
+          project?.uuid ?? TempConst.projectIdDev);
      emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
    } catch (e) {
      emit(const SosFailedState(errorMessage: 'Something went wrong'));
@ -223,13 +229,19 @@ class SosBloc extends Bloc<SosEvent, SosState> {
  void _assignDevice(AssignRoomEvent event, Emitter<SosState> emit) async {
    try {
      emit(SosLoadingState());
+      Project? project = HomeCubit.getInstance().project;

      await HomeManagementAPI.assignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, sosId);
+          event.unit.community.uuid,
+          event.unit.id,
+          event.roomId,
+          sosId,
+          project?.uuid ?? TempConst.projectIdDev);
      final devicesList = await DevicesAPI.getDevicesByRoomId(
          communityUuid: event.unit.community.uuid,
          spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);

      List<String> allDevicesIds = [];

@ -249,13 +261,16 @@ class SosBloc extends Bloc<SosEvent, SosState> {
  void _unassignDevice(UnassignRoomEvent event, Emitter<SosState> emit) async {
    try {
      Map<String, bool> roomDevicesId = {};
+      Project? project = HomeCubit.getInstance().project;
+
      emit(SosLoadingState());
      await HomeManagementAPI.unAssignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, sosId);
+          event.unit.community.uuid, event.unit.id, event.roomId, sosId, project?.uuid ?? TempConst.projectIdDev);
      final devicesList = await DevicesAPI.getDevicesByRoomId(
          communityUuid: event.unit.community.uuid,
          spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);

      List<String> allDevicesIds = [];

--- a/lib/features/devices/bloc/two_touch_bloc/two_touch_bloc.dart
+++ b/lib/features/devices/bloc/two_touch_bloc/two_touch_bloc.dart
@ -40,7 +40,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
  bool createSchedule = false;
  List<ScheduleModel> listSchedule = [];

-  TwoTouchBloc({required this.twoTouchId, required this.switchCode}) : super(InitialState()) {
+  TwoTouchBloc({required this.twoTouchId, required this.switchCode})
+      : super(InitialState()) {
    on<InitialEvent>(_fetchTwoTouchStatus);
    on<TwoTouchUpdated>(_twoTouchUpdated);
    on<ChangeFirstSwitchStatusEvent>(_changeFirstSwitch);
@ -71,13 +72,15 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {

  int selectedTabIndex = 0;

-  void toggleSelectedIndex(ToggleSelectedEvent event, Emitter<TwoTouchState> emit) {
+  void toggleSelectedIndex(
+      ToggleSelectedEvent event, Emitter<TwoTouchState> emit) {
    emit(LoadingInitialState());
    selectedTabIndex = event.index;
    emit(ChangeSlidingSegmentState(value: selectedTabIndex));
  }

-  void toggleCreateSchedule(ToggleCreateScheduleEvent event, Emitter<TwoTouchState> emit) {
+  void toggleCreateSchedule(
+      ToggleCreateScheduleEvent event, Emitter<TwoTouchState> emit) {
    emit(LoadingInitialState());
    createSchedule = !createSchedule;
    selectedDays.clear();
@ -85,7 +88,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    emit(UpdateCreateScheduleState(createSchedule));
  }

-  void _fetchTwoTouchStatus(InitialEvent event, Emitter<TwoTouchState> emit) async {
+  void _fetchTwoTouchStatus(
+      InitialEvent event, Emitter<TwoTouchState> emit) async {
    emit(LoadingInitialState());
    try {
      var response = await DevicesAPI.getDeviceStatus(twoTouchId);
@ -104,18 +108,21 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {

  _listenToChanges() {
    try {
-      DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$twoTouchId');
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$twoTouchId');
      Stream<DatabaseEvent> stream = ref.onValue;

      stream.listen((DatabaseEvent event) async {
        if (_timer != null) {
          await Future.delayed(const Duration(seconds: 2));
        }
-        Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
        List<StatusModel> statusList = [];

        usersMap['status'].forEach((element) {
-          statusList.add(StatusModel(code: element['code'], value: element['value']));
+          statusList
+              .add(StatusModel(code: element['code'], value: element['value']));
        });

        deviceStatus = TwoTouchModel.fromJson(statusList);
@ -130,7 +137,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    emit(UpdateState(twoTouchModel: deviceStatus));
  }

-  void _changeFirstSwitch(ChangeFirstSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
+  void _changeFirstSwitch(
+      ChangeFirstSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
    emit(LoadingNewSate(twoTouchModel: deviceStatus));
    try {
      deviceStatus.firstSwitch = !event.value;
@ -141,7 +149,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {

      _timer = Timer(const Duration(milliseconds: 100), () async {
        final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoTouchId, code: 'switch_1', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoTouchId, code: 'switch_1', value: !event.value),
            twoTouchId);

        if (!response['success']) {
@ -153,7 +162,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  void _changeSecondSwitch(ChangeSecondSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
+  void _changeSecondSwitch(
+      ChangeSecondSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
    emit(LoadingNewSate(twoTouchModel: deviceStatus));
    try {
      deviceStatus.secondSwitch = !event.value;
@ -163,7 +173,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
      }
      _timer = Timer(const Duration(milliseconds: 100), () async {
        final response = await DevicesAPI.controlDevice(
-            DeviceControlModel(deviceId: twoTouchId, code: 'switch_2', value: !event.value),
+            DeviceControlModel(
+                deviceId: twoTouchId, code: 'switch_2', value: !event.value),
            twoTouchId);

        if (!response['success']) {
@ -186,11 +197,15 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
      final response = await Future.wait([
        DevicesAPI.controlDevice(
            DeviceControlModel(
-                deviceId: twoTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
            twoTouchId),
        DevicesAPI.controlDevice(
            DeviceControlModel(
-                deviceId: twoTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
            twoTouchId),
      ]);

@ -213,11 +228,15 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
      final response = await Future.wait([
        DevicesAPI.controlDevice(
            DeviceControlModel(
-                deviceId: twoTouchId, code: 'switch_1', value: deviceStatus.firstSwitch),
+                deviceId: twoTouchId,
+                code: 'switch_1',
+                value: deviceStatus.firstSwitch),
            twoTouchId),
        DevicesAPI.controlDevice(
            DeviceControlModel(
-                deviceId: twoTouchId, code: 'switch_2', value: deviceStatus.secondSwitch),
+                deviceId: twoTouchId,
+                code: 'switch_2',
+                value: deviceStatus.secondSwitch),
            twoTouchId),
      ]);
      if (response.every((element) => !element['success'])) {
@ -237,8 +256,10 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
        groupTwoTouchList[i].firstSwitch = true;
        groupTwoTouchList[i].secondSwitch = true;
      }
-      emit(UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: true));
-      List<String> allDeviceIds = groupTwoTouchList.map((device) => device.deviceId).toList();
+      emit(
+          UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: true));
+      List<String> allDeviceIds =
+          groupTwoTouchList.map((device) => device.deviceId).toList();

      final response1 = await DevicesAPI.deviceBatchController(
        code: 'switch_1',
@ -271,9 +292,11 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
        groupTwoTouchList[i].secondSwitch = false;
      }

-      emit(UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: false));
+      emit(UpdateGroupState(
+          twoTouchList: groupTwoTouchList, allSwitches: false));

-      List<String> allDeviceIds = groupTwoTouchList.map((device) => device.deviceId).toList();
+      List<String> allDeviceIds =
+          groupTwoTouchList.map((device) => device.deviceId).toList();

      final response1 = await DevicesAPI.deviceBatchController(
        code: 'switch_1',
@ -298,17 +321,20 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  void _changeSliding(ChangeSlidingSegment event, Emitter<TwoTouchState> emit) async {
+  void _changeSliding(
+      ChangeSlidingSegment event, Emitter<TwoTouchState> emit) async {
    emit(ChangeSlidingSegmentState(value: event.value));
  }

-  void _setCounterValue(SetCounterValue event, Emitter<TwoTouchState> emit) async {
+  void _setCounterValue(
+      SetCounterValue event, Emitter<TwoTouchState> emit) async {
    emit(LoadingNewSate(twoTouchModel: deviceStatus));
    int seconds = 0;
    try {
      seconds = event.duration.inSeconds;
      final response = await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: twoTouchId, code: event.deviceCode, value: seconds),
+          DeviceControlModel(
+              deviceId: twoTouchId, code: event.deviceCode, value: seconds),
          twoTouchId);

      if (response['success'] ?? false) {
@ -333,7 +359,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  void _getCounterValue(GetCounterEvent event, Emitter<TwoTouchState> emit) async {
+  void _getCounterValue(
+      GetCounterEvent event, Emitter<TwoTouchState> emit) async {
    emit(LoadingInitialState());
    try {
      add(GetScheduleEvent());
@ -441,7 +468,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
        deviceId: twoTouchId,
      );
      List<dynamic> jsonData = response;
-      listSchedule = jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
+      listSchedule =
+          jsonData.map((item) => ScheduleModel.fromJson(item)).toList();
      emit(InitialState());
    } on DioException catch (e) {
      final errorData = e.response!.data;
@ -452,12 +480,13 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {

  int? getTimeStampWithoutSeconds(DateTime? dateTime) {
    if (dateTime == null) return null;
-    DateTime dateTimeWithoutSeconds =
-        DateTime(dateTime.year, dateTime.month, dateTime.day, dateTime.hour, dateTime.minute);
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
    return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
  }

-  Future toggleRepeat(ToggleScheduleEvent event, Emitter<TwoTouchState> emit) async {
+  Future toggleRepeat(
+      ToggleScheduleEvent event, Emitter<TwoTouchState> emit) async {
    try {
      emit(LoadingInitialState());
      final response = await DevicesAPI.changeSchedule(
@ -476,7 +505,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  Future deleteSchedule(DeleteScheduleEvent event, Emitter<TwoTouchState> emit) async {
+  Future deleteSchedule(
+      DeleteScheduleEvent event, Emitter<TwoTouchState> emit) async {
    try {
      emit(LoadingInitialState());
      final response = await DevicesAPI.deleteSchedule(
@ -496,7 +526,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  void _fetchTwoTouchWizardStatus(InitialWizardEvent event, Emitter<TwoTouchState> emit) async {
+  void _fetchTwoTouchWizardStatus(
+      InitialWizardEvent event, Emitter<TwoTouchState> emit) async {
    emit(LoadingInitialState());
    try {
      devicesList = [];
@ -506,7 +537,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
          HomeCubit.getInstance().selectedSpace?.id ?? '', '2GT');

      for (int i = 0; i < devicesList.length; i++) {
-        var response = await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
+        var response =
+            await DevicesAPI.getDeviceStatus(devicesList[i].uuid ?? '');
        List<StatusModel> statusModelList = [];
        for (var status in response['status']) {
          statusModelList.add(StatusModel.fromJson(status));
@ -529,15 +561,16 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
          return true;
        });
      }
-      emit(UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: allSwitchesOn));
+      emit(UpdateGroupState(
+          twoTouchList: groupTwoTouchList, allSwitches: allSwitchesOn));
    } catch (e) {
      emit(FailedState(error: e.toString()));
      return;
    }
  }

-  void _changeFirstWizardSwitch(
-      ChangeFirstWizardSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
+  void _changeFirstWizardSwitch(ChangeFirstWizardSwitchStatusEvent event,
+      Emitter<TwoTouchState> emit) async {
    emit(LoadingNewSate(twoTouchModel: deviceStatus));
    try {
      bool allSwitchesValue = true;
@ -550,7 +583,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
        }
      });

-      emit(UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoTouchList: groupTwoTouchList, allSwitches: allSwitchesValue));
      final response = await DevicesAPI.deviceBatchController(
        code: 'switch_1',
        devicesUuid: [event.deviceId],
@ -565,8 +599,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
    }
  }

-  void _changeSecondWizardSwitch(
-      ChangeSecondWizardSwitchStatusEvent event, Emitter<TwoTouchState> emit) async {
+  void _changeSecondWizardSwitch(ChangeSecondWizardSwitchStatusEvent event,
+      Emitter<TwoTouchState> emit) async {
    emit(LoadingNewSate(twoTouchModel: deviceStatus));
    try {
      bool allSwitchesValue = true;
@ -579,7 +613,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
        }
      });

-      emit(UpdateGroupState(twoTouchList: groupTwoTouchList, allSwitches: allSwitchesValue));
+      emit(UpdateGroupState(
+          twoTouchList: groupTwoTouchList, allSwitches: allSwitchesValue));

      final response = await DevicesAPI.deviceBatchController(
        code: 'switch_2',
@ -598,7 +633,8 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
  String statusSelected = '';
  String optionSelected = '';

-  Future<void> _changeStatus(ChangeStatusEvent event, Emitter<TwoTouchState> emit) async {
+  Future<void> _changeStatus(
+      ChangeStatusEvent event, Emitter<TwoTouchState> emit) async {
    try {
      emit(LoadingInitialState());
      final Map<String, Map<String, String>> controlMap = {
@ -627,11 +663,15 @@ class TwoTouchBloc extends Bloc<TwoTouchEvent, TwoTouchState> {
      final selectedControl = controlMap[optionSelected]?[statusSelected];
      if (selectedControl != null) {
        await DevicesAPI.controlDevice(
-          DeviceControlModel(deviceId: twoTouchId, code: optionSelected, value: selectedControl),
+          DeviceControlModel(
+              deviceId: twoTouchId,
+              code: optionSelected,
+              value: selectedControl),
          twoTouchId,
        );
      } else {
-        emit(const FailedState(error: 'Invalid statusSelected or optionSelected'));
+        emit(const FailedState(
+            error: 'Invalid statusSelected or optionSelected'));
      }
    } on DioException catch (e) {
      final errorData = e.response!.data;
--- a/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_bloc.dart
+++ b/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_bloc.dart
@ -18,6 +18,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
    on<ChangeIndicatorEvent>(_changeIndicator);
    on<ChangeValueEvent>(_changeValue);
    on<WallSensorUpdatedEvent>(_wallSensorUpdated);
+    on<GetDeviceReportsEvent>(_getDeviceReports);
  }

  void _fetchCeilingSensorStatus(InitialEvent event, Emitter<WallSensorState> emit) async {
@ -91,4 +92,17 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
    } catch (_) {}
    emit(UpdateState(wallSensorModel: deviceStatus));
  }
+
+  void _getDeviceReports(GetDeviceReportsEvent event, Emitter<WallSensorState> emit) async {
+    emit(LoadingInitialState());
+
+    try {
+      await DevicesAPI.getDeviceReports(deviceId, event.code).then((value) {
+        emit(DeviceReportsState(deviceReport: value, code: event.code));
+      });
+    } catch (e) {
+      emit(FailedState(error: e.toString()));
+      return;
+    }
+  }
 }
--- a/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_event.dart
+++ b/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_event.dart
@ -29,3 +29,15 @@ class ChangeValueEvent extends WallSensorEvent {
  @override
  List<Object> get props => [value, code];
 }
+
+class GetDeviceReportsEvent extends WallSensorEvent {
+  final String deviceUuid;
+  final String code;
+  const GetDeviceReportsEvent({
+    required this.deviceUuid,
+    required this.code,
+  });
+
+  @override
+  List<Object> get props => [deviceUuid, code];
+}
--- a/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_state.dart
+++ b/lib/features/devices/bloc/wall_sensor_bloc/wall_sensor_state.dart
@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/wall_sensor_model.dart';

 class WallSensorState extends Equatable {
@ -36,3 +37,9 @@ class FailedState extends WallSensorState {
  @override
  List<Object> get props => [error];
 }
+
+class DeviceReportsState extends WallSensorState {
+  final DeviceReport deviceReport;
+  final String code;
+  const DeviceReportsState({required this.deviceReport, required this.code});
+}
--- a/lib/features/devices/model/ac_model.dart
+++ b/lib/features/devices/model/ac_model.dart
@ -11,12 +11,14 @@ class AcStatusModel {
  bool childLock;
  late TempModes acMode;
  late FanSpeeds acFanSpeed;
+  int countdown1;

  AcStatusModel(
      {required this.uuid,
      required this.acSwitch,
      required this.modeString,
      required this.tempSet,
+      required this.countdown1,
      required this.currentTemp,
      required this.fanSpeedsString,
      required this.childLock}) {
@ -25,25 +27,28 @@ class AcStatusModel {
  }

  factory AcStatusModel.fromJson(String id, List<StatusModel> jsonList) {
-    late bool _acSwitch;
-    late String _mode;
-    late int _tempSet;
-    late int _currentTemp;
-    late String _fanSpeeds;
-    late bool _childLock;
+    bool _acSwitch = false;
+    String _mode = '';
+    int _tempSet = 210;
+    int _currentTemp = 210;
+    String _fanSpeeds = '';
+    int _countdown1 = 0;
+    bool _childLock = false;
    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'switch') {
        _acSwitch = jsonList[i].value ?? false;
      } else if (jsonList[i].code == 'mode') {
-        _mode = jsonList[i].value ?? TempModes.cold;
+        _mode = jsonList[i].value ?? '';
      } else if (jsonList[i].code == 'temp_set') {
        _tempSet = jsonList[i].value ?? 210;
      } else if (jsonList[i].code == 'temp_current') {
        _currentTemp = jsonList[i].value ?? 210;
      } else if (jsonList[i].code == 'level') {
-        _fanSpeeds = jsonList[i].value ?? 210;
+        _fanSpeeds = jsonList[i].value ?? '';
      } else if (jsonList[i].code == 'child_lock') {
        _childLock = jsonList[i].value ?? false;
+      } else if (jsonList[i].code == 'countdown_time') {
+        _countdown1 = jsonList[i].value ?? 0;
      }
    }
    return AcStatusModel(
@ -53,6 +58,7 @@ class AcStatusModel {
        tempSet: _tempSet,
        currentTemp: _currentTemp,
        fanSpeedsString: _fanSpeeds,
+        countdown1: _countdown1,
        childLock: _childLock);
  }

--- a/lib/features/devices/model/ceiling_sensor_model.dart
+++ b/lib/features/devices/model/ceiling_sensor_model.dart
@ -7,23 +7,31 @@ class CeilingSensorModel {
  int presenceRange;
  int sportsPara;
  String bodyMovement;
+  String nobodyTime;
+  int movingMaxDis;
+  SpaceTypes spaceType;

  CeilingSensorModel(
      {required this.presenceState,
      required this.sensitivity,
+      required this.nobodyTime,
+      required this.spaceType,
      required this.checkingResult,
      required this.presenceRange,
      required this.sportsPara,
+      required this.movingMaxDis,
      required this.bodyMovement});

  factory CeilingSensorModel.fromJson(List<StatusModel> jsonList) {
-    late String _presenceState;
-    late int _sensitivity;
-    late String _checkingResult;
+    String _presenceState = 'none';
+    int _sensitivity = 1;
+    String _checkingResult = '';
    int _presenceRange = 1;
    int _sportsPara = 1;
+    int _moving_max_dis = 0;
    String _bodyMovement = 'none';
-
+    String _nobody_time = 'none';
+    SpaceTypes _spaceType = SpaceTypes.none;
    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'presence_state') {
        _presenceState = jsonList[i].value ?? 'none';
@ -37,14 +45,46 @@ class CeilingSensorModel {
        _sportsPara = jsonList[i].value ?? 0;
      } else if (jsonList[i].code == 'body_movement') {
        _bodyMovement = jsonList[i].value ?? '';
-      }
+      } else if (jsonList[i].code == 'nobody_time') {
+        _nobody_time = jsonList[i].value ?? 'none';
+      } else if (jsonList[i].code == 'moving_max_dis') {
+        _moving_max_dis = jsonList[i].value ?? 0;
+      } else if (jsonList[i].code == 'scene')
+        _spaceType = getSpaceType(jsonList[i].value ?? 'none');
    }
    return CeilingSensorModel(
+        spaceType: _spaceType,
+        movingMaxDis: _moving_max_dis,
        presenceState: _presenceState,
        sensitivity: _sensitivity,
        checkingResult: _checkingResult,
        presenceRange: _presenceRange,
        sportsPara: _sportsPara,
+        nobodyTime: _nobody_time,
        bodyMovement: _bodyMovement);
  }
 }
+
+enum SpaceTypes {
+  none,
+  parlour,
+  area,
+  toilet,
+  bedroom,
+}
+
+SpaceTypes getSpaceType(String value) {
+  switch (value) {
+    case 'parlour':
+      return SpaceTypes.parlour;
+    case 'area':
+      return SpaceTypes.area;
+    case 'toilet':
+      return SpaceTypes.toilet;
+    case 'bedroom':
+      return SpaceTypes.bedroom;
+    case 'none':
+    default:
+      return SpaceTypes.none;
+  }
+}
--- a/lib/features/devices/model/curtain_model.dart
+++ b/lib/features/devices/model/curtain_model.dart
@ -10,11 +10,11 @@ class CurtainModel {
  });

  factory CurtainModel.fromJson(List<StatusModel> jsonList) {
-    late String _control;
-    late int _percent;
+    String _control = '';
+    int _percent = 0;
    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'control') {
-        _control = jsonList[i].value ?? false;
+        _control = jsonList[i].value ?? '';
      }
      if (jsonList[i].code == 'percent_control') {
        _percent = jsonList[i].value ?? 0;
--- a/lib/features/devices/model/device_info_model.dart
+++ b/lib/features/devices/model/device_info_model.dart
@ -1,5 +1,3 @@
-import 'dart:convert';
-
 class DeviceInfoModel {
  final int activeTime;
  final String category;
--- a/lib/features/devices/model/device_model.dart
+++ b/lib/features/devices/model/device_model.dart
@ -10,6 +10,9 @@ class DeviceModel {
  String? model;
  String? name;
  String? icon;
+  String? categoryName;
+  bool? toggleStatus = false;
+
  String? type;
  bool? isOnline;
  List<StatusModel> status = [];
@ -21,6 +24,8 @@ class DeviceModel {
  DeviceType? productType;
  bool isSelected = false;
  late List<FunctionModel> functions;
+  DeviceSubspace? subspace;
+
  DeviceModel(
      {this.activeTime,
      this.productUuid,
@ -34,6 +39,9 @@ class DeviceModel {
      this.updateTime,
      this.uuid,
      this.productType,
+      this.categoryName,
+      this.subspace,
+      this.toggleStatus,
      this.icon,
      this.type}) {
    functions = getFunctions(productType!);
@ -87,23 +95,74 @@ class DeviceModel {
    } else {
      tempIcon = Assets.assetsIconsLogo;
    }
+    // Step 1: Parse `status` as before
+    final statusList = (json['status'] as List<dynamic>?)
+        ?.map((st) => StatusModel.fromJson(st as Map<String, dynamic>))
+        .toList();
+
+// Step 2: Check whether ANY status means "off"
+    final anyOff = statusList?.any((s) {
+      final code = s.code;
+      if (code == null) return false;
+
+      // 1) Handle "switch" or "switch_x"
+      if (code == 'switch' || code.startsWith('switch_')) {
+        // If it's false, we consider that "off"
+        return s.value == false;
+      }
+
+      // 2) If code == "control" and value == "stop", consider "off"
+      if (s.value == 'open') {
+        return true;
+      }
+
+      // 3) If code == "percent_control" and value == 0, maybe "off"
+      if (code == 'percent_control' && s.value == 0) {
+        return true;
+      }
+
+      // Add more conditions for other codes as needed
+
+      // Default: if none of the above apply, it's not "off"
+      return false;
+    });
+
+// Step 3: Decide final toggleStatus (true = fully "on", false = partially/fully "off")
+    bool computedToggleStatus = !(anyOff ?? false);

    return DeviceModel(
-        icon: tempIcon,
-        activeTime: json['activeTime'],
-        // id: json['id'],
-        localKey: json['localKey'],
-        model: json['model'],
-        name: json['name'],
-        isOnline: json['online'],
-        productName: json['productName'],
-        timeZone: json['timeZone'],
-        updateTime: json['updateTime'],
-        uuid: json['uuid'],
-        productType: type,
-        type: json['productType'],
-        status: [],
-        productUuid: json['productUuid']);
+      icon: tempIcon,
+      activeTime: json['activeTime'],
+      categoryName: json['categoryName'],
+      localKey: json['localKey'],
+      model: json['model'],
+      name: json['name'],
+      isOnline: json['online'],
+      productName: json['productName'],
+      timeZone: json['timeZone'],
+      updateTime: json['updateTime'],
+      uuid: json['uuid'],
+      productType: type,
+      type: json['productType'],
+
+      // Use the newly computed toggleStatus:
+      toggleStatus: computedToggleStatus,
+
+      // Or if you prefer to use the value returned by the backend when available:
+      // toggleStatus: json['toggleStatus'] ?? computedToggleStatus,
+
+      status: statusList ?? [],
+      subspace: json['subspace'] != null
+          ? DeviceSubspace.fromJson(json['subspace'])
+          : DeviceSubspace(
+              createdAt: null,
+              disabled: false,
+              subspaceName: '',
+              updatedAt: null,
+              uuid: '',
+            ),
+      productUuid: json['productUuid'],
+    );
  }

  Map<String, dynamic> toJson() {
@ -118,9 +177,50 @@ class DeviceModel {
      'updateTime': updateTime,
      'uuid': uuid,
      'productType': productType,
+      'subspace': subspace?.toJson(), // serialize subspace
    };
  }

  List<FunctionModel> getFunctions(DeviceType type) =>
      devicesFunctionsMap[productType] ?? [];
 }
+
+class DeviceSubspace {
+  String? uuid;
+  DateTime? createdAt;
+  DateTime? updatedAt;
+  String? subspaceName;
+  bool? disabled;
+
+  DeviceSubspace({
+    this.uuid,
+    this.createdAt,
+    this.updatedAt,
+    this.subspaceName,
+    this.disabled,
+  });
+
+  factory DeviceSubspace.fromJson(Map<String, dynamic> json) {
+    return DeviceSubspace(
+      uuid: json['uuid'],
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt'])
+          : null,
+      updatedAt: json['updatedAt'] != null
+          ? DateTime.tryParse(json['updatedAt'])
+          : null,
+      subspaceName: json['subspaceName'],
+      disabled: json['disabled'],
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'createdAt': createdAt?.toIso8601String(),
+      'updatedAt': updatedAt?.toIso8601String(),
+      'subspaceName': subspaceName,
+      'disabled': disabled,
+    };
+  }
+}
--- a/lib/features/devices/model/door_sensor_model.dart
+++ b/lib/features/devices/model/door_sensor_model.dart
@ -1,27 +1,22 @@
-
-
-
-
 import 'package:syncrow_app/features/devices/model/status_model.dart';

 class DoorSensorModel {
  bool doorContactState;
  int batteryPercentage;

-  DoorSensorModel(
-      {required this.doorContactState,
-        required this.batteryPercentage,
-      });
+  DoorSensorModel({
+    required this.doorContactState,
+    required this.batteryPercentage,
+  });

  factory DoorSensorModel.fromJson(List<StatusModel> jsonList) {
-    late bool _doorContactState;
-    late int _batteryPercentage;
-
+    bool _doorContactState = false;
+    int _batteryPercentage = 0;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'doorcontact_state') {
        _doorContactState = jsonList[i].value ?? false;
-      } else  if (jsonList[i].code == 'battery_percentage') {
+      } else if (jsonList[i].code == 'battery_percentage') {
        _batteryPercentage = jsonList[i].value ?? 0;
      }
    }
--- a/lib/features/devices/model/garage_door_model.dart
+++ b/lib/features/devices/model/garage_door_model.dart
@ -24,15 +24,15 @@ class GarageDoorModel {
  });

  factory GarageDoorModel.fromJson(List<StatusModel> jsonList) {
-    late bool _switch1 = false;
-    late bool _doorContactState = false;
-    late int _countdown1 = 0;
-    late int _countdownAlarm = 0;
-    late String _doorControl1 = "closed";
-    late bool _voiceControl1 = false;
-    late String _doorState1 = "closed";
-    late int _batteryPercentage = 0;
-    late int _tr_timecon = 0;
+    bool _switch1 = false;
+    bool _doorContactState = false;
+    int _countdown1 = 0;
+    int _countdownAlarm = 0;
+    String _doorControl1 = "closed";
+    bool _voiceControl1 = false;
+    String _doorState1 = "closed";
+    int _batteryPercentage = 0;
+    int _tr_timecon = 0;

    for (var status in jsonList) {
      switch (status.code) {
--- a/lib/features/devices/model/one_gang_model.dart
+++ b/lib/features/devices/model/one_gang_model.dart
@ -1,29 +1,27 @@
-
 import 'package:syncrow_app/features/devices/model/status_model.dart';

 class OneGangModel {
  bool firstSwitch;
  int firstCountDown;

-  OneGangModel(
-      {required this.firstSwitch,
-        required this.firstCountDown,
-      });
+  OneGangModel({
+    required this.firstSwitch,
+    required this.firstCountDown,
+  });

  factory OneGangModel.fromJson(List<StatusModel> jsonList) {
-    late bool _switch;
-    late int _count;
-
+    bool _switch = false;
+    int _count = 0;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'switch_1') {
        _switch = jsonList[i].value ?? false;
-      } else  if (jsonList[i].code == 'countdown_1') {
+      } else if (jsonList[i].code == 'countdown_1') {
        _count = jsonList[i].value ?? 0;
      }
    }
    return OneGangModel(
-        firstSwitch: _switch,
+      firstSwitch: _switch,
      firstCountDown: _count,
    );
  }
--- a/lib/features/devices/model/one_touch_model.dart
+++ b/lib/features/devices/model/one_touch_model.dart
@ -1,5 +1,3 @@
-
-
 import 'package:syncrow_app/features/devices/model/status_model.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';

@ -15,15 +13,14 @@ class OneTouchModel {
      required this.firstCountDown,
      required this.light_mode,
      required this.relay,
-      required this.relay_status_1
-      });
+      required this.relay_status_1});

  factory OneTouchModel.fromJson(List<StatusModel> jsonList) {
-    late bool _switch;
-    late int _count;
-    late String _relay;
-    late String _light_mode;
-    late String relay_status_1;
+    bool _switch = false;
+    int _count = 0;
+    String _relay = '';
+    String _light_mode = '';
+    String relay_status_1 = '';

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'switch_1') {
@ -41,10 +38,8 @@ class OneTouchModel {
    return OneTouchModel(
        firstSwitch: _switch,
        firstCountDown: _count,
-        light_mode: lightStatusExtension.fromString(_light_mode) ,
-        relay: StatusExtension.fromString(_relay ) ,
-        relay_status_1:  StatusExtension.fromString(relay_status_1 ) 
-        
-        );
+        light_mode: lightStatusExtension.fromString(_light_mode),
+        relay: StatusExtension.fromString(_relay),
+        relay_status_1: StatusExtension.fromString(relay_status_1));
  }
 }
--- a/lib/features/devices/model/six_scene_model.dart
+++ b/lib/features/devices/model/six_scene_model.dart
@ -22,14 +22,14 @@ class SixSceneModel {
  });

  factory SixSceneModel.fromJson(List<StatusModel> jsonList) {
-    late dynamic _scene_1;
-    late dynamic _scene_2;
-    late dynamic _scene_3;
-    late dynamic _scene_4;
-    late dynamic _scene_5;
-    late dynamic _scene_6;
-    late dynamic _scene_id_group_id;
-    late dynamic _switch_backlight;
+    dynamic _scene_1 = '';
+    dynamic _scene_2 = '';
+    dynamic _scene_3 = '';
+    dynamic _scene_4 = '';
+    dynamic _scene_5 = '';
+    dynamic _scene_6 = '';
+    dynamic _scene_id_group_id = 0;
+    dynamic _switch_backlight = false;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'scene_1') {
--- a/lib/features/devices/model/smart_door_model.dart
+++ b/lib/features/devices/model/smart_door_model.dart
@ -39,23 +39,23 @@ class SmartDoorModel {
      required this.normalOpenSwitch});

  factory SmartDoorModel.fromJson(List<StatusModel> jsonList) {
-    late int _unlockFingerprint;
-    late int _unlockPassword;
-    late int _unlockTemporary;
-    late int _unlockCard;
-    late String _unlockAlarm;
-    late int _unlockRequest;
-    late int _residualElectricity;
-    late bool _reverseLock;
-    late int _unlockApp;
-    late bool _hijack;
-    late bool _doorbell;
-    late String _unlockOfflinePd;
-    late String _unlockOfflineClear;
-    late String _unlockDoubleKit;
-    late String _remoteNoPdSetkey;
-    late String _remoteNoDpKey;
-    late bool _normalOpenSwitch;
+    int _unlockFingerprint = 0;
+    int _unlockPassword = 0;
+    int _unlockTemporary = 0;
+    int _unlockCard = 0;
+    String _unlockAlarm = '';
+    int _unlockRequest = 0;
+    int _residualElectricity = 0;
+    bool _reverseLock = false;
+    int _unlockApp = 0;
+    bool _hijack = false;
+    bool _doorbell = false;
+    String _unlockOfflinePd = '';
+    String _unlockOfflineClear = '';
+    String _unlockDoubleKit = '';
+    String _remoteNoPdSetkey = '';
+    String _remoteNoDpKey = '';
+    bool _normalOpenSwitch = false;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'unlock_fingerprint') {
--- a/lib/features/devices/model/sos_model.dart
+++ b/lib/features/devices/model/sos_model.dart
@ -10,8 +10,8 @@ class SosModel {
  });

  factory SosModel.fromJson(List<StatusModel> jsonList) {
-    late String _sosContactState;
-    late int _batteryPercentage;
+    String _sosContactState = '';
+    int _batteryPercentage = 0;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'sos') {
--- a/lib/features/devices/model/wall_sensor_model.dart
+++ b/lib/features/devices/model/wall_sensor_model.dart
@ -9,17 +9,18 @@ class WallSensorModel {
  int currentDistance;
  int illuminance;
  bool indicator;
+  int noOneTime;

-  WallSensorModel({
-    required this.presenceState,
-    required this.farDetection,
-    required this.presenceTime,
-    required this.motionSensitivity,
-    required this.motionlessSensitivity,
-    required this.currentDistance,
-    required this.illuminance,
-    required this.indicator,
-  });
+  WallSensorModel(
+      {required this.presenceState,
+      required this.farDetection,
+      required this.presenceTime,
+      required this.motionSensitivity,
+      required this.motionlessSensitivity,
+      required this.currentDistance,
+      required this.illuminance,
+      required this.indicator,
+      required this.noOneTime});

  factory WallSensorModel.fromJson(List<StatusModel> jsonList) {
    late String _presenceState;
@ -30,6 +31,7 @@ class WallSensorModel {
    late int _currentDistance;
    late int _illuminance;
    late bool _indicator;
+    late int _noOneTime;

    for (int i = 0; i < jsonList.length; i++) {
      if (jsonList[i].code == 'presence_state') {
@ -48,6 +50,8 @@ class WallSensorModel {
        _illuminance = jsonList[i].value ?? 0;
      } else if (jsonList[i].code == 'indicator') {
        _indicator = jsonList[i].value ?? false;
+      } else if (jsonList[i].code == 'no_one_time') {
+        _noOneTime = jsonList[i].value ?? 0;
      }
    }
    return WallSensorModel(
@ -58,6 +62,7 @@ class WallSensorModel {
        motionlessSensitivity: _motionlessSensitivity,
        currentDistance: _currentDistance,
        illuminance: _illuminance,
-        indicator: _indicator);
+        indicator: _indicator,
+        noOneTime: _noOneTime);
  }
 }
--- a/lib/features/devices/view/device_settings/profile_page.dart
+++ b/lib/features/devices/view/device_settings/profile_page.dart
@ -151,15 +151,17 @@ class SettingProfilePage extends StatelessWidget {
                          padding: const EdgeInsets.all(20),
                          child: InkWell(
                            onTap: () async {
-                              bool val = await Navigator.of(context).push(
-                                MaterialPageRoute(
-                                    builder: (context) => LocationSettingPage(
-                                          space: spaces!.first,
-                                          deviceId: device?.uuid ?? '',
-                                        )),
-                              );
-                              if (val == true) {
-                                _bloc.add(const DeviceSettingInitialInfo());
+                              if (HomeCubit.visitorPasswordManagement) {
+                                bool? val = await Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                      builder: (context) => LocationSettingPage(
+                                            space: spaces!.first,
+                                            deviceId: device?.uuid ?? '',
+                                          )),
+                                );
+                                if (val != null && val == true) {
+                                  _bloc.add(const DeviceSettingInitialInfo());
+                                }
                              }
                            },
                            child: Row(
--- a/lib/features/devices/view/device_settings/settings_page.dart
+++ b/lib/features/devices/view/device_settings/settings_page.dart
@ -40,10 +40,8 @@ class SettingsPage extends StatelessWidget {

            return state is DeviceSettingLoadingState
                ? const Center(
-                    child: DefaultContainer(
-                        width: 50,
-                        height: 50,
-                        child: CircularProgressIndicator()),
+                    child:
+                        DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
                  )
                : ListView(
                    children: [
@ -71,31 +69,25 @@ class SettingsPage extends StatelessWidget {
                                children: [
                                  const SizedBox(height: 20),
                                  DefaultContainer(
-                                    borderRadius: const BorderRadius.all(
-                                        Radius.circular(30)),
+                                    borderRadius: const BorderRadius.all(Radius.circular(30)),
                                    child: Padding(
                                      padding: const EdgeInsets.all(10.0),
                                      child: Padding(
-                                        padding:
-                                            const EdgeInsets.only(left: 90),
+                                        padding: const EdgeInsets.only(left: 90),
                                        child: Row(
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.spaceBetween,
+                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                          children: [
                                            Expanded(
                                              child: Column(
-                                                crossAxisAlignment:
-                                                    CrossAxisAlignment.start,
+                                                crossAxisAlignment: CrossAxisAlignment.start,
                                                children: [
                                                  SizedBox(
                                                      child: Text(
                                                    _bloc.deviceInfo.name,
                                                    style: const TextStyle(
                                                      fontSize: 16,
-                                                      fontWeight:
-                                                          FontWeight.w700,
-                                                      color: ColorsManager
-                                                          .grayColor,
+                                                      fontWeight: FontWeight.w700,
+                                                      color: ColorsManager.grayColor,
                                                    ),
                                                    overflow: TextOverflow
                                                        .ellipsis, // Adds ellipsis (...) when the text overflows.
@ -106,10 +98,7 @@ class SettingsPage extends StatelessWidget {
                                                    height: 5,
                                                  ),
                                                  BodySmall(
-                                                      text: _bloc
-                                                          .deviceInfo
-                                                          .subspace
-                                                          .subspaceName),
+                                                      text: _bloc.deviceInfo.subspace.subspaceName),
                                                ],
                                              ),
                                            ),
@ -136,13 +125,10 @@ class SettingsPage extends StatelessWidget {
                                      backgroundColor: Colors.white,
                                      child: CircleAvatar(
                                        radius: 40,
-                                        backgroundColor:
-                                            ColorsManager.backgroundColor,
+                                        backgroundColor: ColorsManager.backgroundColor,
                                        child: Column(
-                                          crossAxisAlignment:
-                                              CrossAxisAlignment.center,
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.center,
+                                          crossAxisAlignment: CrossAxisAlignment.center,
+                                          mainAxisAlignment: MainAxisAlignment.center,
                                          children: [
                                            device!.type == "SOS"
                                                ? ClipOval(
@ -153,20 +139,15 @@ class SettingsPage extends StatelessWidget {
                                                    ),
                                                  )
                                                : Padding(
-                                                    padding: device!.type ==
-                                                            "4S"
-                                                        ? const EdgeInsets.only(
-                                                            top: 5)
-                                                        : const EdgeInsets.only(
-                                                            top: 0),
+                                                    padding: device!.type == "4S"
+                                                        ? const EdgeInsets.only(top: 5)
+                                                        : const EdgeInsets.only(top: 0),
                                                    child: SizedBox(
                                                      height: 70,
                                                      child: SvgPicture.asset(
                                                        device!.type == "4S"
-                                                            ? Assets
-                                                                .fourSceneIcon
-                                                            : Assets
-                                                                .sixSceneIcon,
+                                                            ? Assets.fourSceneIcon
+                                                            : Assets.sixSceneIcon,
                                                        fit: BoxFit.contain,
                                                      ),
                                                    ),
@ -221,114 +202,114 @@ class SettingsPage extends StatelessWidget {
                        ),
                      ),
                      const SizedBox(height: 20),
-                      const BodyMedium(
-                        text: 'Device Offline Notification',
-                        fontWeight: FontWeight.w700,
-                        fontSize: 12,
-                        fontColor: ColorsManager.grayColor,
-                      ),
-                      DefaultContainer(
-                        child: Column(
-                          children: [
-                            SettingWidget(
-                              value: _bloc.enableAlarm,
-                              onChanged: (p0) {
-                                context
-                                    .read<DeviceSettingBloc>()
-                                    .add(ToggleEnableAlarmEvent(p0));
-                              },
-                              isNotification: true,
-                              onTap: () {},
-                              text: 'Offline Notification',
-                              icon: Assets.notificationIcon,
-                            ),
-                          ],
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                      const BodyMedium(
-                        text: 'Others',
-                        fontWeight: FontWeight.w700,
-                        fontSize: 12,
-                        fontColor: ColorsManager.grayColor,
-                      ),
-                      const SizedBox(height: 5),
-                      DefaultContainer(
-                        child: Column(
-                          children: [
-                            SettingWidget(
-                              onTap: () {
-                                Navigator.of(context).push(
-                                  MaterialPageRoute(
-                                      builder: (context) =>
-                                          ShareDevicePage(device: device!)),
-                                );
-                              },
-                              text: 'Share Device',
-                              icon: Assets.shareIcon,
-                            ),
-                            // const Divider(
-                            //   color: ColorsManager.dividerColor,
-                            // ),
-                            // SettingWidget(
-                            //   onTap: () {
-                            //     Navigator.of(context).push(
-                            //       MaterialPageRoute(
-                            //           builder: (context) =>
-                            //               FourSceneCreateGroup(
-                            //                   device: device!)),
-                            //     );
-                            //   },
-                            //   text: 'Create Group',
-                            //   icon: Assets.createGroupIcon,
-                            // ),
-                            const Divider(
-                              color: ColorsManager.dividerColor,
-                            ),
-                            SettingWidget(
-                              onTap: () {
-                                Navigator.of(context).push(
-                                  MaterialPageRoute(
-                                      builder: (context) =>
-                                          FaqSettingPage(device: device!)),
-                                );
-                              },
-                              text: 'Device FAQ',
-                              icon: Assets.faqIcon,
-                            ),
-                            const Divider(
-                              color: ColorsManager.dividerColor,
-                            ),
-                            SettingWidget(
-                              onTapUpdate: () {
-                                showDialog(
-                                  context: context,
-                                  builder: (context) {
-                                    return UpdateInfoDialog(
-                                      cancelTab: () {
-                                        Navigator.of(context).pop();
-                                      },
-                                      confirmTab: () {
-                                        Navigator.of(context).pop();
-                                      },
-                                    );
-                                  },
-                                );
-                              },
-                              isUpdate: true,
-                              onTap: () {
-                                Navigator.of(context).push(
-                                  MaterialPageRoute(
-                                      builder: (context) =>
-                                          const UpdatePageSetting()),
-                                );
-                              },
-                              text: 'Device Update',
-                              icon: Assets.updateIcon,
-                            ),
-                          ],
-                        ),
-                      ),
+                      // const BodyMedium(
+                      //   text: 'Device Offline Notification',
+                      //   fontWeight: FontWeight.w700,
+                      //   fontSize: 12,
+                      //   fontColor: ColorsManager.grayColor,
+                      // ),
+                      // DefaultContainer(
+                      //   child: Column(
+                      //     children: [
+                      //       SettingWidget(
+                      //         value: _bloc.enableAlarm,
+                      //         onChanged: (p0) {
+                      //           context
+                      //               .read<DeviceSettingBloc>()
+                      //               .add(ToggleEnableAlarmEvent(p0));
+                      //         },
+                      //         isNotification: true,
+                      //         onTap: () {},
+                      //         text: 'Offline Notification',
+                      //         icon: Assets.notificationIcon,
+                      //       ),
+                      //     ],
+                      //   ),
+                      // ),
+                      // const SizedBox(height: 20),
+                      // const BodyMedium(
+                      //   text: 'Others',
+                      //   fontWeight: FontWeight.w700,
+                      //   fontSize: 12,
+                      //   fontColor: ColorsManager.grayColor,
+                      // ),
+                      // const SizedBox(height: 5),
+                      // DefaultContainer(
+                      //   child: Column(
+                      //     children: [
+                      //       SettingWidget(
+                      //         onTap: () {
+                      //           Navigator.of(context).push(
+                      //             MaterialPageRoute(
+                      //                 builder: (context) =>
+                      //                     ShareDevicePage(device: device!)),
+                      //           );
+                      //         },
+                      //         text: 'Share Device',
+                      //         icon: Assets.shareIcon,
+                      //       ),
+                      //       // const Divider(
+                      //       //   color: ColorsManager.dividerColor,
+                      //       // ),
+                      //       // SettingWidget(
+                      //       //   onTap: () {
+                      //       //     Navigator.of(context).push(
+                      //       //       MaterialPageRoute(
+                      //       //           builder: (context) =>
+                      //       //               FourSceneCreateGroup(
+                      //       //                   device: device!)),
+                      //       //     );
+                      //       //   },
+                      //       //   text: 'Create Group',
+                      //       //   icon: Assets.createGroupIcon,
+                      //       // ),
+                      //       const Divider(
+                      //         color: ColorsManager.dividerColor,
+                      //       ),
+                      //       SettingWidget(
+                      //         onTap: () {
+                      //           Navigator.of(context).push(
+                      //             MaterialPageRoute(
+                      //                 builder: (context) =>
+                      //                     FaqSettingPage(device: device!)),
+                      //           );
+                      //         },
+                      //         text: 'Device FAQ',
+                      //         icon: Assets.faqIcon,
+                      //       ),
+                      //       const Divider(
+                      //         color: ColorsManager.dividerColor,
+                      //       ),
+                      //       SettingWidget(
+                      //         onTapUpdate: () {
+                      //           showDialog(
+                      //             context: context,
+                      //             builder: (context) {
+                      //               return UpdateInfoDialog(
+                      //                 cancelTab: () {
+                      //                   Navigator.of(context).pop();
+                      //                 },
+                      //                 confirmTab: () {
+                      //                   Navigator.of(context).pop();
+                      //                 },
+                      //               );
+                      //             },
+                      //           );
+                      //         },
+                      //         isUpdate: true,
+                      //         onTap: () {
+                      //           Navigator.of(context).push(
+                      //             MaterialPageRoute(
+                      //                 builder: (context) =>
+                      //                     const UpdatePageSetting()),
+                      //           );
+                      //         },
+                      //         text: 'Device Update',
+                      //         icon: Assets.updateIcon,
+                      //       ),
+                      //     ],
+                      //   ),
+                      // ),
                      const SizedBox(height: 20),
                      InkWell(
                        onTap: () {
@ -356,8 +337,7 @@ class SettingsPage extends StatelessWidget {
                                    ),
                                    const SizedBox(height: 10),
                                    Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.spaceBetween,
+                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                      children: [
                                        InkWell(
                                          onTap: () {
@ -379,8 +359,7 @@ class SettingsPage extends StatelessWidget {
                                            text: 'Disconnect Device',
                                            fontWeight: FontWeight.w400,
                                            fontSize: 15,
-                                            fontColor:
-                                                ColorsManager.textPrimaryColor,
+                                            fontColor: ColorsManager.textPrimaryColor,
                                          ),
                                        ),
                                        const Icon(
@ -391,8 +370,7 @@ class SettingsPage extends StatelessWidget {
                                    ),
                                    const SizedBox(height: 20),
                                    Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.spaceBetween,
+                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                      children: [
                                        InkWell(
                                          onTap: () {
@ -404,20 +382,17 @@ class SettingsPage extends StatelessWidget {
                                                    Navigator.of(context).pop();
                                                  },
                                                  confirmTab: () {
-                                                    _bloc.add(
-                                                        DeleteDeviceEvent());
+                                                    _bloc.add(DeleteDeviceEvent());
                                                  },
                                                );
                                              },
                                            );
                                          },
                                          child: const BodyMedium(
-                                            text:
-                                                'Disconnect Device and Wipe Data',
+                                            text: 'Disconnect Device and Wipe Data',
                                            fontWeight: FontWeight.w400,
                                            fontSize: 15,
-                                            fontColor:
-                                                ColorsManager.textPrimaryColor,
+                                            fontColor: ColorsManager.textPrimaryColor,
                                          ),
                                        ),
                                        const Icon(
--- a/lib/features/devices/view/widgets/ACs/ac_interface.dart
+++ b/lib/features/devices/view/widgets/ACs/ac_interface.dart
@ -1,9 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_event.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/ac_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface_controls.dart';
@ -28,6 +30,7 @@ class AcInterface extends StatelessWidget {
      },
      builder: (context, state) {
        AcStatusModel statusModel = AcStatusModel(
+            countdown1: 0,
            uuid: ac.uuid ?? '',
            acSwitch: true,
            modeString: 'hot',
@ -70,6 +73,7 @@ class AcInterface extends StatelessWidget {
                          onTap: () {
                            BlocProvider.of<ACsBloc>(context)
                                .add(AcSwitch(acSwitch: statusModel.acSwitch));
+
                          },
                          child: SvgPicture.asset(Assets.acSwitchIcon))
                    ],
--- a/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
+++ b/lib/features/devices/view/widgets/ACs/ac_interface_controls.dart
@ -7,11 +7,13 @@ import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
 import 'package:syncrow_app/features/devices/model/ac_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_mode_control_unit.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_timer_page.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/generated/assets.dart';

 class AcInterfaceControls extends StatelessWidget {
-  const AcInterfaceControls({super.key, required this.deviceModel, required this.deviceStatus});
+  const AcInterfaceControls(
+      {super.key, required this.deviceModel, required this.deviceStatus});

  final DeviceModel deviceModel;
  final AcStatusModel deviceStatus;
@ -20,8 +22,9 @@ class AcInterfaceControls extends StatelessWidget {
  Widget build(BuildContext context) {
    return BlocBuilder<ACsBloc, AcsState>(
      builder: (context, state) {
-        String lockIconName =
-            deviceStatus.childLock ? Assets.assetsIconsLock : Assets.assetsIconsUnLock;
+        String lockIconName = deviceStatus.childLock
+            ? Assets.assetsIconsLock
+            : Assets.assetsIconsUnLock;

        return Column(
          children: [
@ -34,11 +37,23 @@ class AcInterfaceControls extends StatelessWidget {
              children: [
                Flexible(
                  child: GestureDetector(
-                    onTap: () {},
+                    onTap: () {
+                      Navigator.push(
+                          context,
+                          PageRouteBuilder(
+                              pageBuilder: (context, animation1, animation2) =>
+                                  AcTimerPage(
+                                    deviceStatus: deviceStatus,
+                                    device: deviceModel,
+                                    deviceCode: deviceModel.type!,
+                                    switchCode: '',
+                                  )));
+                    },
                    child: DefaultContainer(
                      height: 55,
                      child: Center(
-                        child: SvgPicture.asset(Assets.assetsIconsAutomatedClock),
+                        child:
+                            SvgPicture.asset(Assets.assetsIconsAutomatedClock),
                      ),
                    ),
                  ),
--- a/lib/features/devices/view/widgets/ACs/ac_timer_page.dart
+++ b/lib/features/devices/view/widgets/ACs/ac_timer_page.dart
@ -0,0 +1,168 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_state.dart';
+import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
+import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_event.dart';
+import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
+import 'package:syncrow_app/features/devices/model/ac_model.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ACs/custom_halfhour_timer_picker.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
+import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
+
+class AcTimerPage extends StatelessWidget {
+  final DeviceModel device;
+  final String deviceCode;
+  final String switchCode;
+  final AcStatusModel deviceStatus;
+
+  const AcTimerPage(
+      {required this.device,
+      required this.deviceCode,
+      required this.switchCode,
+      required this.deviceStatus,
+      super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return AnnotatedRegion(
+      value: SystemUiOverlayStyle(
+        statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
+        statusBarIconBrightness: Brightness.light,
+      ),
+      child: BlocProvider(
+        create: (context) => ACsBloc(acId: device.uuid ?? ''),
+        child: BlocBuilder<ACsBloc, AcsState>(
+          builder: (context, state) {
+            final acBloc = BlocProvider.of<ACsBloc>(context);
+            Duration duration = Duration.zero;
+            int selectedValue = 0;
+            int countNum = 0;
+            if (state is AcsInitialState) {
+              acBloc.add(GetCounterEvent(deviceCode: deviceCode));
+            } else if (state is UpdateTimerState) {
+              countNum = state.seconds;
+            } else if (state is TimerRunInProgress) {
+              countNum = state.remainingTime;
+            } else if (state is TimerRunComplete) {
+              countNum = 0;
+            }
+            return PopScope(
+                canPop: false,
+                onPopInvoked: (didPop) {
+                  if (!didPop) {
+                    acBloc.add(OnClose());
+                    Navigator.pop(context);
+                  }
+                },
+                child: DefaultTabController(
+                    length: 2,
+                    child: DefaultScaffold(
+                      appBar: AppBar(
+                        backgroundColor: Colors.transparent,
+                        centerTitle: true,
+                        title: const BodyLarge(
+                          text: 'Countdown',
+                          fontColor: ColorsManager.primaryColor,
+                          fontWeight: FontsManager.bold,
+                        ),
+                      ),
+                      child: state is AcsLoadingState
+                          ? const Center(child: CircularProgressIndicator())
+                          : Column(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                Container(
+                                  width: MediaQuery.of(context).size.width,
+                                  decoration: const ShapeDecoration(
+                                    color: ColorsManager.onPrimaryColor,
+                                    shape: RoundedRectangleBorder(
+                                      borderRadius:
+                                          BorderRadius.all(Radius.circular(30)),
+                                    ),
+                                  ),
+                                ),
+                                Center(
+                                  child: SizedBox(
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: [
+                                        countNum > 0
+                                            ? BodyLarge(
+                                                text: formatDuration(countNum),
+                                                fontColor: ColorsManager
+                                                    .slidingBlueColor,
+                                                fontSize: 40,
+                                              )
+                                            : SizedBox(
+                                                child: CustomHalfHourPicker(
+                                                  onValueChanged: (value) {
+                                                    selectedValue =
+                                                        (value * 10).toInt();
+                                                    if (selectedValue == 5) {
+                                                      duration = const Duration(
+                                                          minutes: 30);
+                                                      countNum =
+                                                          duration.inSeconds;
+                                                    } else {
+                                                      duration = Duration(
+                                                          minutes:
+                                                              selectedValue *
+                                                                  6);
+                                                      countNum =
+                                                          duration.inSeconds;
+                                                    }
+                                                  },
+                                                ),
+                                              ),
+                                        GestureDetector(
+                                            onTap: () {
+                                              if (state is LoadingNewSate) {
+                                                return;
+                                              }
+                                              if (countNum > 0) {
+                                                acBloc.add(SetCounterValue(
+                                                    seconds: countNum,
+                                                    deviceCode:
+                                                        'countdown_time',
+                                                    duration: selectedValue));
+                                              } else if (duration !=
+                                                  Duration.zero) {
+                                                acBloc.add(SetCounterValue(
+                                                    seconds: 0,
+                                                    deviceCode:
+                                                        'countdown_time',
+                                                    duration: selectedValue));
+                                              }
+                                            },
+                                            child: SvgPicture.asset(countNum > 0
+                                                ? Assets.pauseIcon
+                                                : Assets.playIcon)),
+                                      ],
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                    )));
+          },
+        ),
+      ),
+    );
+  }
+
+  String formatDuration(int seconds) {
+    final hours = (seconds ~/ 3600).toString().padLeft(2, '0');
+    final minutes = ((seconds % 3600) ~/ 60).toString().padLeft(2, '0');
+    final secs = (seconds % 60).toString().padLeft(2, '0');
+    return '$hours:$minutes:$secs';
+  }
+}
--- a/lib/features/devices/view/widgets/ACs/acs_list.dart
+++ b/lib/features/devices/view/widgets/ACs/acs_list.dart
@ -31,7 +31,7 @@ class ACsList extends StatelessWidget {
        List<DeviceModel> devicesList = [];
        bool allOn = false;
        bool allTempSame = false;
-        int temperature = 20;
+        int temperature = 250;
        if (state is GetAllAcsStatusState) {
          devicesStatuesList = state.allAcsStatues;
          devicesList = state.allAcs;
--- a/lib/features/devices/view/widgets/ACs/acs_view.dart
+++ b/lib/features/devices/view/widgets/ACs/acs_view.dart
@ -22,8 +22,6 @@ class ACsView extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    print("ACsView deviceModel UUID: ${deviceModel?.uuid}");
-
    return BlocProvider(
      create: (context) => ACsBloc(acId: deviceModel?.uuid ?? '')
        ..add(AcsInitial(allAcs: deviceModel != null ? false : true)),
@ -40,6 +38,7 @@ class ACsView extends StatelessWidget {
                extendBody: true,
                appBar: deviceModel != null
                    ? DeviceAppbar(
+                        value: true,
                        deviceName: deviceModel!.name!,
                        deviceUuid: deviceModel!.uuid!,
                      )
--- a/lib/features/devices/view/widgets/ACs/custom_halfhour_timer_picker.dart
+++ b/lib/features/devices/view/widgets/ACs/custom_halfhour_timer_picker.dart
@ -0,0 +1,51 @@
+import 'package:flutter/material.dart';
+
+class CustomHalfHourPicker extends StatefulWidget {
+  final Function(double) onValueChanged;
+
+  const CustomHalfHourPicker({super.key, required this.onValueChanged});
+
+  @override
+  _CustomHalfHourPickerState createState() => _CustomHalfHourPickerState();
+}
+
+class _CustomHalfHourPickerState extends State<CustomHalfHourPicker> {
+  double selectedValue = 0.0;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 200,
+      child: ListWheelScrollView.useDelegate(
+        itemExtent: 50,
+        perspective: 0.005,
+        physics: const FixedExtentScrollPhysics(),
+        overAndUnderCenterOpacity: 0.3,
+        onSelectedItemChanged: (index) {
+          setState(() {
+            selectedValue =
+                index * 0.5; // Convert index to half-hour increments
+            widget.onValueChanged(selectedValue);
+          });
+        },
+        childDelegate: ListWheelChildBuilderDelegate(
+          builder: (context, index) {
+            if (index < 0 || index > 48)
+              return null; // Limit to 24.0 (48 * 0.5)
+            return Center(
+              child: Text(
+                (index * 0.5)
+                    .toStringAsFixed(1), // Display value as 0.0, 0.5, etc.
+                style: const TextStyle(
+                    fontSize: 25,
+                    color: Colors.black,
+                    fontWeight: FontWeight.w800),
+              ),
+            );
+          },
+          childCount: 49, // 0.0 to 24.0 (inclusive)
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/all_devices.dart
+++ b/lib/features/devices/view/widgets/all_devices.dart
@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/devices/view/widgets/room_page_switch.dart';
+import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class AllDevices extends StatefulWidget {
+  const AllDevices({super.key, required this.allDevices});
+
+  final List<DeviceModel> allDevices;
+
+  @override
+  _AllDevicesState createState() => _AllDevicesState();
+}
+
+class _AllDevicesState extends State<AllDevices> {
+  final TextEditingController _searchController = TextEditingController();
+  List<DeviceModel> _filteredDevices = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _filteredDevices = widget.allDevices ?? [];
+    _searchController.addListener(_filterDevices);
+  }
+
+  @override
+  void dispose() {
+    _searchController.removeListener(_filterDevices);
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  void _filterDevices() {
+    final query = _searchController.text.toLowerCase();
+    setState(() {
+      _filteredDevices = widget.allDevices!
+          .where((device) => device.name!.toLowerCase().contains(query))
+          .toList();
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        if (widget.allDevices.isNotEmpty)
+          TextFormField(
+            controller: _searchController,
+            decoration: InputDecoration(
+              hintText: 'Search',
+              hintStyle: const TextStyle(
+                  color: ColorsManager.textGray,
+                  fontSize: 16,
+                  fontWeight: FontWeight.w400),
+              prefixIcon: Container(
+                padding: const EdgeInsets.all(5.0),
+                margin: const EdgeInsets.all(10.0),
+                child: SvgPicture.asset(
+                  Assets.searchIcon,
+                  fit: BoxFit.contain,
+                ),
+              ),
+              border: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(8.0),
+              ),
+            ),
+          ),
+        _filteredDevices.isNotEmpty
+            ? Expanded(
+                child: GridView.builder(
+                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                    crossAxisCount: 2,
+                    crossAxisSpacing: 10,
+                    mainAxisSpacing: 10,
+                    childAspectRatio: 1.5,
+                  ),
+                  padding: const EdgeInsets.only(top: 10),
+                  itemCount: _filteredDevices.length,
+                  itemBuilder: (context, index) {
+                    return RoomPageSwitch(
+                        allDevices: _filteredDevices,
+                        isAllDevices: true,
+                        device: _filteredDevices[index]);
+                  },
+                ),
+              )
+            : widget.allDevices.isNotEmpty
+                ? const Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Center(
+                            child: Text(
+                          'No Results Found',
+                          style: TextStyle(
+                              color: ColorsManager.grayColor,
+                              fontSize: 14,
+                              fontWeight: FontWeight.w400),
+                        )),
+                      ],
+                    ),
+                  )
+                : const SizedBox(),
+      ],
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/ceiling_sensor/ceiling_help_description.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/ceiling_help_description.dart
@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+
+class CeilingHelpDescription extends StatelessWidget {
+  const CeilingHelpDescription({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultScaffold(
+      title: 'Help Description',
+      child: Center(
+        child: ListView(
+          shrinkWrap: true,
+          padding: const EdgeInsets.all(16.0),
+          children: [
+            Text(
+              '1. Nobody, the report to someone\n'
+              'Instruction: The propagation and processing of electromagnetic waves are complicated. '
+              'There will be false alarms in the actual use of radar, and there will be some influencing '
+              'factors in the environment, including:\n\n'
+              'A. Physical disturbance: including air conditioning, fan, motor and other facilities vibration, '
+              'cats, dogs, mice, birds and other animals passing by, which may cause radar misjudgement '
+              'of the environment.\n\n'
+              'B. Space electromagnetic wave disturbance: This includes the possible existence of high-power '
+              'electrical equipment around the radar, electromagnetic-wave-intensive places, and the '
+              'simultaneous coexistence of multiple radars and other environmental factors. These '
+              'interferences are relatively few in home and office scenarios but may be more common '
+              'in factories and industrial environments.\n\n'
+              'C. Power supply disturbance: This is mainly caused by power supply radar crosstalk due to '
+              'associated facilities and equipment in the mains environment, resulting in an unstable '
+              'power supply for the radar and potential misjudgement.\n\n'
+              '2. In the case of human misreporting no one:\n'
+              'A. The presence of a human body may be beyond the radar test range.\n\n'
+              'B. The human body is covered by metal or by extremely thick office desks and chairs.\n\n'
+              'C. When sleeping, the body might not exhibit noticeable breathing micro-movements on the side, '
+              'leading to a short-term misjudgement as nobody.',
+              style: Theme.of(context).textTheme.bodyMedium,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart
@ -7,6 +7,11 @@ import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_ev
 import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart';
 import 'package:syncrow_app/features/devices/model/ceiling_sensor_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/ceiling_help_description.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/double_parameter_control.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/max_distance_control.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/presence_record.dart';
+import 'package:syncrow_app/features/devices/view/widgets/ceiling_sensor/presence_space_type.dart';
 import 'package:syncrow_app/features/devices/view/widgets/device_appbar.dart';
 import 'package:syncrow_app/features/devices/view/widgets/wall_sensor/wall_sensor_interface.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
@ -22,382 +27,383 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';

 class CeilingSensorInterface extends StatelessWidget {
  const CeilingSensorInterface({super.key, required this.ceilingSensor});
+
  final DeviceModel ceilingSensor;
+
  @override
  Widget build(BuildContext context) {
-    // String state = ceilingSensor.status
-    //     .firstWhere((element) => element.code == "presence_state")
-    //     .value
-    //     .toString();
-
    return BlocProvider(
-      create: (context) =>
-          CeilingSensorBloc(deviceId: ceilingSensor.uuid ?? '')..add(InitialEvent()),
-      child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(builder: (context, state) {
-        CeilingSensorModel ceilingSensorModel = CeilingSensorModel(
-            presenceState: 'none',
-            sensitivity: 1,
-            checkingResult: '',
-            presenceRange: 1,
-            sportsPara: 1,
-            bodyMovement: 'none');
-        if (state is UpdateState) {
-          ceilingSensorModel = state.ceilingSensorModel;
-        } else if (state is LoadingNewSate) {
-          ceilingSensorModel = state.ceilingSensorModel;
-        }
-        return AnnotatedRegion(
-          value: SystemUiOverlayStyle(
-            statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
-            statusBarIconBrightness: Brightness.light,
-          ),
-          child: Scaffold(
-            backgroundColor: ColorsManager.backgroundColor,
-            extendBodyBehindAppBar: true,
-            extendBody: true,
-            appBar: DeviceAppbar(
-              deviceName: ceilingSensor.name!,
-              deviceUuid: ceilingSensor.uuid!,
+      create: (context) => CeilingSensorBloc(deviceId: ceilingSensor.uuid ?? '')
+        ..add(InitialEvent()),
+      child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
+        builder: (context, state) {
+          final _bloc = BlocProvider.of<CeilingSensorBloc>(context);
+
+          CeilingSensorModel ceilingSensorModel = _initializeSensorModel(state);
+
+          return AnnotatedRegion(
+            value: SystemUiOverlayStyle(
+              statusBarColor: ColorsManager.primaryColor.withOpacity(0.5),
+              statusBarIconBrightness: Brightness.light,
            ),
-            body: Container(
-                width: MediaQuery.sizeOf(context).width,
-                height: MediaQuery.sizeOf(context).height,
-                padding: const EdgeInsets.all(Constants.defaultPadding),
-                decoration: const BoxDecoration(
-                  image: DecorationImage(
-                    image: AssetImage(
-                      Assets.assetsImagesBackground,
-                    ),
-                    fit: BoxFit.cover,
-                    opacity: 0.4,
-                  ),
-                ),
-                child: state is LoadingInitialState
-                    ? const Center(
-                        child: RefreshProgressIndicator(),
-                      )
-                    : SafeArea(
-                        child: RefreshIndicator(
-                        onRefresh: () async {
-                          BlocProvider.of<CeilingSensorBloc>(context).add(InitialEvent());
-                        },
-                        child: Container(
-                          child: ListView(
-                            shrinkWrap: true,
-                            children: [
-                              Container(
-                                height: MediaQuery.of(context).size.height,
-                                child: Column(
-                                  children: [
-                                    Expanded(
-                                      child: Column(
-                                        children: [
-                                          // InkWell(
-                                          //   onTap: () {
-                                          //     if ((ceilingSensor.isOnline ?? false) == false) {
-                                          //       ScaffoldMessenger.of(context).showSnackBar(
-                                          //         const SnackBar(
-                                          //           content: Text(
-                                          //             'Device is offline',
-                                          //           ),
-                                          //           backgroundColor: Colors.red,
-                                          //         ),
-                                          //       );
-                                          //       return;
-                                          //     }
-                                          //     String controlCode = 'sensitivity';
-                                          //     showDialog(
-                                          //       context: context,
-                                          //       builder: (context) => ParameterControlDialog(
-                                          //         title: 'Sensitivity',
-                                          //         sensor: ceilingSensor,
-                                          //         controlCode: controlCode,
-                                          //         value: ceilingSensor.status
-                                          //             .firstWhere((element) => element.code == controlCode)
-                                          //             .value as int,
-                                          //         min: ceilingSensor.functions
-                                          //                 .firstWhere((element) => element.code == controlCode)
-                                          //                 .values
-                                          //                 ?.min ??
-                                          //             0,
-                                          //         max: ceilingSensor.functions
-                                          //                 .firstWhere((element) => element.code == controlCode)
-                                          //                 .values
-                                          //                 ?.max ??
-                                          //             0,
-                                          //       ),
-                                          //     );
-                                          //   },
-                                          //   child:
-                                          // ),
-
-                                          SvgPicture.asset(
-                                            ceilingSensorModel.presenceState.toLowerCase() ==
-                                                    'motion'
-                                                ? Assets
-                                                    .assetsIconsPresenceSensorAssetsPresenceSensorMotion
-                                                : Assets.assetsIconsPresenceSensorAssetsPresence,
-                                            width: 100,
-                                            height: 100,
-                                            // colorFilter: ColorFilter.mode(
-                                            //   (ceilingSensor.isOnline ?? false)
-                                            //       ? ColorsManager.primaryColor
-                                            //       : Colors.grey.withOpacity(0.9),
-                                            //   BlendMode.srcIn,
-                                            // ),
-                                          ),
-                                          const SizedBox(
-                                            height: 10,
-                                          ),
-                                          BodyMedium(
-                                            text: StringHelpers.toTitleCase(
-                                                ceilingSensorModel.presenceState),
-                                            // (ceilingSensor.isOnline ?? false)
-                                            //     ? StringHelpers.toTitleCase(ceilingSensor.status
-                                            //         .firstWhere((element) =>
-                                            //             element.code == 'presence_state')
-                                            //         .value
-                                            //         .toString())
-                                            //     : "Offline",
-                                            style: context.bodyMedium.copyWith(
-                                              fontWeight: FontsManager.bold,
-                                            ),
-                                          ),
-                                        ],
-                                      ),
-                                    ),
-                                    Expanded(
-                                      flex: 3,
-                                      child: Column(
-                                        children: [
-                                          DefaultContainer(
-                                              padding: const EdgeInsets.symmetric(
-                                                vertical: 20,
-                                              ),
-                                              child: Row(
-                                                mainAxisAlignment: MainAxisAlignment.center,
-                                                children: [
-                                                  Flexible(
-                                                    child: Column(
-                                                      mainAxisSize: MainAxisSize.min,
-                                                      children: [
-                                                        const BodySmall(text: 'Sports Para'),
-                                                        BodyLarge(
-                                                          text: ceilingSensorModel.sportsPara
-                                                              .toString(),
-                                                          style: context.bodyLarge.copyWith(
-                                                            fontWeight: FontsManager.bold,
-                                                          ),
-                                                        ),
-                                                      ],
-                                                    ),
-                                                  ),
-                                                  Padding(
-                                                    padding:
-                                                        const EdgeInsets.symmetric(horizontal: 10),
-                                                    child: Container(
-                                                      width: 1,
-                                                      height: 45,
-                                                      color: ColorsManager.greyColor,
-                                                    ),
-                                                  ),
-                                                  Flexible(
-                                                    child: Column(
-                                                      mainAxisSize: MainAxisSize.min,
-                                                      children: [
-                                                        const BodySmall(
-                                                          text: 'Detection Range',
-                                                          textOverflow: TextOverflow.ellipsis,
-                                                        ),
-                                                        BodyLarge(
-                                                          text:
-                                                              '${ceilingSensorModel.presenceRange}M',
-                                                          textOverflow: TextOverflow.ellipsis,
-                                                          style: context.bodyLarge.copyWith(
-                                                            fontWeight: FontsManager.bold,
-                                                          ),
-                                                        ),
-                                                      ],
-                                                    ),
-                                                  ),
-                                                  Padding(
-                                                    padding:
-                                                        const EdgeInsets.symmetric(horizontal: 10),
-                                                    child: Container(
-                                                      width: 1,
-                                                      height: 45,
-                                                      color: ColorsManager.greyColor,
-                                                    ),
-                                                  ),
-                                                  Flexible(
-                                                    child: Column(
-                                                      mainAxisSize: MainAxisSize.min,
-                                                      children: [
-                                                        const BodySmall(
-                                                          text: 'Movement',
-                                                          textOverflow: TextOverflow.ellipsis,
-                                                        ),
-                                                        BodyLarge(
-                                                          text: ceilingSensorModel.bodyMovement,
-                                                          textOverflow: TextOverflow.ellipsis,
-                                                          style: context.bodyLarge.copyWith(
-                                                            fontWeight: FontsManager.bold,
-                                                          ),
-                                                        ),
-                                                      ],
-                                                    ),
-                                                  ),
-                                                ],
-                                              )),
-                                          const SizedBox(
-                                            height: 15,
-                                          ),
-                                          for (int index = 0;
-                                              index < ceilingSensorButtons().length;
-                                              index++)
-                                            DefaultContainer(
-                                              margin: const EdgeInsets.only(bottom: 5),
-                                              padding: const EdgeInsets.symmetric(
-                                                  vertical: 12, horizontal: 20),
-                                              onTap: () async {
-                                                if (ceilingSensorButtons()[index]['title'] ==
-                                                    'Sensitivity') {
-                                                  final result = await showDialog(
-                                                    context: context,
-                                                    builder: (context) {
-                                                      return ParameterControlDialog(
-                                                        title: ceilingSensorButtons()[index]
-                                                                ['title']
-                                                            .toString(),
-                                                        sensor: ceilingSensor,
-                                                        value: ceilingSensorModel.sensitivity,
-                                                        min: 0,
-                                                        max: 10,
-                                                      );
-                                                    },
-                                                  );
-                                                  if (result != null) {
-                                                    BlocProvider.of<CeilingSensorBloc>(context).add(
-                                                        ChangeValueEvent(
-                                                            value: result, code: 'sensitivity'));
-                                                  }
-                                                }
-
-                                                // if (ceilingSensorButtons[index]['page'] != null) {
-                                                //   Navigator.push(
-                                                //     context,
-                                                //     MaterialPageRoute(
-                                                //       builder: (context) =>
-                                                //           ceilingSensorButtons[index]['page'] as Widget,
-                                                //     ),
-                                                //   );
-                                                // }
-                                              },
-                                              child: Row(
-                                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                                children: [
-                                                  Row(
-                                                    children: [
-                                                      SvgPicture.asset(
-                                                        ceilingSensorButtons()[index]['icon']
-                                                            as String,
-                                                        // width: 30,
-                                                        // height: 50,
-                                                      ),
-                                                      const SizedBox(
-                                                        width: 25,
-                                                      ),
-                                                      BodyMedium(
-                                                        text: ceilingSensorButtons()[index]['title']
-                                                            as String,
-                                                        style: context.bodyMedium.copyWith(
-                                                          fontWeight: FontsManager.bold,
-                                                        ),
-                                                      ),
-                                                    ],
-                                                  ),
-                                                  if (ceilingSensorButtons()[index]['withArrow'] ==
-                                                      true)
-                                                    Row(
-                                                      mainAxisAlignment: MainAxisAlignment.end,
-                                                      children: [
-                                                        Text(ceilingSensorButtons(
-                                                                sensitivity_val: ceilingSensorModel
-                                                                    .sensitivity
-                                                                    .toString())[index]['val']
-                                                            .toString()),
-                                                        const Icon(
-                                                          Icons.arrow_forward_ios,
-                                                          color: ColorsManager.greyColor,
-                                                          size: 15,
-                                                        ),
-                                                      ],
-                                                    ),
-                                                ],
-                                              ),
-                                            ),
-                                        ],
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ))),
-          ),
-        );
-      }),
+            child: Scaffold(
+              backgroundColor: ColorsManager.backgroundColor,
+              extendBodyBehindAppBar: true,
+              extendBody: true,
+              appBar: DeviceAppbar(
+                deviceName: ceilingSensor.name!,
+                deviceUuid: ceilingSensor.uuid!,
+              ),
+              body: _buildBody(context, state, _bloc, ceilingSensorModel),
+            ),
+          );
+        },
+      ),
    );
  }

-  dynamic ceilingSensorButtons({
-    sensitivity_val = 0,
+  CeilingSensorModel _initializeSensorModel(CeilingSensorState state) {
+    CeilingSensorModel ceilingSensorModel = CeilingSensorModel(
+      spaceType: SpaceTypes.none,
+      nobodyTime: '',
+      movingMaxDis: 0,
+      presenceState: 'none',
+      sensitivity: 1,
+      checkingResult: '',
+      presenceRange: 1,
+      sportsPara: 1,
+      bodyMovement: 'none',
+    );
+
+    if (state is UpdateState) {
+      ceilingSensorModel = state.ceilingSensorModel;
+    } else if (state is LoadingNewSate) {
+      ceilingSensorModel = state.ceilingSensorModel;
+    }
+
+    return ceilingSensorModel;
+  }
+
+  Widget _buildBody(BuildContext context, CeilingSensorState state,
+      CeilingSensorBloc bloc, CeilingSensorModel model) {
+    return Container(
+      width: MediaQuery.sizeOf(context).width,
+      height: MediaQuery.sizeOf(context).height,
+      padding: const EdgeInsets.all(Constants.defaultPadding),
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+          image: AssetImage(Assets.assetsImagesBackground),
+          fit: BoxFit.cover,
+          opacity: 0.4,
+        ),
+      ),
+      child: state is LoadingInitialState
+          ? const Center(child: RefreshProgressIndicator())
+          : SafeArea(
+              child: RefreshIndicator(
+                onRefresh: () async => bloc.add(InitialEvent()),
+                child: ListView(
+                  shrinkWrap: true,
+                  children: [
+                    _buildMainContent(context, bloc, model),
+                  ],
+                ),
+              ),
+            ),
+    );
+  }
+
+  Widget _buildMainContent(
+      BuildContext context, CeilingSensorBloc bloc, CeilingSensorModel model) {
+    return SizedBox(
+      height: MediaQuery.of(context).size.height,
+      child: Column(
+        children: [
+          _buildPresenceDisplay(context, model),
+          Expanded(flex: 3, child: _buildControlButtons(context, bloc, model)),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildPresenceDisplay(BuildContext context, CeilingSensorModel model) {
+    return Expanded(
+      child: Column(
+        children: [
+          SvgPicture.asset(
+            model.presenceState.toLowerCase() == 'motion'
+                ? Assets.assetsIconsPresenceSensorAssetsPresenceSensorMotion
+                : Assets.assetsIconsPresenceSensorAssetsPresence,
+            width: 100,
+            height: 100,
+          ),
+          const SizedBox(height: 10),
+          BodyMedium(
+            text: StringHelpers.toTitleCase(model.presenceState),
+            style: context.bodyMedium.copyWith(fontWeight: FontsManager.bold),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildControlButtons(
+      BuildContext context, CeilingSensorBloc bloc, CeilingSensorModel model) {
+    return Column(
+      children: [
+        DefaultContainer(
+          padding: const EdgeInsets.symmetric(vertical: 20),
+          child: _buildSensorAttributes(context, model),
+        ),
+        const SizedBox(height: 15),
+        ..._buildActionButtons(context, bloc, model),
+      ],
+    );
+  }
+
+  Widget _buildSensorAttributes(
+      BuildContext context, CeilingSensorModel model) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        _buildAttribute(context, 'Sports Para', model.sportsPara.toString()),
+        _divider(),
+        _buildAttribute(context, 'Detection Range', '${model.presenceRange}M'),
+        _divider(),
+        _buildAttribute(context, 'Movement', model.bodyMovement),
+      ],
+    );
+  }
+
+  Widget _buildAttribute(BuildContext context, String label, String value) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        BodySmall(
+          text: label,
+        ),
+        BodyLarge(
+          text: value,
+          style: context.bodyLarge.copyWith(
+            fontWeight: FontsManager.bold,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _divider() {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 10),
+      child: Container(width: 1, height: 45, color: ColorsManager.greyColor),
+    );
+  }
+
+  List<Widget> _buildActionButtons(
+      BuildContext context, CeilingSensorBloc bloc, CeilingSensorModel model) {
+    return ceilingSensorButtons().map((button) {
+      return DefaultContainer(
+        margin: const EdgeInsets.only(bottom: 5),
+        padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 20),
+        onTap: () => _handleButtonTap(context, bloc, button, model),
+        child: _buildButtonContent(context, button, model),
+      );
+    }).toList();
+  }
+
+  Widget _buildButtonContent(BuildContext context, Map<String, dynamic> button,
+      CeilingSensorModel model) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Row(
+          children: [
+            SvgPicture.asset(button['icon'] as String),
+            const SizedBox(width: 25),
+            BodyMedium(
+              text: button['title'] as String,
+              style: context.bodyMedium.copyWith(fontWeight: FontsManager.bold),
+            ),
+          ],
+        ),
+        if (button['withArrow'] == true)
+          Row(
+            children: [
+              if (button['title'] == 'Sensitivity') ...[
+                Text(
+                  model.sensitivity.toString(),
+                  style: const TextStyle(color: Colors.black),
+                ),
+              ] else if (button['title'] == 'Maximum Distance') ...[
+                Text(
+                  model.movingMaxDis.toString(),
+                  style: const TextStyle(color: Colors.black),
+                ),
+                const Text(
+                  "m",
+                  style: TextStyle(color: ColorsManager.greyColor),
+                ),
+              ] else if (button['title'] == 'Nobody Time') ...[
+                Text(
+                  model.nobodyTime.toString(),
+                  style: const TextStyle(color: Colors.black),
+                ),
+              ] else if (button['title'] == 'Space Type') ...[
+                Text(
+                  model.spaceType.name.toString() == "none"
+                      ? "Office"
+                      : model.spaceType.name.toString(),
+                  style: const TextStyle(color: Colors.black),
+                ),
+              ] else ...[
+                Text(
+                  button['val'].toString(),
+                  style: const TextStyle(color: Colors.black),
+                ),
+              ],
+              const Icon(
+                Icons.arrow_forward_ios,
+                color: ColorsManager.greyColor,
+                size: 15,
+              ),
+            ],
+          ),
+      ],
+    );
+  }
+
+  Future<void> _handleButtonTap(BuildContext context, CeilingSensorBloc bloc,
+      Map<String, dynamic> button, CeilingSensorModel model) async {
+    final title = button['title'];
+    if (title == 'Space Type') {
+      final result = await _showDialog(
+        context,
+        PresenceSpaceTypeDialog(
+          description: 'Space Type',
+          onSpaceTypeSelected: (spaceType) {
+            bloc.add(ChangeValueEvent(
+                type: title.toString(), value: spaceType.name, code: 'scene'));
+          },
+          selectedSpaceType: model.spaceType,
+        ),
+      );
+    } else if (title == 'Nobody Time') {
+      final result = await _showDialog(
+        context,
+        MaxDistanceControl(
+          title: title.toString(),
+          sensor: ceilingSensor,
+          value: model.nobodyTime,
+          min: 0.0,
+          max: 5.0,
+          measurement: '',
+        ),
+      );
+      if (result != null) {
+        bloc.add(ChangeValueEvent(
+            type: title.toString(),
+            value: result
+                .toString()
+                .toLowerCase()
+                .replaceAll('sec', 's')
+                .replaceAll('1hr', '1hour'),
+            code: 'nobody_time'));
+      }
+    } else if (title == 'Maximum Distance') {
+      final result = await _showDialog(
+        context,
+        DoubleParameterControl(
+          title: title.toString(),
+          sensor: ceilingSensor,
+          value: model.movingMaxDis,
+          min: 0,
+          max: 500,
+          measurement: 'm',
+        ),
+      );
+      if (result != null) {
+        bloc.add(ChangeValueEvent(
+            type: title.toString(), value: result, code: 'moving_max_dis'));
+      }
+    } else if (title == 'Sensitivity') {
+      final result = await _showDialog(
+          context,
+          ParameterControlDialog(
+            title: title.toString(),
+            sensor: ceilingSensor,
+            value: model.sensitivity,
+            min: 1,
+            max: 10,
+          ));
+      if (result != null) {
+        bloc.add(ChangeValueEvent(
+            type: title.toString(), value: result, code: 'sensitivity'));
+      }
+    } else if (title == 'Help Description') {
+      Navigator.push(
+        context,
+        MaterialPageRoute(builder: (context) => const CeilingHelpDescription()),
+      );
+    } else if (title == 'Presence Record') {
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+            builder: (context) => PresenceRecord(uuid: ceilingSensor.uuid!)),
+      );
+    }
+  }
+
+  Future<dynamic> _showDialog(BuildContext context, Widget dialog) {
+    return showDialog(context: context, builder: (context) => dialog);
+  }
+
+  List<Map<String, dynamic>> ceilingSensorButtons({
+    sensitivityVal = 0,
    spaceType = 'Office',
    maximumDistanceVal = '3.9m',
    nobodyTimeVal = '1hr',
-  }) =>
-      [
-        {
-          'title': 'Space Type',
-          'icon': Assets.spaceTypeIcon,
-          'page': null,
-          'withArrow': true,
-          'val': spaceType
-        },
-        {
-          'title': 'Sensitivity',
-          'icon': Assets.sensitivityIcon,
-          'page': null,
-          'withArrow': true,
-          'val': sensitivity_val
-        },
-        {
-          'title': 'Maximum Distance',
-          'icon': Assets.maximumDistanceIcon,
-          'page': null,
-          'withArrow': true,
-          'val': maximumDistanceVal,
-        },
-        {
-          'title': 'Nobody Time',
-          'icon': Assets.assetsIconsPresenceSensorAssetsEmpty,
-          'page': null,
-          'withArrow': true,
-          'val': nobodyTimeVal,
-        },
-        {
-          'title': 'Induction History',
-          'icon': Assets.assetsIconsPresenceSensorAssetsInductionRecording,
-          'page': null,
-          'withArrow': false,
-        },
-        {
-          'title': 'Help Description',
-          'icon': Assets.assetsIconsPresenceSensorAssetsHelpDescription,
-          'page': null,
-          'withArrow': false,
-        },
-      ];
+  }) {
+    return [
+      {
+        'title': 'Space Type',
+        'icon': Assets.spaceTypeIcon,
+        'page': null,
+        'withArrow': true,
+        'val': spaceType,
+      },
+      {
+        'title': 'Sensitivity',
+        'icon': Assets.sensitivityIcon,
+        'page': null,
+        'withArrow': true,
+        'val': sensitivityVal,
+      },
+      {
+        'title': 'Maximum Distance',
+        'icon': Assets.maximumDistanceIcon,
+        'page': null,
+        'withArrow': true,
+        'val': maximumDistanceVal,
+      },
+      {
+        'title': 'Nobody Time',
+        'icon': Assets.assetsIconsPresenceSensorAssetsEmpty,
+        'page': null,
+        'withArrow': true,
+        'val': nobodyTimeVal,
+      },
+      {
+        'title': 'Presence Record',
+        'icon': Assets.assetsIconsPresenceSensorAssetsInductionRecording,
+        'page': null,
+        'withArrow': false,
+      },
+      {
+        'title': 'Help Description',
+        'icon': Assets.assetsIconsPresenceSensorAssetsHelpDescription,
+        'page': null,
+        'withArrow': false,
+      },
+    ];
+  }
 }
--- a/lib/features/devices/view/widgets/ceiling_sensor/double_parameter_control.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/double_parameter_control.dart
@ -0,0 +1,201 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/helpers/snack_bar.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
+
+class DoubleParameterControl extends StatefulWidget {
+  final String title;
+  final String measurement;
+  final DeviceModel sensor;
+  final int value;
+  final int min;
+  final int max;
+
+  const DoubleParameterControl({
+    super.key,
+    required this.title,
+    required this.measurement,
+    required this.sensor,
+    required this.value,
+    required this.min,
+    required this.max,
+  });
+
+  @override
+  DoubleParameterControlState createState() => DoubleParameterControlState();
+}
+
+class DoubleParameterControlState extends State<DoubleParameterControl> {
+  late int _value;
+
+  @override
+  void initState() {
+    super.initState();
+    _value = widget.value.clamp(widget.min, widget.max);
+  }
+
+  int? _getDivisions(int min, int max, int step) {
+    final range = max - min;
+    final divisions = (range / step).floor();
+    return divisions > 0 ? divisions : null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(20),
+        ),
+        padding: const EdgeInsets.only(top: 20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            BodyMedium(
+              text: widget.title,
+              style: context.bodyMedium.copyWith(
+                color: ColorsManager.primaryColorWithOpacity,
+                fontWeight: FontsManager.extraBold,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: 15,
+                horizontal: 50,
+              ),
+              child: Container(
+                height: 1,
+                width: double.infinity,
+                color: ColorsManager.greyColor,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: 10,
+              ),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  TitleMedium(
+                    text: _value.toStringAsFixed(0),
+                    style: context.titleMedium.copyWith(
+                      color: Colors.black,
+                      fontWeight: FontsManager.bold,
+                    ),
+                  ),
+                  TitleMedium(
+                    text: widget.measurement.toString(),
+                    style: context.titleMedium.copyWith(
+                      color: Colors.black,
+                      fontWeight: FontsManager.bold,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            SizedBox(
+              width: MediaQuery.sizeOf(context).width,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  IconButton(
+                    onPressed: () {
+                      setState(() {
+                        _value = (_value - 50).clamp(widget.min, widget.max);
+                      });
+                    },
+                    icon: const Icon(
+                      Icons.remove,
+                      color: Colors.grey,
+                    ),
+                  ),
+                  Flexible(
+                    child: Slider(
+                      value: _value.toDouble(), 
+                      min: widget.min.toDouble(), 
+                      max: widget.max.toDouble(), 
+                      divisions: _getDivisions(
+                          widget.min, widget.max, 50), 
+                      onChanged: (value) {
+                        setState(() {
+                          _value =
+                              value.round(); 
+                        });
+                      },
+                      label: _value.toStringAsFixed(0),
+                      inactiveColor: ColorsManager.greyColor,
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () {
+                      setState(() {
+                        _value = (_value + 50).clamp(widget.min, widget.max);
+                      });
+                    },
+                    icon: const Icon(
+                      Icons.add,
+                      color: Colors.grey,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+              height: 1,
+              width: double.infinity,
+              color: ColorsManager.greyColor,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                InkWell(
+                  onTap: () {
+                    Navigator.pop(context);
+                  },
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Cancel',
+                      style: context.bodyMedium
+                          .copyWith(color: ColorsManager.greyColor),
+                    ),
+                  ),
+                ),
+                Container(
+                  height: 50,
+                  width: 1,
+                  color: ColorsManager.greyColor,
+                ),
+                InkWell(
+                  onTap: () {
+                    Navigator.pop(context, _value);
+                    if (widget.sensor.isOnline == null) {
+                      CustomSnackBar.displaySnackBar('The device is offline');
+                      return;
+                    }
+                    if (!widget.sensor.isOnline!) {
+                      CustomSnackBar.displaySnackBar('The device is offline');
+                      return;
+                    }
+                  },
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Confirm',
+                      style: context.bodyMedium.copyWith(
+                          color: ColorsManager.primaryColorWithOpacity),
+                    ),
+                  ),
+                ),
+              ],
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/ceiling_sensor/max_distance_control.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/max_distance_control.dart
@ -0,0 +1,249 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/helpers/snack_bar.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
+
+class MaxDistanceControl extends StatefulWidget {
+  final String title;
+  final String measurement;
+  final DeviceModel sensor;
+  final String value;
+
+  final double min;
+  final double max;
+
+  const MaxDistanceControl({
+    super.key,
+    required this.title,
+    required this.measurement,
+    required this.sensor,
+    required this.value,
+    required this.min,
+    required this.max,
+  });
+
+  @override
+  MaxDistanceControlState createState() => MaxDistanceControlState();
+}
+
+int _parseValue(String value) {
+  if (value.endsWith('s')) {
+    return int.parse(value.replaceAll('s', '').trim());
+  } else if (value.endsWith('min')) {
+    return int.parse(value.replaceAll('min', '').trim()) * 60;
+  } else if (value.endsWith('hour')) {
+    return int.parse(value.replaceAll('hour', '').trim()) * 3600;
+  }
+  return 0; // Default to 0 if the format is unrecognized
+}
+
+class MaxDistanceControlState extends State<MaxDistanceControl> {
+  final List<double> _stepValues = [
+    0,
+    10,
+    30,
+    60,
+    120,
+    300,
+    600,
+    1800,
+    3600,
+  ];
+
+  late int _currentIndex;
+
+  String _formatLabel(double seconds) {
+    if (seconds == 0) return 'None';
+    if (seconds < 60) return '${seconds.toInt()}s';
+    if (seconds < 3600) {
+      final minutes = (seconds / 60).round();
+      return '${minutes}min';
+    }
+    final hours = (seconds / 3600).round();
+    return '${hours}hr';
+  }
+
+  int _nearestStepIndex(double initialValue) {
+    double minDiff = double.infinity;
+    int nearestIndex = 0;
+    for (int i = 0; i < _stepValues.length; i++) {
+      final diff = (initialValue - _stepValues[i]).abs();
+      if (diff < minDiff) {
+        minDiff = diff;
+        nearestIndex = i;
+      }
+    }
+    return nearestIndex;
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    final int parsedSeconds = _parseValue(widget.value);
+    _currentIndex = _nearestStepIndex(parsedSeconds.toDouble());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final double currentSeconds = _stepValues[_currentIndex];
+    return Dialog(
+      child: Container(
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(20),
+        ),
+        padding: const EdgeInsets.only(top: 20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            BodyMedium(
+              text: widget.title,
+              style: context.bodyMedium.copyWith(
+                color: ColorsManager.primaryColorWithOpacity,
+                fontWeight: FontsManager.extraBold,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: 15,
+                horizontal: 50,
+              ),
+              child: Container(
+                height: 1,
+                width: double.infinity,
+                color: ColorsManager.greyColor,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: 10,
+              ),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  TitleMedium(
+                    text: _formatLabel(currentSeconds)
+                        .replaceAll('1hr', '1hour')
+                        .replaceAllMapped(RegExp(r's$'), (match) => 'sec'),
+                    style: context.titleMedium.copyWith(
+                      color: Colors.black,
+                      fontWeight: FontsManager.bold,
+                    ),
+                  ),
+                  const SizedBox(width: 5),
+                  TitleMedium(
+                    text: widget.measurement,
+                    style: context.titleMedium.copyWith(
+                      color: Colors.black,
+                      fontWeight: FontsManager.bold,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            SizedBox(
+              width: MediaQuery.sizeOf(context).width,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  IconButton(
+                    onPressed: () {
+                      setState(() {
+                        _currentIndex =
+                            (_currentIndex > 0) ? _currentIndex - 1 : 0;
+                      });
+                    },
+                    icon: const Icon(
+                      Icons.remove,
+                      color: Colors.grey,
+                    ),
+                  ),
+                  Flexible(
+                    child: Slider(
+                      min: 0,
+                      max: (_stepValues.length - 1).toDouble(),
+                      divisions: _stepValues.length - 1,
+                      value: _currentIndex.toDouble(),
+                      onChanged: (double newIndex) {
+                        setState(() {
+                          _currentIndex = newIndex.round();
+                        });
+                      },
+                      label: _formatLabel(_stepValues[_currentIndex]),
+                      inactiveColor: ColorsManager.greyColor,
+                    ),
+                  ),
+                  IconButton(
+                    onPressed: () {
+                      setState(() {
+                        _currentIndex = (_currentIndex < _stepValues.length - 1)
+                            ? _currentIndex + 1
+                            : _currentIndex;
+                      });
+                    },
+                    icon: const Icon(
+                      Icons.add,
+                      color: Colors.grey,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Container(
+              height: 1,
+              width: double.infinity,
+              color: ColorsManager.greyColor,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                InkWell(
+                  onTap: () => Navigator.pop(context),
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Cancel',
+                      style: context.bodyMedium.copyWith(
+                        color: ColorsManager.greyColor,
+                      ),
+                    ),
+                  ),
+                ),
+                Container(
+                  height: 50,
+                  width: 1,
+                  color: ColorsManager.greyColor,
+                ),
+                InkWell(
+                  onTap: () {
+                    Future.delayed(const Duration(seconds: 1), () {
+                      Navigator.pop(context, _formatLabel(currentSeconds));
+
+                      if (widget.sensor.isOnline == null ||
+                          widget.sensor.isOnline == false) {
+                        CustomSnackBar.displaySnackBar('The device is offline');
+                        return;
+                      }
+                    });
+                  },
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Confirm',
+                      style: context.bodyMedium.copyWith(
+                        color: ColorsManager.primaryColorWithOpacity,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/presence_record.dart
@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
+import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_bloc.dart';
+import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_event.dart';
+import 'package:syncrow_app/features/devices/bloc/ceiling_bloc/ceiling_sensor_state.dart';
+import 'package:syncrow_app/features/devices/model/device_report_model.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class PresenceRecord extends StatelessWidget {
+  final String uuid;
+  const PresenceRecord({super.key, required this.uuid});
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultScaffold(
+      title: 'Presence Record',
+      child: BlocProvider(
+        create: (context) =>
+            CeilingSensorBloc(deviceId: uuid)..add(const ReportLogsInitial()),
+        child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
+            builder: (context, state) {
+          final garageDoorBloc = BlocProvider.of<CeilingSensorBloc>(context);
+          final Map<String, List<DeviceEvent>> groupedRecords = {};
+
+          if (state is LoadingInitialState) {
+            return const Center(
+              child: DefaultContainer(
+                  width: 50, height: 50, child: CircularProgressIndicator()),
+            );
+          } else if (state is FitchData) {
+            for (var record in garageDoorBloc.recordGroups.data!) {
+              final DateTime eventDateTime =
+                  DateTime.fromMillisecondsSinceEpoch(record.eventTime!);
+              final String formattedDate =
+                  DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);
+
+              // Group by formatted date
+              if (groupedRecords.containsKey(formattedDate)) {
+                groupedRecords[formattedDate]!.add(record);
+              } else {
+                groupedRecords[formattedDate] = [record];
+              }
+            }
+          }
+          return ListView.builder(
+            itemCount: groupedRecords.length,
+            itemBuilder: (context, index) {
+              final String date = groupedRecords.keys.elementAt(index);
+              final List<DeviceEvent> recordsForDate = groupedRecords[date]!;
+
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 5, top: 10),
+                    child: Text(
+                      date,
+                      style: const TextStyle(
+                        color: ColorsManager.grayColor,
+                        fontSize: 13,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                  ),
+                  DefaultContainer(
+                    child: Column(
+                      children: [
+                        ...recordsForDate.asMap().entries.map((entry) {
+                          final int idx = entry.key;
+                          final DeviceEvent record = entry.value;
+                          final DateTime eventDateTime =
+                              DateTime.fromMillisecondsSinceEpoch(
+                                  record.eventTime!);
+                          final String formattedTime =
+                              DateFormat('HH:mm:ss').format(eventDateTime);
+
+                          return Column(
+                            children: [
+                              Container(
+                                child: ListTile(
+                                  leading: Icon(
+                                    record.value == 'true'
+                                        ? Icons.radio_button_checked
+                                        : Icons.radio_button_unchecked,
+                                    color: record.value == 'true'
+                                        ? Colors.blue
+                                        : Colors.grey,
+                                  ),
+                                  title: Text(
+                                    record.value.toString(),
+                                    style: const TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 18,
+                                    ),
+                                  ),
+                                  subtitle: Text('$formattedTime'),
+                                ),
+                              ),
+                              if (idx != recordsForDate.length - 1)
+                                const Divider(
+                                  color: ColorsManager.graysColor,
+                                ),
+                            ],
+                          );
+                        }).toList(),
+                      ],
+                    ),
+                  ),
+                ],
+              );
+            },
+          );
+        }),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/ceiling_sensor/presence_space_type.dart
+++ b/lib/features/devices/view/widgets/ceiling_sensor/presence_space_type.dart
@ -0,0 +1,180 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/devices/model/ceiling_sensor_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/generated/assets.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
+
+class PresenceSpaceTypeDialog extends StatefulWidget {
+  final String description;
+  final SpaceTypes selectedSpaceType;
+  final void Function(SpaceTypes spaceType) onSpaceTypeSelected;
+
+  const PresenceSpaceTypeDialog({
+    super.key,
+    required this.description,
+    required this.selectedSpaceType,
+    required this.onSpaceTypeSelected,
+  });
+
+  @override
+  _PresenceSpaceTypeDialogState createState() =>
+      _PresenceSpaceTypeDialogState();
+}
+
+class _PresenceSpaceTypeDialogState extends State<PresenceSpaceTypeDialog> {
+  late SpaceTypes _selectedSpaceType;
+
+  @override
+  void initState() {
+    super.initState();
+    _selectedSpaceType = widget.selectedSpaceType;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final Map<SpaceTypes, String> spaceTypeIcons = {
+      SpaceTypes.none: Assets.office,
+      SpaceTypes.parlour: Assets.parlour,
+      SpaceTypes.area: Assets.dyi,
+      SpaceTypes.toilet: Assets.bathroom,
+      SpaceTypes.bedroom: Assets.bedroom,
+    };
+
+    final Map<SpaceTypes, String> spaceTypeTitles = {
+      SpaceTypes.none: 'None',
+      SpaceTypes.parlour: 'Parlour',
+      SpaceTypes.area: 'Area',
+      SpaceTypes.toilet: 'Toilet',
+      SpaceTypes.bedroom: 'Bedroom',
+    };
+
+    return Dialog(
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Container(
+        // padding: const EdgeInsets.all(20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Text(
+                widget.description,
+                style: context.bodyMedium.copyWith(
+                    color: ColorsManager.primaryColorWithOpacity,
+                    fontWeight: FontsManager.extraBold,
+                    fontSize: 16),
+              ),
+            ),
+            Container(
+              height: 1,
+              width: double.infinity,
+              color: ColorsManager.greyColor,
+            ),
+            const SizedBox(height: 16),
+            Wrap(
+              runSpacing: 12,
+              spacing: 16,
+              children: spaceTypeIcons.entries.map((entry) {
+                final spaceType = entry.key;
+                final icon = entry.value;
+                final title = spaceTypeTitles[spaceType]!;
+                return Container(
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(25),
+                    color: _selectedSpaceType == spaceType
+                        ? ColorsManager.primaryColorWithOpacity
+                        : ColorsManager.textGray,
+                  ),
+                  child: GestureDetector(
+                    onTap: () {
+                      setState(() {
+                        _selectedSpaceType = spaceType;
+                      });
+                    },
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 10, right: 10),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Container(
+                            padding: const EdgeInsets.all(10),
+                            child: SvgPicture.asset(
+                              icon,
+                            ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            title == "None" ? "Office" : title,
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodySmall
+                                ?.copyWith(
+                                    color: _selectedSpaceType == spaceType
+                                        ? ColorsManager.onPrimaryColor
+                                        : ColorsManager.blackColor,
+                                    fontWeight: FontWeight.w400,
+                                    fontSize: 15),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                );
+              }).toList(),
+            ),
+            const SizedBox(height: 20),
+
+            Container(
+              height: 1,
+              width: double.infinity,
+              color: ColorsManager.greyColor,
+            ),
+
+            /// Cancel / Confirm
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                InkWell(
+                  onTap: () => Navigator.pop(context),
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Cancel',
+                      style: context.bodyMedium.copyWith(
+                        color: ColorsManager.greyColor,
+                      ),
+                    ),
+                  ),
+                ),
+                Container(
+                  height: 50,
+                  width: 1,
+                  color: ColorsManager.greyColor,
+                ),
+                InkWell(
+                  onTap: () {
+                    widget.onSpaceTypeSelected(_selectedSpaceType);
+                    Navigator.pop(context, _selectedSpaceType);
+                  },
+                  child: Center(
+                    child: BodyMedium(
+                      text: 'Confirm',
+                      style: context.bodyMedium.copyWith(
+                        color: ColorsManager.primaryColorWithOpacity,
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/curtains/curtain_view.dart
+++ b/lib/features/devices/view/widgets/curtains/curtain_view.dart
@ -6,6 +6,7 @@ import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_event.dar
 import 'package:syncrow_app/features/devices/bloc/curtain_bloc/curtain_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/curtains/curtain_buttons.dart';
+import 'package:syncrow_app/features/devices/view/widgets/device_appbar.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/generated/assets.dart';
@ -33,11 +34,17 @@ class CurtainView extends StatelessWidget {
            // blindHeight = state.blindHeight;
          }
          return DefaultScaffold(
+            appBar: DeviceAppbar(
+              deviceName: curtain!.name!,
+              deviceUuid: curtain!.uuid!,
+            ),
            title: curtain.name,
            child: state is CurtainLoadingState
                ? const Center(
-                    child:
-                        DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
+                    child: DefaultContainer(
+                        width: 50,
+                        height: 50,
+                        child: CircularProgressIndicator()),
                  )
                : RefreshIndicator(
                    onRefresh: () async {
@ -62,37 +69,56 @@ class CurtainView extends StatelessWidget {
                                children: [
                                  SvgPicture.asset(
                                    Assets.assetsIconsCurtainsIconCurtainHolder,
-                                    width: MediaQuery.sizeOf(context).width * 0.75,
+                                    width:
+                                        MediaQuery.sizeOf(context).width * 0.75,
                                  ),
                                  SizedBox(
-                                    width: MediaQuery.sizeOf(context).width * 0.75,
+                                    width:
+                                        MediaQuery.sizeOf(context).width * 0.75,
                                    child: Row(
-                                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceBetween,
                                      children: [
                                        SizedBox(
-                                          width: MediaQuery.sizeOf(context).width * 0.025,
+                                          width:
+                                              MediaQuery.sizeOf(context).width *
+                                                  0.025,
                                        ),
                                        AnimatedContainer(
-                                          duration: const Duration(milliseconds: 200),
+                                          duration:
+                                              const Duration(milliseconds: 200),
                                          curve: Curves.linear,
-                                          height: MediaQuery.sizeOf(context).height * 0.35,
-                                          width: MediaQuery.sizeOf(context).width * 0.35,
+                                          height: MediaQuery.sizeOf(context)
+                                                  .height *
+                                              0.35,
+                                          width:
+                                              MediaQuery.sizeOf(context).width *
+                                                  0.35,
                                          child: Stack(
                                            children: List.generate(
                                              4,
                                              (index) {
-                                                double spacing = curtainWidth / 7.5;
-                                                double leftMostPosition = index * spacing;
+                                                double spacing =
+                                                    curtainWidth / 7.5;
+                                                double leftMostPosition =
+                                                    index * spacing;
                                                return AnimatedPositioned(
-                                                  duration: const Duration(milliseconds: 200),
+                                                  duration: const Duration(
+                                                      milliseconds: 200),
                                                  curve: Curves.linear,
                                                  left: leftMostPosition,
                                                  child: SizedBox(
-                                                    height:
-                                                        MediaQuery.sizeOf(context).height * 0.35,
-                                                    width: MediaQuery.sizeOf(context).width * 0.08,
+                                                    height: MediaQuery.sizeOf(
+                                                                context)
+                                                            .height *
+                                                        0.35,
+                                                    width: MediaQuery.sizeOf(
+                                                                context)
+                                                            .width *
+                                                        0.08,
                                                    child: SvgPicture.asset(
-                                                      Assets.assetsIconsCurtainsIconVerticalBlade,
+                                                      Assets
+                                                          .assetsIconsCurtainsIconVerticalBlade,
                                                      fit: BoxFit.fill,
                                                    ),
                                                  ),
@ -102,23 +128,37 @@ class CurtainView extends StatelessWidget {
                                          ),
                                        ),
                                        AnimatedContainer(
-                                          duration: const Duration(milliseconds: 200),
+                                          duration:
+                                              const Duration(milliseconds: 200),
                                          curve: Curves.linear,
-                                          height: MediaQuery.sizeOf(context).height * 0.35,
-                                          width: MediaQuery.sizeOf(context).width * 0.35,
+                                          height: MediaQuery.sizeOf(context)
+                                                  .height *
+                                              0.35,
+                                          width:
+                                              MediaQuery.sizeOf(context).width *
+                                                  0.35,
                                          child: Stack(
                                            children: List.generate(
                                              4,
                                              (index) {
-                                                double spacing = curtainWidth / 7.5;
-                                                double rightMostPosition = index * spacing;
+                                                double spacing =
+                                                    curtainWidth / 7.5;
+                                                double rightMostPosition =
+                                                    index * spacing;
                                                return AnimatedPositioned(
-                                                  duration: const Duration(milliseconds: 200),
+                                                  duration: const Duration(
+                                                      milliseconds: 200),
                                                  curve: Curves.linear,
                                                  right: rightMostPosition,
                                                  child: SizedBox(
-                                                    height: MediaQuery.sizeOf(context).height * 0.35,
-                                                    width: MediaQuery.sizeOf(context).width * 0.08,
+                                                    height: MediaQuery.sizeOf(
+                                                                context)
+                                                            .height *
+                                                        0.35,
+                                                    width: MediaQuery.sizeOf(
+                                                                context)
+                                                            .width *
+                                                        0.08,
                                                    child: SvgPicture.asset(
                                                      Assets.rightVerticalBlade,
                                                      fit: BoxFit.fill,
@ -130,7 +170,9 @@ class CurtainView extends StatelessWidget {
                                          ),
                                        ),
                                        SizedBox(
-                                          width: MediaQuery.sizeOf(context).width * 0.025,
+                                          width:
+                                              MediaQuery.sizeOf(context).width *
+                                                  0.025,
                                        ),
                                      ],
                                    ),
--- a/lib/features/devices/view/widgets/device_appbar.dart
+++ b/lib/features/devices/view/widgets/device_appbar.dart
@ -1,6 +1,5 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
-import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
-import 'package:syncrow_app/features/devices/view/widgets/popup_menu_widget.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
@ -8,14 +7,27 @@ import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
 class DeviceAppbar extends StatelessWidget implements PreferredSizeWidget {
  final String deviceName;
  final String deviceUuid;
+  final bool? value;
+
  final double appBarHeight = 56.0;
  final void Function()? onPressed;
  const DeviceAppbar(
-      {super.key, required this.deviceName, required this.deviceUuid, this.onPressed});
+      {super.key,
+      required this.deviceName,
+      this.value,
+      required this.deviceUuid,
+      this.onPressed});

  @override
  Widget build(BuildContext context) {
    return AppBar(
+      leading: IconButton(
+          onPressed: () {
+            Navigator.of(context).pop(value ?? true);
+          },
+          icon: Icon(
+            Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back,
+          )),
      backgroundColor: Colors.transparent,
      centerTitle: true,
      title: BodyLarge(
@ -24,19 +36,19 @@ class DeviceAppbar extends StatelessWidget implements PreferredSizeWidget {
        fontWeight: FontsManager.bold,
      ),
      actions: [
-        IconButton(
-            onPressed: () {
-              showPopupMenu(context: context, items: [
-                PopupMenuItem(
-                  onTap: () async {
-                    HomeCubit.getInstance().updateDevice(deviceUuid);
-                  },
-                  value: 'Update',
-                  child: const Text('Update'),
-                )
-              ]);
-            },
-            icon: Icon(Icons.edit))
+        // IconButton(
+        //     onPressed: () {
+        //       showPopupMenu(context: context, items: [
+        //         PopupMenuItem(
+        //           onTap: () async {
+        //             HomeCubit.getInstance().updateDevice(deviceUuid);
+        //           },
+        //           value: 'Update',
+        //           child: const Text('Update'),
+        //         )
+        //       ]);
+        //     },
+        //     icon: Icon(Icons.edit))
      ],
    );
  }
--- a/lib/features/devices/view/widgets/devices_view_body.dart
+++ b/lib/features/devices/view/widgets/devices_view_body.dart
@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
-import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/view/widgets/all_devices.dart';
 import 'package:syncrow_app/features/devices/view/widgets/room_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/rooms_slider.dart';
 import 'package:syncrow_app/features/devices/view/widgets/wizard_page.dart';
-import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/view/scene_view.dart';
 import 'package:syncrow_app/features/shared_widgets/create_unit.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
@ -14,103 +14,123 @@ import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.da
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';

-class DevicesViewPage extends StatelessWidget {
-  const DevicesViewPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => SceneBloc(), // Initialize your SceneBloc here
-      child: DevicesViewBody(),
-    );
-  }
-}
-
 class DevicesViewBody extends StatelessWidget {
-  const DevicesViewBody({
-    super.key,
-  });
-
+  const DevicesViewBody({Key? key}) : super(key: key);
  @override
  Widget build(BuildContext context) {
-    return BlocBuilder<DevicesCubit, DevicesState>(
-      builder: (context, state) {
-        if (state is DevicesLoading ||
-            state is GetDevicesLoading ||
-            state is DevicesCategoriesLoading) {
-          return const Center(child: CircularProgressIndicator());
-        } else {
-          return HomeCubit.getInstance().spaces?.isEmpty ?? true
-              ? const CreateUnitWidget()
-              : Column(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: [
-                    Row(
-                      children: [
-                        TitleMedium(
-                          text: StringsManager.devices,
-                          style: context.titleMedium.copyWith(
-                            fontSize: 25,
-                          ),
-                        ),
-                      ],
-                    ),
-                    SizedBox(
-                        height: MediaQuery.of(context).size.height * 0.1,
-                        child: const SceneView(
-                          pageType: true,
-                        )),
-                    const SizedBox(
-                      height: 20,
-                    ),
-                    const RoomsSlider(),
-                    const SizedBox(
-                      height: 10,
-                    ),
-                    Expanded(
-                      child: PageView(
-                        controller: HomeCubit.getInstance().devicesPageController,
-                        onPageChanged: (index) {
-                          HomeCubit.getInstance().devicesPageChanged(index);
-                        },
-                        children: [
-                          WizardPage(
-                            groupsList: DevicesCubit.getInstance().allCategories ?? [],
-                          ),
-                          if (HomeCubit.getInstance().selectedSpace != null)
-                            ...HomeCubit.getInstance().selectedSpace!.subspaces.map(
-                              (room) {
-                                return RoomPage(
-                                  room: room,
-                                );
-                              },
-                            )
-                        ],
-                      ),
-                    ),
-                    HomeCubit.getInstance().selectedSpace != null
-                        ? Padding(
-                            padding: const EdgeInsets.symmetric(
-                              vertical: 7,
-                            ),
-                            child: SmoothPageIndicator(
-                              controller: HomeCubit.getInstance().devicesPageController,
-                              count: HomeCubit.getInstance().selectedSpace!.subspaces.length + 1,
-                              effect: const WormEffect(
-                                paintStyle: PaintingStyle.stroke,
-                                dotHeight: 8,
-                                dotWidth: 8,
-                              ),
-                            ),
-                          )
-                        : const Center(
-                            child: BodyLarge(text: 'No Home Found'),
-                          ),
-                  ],
-                );
+    return BlocBuilder<HomeCubit, HomeState>(
+      builder: (context, homeState) {
+        final homeCubit = HomeCubit.getInstance();
+        // Handle state priority: Errors first
+        if (homeState is ActivationError) {
+          return const CreateUnitWidget();
        }
+        // Handle loading states
+        if (homeState is GetSpacesLoading || homeState is HomeLoading) {
+          return const Center(child: CircularProgressIndicator());
+        }
+        // Handle error states
+        if (homeState is GetSpacesError) {
+          return const CreateUnitWidget();
+        }
+        // Handle success states
+        if (homeState is GetSpacesSuccess ||
+            homeState is RoomUnSelected ||
+            homeState is RoomSelected ||
+            homeState is NavChangePage ||
+            homeState is GetSpaceRoomsSuccess) {
+          // Show empty state if no spaces
+          if (homeCubit.spaces.isEmpty) {
+            return const CreateUnitWidget();
+          }
+          return BlocBuilder<DevicesCubit, DevicesState>(
+            builder: (context, devicesState) {
+              // Devices loading states
+              if (devicesState is DevicesLoading ||
+                  devicesState is DevicesCategoriesLoading ||
+                  devicesState is GetDevicesLoading) {
+                return const Center(child: CircularProgressIndicator());
+              }
+              // Devices error state
+              if (devicesState is GetDevicesError) {
+                return Center(child: BodyLarge(text: devicesState.errorMsg));
+              }
+              // Main content for both GetSpacesSuccess and RoomUnSelected
+              return _buildMainContent(context, homeCubit);
+            },
+          );
+        }
+        // Fallback for unknown states
+        return const Center(child: BodyLarge(text: ''));
      },
    );
  }
+
+  Widget _buildMainContent(BuildContext context, HomeCubit homeCubit) {
+    final devicesCubit = context.read<DevicesCubit>();
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Row(
+          children: [
+            TitleMedium(
+              text: StringsManager.devices,
+              style: context.titleMedium.copyWith(fontSize: 25),
+            ),
+          ],
+        ),
+        SizedBox(
+          height: MediaQuery.of(context).size.height * 0.1,
+          child: const SceneView(pageType: true),
+        ),
+        const SizedBox(height: 20),
+        const RoomsSlider(),
+        const SizedBox(height: 10),
+        Expanded(
+          child: PageView(
+            controller: homeCubit.devicesPageController,
+            onPageChanged: (index) {
+              homeCubit.devicesPageChanged(index);
+              if (index == 0) {
+                devicesCubit.fetchAllDevices(homeCubit.selectedSpace);
+              }
+            },
+            children: [
+              AllDevices(
+                allDevices: devicesCubit.allDevices,
+              ),
+              WizardPage(
+                groupsList: devicesCubit.allCategories ?? [],
+              ),
+              if (homeCubit.selectedSpace != null)
+                ...homeCubit.selectedSpace!.subspaces.map(
+                  (room) => RoomPage(room: room),
+                ),
+            ],
+          ),
+        ),
+        _buildPageIndicator(homeCubit),
+      ],
+    );
+  }
+
+  Widget _buildPageIndicator(HomeCubit homeCubit) {
+    return homeCubit.selectedSpace != null
+        ? Padding(
+            padding: const EdgeInsets.symmetric(vertical: 7),
+            child: SmoothPageIndicator(
+              controller: homeCubit.devicesPageController,
+              count: homeCubit.selectedSpace!.subspaces.length + 2,
+              effect: const WormEffect(
+                paintStyle: PaintingStyle.stroke,
+                dotHeight: 8,
+                dotWidth: 8,
+              ),
+            ),
+          )
+        : const Center(
+            child: BodyLarge(text: 'No Home Found'),
+          );
+  }
 }
--- a/lib/features/devices/view/widgets/garage_door/garage_door_screen.dart
+++ b/lib/features/devices/view/widgets/garage_door/garage_door_screen.dart
@ -5,6 +5,7 @@ import 'package:syncrow_app/features/devices/bloc/garage_door_bloc/garage_door_b
 import 'package:syncrow_app/features/devices/bloc/garage_door_bloc/garage_door_event.dart';
 import 'package:syncrow_app/features/devices/bloc/garage_door_bloc/garage_door_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/devices/view/widgets/device_appbar.dart';
 import 'package:syncrow_app/features/devices/view/widgets/garage_door/garage_preferences_settings.dart';
 import 'package:syncrow_app/features/devices/view/widgets/garage_door/garage_records_screen.dart';
 import 'package:syncrow_app/features/devices/view/widgets/garage_door/schedule_garage_screen.dart';
@ -22,6 +23,10 @@ class GarageDoorScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return DefaultScaffold(
+      appBar: DeviceAppbar(
+        deviceName: device!.name!,
+        deviceUuid: device!.uuid!,
+      ),
      title: 'Garage Door Opener',
      child: BlocProvider(
        create: (context) => GarageDoorBloc(GDId: device?.uuid ?? '')
--- a/lib/features/devices/view/widgets/room_page_switch.dart
+++ b/lib/features/devices/view/widgets/room_page_switch.dart
@ -5,6 +5,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/6_scene_switch/six_scene_screen.dart';
@ -28,23 +29,31 @@ import 'package:syncrow_app/features/devices/view/widgets/smart_door/door_interf
 import 'package:syncrow_app/features/devices/view/widgets/three_gang/three_gang_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/water_heater/water_heater_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/water_leak/water_leak_screen.dart';
+import 'package:syncrow_app/features/shared_widgets/custom_switch.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/helpers/custom_page_route.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';

 class RoomPageSwitch extends StatelessWidget {
-  const RoomPageSwitch({
-    super.key,
-    required this.device,
-  });
+  const RoomPageSwitch(
+      {super.key,
+      required this.device,
+      this.isAllDevices = false,
+      this.allDevices});

  final DeviceModel device;
+  final List<DeviceModel>? allDevices;
+  final bool isAllDevices;
  @override
  Widget build(BuildContext context) {
    return GestureDetector(
      onTap: () {
-        showDeviceInterface(device, context);
+        showDeviceInterface(
+            device: device,
+            context: context,
+            isAllDevices: isAllDevices,
+            allDevices: allDevices);
      },
      child: DefaultContainer(
        padding: const EdgeInsets.all(15),
@ -60,22 +69,38 @@ class RoomPageSwitch extends StatelessWidget {
                  device.icon!,
                  fit: BoxFit.contain,
                ),
-                // CustomSwitch(
-                //   device: device,
-                // ),
+                isAllDevices
+                    ? CustomSwitch(
+                        device: device,
+                      )
+                    : const SizedBox(),
              ],
            ),
            Flexible(
              child: FittedBox(
-                child: Text(
-                  device.name ?? "",
-                  overflow: TextOverflow.ellipsis,
-                  maxLines: 2,
-                  style: context.bodyLarge.copyWith(
-                    fontWeight: FontWeight.bold,
-                    fontSize: 20,
-                    color: Colors.grey,
-                  ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      device.name ?? "",
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 2,
+                      style: context.bodyLarge.copyWith(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 20,
+                        color: Colors.grey,
+                      ),
+                    ),
+                    Text(
+                      device.subspace!.subspaceName ?? '',
+                      overflow: TextOverflow.ellipsis,
+                      style: context.bodySmall.copyWith(
+                        fontWeight: FontWeight.w400,
+                        fontSize: 10,
+                        color: Colors.grey,
+                      ),
+                    ),
+                  ],
                ),
              ),
            ),
@ -89,14 +114,23 @@ class RoomPageSwitch extends StatelessWidget {
 /// Shows the device interface based on the product type of the device.
 ///
 /// The [device] parameter represents the device model.
-void showDeviceInterface(DeviceModel device, BuildContext context) {
+Future<void> showDeviceInterface(
+    {required DeviceModel device,
+    required BuildContext context,
+    required isAllDevices,
+    List<DeviceModel>? allDevices}) async {
+  final devicesCubit = context.read<DevicesCubit>();
+
  switch (device.productType) {
    case DeviceType.AC:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  ACsView(deviceModel: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
      // navigateToInterface(ACsView(deviceModel: device), context);
      break;
    case DeviceType.WallSensor:
@ -116,12 +150,15 @@ void showDeviceInterface(DeviceModel device, BuildContext context) {
      // navigateToInterface(CeilingSensorInterface(ceilingSensor: device), context);
      break;
    case DeviceType.Curtain:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) => CurtainView(
                    curtain: device,
                  )));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
      break;
    case DeviceType.Blind:
      break;
@ -143,30 +180,43 @@ void showDeviceInterface(DeviceModel device, BuildContext context) {
    case DeviceType.LightBulb:
      navigateToInterface(LightInterface(light: device), context);
    case DeviceType.OneGang:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  OneGangInterface(gangSwitch: device)));
+
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
    case DeviceType.TwoGang:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  TwoGangInterface(gangSwitch: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
    case DeviceType.ThreeGang:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  ThreeGangInterface(gangSwitch: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.WH:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  WaterHeaterPage(device: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
    case DeviceType.DS:
      Navigator.push(
          context,
@ -182,31 +232,43 @@ void showDeviceInterface(DeviceModel device, BuildContext context) {
                  PowerClampPage(device: device)));

    case DeviceType.OneTouch:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  OneTouchScreen(device: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.TowTouch:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  TwoTouchInterface(touchSwitch: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }
    case DeviceType.ThreeTouch:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  ThreeTouchInterface(touchSwitch: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.GarageDoor:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  GarageDoorScreen(device: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.WaterLeak:
      Navigator.push(
@ -216,18 +278,24 @@ void showDeviceInterface(DeviceModel device, BuildContext context) {
                  WaterLeakScreen(device: device)));

    case DeviceType.SixScene:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  SixSceneScreen(device: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.FourScene:
-      Navigator.push(
+      var value = await Navigator.push(
          context,
          PageRouteBuilder(
              pageBuilder: (context, animation1, animation2) =>
                  FourSceneScreen(device: device)));
+      if (value && isAllDevices) {
+        devicesCubit.fetchAllDevices(HomeCubit.getInstance().selectedSpace);
+      }

    case DeviceType.SOS:
      Navigator.push(
--- a/lib/features/devices/view/widgets/rooms_slider.dart
+++ b/lib/features/devices/view/widgets/rooms_slider.dart
@ -23,6 +23,21 @@ class RoomsSlider extends StatelessWidget {
              HomeCubit.getInstance().roomSliderPageChanged(index);
            },
            children: [
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 15),
+                child: InkWell(
+                  onTap: () {
+                    HomeCubit.getInstance().unselectRoom();
+                  },
+                  child: TitleMedium(
+                    text: 'All Devices',
+                    style: context.titleMedium.copyWith(
+                      fontSize: 25,
+                      color: ColorsManager.textPrimaryColor,
+                    ),
+                  ),
+                ),
+              ),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 15),
                child: InkWell(
@ -43,7 +58,10 @@ class RoomsSlider extends StatelessWidget {
                      (room) => InkWell(
                        onTap: () {
                          HomeCubit.getInstance().roomSliderPageChanged(
-                              HomeCubit.getInstance().selectedSpace!.subspaces.indexOf(room));
+                              HomeCubit.getInstance()
+                                  .selectedSpace!
+                                  .subspaces
+                                  .indexOf(room));
                        },
                        child: TitleMedium(
                          text: room.name!,
@ -51,7 +69,8 @@ class RoomsSlider extends StatelessWidget {
                            fontSize: 25,
                            color: HomeCubit.getInstance().selectedRoom == room
                                ? ColorsManager.textPrimaryColor
-                                : ColorsManager.textPrimaryColor.withOpacity(.2),
+                                : ColorsManager.textPrimaryColor
+                                    .withOpacity(.2),
                          ),
                        ),
                      ),
--- a/lib/features/devices/view/widgets/scene_listview.dart
+++ b/lib/features/devices/view/widgets/scene_listview.dart
@ -1,14 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
-import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
-import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
-import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/generated/assets.dart';
-import 'package:syncrow_app/navigation/routing_constants.dart';

 class SceneListview extends StatelessWidget {
  final List<ScenesModel> scenes;
@ -31,23 +28,28 @@ class SceneListview extends StatelessWidget {
            padding: const EdgeInsets.only(right: 10),
            child: DefaultContainer(
              onTap: () {
-                Navigator.pushNamed(
-                  context,
-                  Routes.sceneTasksRoute,
-                  arguments: SceneSettingsRouteArguments(
-                    sceneType: CreateSceneEnum.tabToRun.name,
-                    sceneId: scene.id,
-                    sceneName: scene.name,
-                  ),
-                );
-                context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
+                context
+                    .read<SceneBloc>()
+                    .add(SceneTrigger(scene.id, scene.name));
+                // Navigator.pushNamed(
+                //   context,
+                //   Routes.sceneTasksRoute,
+                //   arguments: SceneSettingsRouteArguments(
+                //     sceneType: CreateSceneEnum.tabToRun.name,
+                //     sceneId: scene.id,
+                //     sceneName: scene.name,
+                //   ),
+                // );
+                // context.read<SmartSceneSelectBloc>()
+                //     .add(const SmartSceneClearEvent());

-                BlocProvider.of<CreateSceneBloc>(context)
-                    .add(FetchSceneTasksEvent(sceneId: scene.id, isAutomation: false));
+                // BlocProvider.of<CreateSceneBloc>(context).add(
+                //     FetchSceneTasksEvent(
+                //         sceneId: scene.id, isAutomation: false));

-                /// the state to set the scene type must be after the fetch
-                BlocProvider.of<CreateSceneBloc>(context)
-                    .add(const SceneTypeEvent(CreateSceneEnum.tabToRun));
+                // /// the state to set the scene type must be after the fetch
+                // BlocProvider.of<CreateSceneBloc>(context)
+                //     .add(const SceneTypeEvent(CreateSceneEnum.tabToRun));
              },
              child: SizedBox(
                width: MediaQuery.of(context).size.width * 0.4,
@ -62,7 +64,8 @@ class SceneListview extends StatelessWidget {
                              height: 32,
                              width: 32,
                              fit: BoxFit.fill,
-                              errorBuilder: (context, error, stackTrace) => Image.asset(
+                              errorBuilder: (context, error, stackTrace) =>
+                                  Image.asset(
                                Assets.assetsIconsLogo,
                                height: 32,
                                width: 32,
--- a/lib/features/devices/view/widgets/smart_door/door_grid.dart
+++ b/lib/features/devices/view/widgets/smart_door/door_grid.dart
@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/members_management_view.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/smart_linkage_view.dart';
 import 'package:syncrow_app/features/devices/view/widgets/smart_door/temporary_password_page.dart';
@ -14,6 +15,8 @@ class DoorLockGrid extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final buttons = doorLockButtons(val: uuid);
+
    return GridView.builder(
      shrinkWrap: true,
      physics: const NeverScrollableScrollPhysics(),
@ -23,14 +26,15 @@ class DoorLockGrid extends StatelessWidget {
        crossAxisSpacing: 10,
        childAspectRatio: 1.75 / 1,
      ),
-      itemCount: 4,
+      itemCount: buttons.length,
      itemBuilder: (context, index) => DefaultContainer(
        onTap: () {
          //TODO: remove checking after adding the pages
          doorLockButtons()[index]['page'] != null
              ? Navigator.of(context).push(
                  MaterialPageRoute(
-                    builder: (context) => doorLockButtons(val: uuid)[index]['page'] as Widget,
+                    builder: (context) =>
+                        doorLockButtons(val: uuid)[index]['page'] as Widget,
                  ),
                )
              : null;
@ -75,11 +79,12 @@ List<Map<String, dynamic>> doorLockButtons({val}) => [
        'image': Assets.assetsIconsDoorlockAssetsMembersManagement,
        'page': const MembersManagementView(),
      },
-      {
-        'title': 'Temporary Password',
-        'image': Assets.assetsIconsDoorlockAssetsTemporaryPassword,
-        'page': TemporaryPasswordPage(deviceId: val),
-      },
+      if (HomeCubit.manageDeviceLocation)
+        {
+          'title': 'Temporary Password',
+          'image': Assets.assetsIconsDoorlockAssetsTemporaryPassword,
+          'page': TemporaryPasswordPage(deviceId: val),
+        },
      {
        'title': 'Smart Linkage',
        'image': Assets.assetsIconsDoorlockAssetsSmartLinkage,
--- a/lib/features/devices/view/widgets/sos/sos_records_screen.dart
+++ b/lib/features/devices/view/widgets/sos/sos_records_screen.dart
@ -8,9 +8,7 @@ import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_state.dart';
 import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 import 'package:syncrow_app/generated/assets.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';

 class SosRecordsScreen extends StatefulWidget {
@ -22,14 +20,13 @@ class SosRecordsScreen extends StatefulWidget {
 }

 class _SosRecordsScreenState extends State<SosRecordsScreen> {
-  int _selectedIndex = 0;
+  // int _selectedIndex = 0;
  @override
  Widget build(BuildContext context) {
    return DefaultScaffold(
      title: 'Records',
      child: BlocProvider(
-        create: (context) =>
-            SosBloc(sosId: widget.sosId)..add(const ReportLogsInitial()),
+        create: (context) => SosBloc(sosId: widget.sosId)..add(const ReportLogsInitial()),
        child: BlocBuilder<SosBloc, SosState>(
          builder: (context, state) {
            final waterSensorBloc = BlocProvider.of<SosBloc>(context);
@ -37,15 +34,13 @@ class _SosRecordsScreenState extends State<SosRecordsScreen> {

            if (state is LoadingNewSate) {
              return const Center(
-                child: DefaultContainer(
-                    width: 50, height: 50, child: CircularProgressIndicator()),
+                child: DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
              );
            } else if (state is UpdateState) {
              for (var record in waterSensorBloc.recordGroups.data!) {
                final DateTime eventDateTime =
                    DateTime.fromMillisecondsSinceEpoch(record.eventTime!);
-                final String formattedDate =
-                    DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);
+                final String formattedDate = DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);
                if (groupedRecords.containsKey(formattedDate)) {
                  groupedRecords[formattedDate]!.add(record);
                } else {
@ -58,63 +53,61 @@ class _SosRecordsScreenState extends State<SosRecordsScreen> {
              length: 2,
              child: Column(
                children: [
-                  Container(
-                    width: MediaQuery.of(context).size.width,
-                    decoration: const ShapeDecoration(
-                      color: ColorsManager.onPrimaryColor,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(Radius.circular(30)),
-                      ),
-                    ),
-                    child: TabBar(
-                      onTap: (value) {
-                        setState(() {
-                          _selectedIndex = value;
-                        });
-                      },
-                      indicatorColor: Colors.white,
-                      dividerHeight: 0,
-                      indicatorSize: TabBarIndicatorSize.tab,
-                      indicator: const ShapeDecoration(
-                        color: ColorsManager.slidingBlueColor,
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(20)),
-                        ),
-                      ),
-                      tabs: [
-                        Tab(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 10),
-                            child: BodySmall(
-                              text: 'Record',
-                              style: context.bodySmall.copyWith(
-                                color: _selectedIndex == 0
-                                    ? Colors.white
-                                    : ColorsManager.blackColor,
-                                fontSize: 12,
-                                fontWeight: FontWeight.w400,
-                              ),
-                            ),
-                          ),
-                        ),
-                        Tab(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 10),
-                            child: Text(
-                              'Automation Log',
-                              style: context.bodySmall.copyWith(
-                                color: _selectedIndex == 1
-                                    ? Colors.white
-                                    : ColorsManager.blackColor,
-                                fontSize: 12,
-                                fontWeight: FontWeight.w400,
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
+                  // Container(
+                  //   width: MediaQuery.of(context).size.width,
+                  //   decoration: const ShapeDecoration(
+                  //     color: ColorsManager.onPrimaryColor,
+                  //     shape: RoundedRectangleBorder(
+                  //       borderRadius: BorderRadius.all(Radius.circular(30)),
+                  //     ),
+                  //   ),
+                  //   child: TabBar(
+                  //     onTap: (value) {
+                  //       setState(() {
+                  //         _selectedIndex = value;
+                  //       });
+                  //     },
+                  //     indicatorColor: Colors.white,
+                  //     dividerHeight: 0,
+                  //     indicatorSize: TabBarIndicatorSize.tab,
+                  //     indicator: const ShapeDecoration(
+                  //       color: ColorsManager.slidingBlueColor,
+                  //       shape: RoundedRectangleBorder(
+                  //         borderRadius: BorderRadius.all(Radius.circular(20)),
+                  //       ),
+                  //     ),
+                  //     tabs: [
+                  //       Tab(
+                  //         child: Container(
+                  //           padding: const EdgeInsets.symmetric(vertical: 10),
+                  //           child: BodySmall(
+                  //             text: 'Record',
+                  //             style: context.bodySmall.copyWith(
+                  //               color:
+                  //                   _selectedIndex == 0 ? Colors.white : ColorsManager.blackColor,
+                  //               fontSize: 12,
+                  //               fontWeight: FontWeight.w400,
+                  //             ),
+                  //           ),
+                  //         ),
+                  //       ),
+                  //       Tab(
+                  //         child: Container(
+                  //           padding: const EdgeInsets.symmetric(vertical: 10),
+                  //           child: Text(
+                  //             'Automation Log',
+                  //             style: context.bodySmall.copyWith(
+                  //               color:
+                  //                   _selectedIndex == 1 ? Colors.white : ColorsManager.blackColor,
+                  //               fontSize: 12,
+                  //               fontWeight: FontWeight.w400,
+                  //             ),
+                  //           ),
+                  //         ),
+                  //       ),
+                  //     ],
+                  //   ),
+                  // ),
                  Expanded(
                    child: TabBarView(
                      physics: const NeverScrollableScrollPhysics(),
@ -129,14 +122,11 @@ class _SosRecordsScreenState extends State<SosRecordsScreen> {
                            : ListView.builder(
                                itemCount: groupedRecords.length,
                                itemBuilder: (context, index) {
-                                  final String date =
-                                      groupedRecords.keys.elementAt(index);
-                                  final List<DeviceEvent> recordsForDate =
-                                      groupedRecords[date]!;
+                                  final String date = groupedRecords.keys.elementAt(index);
+                                  final List<DeviceEvent> recordsForDate = groupedRecords[date]!;

                                  return Column(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
+                                    crossAxisAlignment: CrossAxisAlignment.start,
                                    children: [
                                      Padding(
                                        padding: const EdgeInsets.all(16.0),
@ -152,49 +142,37 @@ class _SosRecordsScreenState extends State<SosRecordsScreen> {
                                      DefaultContainer(
                                        child: Column(
                                          children: [
-                                            ...recordsForDate
-                                                .asMap()
-                                                .entries
-                                                .map((entry) {
+                                            ...recordsForDate.asMap().entries.map((entry) {
                                              final int idx = entry.key;
-                                              final DeviceEvent record =
-                                                  entry.value;
+                                              final DeviceEvent record = entry.value;
                                              final DateTime eventDateTime =
-                                                  DateTime
-                                                      .fromMillisecondsSinceEpoch(
-                                                          record.eventTime!);
+                                                  DateTime.fromMillisecondsSinceEpoch(
+                                                      record.eventTime!);
                                              final String formattedTime =
-                                                  DateFormat('HH:mm:ss')
-                                                      .format(eventDateTime);
+                                                  DateFormat('HH:mm:ss').format(eventDateTime);

                                              return Column(
                                                children: [
                                                  ListTile(
                                                    leading: SvgPicture.asset(
                                                      record.value == 'true'
-                                                          ? Assets
-                                                              .leakDetectedIcon
-                                                          : Assets
-                                                              .leakNormalIcon,
+                                                          ? Assets.leakDetectedIcon
+                                                          : Assets.leakNormalIcon,
                                                      height: 25,
                                                      width: 25,
                                                    ),
                                                    title: const Text(
                                                      "SOS Alert Triggered",
                                                      style: const TextStyle(
-                                                        fontWeight:
-                                                            FontWeight.bold,
+                                                        fontWeight: FontWeight.bold,
                                                        fontSize: 18,
                                                      ),
                                                    ),
-                                                    subtitle:
-                                                        Text(formattedTime),
+                                                    subtitle: Text(formattedTime),
                                                  ),
-                                                  if (idx !=
-                                                      recordsForDate.length - 1)
+                                                  if (idx != recordsForDate.length - 1)
                                                    const Divider(
-                                                      color: ColorsManager
-                                                          .graysColor,
+                                                      color: ColorsManager.graysColor,
                                                    ),
                                                ],
                                              );
--- a/lib/features/devices/view/widgets/two_touch/two_touch_Interface.dart
+++ b/lib/features/devices/view/widgets/two_touch/two_touch_Interface.dart
@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/devices/bloc/two_touch_bloc/two_touch_bloc.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/device_appbar.dart';
 import 'package:syncrow_app/features/devices/view/widgets/two_touch/two_touch_screen.dart';
@ -26,6 +28,7 @@ class TwoTouchInterface extends StatelessWidget {
        extendBody: true,
        appBar: touchSwitch != null
            ? DeviceAppbar(
+                value: true,
                deviceName: touchSwitch!.name!,
                deviceUuid: touchSwitch!.uuid!,
              )
--- a/lib/features/devices/view/widgets/wall_sensor/parameters_list.dart
+++ b/lib/features/devices/view/widgets/wall_sensor/parameters_list.dart
@ -215,8 +215,7 @@ class ParametersList extends StatelessWidget {
    {
      'icon': Assets.assetsIconsPresenceSensorAssetsEmpty,
      'title': 'Nobody Time',
-      'code': null,
-      //TODO: Implement the nobody time
+      'code': 'no_one_time',
    },
    {
      'icon': Assets.assetsIconsPresenceSensorAssetsIndicator,
@ -231,7 +230,7 @@ class ParametersList extends StatelessWidget {
    {
      'icon': Assets.assetsIconsPresenceSensorAssetsIlluminanceRecord,
      'title': 'Illuminance Record',
-      'code': null
+      'code': 'illuminance_value'
    },
  ];
 }
@ -240,6 +239,7 @@ Widget listItem(Map<String, Object?> wallSensorButton, BuildContext context, Dev
    WallSensorModel wallSensorStatus) {
  String? unit;
  dynamic value;
+  int noBodyTimeValue;
  if (wallSensorButton['code'] != null) {
    // if (wallSensor.status.any((element) => element.code == wallSensorButton['code'] as String)) {
    //   unit = unitsMap[wallSensorButton['code'] as String];
@ -256,12 +256,15 @@ Widget listItem(Map<String, Object?> wallSensorButton, BuildContext context, Dev
    } else if (wallSensorButton['code'] == 'illuminance_value') {
      unit = unitsMap[wallSensorButton['code'] as String];
      value = wallSensorStatus.illuminance;
+    } else if (wallSensorButton['code'] == 'no_one_time') {
+      unit = unitsMap[wallSensorButton['code'] as String];
+      value = wallSensorStatus.noOneTime;
    }
  }
  return DefaultContainer(
    margin: const EdgeInsets.only(bottom: 5),
    padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 20),
-    onTap: () {
+    onTap: () async {
      if (wallSensorButton['page'] != null) {
        Navigator.push(
          context,
@ -270,6 +273,42 @@ Widget listItem(Map<String, Object?> wallSensorButton, BuildContext context, Dev
          ),
        );
      }
+      if (wallSensorButton['title'] == 'Presence Record') {
+        Navigator.of(context).push(
+          MaterialPageRoute(
+              builder: (context) => PresenceRecords(
+                    deviceId: wallSensor.uuid!,
+                    code: 'presence_state',
+                    title: 'Presence Record',
+                  )),
+        );
+      }
+
+      if (wallSensorButton['title'] == 'Illuminance Record') {
+        Navigator.of(context).push(
+          MaterialPageRoute(
+              builder: (context) => PresenceRecords(
+                    deviceId: wallSensor.uuid!,
+                    code: 'illuminance_value',
+                    title: 'Illuminance Record',
+                  )),
+        );
+      }
+
+      if (wallSensorButton['title'] == 'Nobody Time') {
+        int noBodyTimeValue = value as int;
+        String controlCode = 'no_one_time';
+        final result = await showDialog(
+          context: context,
+          builder: (context) => ParameterControlDialog(
+              title: 'Nobody Time', sensor: wallSensor, value: noBodyTimeValue, min: 0, max: 10000),
+        );
+
+        if (result != null) {
+          BlocProvider.of<WallSensorBloc>(context)
+              .add(ChangeValueEvent(value: result, code: controlCode));
+        }
+      }
    },
    child: Row(
      children: [
--- a/lib/features/devices/view/widgets/wall_sensor/persence_records.dart
+++ b/lib/features/devices/view/widgets/wall_sensor/persence_records.dart
@ -0,0 +1,120 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
+import 'package:syncrow_app/features/devices/bloc/wall_sensor_bloc/wall_sensor_bloc.dart';
+import 'package:syncrow_app/features/devices/bloc/wall_sensor_bloc/wall_sensor_event.dart';
+import 'package:syncrow_app/features/devices/bloc/wall_sensor_bloc/wall_sensor_state.dart';
+import 'package:syncrow_app/features/devices/model/device_report_model.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class PresenceRecords extends StatelessWidget {
+  final String deviceId;
+  final String code;
+  final String title;
+  const PresenceRecords(
+      {super.key, required this.deviceId, required this.code, required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultScaffold(
+      title: title,
+      child: BlocProvider(
+        create: (context) => WallSensorBloc(deviceId: deviceId)
+          ..add(GetDeviceReportsEvent(deviceUuid: deviceId, code: code)),
+        child: BlocBuilder<WallSensorBloc, WallSensorState>(builder: (context, state) {
+          final Map<String, List<DeviceEvent>> groupedRecords = {};
+
+          if (state is LoadingInitialState) {
+            return const Center(
+              child: DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
+            );
+          } else if (state is DeviceReportsState) {
+            for (var record in state.deviceReport.data ?? []) {
+              final DateTime eventDateTime = DateTime.fromMillisecondsSinceEpoch(record.eventTime!);
+              final String formattedDate = DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);
+
+              // Group by formatted date
+              if (groupedRecords.containsKey(formattedDate)) {
+                groupedRecords[formattedDate]!.add(record);
+              } else {
+                groupedRecords[formattedDate] = [record];
+              }
+            }
+          }
+          return groupedRecords.isEmpty
+              ? const Center(
+                  child: Text('No records found'),
+                )
+              : ListView.builder(
+                  itemCount: groupedRecords.length,
+                  itemBuilder: (context, index) {
+                    final String date = groupedRecords.keys.elementAt(index);
+                    final List<DeviceEvent> recordsForDate = groupedRecords[date]!;
+
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.only(bottom: 5, top: 10),
+                          child: Text(
+                            date,
+                            style: const TextStyle(
+                              color: ColorsManager.grayColor,
+                              fontSize: 13,
+                              fontWeight: FontWeight.w700,
+                            ),
+                          ),
+                        ),
+                        DefaultContainer(
+                          child: Column(
+                            children: [
+                              ...recordsForDate.asMap().entries.map((entry) {
+                                final int idx = entry.key;
+                                final DeviceEvent record = entry.value;
+                                final DateTime eventDateTime =
+                                    DateTime.fromMillisecondsSinceEpoch(record.eventTime!);
+                                final String formattedTime =
+                                    DateFormat('HH:mm:ss').format(eventDateTime);
+
+                                return Column(
+                                  children: [
+                                    Container(
+                                      child: ListTile(
+                                        leading: Icon(
+                                          record.value == 'true'
+                                              ? Icons.radio_button_checked
+                                              : Icons.radio_button_unchecked,
+                                          color: record.value == 'true' ? Colors.blue : Colors.grey,
+                                        ),
+                                        title: Text(
+                                          record.value == 'true' ? "Opened" : "Closed",
+                                          style: const TextStyle(
+                                            fontWeight: FontWeight.bold,
+                                            fontSize: 18,
+                                          ),
+                                        ),
+                                        subtitle: Text('$formattedTime'),
+                                      ),
+                                    ),
+                                    if (idx != recordsForDate.length - 1)
+                                      const Divider(
+                                        color: ColorsManager.graysColor,
+                                      ),
+                                  ],
+                                );
+                              }).toList(),
+                            ],
+                          ),
+                        ),
+                      ],
+                    );
+                  },
+                );
+        }),
+      ),
+    );
+  }
+}
--- a/lib/features/devices/view/widgets/wall_sensor/wall_sensor_interface.dart
+++ b/lib/features/devices/view/widgets/wall_sensor/wall_sensor_interface.dart
@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@ -9,6 +11,8 @@ import 'package:syncrow_app/features/devices/bloc/wall_sensor_bloc/wall_sensor_e
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/model/wall_sensor_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/device_appbar.dart';
+import 'package:syncrow_app/features/devices/view/widgets/garage_door/garage_records_screen.dart';
+import 'package:syncrow_app/features/devices/view/widgets/wall_sensor/persence_records.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
@ -41,7 +45,8 @@ class WallMountedInterface extends StatelessWidget {
            motionlessSensitivity: 0,
            currentDistance: 0,
            illuminance: 0,
-            indicator: false);
+            indicator: false,
+            noOneTime: 0);

        if (state is UpdateState) {
          wallSensorModel = state.wallSensorModel;
--- a/lib/features/devices/view/widgets/water_heater/wh_timer_schedule_screen.dart
+++ b/lib/features/devices/view/widgets/water_heater/wh_timer_schedule_screen.dart
@ -6,9 +6,9 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/devices/bloc/water_heater_bloc/water_heater_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/water_heater_bloc/water_heater_state.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
-import 'package:syncrow_app/features/devices/view/widgets/water_heater/Inching_widget.dart';
-import 'package:syncrow_app/features/devices/view/widgets/water_heater/circulate_list_view.dart';
-import 'package:syncrow_app/features/devices/view/widgets/water_heater/circulate_widget.dart';
+// import 'package:syncrow_app/features/devices/view/widgets/water_heater/Inching_widget.dart';
+// import 'package:syncrow_app/features/devices/view/widgets/water_heater/circulate_list_view.dart';
+// import 'package:syncrow_app/features/devices/view/widgets/water_heater/circulate_widget.dart';
 import 'package:syncrow_app/features/shared_widgets/create_schedule.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
 import 'package:syncrow_app/features/shared_widgets/schedule_list.dart';
@ -61,7 +61,7 @@ class WHTimerScheduleScreen extends StatelessWidget {
                  }
                },
                child: DefaultTabController(
-                    length: 4,
+                    length: 2,
                    child: DefaultScaffold(
                      appBar: AppBar(
                        backgroundColor: Colors.transparent,
@ -220,54 +220,54 @@ class WHTimerScheduleScreen extends StatelessWidget {
                                            ),
                                          ),
                                        ),
-                                        Tab(
-                                          icon: Padding(
-                                            padding: const EdgeInsets.only(top: 10),
-                                            child: SvgPicture.asset(
-                                              Assets.scheduleCirculateIcon,
-                                              color: waterHeaterBloc.selectedTabIndex == 2
-                                                  ? Colors.white
-                                                  : ColorsManager.blackColor,
-                                            ),
-                                          ),
-                                          child: Container(
-                                            padding: const EdgeInsets.symmetric(vertical: 5),
-                                            child: Text(
-                                              'Circulate',
-                                              style: context.bodySmall.copyWith(
-                                                color: waterHeaterBloc.selectedTabIndex == 2
-                                                    ? Colors.white
-                                                    : ColorsManager.blackColor,
-                                                fontSize: 12,
-                                                fontWeight: FontWeight.w400,
-                                              ),
-                                            ),
-                                          ),
-                                        ),
-                                        Tab(
-                                          icon: Padding(
-                                            padding: const EdgeInsets.only(top: 10),
-                                            child: SvgPicture.asset(
-                                              Assets.scheduleInchingIcon,
-                                              color: waterHeaterBloc.selectedTabIndex == 3
-                                                  ? Colors.white
-                                                  : ColorsManager.blackColor,
-                                            ),
-                                          ),
-                                          child: Container(
-                                            padding: const EdgeInsets.symmetric(vertical: 5),
-                                            child: Text(
-                                              'Inching',
-                                              style: context.bodySmall.copyWith(
-                                                color: waterHeaterBloc.selectedTabIndex == 3
-                                                    ? Colors.white
-                                                    : ColorsManager.blackColor,
-                                                fontSize: 12,
-                                                fontWeight: FontWeight.w400,
-                                              ),
-                                            ),
-                                          ),
-                                        ),
+                                        // Tab(
+                                        //   icon: Padding(
+                                        //     padding: const EdgeInsets.only(top: 10),
+                                        //     child: SvgPicture.asset(
+                                        //       Assets.scheduleCirculateIcon,
+                                        //       color: waterHeaterBloc.selectedTabIndex == 2
+                                        //           ? Colors.white
+                                        //           : ColorsManager.blackColor,
+                                        //     ),
+                                        //   ),
+                                        //   child: Container(
+                                        //     padding: const EdgeInsets.symmetric(vertical: 5),
+                                        //     child: Text(
+                                        //       'Circulate',
+                                        //       style: context.bodySmall.copyWith(
+                                        //         color: waterHeaterBloc.selectedTabIndex == 2
+                                        //             ? Colors.white
+                                        //             : ColorsManager.blackColor,
+                                        //         fontSize: 12,
+                                        //         fontWeight: FontWeight.w400,
+                                        //       ),
+                                        //     ),
+                                        //   ),
+                                        // ),
+                                        // Tab(
+                                        //   icon: Padding(
+                                        //     padding: const EdgeInsets.only(top: 10),
+                                        //     child: SvgPicture.asset(
+                                        //       Assets.scheduleInchingIcon,
+                                        //       color: waterHeaterBloc.selectedTabIndex == 3
+                                        //           ? Colors.white
+                                        //           : ColorsManager.blackColor,
+                                        //     ),
+                                        //   ),
+                                        //   child: Container(
+                                        //     padding: const EdgeInsets.symmetric(vertical: 5),
+                                        //     child: Text(
+                                        //       'Inching',
+                                        //       style: context.bodySmall.copyWith(
+                                        //         color: waterHeaterBloc.selectedTabIndex == 3
+                                        //             ? Colors.white
+                                        //             : ColorsManager.blackColor,
+                                        //         fontSize: 12,
+                                        //         fontWeight: FontWeight.w400,
+                                        //       ),
+                                        //     ),
+                                        //   ),
+                                        // ),
                                      ],
                                    )),
                                Expanded(
@ -357,57 +357,57 @@ class WHTimerScheduleScreen extends StatelessWidget {
                                                ),
                                              ),
                                      ),
-                                      Center(
-                                        child: Column(
-                                          crossAxisAlignment: CrossAxisAlignment.center,
-                                          mainAxisAlignment: MainAxisAlignment.center,
-                                          children: [
-                                            waterHeaterBloc.createCirculate == true
-                                                ? CirculateWidget(
-                                                    endDuration: () {
-                                                      waterHeaterBloc.add(SelectTimeEvent(
-                                                          context: context, isEffective: false));
-                                                    },
-                                                    startDuration: () {
-                                                      waterHeaterBloc.add(SelectTimeEvent(
-                                                          context: context, isEffective: false));
-                                                    },
-                                                    isStartEndTime: true,
-                                                    startTime: DateTime.now(),
-                                                    endTime: DateTime.now(),
-                                                    days: waterHeaterBloc.days,
-                                                    selectedDays: [],
-                                                    onToggleStartEndTime: (c) {},
-                                                    onTimeChanged: (x, f) {},
-                                                    onDaySelected: (p0) {},
-                                                  )
-                                                : CirculateListView(
-                                                    listSchedule: [], // Pass the schedule list here
-                                                    onDismissed: (scheduleId) {
-                                                      waterHeaterBloc.listSchedule.removeWhere(
-                                                          (schedule) =>
-                                                              schedule.scheduleId == scheduleId);
-                                                      waterHeaterBloc
-                                                          .add(DeleteScheduleEvent(id: scheduleId));
-                                                    },
-                                                    onToggleSchedule: (scheduleId, isEnabled) {
-                                                      waterHeaterBloc.add(ToggleScheduleEvent(
-                                                        id: scheduleId,
-                                                        toggle: isEnabled,
-                                                      ));
-                                                    },
-                                                  )
-                                          ],
-                                        ),
-                                      ),
-                                      Column(
-                                        children: [
-                                          SizedBox(height: 20),
-                                          Container(
-                                            child: InchingWidget(),
-                                          ),
-                                        ],
-                                      )
+                                      // Center(
+                                      //   child: Column(
+                                      //     crossAxisAlignment: CrossAxisAlignment.center,
+                                      //     mainAxisAlignment: MainAxisAlignment.center,
+                                      //     children: [
+                                      //       waterHeaterBloc.createCirculate == true
+                                      //           ? CirculateWidget(
+                                      //               endDuration: () {
+                                      //                 waterHeaterBloc.add(SelectTimeEvent(
+                                      //                     context: context, isEffective: false));
+                                      //               },
+                                      //               startDuration: () {
+                                      //                 waterHeaterBloc.add(SelectTimeEvent(
+                                      //                     context: context, isEffective: false));
+                                      //               },
+                                      //               isStartEndTime: true,
+                                      //               startTime: DateTime.now(),
+                                      //               endTime: DateTime.now(),
+                                      //               days: waterHeaterBloc.days,
+                                      //               selectedDays: [],
+                                      //               onToggleStartEndTime: (c) {},
+                                      //               onTimeChanged: (x, f) {},
+                                      //               onDaySelected: (p0) {},
+                                      //             )
+                                      //           : CirculateListView(
+                                      //               listSchedule: [], // Pass the schedule list here
+                                      //               onDismissed: (scheduleId) {
+                                      //                 waterHeaterBloc.listSchedule.removeWhere(
+                                      //                     (schedule) =>
+                                      //                         schedule.scheduleId == scheduleId);
+                                      //                 waterHeaterBloc
+                                      //                     .add(DeleteScheduleEvent(id: scheduleId));
+                                      //               },
+                                      //               onToggleSchedule: (scheduleId, isEnabled) {
+                                      //                 waterHeaterBloc.add(ToggleScheduleEvent(
+                                      //                   id: scheduleId,
+                                      //                   toggle: isEnabled,
+                                      //                 ));
+                                      //               },
+                                      //             )
+                                      //     ],
+                                      //   ),
+                                      // ),
+                                      // Column(
+                                      //   children: [
+                                      //     SizedBox(height: 20),
+                                      //     Container(
+                                      //       child: InchingWidget(),
+                                      //     ),
+                                      //   ],
+                                      // )
                                    ],
                                  ),
                                ),
--- a/lib/features/devices/view/widgets/water_leak/water_leak_records_screen.dart
+++ b/lib/features/devices/view/widgets/water_leak/water_leak_records_screen.dart
@ -8,9 +8,7 @@ import 'package:syncrow_app/features/devices/bloc/water_leak_bloc/water_leak_sta
 import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/shared_widgets/default_container.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 import 'package:syncrow_app/generated/assets.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';

 class WaterLeakRecordsScreen extends StatefulWidget {
@ -22,14 +20,13 @@ class WaterLeakRecordsScreen extends StatefulWidget {
 }

 class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
-  int _selectedIndex = 0;
+  // int _selectedIndex = 0;
  @override
  Widget build(BuildContext context) {
    return DefaultScaffold(
      title: 'Records',
      child: BlocProvider(
-        create: (context) =>
-            WaterLeakBloc(WLId: widget.WLId)..add(const ReportLogsInitial()),
+        create: (context) => WaterLeakBloc(WLId: widget.WLId)..add(const ReportLogsInitial()),
        child: BlocBuilder<WaterLeakBloc, WaterLeakState>(
          builder: (context, state) {
            final waterSensorBloc = BlocProvider.of<WaterLeakBloc>(context);
@ -37,15 +34,13 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {

            if (state is WaterLeakLoadingState) {
              return const Center(
-                child: DefaultContainer(
-                    width: 50, height: 50, child: CircularProgressIndicator()),
+                child: DefaultContainer(width: 50, height: 50, child: CircularProgressIndicator()),
              );
            } else if (state is UpdateState) {
              for (var record in waterSensorBloc.recordGroups.data!) {
                final DateTime eventDateTime =
                    DateTime.fromMillisecondsSinceEpoch(record.eventTime!);
-                final String formattedDate =
-                    DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);
+                final String formattedDate = DateFormat('EEEE, dd/MM/yyyy').format(eventDateTime);

                if (groupedRecords.containsKey(formattedDate)) {
                  groupedRecords[formattedDate]!.add(record);
@ -59,63 +54,63 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
              length: 2,
              child: Column(
                children: [
-                  Container(
-                    width: MediaQuery.of(context).size.width,
-                    decoration: const ShapeDecoration(
-                      color: ColorsManager.onPrimaryColor,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.all(Radius.circular(30)),
-                      ),
-                    ),
-                    child: TabBar(
-                      onTap: (value) {
-                        setState(() {
-                          _selectedIndex = value;
-                        });
-                      },
-                      indicatorColor: Colors.white,
-                      dividerHeight: 0,
-                      indicatorSize: TabBarIndicatorSize.tab,
-                      indicator: const ShapeDecoration(
-                        color: ColorsManager.slidingBlueColor,
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.all(Radius.circular(20)),
-                        ),
-                      ),
-                      tabs: [
-                        Tab(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 10),
-                            child: BodySmall(
-                              text: 'Record',
-                              style: context.bodySmall.copyWith(
-                                color: _selectedIndex == 0
-                                    ? Colors.white
-                                    : ColorsManager.blackColor,
-                                fontSize: 12,
-                                fontWeight: FontWeight.w400,
-                              ),
-                            ),
-                          ),
-                        ),
-                        Tab(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 10),
-                            child: Text(
-                              'Automation Record',
-                              style: context.bodySmall.copyWith(
-                                color: _selectedIndex == 1
-                                    ? Colors.white
-                                    : ColorsManager.blackColor,
-                                fontSize: 12,
-                                fontWeight: FontWeight.w400,
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
+                  // Container(
+                  //   width: MediaQuery.of(context).size.width,
+                  //   decoration: const ShapeDecoration(
+                  //     color: ColorsManager.onPrimaryColor,
+                  //     shape: RoundedRectangleBorder(
+                  //       borderRadius: BorderRadius.all(Radius.circular(30)),
+                  //     ),
+                  //   ),
+                  //   child: TabBar(
+                  //     onTap: (value) {
+                  //       setState(() {
+                  //         _selectedIndex = value;
+                  //       });
+                  //     },
+                  //     indicatorColor: Colors.white,
+                  //     dividerHeight: 0,
+                  //     indicatorSize: TabBarIndicatorSize.tab,
+                  //     indicator: const ShapeDecoration(
+                  //       color: ColorsManager.slidingBlueColor,
+                  //       shape: RoundedRectangleBorder(
+                  //         borderRadius: BorderRadius.all(Radius.circular(20)),
+                  //       ),
+                  //     ),
+                  //     tabs: [
+                  //       Tab(
+                  //         child: Container(
+                  //           padding: const EdgeInsets.symmetric(vertical: 10),
+                  //           child: BodySmall(
+                  //             text: 'Record',
+                  //             style: context.bodySmall.copyWith(
+                  //               color: _selectedIndex == 0
+                  //                   ? Colors.white
+                  //                   : ColorsManager.blackColor,
+                  //               fontSize: 12,
+                  //               fontWeight: FontWeight.w400,
+                  //             ),
+                  //           ),
+                  //         ),
+                  //       ),
+                  //       Tab(
+                  //         child: Container(
+                  //           padding: const EdgeInsets.symmetric(vertical: 10),
+                  //           child: Text(
+                  //             'Automation Record',
+                  //             style: context.bodySmall.copyWith(
+                  //               color: _selectedIndex == 1
+                  //                   ? Colors.white
+                  //                   : ColorsManager.blackColor,
+                  //               fontSize: 12,
+                  //               fontWeight: FontWeight.w400,
+                  //             ),
+                  //           ),
+                  //         ),
+                  //       ),
+                  //     ],
+                  //   ),
+                  // ),
                  Expanded(
                    child: TabBarView(
                      physics: const NeverScrollableScrollPhysics(),
@ -125,14 +120,11 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
                            : ListView.builder(
                                itemCount: groupedRecords.length,
                                itemBuilder: (context, index) {
-                                  final String date =
-                                      groupedRecords.keys.elementAt(index);
-                                  final List<DeviceEvent> recordsForDate =
-                                      groupedRecords[date]!;
+                                  final String date = groupedRecords.keys.elementAt(index);
+                                  final List<DeviceEvent> recordsForDate = groupedRecords[date]!;

                                  return Column(
-                                    crossAxisAlignment:
-                                        CrossAxisAlignment.start,
+                                    crossAxisAlignment: CrossAxisAlignment.start,
                                    children: [
                                      Padding(
                                        padding: const EdgeInsets.all(16.0),
@ -148,30 +140,22 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
                                      DefaultContainer(
                                        child: Column(
                                          children: [
-                                            ...recordsForDate
-                                                .asMap()
-                                                .entries
-                                                .map((entry) {
+                                            ...recordsForDate.asMap().entries.map((entry) {
                                              final int idx = entry.key;
-                                              final DeviceEvent record =
-                                                  entry.value;
+                                              final DeviceEvent record = entry.value;
                                              final DateTime eventDateTime =
-                                                  DateTime
-                                                      .fromMillisecondsSinceEpoch(
-                                                          record.eventTime!);
+                                                  DateTime.fromMillisecondsSinceEpoch(
+                                                      record.eventTime!);
                                              final String formattedTime =
-                                                  DateFormat('HH:mm:ss')
-                                                      .format(eventDateTime);
+                                                  DateFormat('HH:mm:ss').format(eventDateTime);

                                              return Column(
                                                children: [
                                                  ListTile(
                                                    leading: SvgPicture.asset(
                                                      record.value == 'true'
-                                                          ? Assets
-                                                              .leakDetectedIcon
-                                                          : Assets
-                                                              .leakNormalIcon,
+                                                          ? Assets.leakDetectedIcon
+                                                          : Assets.leakNormalIcon,
                                                      height: 25,
                                                      width: 25,
                                                    ),
@ -180,19 +164,15 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
                                                          ? "Leak Detected"
                                                          : "Normal",
                                                      style: const TextStyle(
-                                                        fontWeight:
-                                                            FontWeight.bold,
+                                                        fontWeight: FontWeight.bold,
                                                        fontSize: 18,
                                                      ),
                                                    ),
-                                                    subtitle:
-                                                        Text('$formattedTime'),
+                                                    subtitle: Text('$formattedTime'),
                                                  ),
-                                                  if (idx !=
-                                                      recordsForDate.length - 1)
+                                                  if (idx != recordsForDate.length - 1)
                                                    const Divider(
-                                                      color: ColorsManager
-                                                          .graysColor,
+                                                      color: ColorsManager.graysColor,
                                                    ),
                                                ],
                                              );
@ -207,8 +187,7 @@ class _WaterLeakRecordsScreenState extends State<WaterLeakRecordsScreen> {
                        Container(
                          height: 10,
                          width: 20,
-                          child:
-                              const Center(child: Text('No data available.')),
+                          child: const Center(child: Text('No data available.')),
                        ),
                      ],
                    ),
--- a/lib/features/menu/bloc/create_unit_bloc/create_unit_bloc.dart
+++ b/lib/features/menu/bloc/create_unit_bloc/create_unit_bloc.dart
@ -1,10 +1,12 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/user_model.dart';
 import 'package:syncrow_app/features/menu/bloc/create_unit_bloc/create_unit_event.dart';
 import 'package:syncrow_app/features/menu/bloc/create_unit_bloc/create_unit_state.dart';
 import 'package:syncrow_app/services/api/home_creation_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';

 class CreateUnitBloc extends Bloc<CreateUnitEvent, CreateUnitState> {
@ -239,8 +241,13 @@ Future<String> _createNewRoom(
    required String communityId}) async {
  try {
    Map<String, String> body = {'subspaceName': roomName};
+    Project? project = HomeCubit.getInstance().project;
+
    final response = await HomeCreation.createRoom(
-        communityId: communityId, spaceId: unitId, body: body);
+        communityId: communityId,
+        spaceId: unitId,
+        body: body,
+        projectId: project?.uuid ?? TempConst.projectIdDev);
    // if (response['data']['uuid'] != '') {
    //   final result = await _assignToRoom(roomId: response['data']['uuid'], userId: userId);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
mohammad	22789234fe	Sensitivity Start from 1	2025-02-23 16:30:50 +03:00
mohammad	8393ec353a	fetchDevices by projectUuid	2025-02-20 16:02:25 +03:00
Abdullah Alassaf	0b45d61b25	Fixed list issue in the manage home screen	2025-02-20 10:50:47 +03:00
Abdullah Alassaf	450b773921	set default values in the devices models instead of late, and fixed issues in the AC bloc	2025-02-20 04:13:37 +03:00
hannathkadher	3f7f7ce49f	updated project hardcoded values	2025-02-16 20:55:13 +04:00
hannathkadher	67209961b4	added project model	2025-02-15 11:54:02 +04:00
mohammadnemer1	9098276223	Merge pull request #71 from SyncrowIOT/fixes_bugs_sprint15 fixes bugs and add project id staging	2025-02-12 12:47:09 +03:00
mohammad	36dfe2c85e	change the key	2025-02-12 12:06:00 +03:00
mohammad	efed5f55a7	add project id to env file and hide about	2025-02-11 11:05:13 +03:00
mohammad	9897c19dad	fixes bugs and add project id staging	2025-02-10 10:26:02 +03:00
Abdullah	48733fd65e	Merge pull request #70 from SyncrowIOT/sprint_14_changes Sprint 14 changes	2025-02-02 22:33:28 +03:00
Abdullah Alassaf	4ca4086bd3	Merged with dev	2025-02-02 22:32:15 +03:00
mohammadnemer1	4da1b16b18	Merge pull request #69 from SyncrowIOT/role_permission_restrict_user restrict_spaceMemberUser_and_change_SignUpModel	2025-02-02 14:27:31 +03:00
mohammad	1189b52c57	remove comment DevicesViewBody and fix home page	2025-02-02 13:17:25 +03:00
mohammad	c578d63134	all_devices and Restrict_user	2025-01-29 14:10:38 +03:00
Abdullah Alassaf	457b7c2c51	Updated gradle and kotlin	2025-01-26 20:38:37 +03:00
Abdullah Alassaf	4ae04cf2af	Merged with Dev	2025-01-26 13:08:40 +03:00
mohammad	d72253e3de	hide SceneSettings	2025-01-23 18:41:50 +03:00
mohammad	790479effb	restrict_spaceMemberUser_and_change_SignUpModel	2025-01-23 18:35:01 +03:00
mohammadnemer1	827585815b	Merge pull request #68 from SyncrowIOT/user_agreement_policy User agreement and policy	2025-01-21 12:05:25 +03:00
mohammad	de024994c9	showSpaceBottomSheet in a DefaultAppBar and Routine trigger from the device screen and fixes github comments and i used this package flutter_html: ^3.0.0-beta.2	2025-01-20 15:50:36 +03:00
mohammad	bcc4ba98ff	size changes	2025-01-19 16:56:42 +03:00
mohammad	df0f1c6c94	user_agreement and privacy_policy sign up and menu	2025-01-19 16:49:54 +03:00
mohammadnemer1	1f62cadcec	Merge pull request #66 from SyncrowIOT/Implement_Change_Password_Flow change_password	2025-01-16 18:02:33 +03:00
mohammad	ee01a89d21	change file name	2025-01-16 18:01:23 +03:00
mohammad	31cc210560	Fitch report Data	2025-01-15 17:55:07 +03:00
mohammad	f779445d17	refactor code and implement CeilingSensor taps	2025-01-15 17:24:25 +03:00
mohammad	c76548a17f	remove role model	2025-01-13 13:16:29 +03:00
Abdullah Alassaf	f960a553ca	Updated the pacakages	2025-01-13 13:02:51 +03:00
mohammad	55c1a30f10	change api generateInvitationCode	2025-01-12 12:59:10 +03:00
Abdullah Alassaf	90812f78e8	Completed wall sensor implementation	2025-01-12 00:12:08 +03:00
Abdullah Alassaf	b1368bf4d7	update ios packages	2025-01-12 00:10:02 +03:00
mohammad	de9c51998c	changes	2025-01-09 16:43:09 +03:00
mohammad	763e39ef12	changeAcSwitch	2025-01-09 15:37:26 +03:00
mohammad	cc9ddffa44	Join the space through the invitation code_ac countdown	2025-01-09 15:35:04 +03:00
mohammad	7a22bb4bc8	count_down_ac	2025-01-08 17:17:52 +03:00
mohammad	cff8c4728c	change_pass	2024-12-31 10:36:52 +03:00
mohammad	8be05fbd91	change_password	2024-12-30 16:51:35 +03:00
Abdullah Alassaf	33d2bbc91f	Hide unused widgets	2024-12-17 01:13:36 +03:00
Abdullah Alassaf	f81880a704	Hide nonfunctional widgets	2024-12-15 02:22:11 +03:00
hannathkadher	fc3f215dba	Merge pull request #65 from SyncrowIOT/feat/change-community-endpoint changed endpoint	2024-12-11 16:17:20 +04:00
hannathkadher	66eadd2567	changed endpoint	2024-12-10 10:49:43 +04:00
mohammad	2ac8128eff	actionType automation	2024-12-02 14:27:47 +03:00
mohammadnemer1	2e92861b7a	Merge pull request #64 from SyncrowIOT/4_scene_&_6_scene_devices 4 scene & 6 scene devices	2024-12-02 11:25:19 +03:00