Refactor WallSensorBloc to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and real-time status updates from Firebase, including optimized parsing logic for device status values.

Refactor TwoGangSwitchBloc to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and real-time status updates from Firebase, including parsing logic for device status values.
Refactor TwoGangGlassSwitchBloc to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and state updates, including real-time status listening from Firebase.
2025-07-14 17:25:50 +00:00 · 2025-06-03 11:15:06 +03:00 · 2025-06-03 10:48:01 +03:00 · 2025-06-03 10:33:33 +03:00 · 2025-06-03 10:19:10 +03:00 · 2025-06-03 09:49:26 +03:00
128 changed files with 5022 additions and 2364 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -0,0 +1,30 @@
+<!--
+  Thanks for contributing!
+
+  Provide a description of your changes below and a general summary in the title
+
+  Please look at the following checklist to ensure that your PR can be accepted quickly:
+-->
+
+## Jira Ticket
+<!-- Add your Jira ticket number as a link (e.g., [PROJ-123](https://jira.company.com/browse/PROJ-123)) -->
+
+## Status
+
+**READY/IN DEVELOPMENT/HOLD**
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Type of Change
+
+<!--- Put an `x` in all the boxes that apply: -->
+
+- [ ] ✨ New feature (non-breaking change which adds functionality)
+- [ ] 🛠️ Bug fix (non-breaking change which fixes an issue)
+- [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] 🧹 Code refactor
+- [ ] ✅ Build configuration change
+- [ ] 📝 Documentation
+- [ ] 🗑️ Chore 
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -16,6 +16,7 @@
              "3000",
              "-t",
              "lib/main_dev.dart",
+              "--web-experimental-hot-reload",
            ],
       
            "flutterMode": "debug"
@ -35,6 +36,7 @@
                "3000",
                "-t",
                "lib/main_staging.dart",
+                "--web-experimental-hot-reload",
            ],
       
            "flutterMode": "debug"
@ -54,6 +56,7 @@
              "3000",
              "-t",
              "lib/main.dart",
+              "--web-experimental-hot-reload",
            ],
       
            "flutterMode": "debug"
--- a/assets/icons/aqi_air_quality.svg
+++ b/assets/icons/aqi_air_quality.svg
@ -0,0 +1,5 @@
+<svg width="70" height="75" viewBox="0 0 70 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M49.5 5.59985e-05C44.6887 -0.000931248 40.0384 1.7325 36.4016 4.8825C32.7649 8.03249 30.3856 12.3879 29.7 17.1501C29.6496 17.5065 29.6767 17.8696 29.7796 18.2145C29.8825 18.5595 30.0586 18.8782 30.296 19.1488C30.5333 19.4194 30.8264 19.6355 31.155 19.7825C31.4836 19.9294 31.8401 20.0036 32.2 20.0001C32.8029 20.0069 33.388 19.7956 33.8474 19.4051C34.3068 19.0146 34.6096 18.4712 34.7 17.8751C35.2437 13.9233 37.3349 10.3494 40.5137 7.9396C43.6924 5.52975 47.6983 4.48136 51.65 5.02506C55.6017 5.56875 59.1756 7.65999 61.5855 10.8387C63.9953 14.0175 65.0437 18.0233 64.5 21.9751C63.9311 25.6593 62.043 29.0113 59.1871 31.4073C56.3312 33.8033 52.702 35.0801 48.975 35.0001H-0.5C-1.16304 35.0001 -1.79893 35.2634 -2.26777 35.7323C-2.73661 36.2011 -3 36.837 -3 37.5001C-3 38.1631 -2.73661 38.799 -2.26777 39.2678C-1.79893 39.7367 -1.16304 40.0001 -0.5 40.0001H48.8C53.9647 40.0838 58.9698 38.2099 62.8097 34.7549C66.6495 31.3 69.0397 26.5199 69.5 21.3751C69.6888 18.6353 69.3114 15.886 68.3912 13.2985C67.4709 10.711 66.0277 8.34072 64.1514 6.33539C62.275 4.33006 60.0058 2.73264 57.4851 1.64268C54.9644 0.552712 52.2463 -0.00644241 49.5 5.59985e-05Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M38.975 45H-0.5C-1.16304 45 -1.79893 45.2634 -2.26777 45.7322C-2.73661 46.2011 -3 46.837 -3 47.5C-3 48.163 -2.73661 48.7989 -2.26777 49.2678C-1.79893 49.7366 -1.16304 50 -0.5 50H38.975C40.4886 49.9992 41.9825 50.3421 43.3443 51.0026C44.7061 51.6632 45.9002 52.6242 46.8366 53.8134C47.773 55.0025 48.4272 56.3887 48.75 57.8674C49.0728 59.3461 49.0557 60.8788 48.7 62.35C48.1662 64.553 46.8997 66.5092 45.1083 67.8981C43.3169 69.2869 41.1068 70.0259 38.8403 69.9939C36.5738 69.962 34.3854 69.1609 32.6338 67.7221C30.8823 66.2833 29.6715 64.2922 29.2 62.075C29.0988 61.488 28.7914 60.9565 28.333 60.576C27.8747 60.1956 27.2956 59.9913 26.7 60C26.3376 59.9959 25.9787 60.0706 25.648 60.219C25.3174 60.3674 25.023 60.5859 24.7852 60.8594C24.5474 61.1329 24.3719 61.4548 24.2708 61.8028C24.1698 62.1508 24.1456 62.5167 24.2 62.875C24.7446 65.6637 26.0701 68.2403 28.0221 70.305C29.9742 72.3697 32.4725 73.8375 35.2263 74.5375C37.9801 75.2376 40.8761 75.1411 43.5772 74.2592C46.2782 73.3774 48.6733 71.7465 50.4835 69.5565C52.2938 67.3664 53.4448 64.7072 53.8025 61.8884C54.1603 59.0697 53.71 56.2073 52.5043 53.6344C51.2985 51.0616 49.3867 48.8841 46.9916 47.3555C44.5964 45.8269 41.8164 45.0101 38.975 45Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M13.475 24.625H-0.300049C-0.96309 24.625 -1.59897 24.8884 -2.06782 25.3572C-2.53666 25.826 -2.80005 26.4619 -2.80005 27.125C-2.80005 27.788 -2.53666 28.4239 -2.06782 28.8927C-1.59897 29.3616 -0.96309 29.625 -0.300049 29.625H13.35C16.2081 29.672 18.983 28.662 21.1422 26.7888C23.3015 24.9156 24.693 22.3111 25.05 19.475C25.3248 16.6914 24.5527 13.9052 22.8845 11.66C21.2162 9.41477 18.7714 7.87157 16.0269 7.33142C13.2824 6.79126 10.4351 7.29289 8.04041 8.73845C5.64574 10.184 3.87548 12.4698 3.07495 15.15C2.95867 15.5323 2.93577 15.937 3.00815 16.3301C3.08053 16.7231 3.24609 17.0931 3.49096 17.409C3.73582 17.7249 4.05284 17.9774 4.41544 18.1455C4.77805 18.3136 5.17566 18.3923 5.57495 18.375C6.14604 18.3916 6.7056 18.2121 7.16047 17.8664C7.61534 17.5207 7.93807 17.0297 8.07495 16.475C8.54422 15.0056 9.54026 13.7617 10.8714 12.9826C12.2026 12.2034 13.7749 11.944 15.2858 12.2542C16.7967 12.5645 18.1396 13.4225 19.056 14.6632C19.9724 15.9039 20.3977 17.4396 20.25 18.975C20.0327 20.5938 19.2163 22.0723 17.9619 23.1184C16.7076 24.1645 15.1065 24.7021 13.475 24.625Z" fill="#5D5D5D" fill-opacity="0.1"/>
+</svg>
--- a/assets/icons/aqi_humidity.svg
+++ b/assets/icons/aqi_humidity.svg
@ -0,0 +1,7 @@
+<svg width="65" height="75" viewBox="0 0 65 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M32.4384 30.1807C31.6907 29.8668 30.8306 30.2187 30.5171 30.9662L20.3571 55.1748C20.0433 55.9222 20.395 56.7825 21.1424 57.0961C21.328 57.174 21.5205 57.2108 21.7099 57.2108C22.2834 57.2108 22.828 56.8726 23.0638 56.3106L33.2237 32.1019C33.5373 31.3545 33.1856 30.4944 32.4384 30.1807Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M19.7629 28.9307C16.4783 28.9307 13.8062 31.9292 13.8062 35.615C13.8062 39.3009 16.4785 42.2994 19.7629 42.2994C23.0477 42.2994 25.7199 39.3009 25.7199 35.615C25.7199 31.9292 23.0477 28.9307 19.7629 28.9307ZM19.7629 39.3639C18.0968 39.3639 16.7416 37.6821 16.7416 35.615C16.7416 33.548 18.0968 31.8662 19.7629 31.8662C21.4291 31.8662 22.7845 33.548 22.7845 35.615C22.7845 37.6821 21.4291 39.3639 19.7629 39.3639Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M27.5299 52.1678C27.5299 55.8535 30.2022 58.8521 33.4867 58.8521C36.7712 58.8521 39.4435 55.8536 39.4435 52.1678C39.4435 48.4819 36.7712 45.4834 33.4867 45.4834C30.2022 45.4834 27.5299 48.4821 27.5299 52.1678ZM33.4867 48.4188C35.1528 48.4188 36.5081 50.1006 36.5081 52.1678C36.5081 54.235 35.1528 55.9166 33.4867 55.9166C31.8206 55.9166 30.4653 54.2348 30.4653 52.1678C30.4653 50.1006 31.8206 48.4188 33.4867 48.4188Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M62.2349 28.6673L48.9685 5.68931C48.2842 4.50308 47.0581 3.79482 45.6887 3.79482C44.3193 3.79482 43.0932 4.50308 42.4091 5.68901L37.5363 14.1299L30.756 2.38608C29.8933 0.891943 28.3485 0 26.6232 0C24.8981 0 23.3532 0.891943 22.4907 2.38594L3.59513 35.1141C-1.112 43.2671 -1.20179 53.0487 3.35504 61.2801C3.74762 61.9893 4.64088 62.2459 5.35002 61.8533C6.05915 61.4606 6.31579 60.5676 5.92321 59.8583C1.86969 52.5363 1.94982 43.8349 6.13737 36.5817L25.0328 3.85371C25.5112 3.0249 26.3045 2.9354 26.6232 2.9354C26.9421 2.9354 27.7353 3.0249 28.2137 3.85371L47.1093 36.5818C51.3852 43.9879 51.3852 52.8309 47.1093 60.2369C42.8335 67.643 35.175 72.0646 26.6232 72.0646C22.2829 72.0646 18.0757 70.9146 14.4567 68.7388C13.762 68.3209 12.8603 68.5458 12.4425 69.2405C12.0249 69.9352 12.2494 70.8369 12.9442 71.2547C17.02 73.7049 21.75 75 26.6234 75C36.2364 75 44.845 70.0298 49.6514 61.7046C50.6635 59.9517 51.4596 58.1266 52.0456 56.2607C55.7953 54.952 59.0005 52.5164 61.316 49.2136C63.6089 45.9432 64.8209 42.1323 64.8209 38.1927C64.8211 34.8907 63.9268 31.5968 62.2349 28.6673ZM58.9126 47.5285C57.3392 49.7726 55.2829 51.5414 52.8959 52.7241C53.8949 46.7682 52.814 40.5916 49.6516 35.1139L39.231 17.065L44.9515 7.15591C45.1733 6.77153 45.5408 6.72993 45.6887 6.72993C45.8365 6.72993 46.2042 6.77139 46.4261 7.1562L59.6928 30.1348C61.1478 32.6543 61.8857 35.3651 61.8857 38.1924C61.8857 41.4785 60.8298 44.794 58.9126 47.5285Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M8.53564 67.3704C9.34627 67.3704 10.0034 66.7132 10.0034 65.9026C10.0034 65.092 9.34627 64.4348 8.53564 64.4348C7.72502 64.4348 7.06787 65.092 7.06787 65.9026C7.06787 66.7132 7.72502 67.3704 8.53564 67.3704Z" fill="#5D5D5D" fill-opacity="0.1"/>
+</svg>
--- a/assets/icons/aqi_temperature.svg
+++ b/assets/icons/aqi_temperature.svg
@ -0,0 +1,8 @@
+<svg width="45" height="75" viewBox="0 0 45 75" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.9116 48.6345V19.6655C19.9116 18.4519 18.928 17.4683 17.7143 17.4683C16.5012 17.4683 15.517 18.4519 15.517 19.6655V48.6345C11.6547 49.6164 8.78906 53.1229 8.78906 57.2874C8.78906 62.2095 12.7928 66.2138 17.7143 66.2138C22.6358 66.2138 26.6401 62.2095 26.6401 57.2874C26.6401 53.1229 23.774 49.6164 19.9116 48.6345ZM17.7143 61.8193C15.2161 61.8193 13.1836 59.7862 13.1836 57.2874C13.1836 54.788 15.2161 52.755 17.7143 52.755C20.2131 52.755 22.2456 54.788 22.2456 57.2874C22.2456 59.7862 20.2131 61.8193 17.7143 61.8193Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M28.6194 43.3193V10.9062C28.6194 4.89235 23.7276 0 17.7143 0C11.7016 0 6.80981 4.89235 6.80981 10.9062V43.3193C2.52514 46.6684 0 51.804 0 57.2823C0 67.0521 7.94678 75 17.7143 75C27.4824 75 35.4292 67.0521 35.4292 57.2823C35.4292 51.804 32.9041 46.6684 28.6194 43.3193ZM17.7143 70.6055C10.3695 70.6055 4.39453 64.6288 4.39453 57.2823C4.39453 52.8631 6.58035 48.7398 10.2419 46.2524C10.8438 45.8433 11.2043 45.1624 11.2043 44.4345V10.9062C11.2043 7.31564 14.1249 4.39453 17.7143 4.39453C21.3043 4.39453 24.2249 7.31564 24.2249 10.9062V44.4345C24.2249 45.1624 24.5853 45.8433 25.1873 46.2524C28.8488 48.7398 31.0347 52.8631 31.0347 57.2823C31.0347 64.6288 25.0591 70.6055 17.7143 70.6055Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M42.021 35.0811H35.2112C33.9975 35.0811 33.0139 36.0647 33.0139 37.2783C33.0139 38.492 33.9975 39.4756 35.2112 39.4756H42.021C43.2341 39.4756 44.2183 38.492 44.2183 37.2783C44.2183 36.0647 43.2341 35.0811 42.021 35.0811Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M42.021 26.2939H35.2112C33.9975 26.2939 33.0139 27.2776 33.0139 28.4912C33.0139 29.7049 33.9975 30.6885 35.2112 30.6885H42.021C43.2341 30.6885 44.2183 29.7049 44.2183 28.4912C44.2183 27.2776 43.2341 26.2939 42.021 26.2939Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M42.021 17.5049H35.2112C33.9975 17.5049 33.0139 18.4885 33.0139 19.7021C33.0139 20.9158 33.9975 21.8994 35.2112 21.8994H42.021C43.2341 21.8994 44.2183 20.9158 44.2183 19.7021C44.2183 18.4885 43.2341 17.5049 42.021 17.5049Z" fill="#5D5D5D" fill-opacity="0.1"/>
+<path d="M35.2112 13.1104H42.021C43.2341 13.1104 44.2183 12.1267 44.2183 10.9131C44.2183 9.70001 43.2341 8.71582 42.021 8.71582H35.2112C33.9975 8.71582 33.0139 9.70001 33.0139 10.9131C33.0139 12.1267 33.9975 13.1104 35.2112 13.1104Z" fill="#5D5D5D" fill-opacity="0.1"/>
+</svg>
--- a/assets/icons/energy_consumed_icon.svg
+++ b/assets/icons/energy_consumed_icon.svg
@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 6.90237L13.6328 13.1837L6.60156 6.1524L2.32422 10.418L1.50391 9.59769L6.60156 4.48828L13.6328 11.5195L19.1797 6.08206L20 6.90237Z" fill="#64E1DC"/>
+<path d="M20 13.1133L19.1797 13.9336L13.6328 8.49615L7.77344 14.3555L5.42969 12.0118L2.32422 15.1055L1.50391 14.2852L5.42969 10.3477L7.77344 12.6914L13.6328 6.83203L20 13.1133Z" fill="#FDBF00"/>
+<path d="M20 6.90234L13.6328 13.1836L10.1172 9.668V8.00388L13.6328 11.5195L19.1797 6.08203L20 6.90234Z" fill="#00C8C8"/>
+<path d="M20 13.1133L19.1797 13.9336L13.6328 8.49615L10.1172 12.0118V10.3477L13.6328 6.83203L20 13.1133Z" fill="#FF9100"/>
+<path d="M19.1714 17.625V18.7813L17.7184 18.7821L10.1172 18.7851L1.32812 18.7891V0.75H2.5V17.625H19.1714Z" fill="#676E74"/>
+<path d="M3.0127 2.37976L1.91406 1.50024L0.732422 2.37976L0 1.46423L1.91406 0L3.74512 1.46423L3.0127 2.37976Z" fill="#676E74"/>
+<path d="M19.1714 17.625V18.7813L17.7176 18.7824L17.7184 18.7821L10.1172 18.7851V17.625H19.1714Z" fill="#474F54"/>
+<path d="M19.9998 18.2108L18.1205 19.9999L17.292 19.1714L17.7174 18.7823L17.7182 18.782L18.3427 18.2108L17.7565 17.6249L17.292 17.1604L18.1205 16.332L19.9998 18.2108Z" fill="#474F54"/>
+</svg>
--- a/assets/icons/humidity.svg
+++ b/assets/icons/humidity.svg
@ -0,0 +1,7 @@
+<svg width="10" height="9" viewBox="0 0 10 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.00332 3.62169C4.9136 3.58402 4.81039 3.62624 4.77277 3.71594L3.55357 6.62098C3.51592 6.71066 3.55812 6.8139 3.6478 6.85153C3.67008 6.86088 3.69317 6.86529 3.7159 6.86529C3.78472 6.86529 3.85008 6.82471 3.87838 6.75728L5.09756 3.85223C5.13519 3.76254 5.09299 3.65932 5.00332 3.62169Z" fill="#5D5D5D"/>
+<path d="M3.48227 3.47168C3.08812 3.47168 2.76746 3.8315 2.76746 4.2738C2.76746 4.71611 3.08813 5.07593 3.48227 5.07593C3.87644 5.07593 4.1971 4.71611 4.1971 4.2738C4.1971 3.8315 3.87644 3.47168 3.48227 3.47168ZM3.48227 4.72366C3.28234 4.72366 3.1197 4.52185 3.1197 4.2738C3.1197 4.02576 3.28234 3.82395 3.48227 3.82395C3.6822 3.82395 3.84485 4.02576 3.84485 4.2738C3.84485 4.52185 3.6822 4.72366 3.48227 4.72366Z" fill="#5D5D5D"/>
+<path d="M4.41431 6.26013C4.41431 6.70242 4.73498 7.06226 5.12912 7.06226C5.52326 7.06226 5.84394 6.70243 5.84394 6.26013C5.84394 5.81783 5.52326 5.45801 5.12912 5.45801C4.73498 5.45801 4.41431 5.81785 4.41431 6.26013ZM5.12912 5.81026C5.32905 5.81026 5.49169 6.01207 5.49169 6.26013C5.49169 6.5082 5.32905 6.70999 5.12912 6.70999C4.92919 6.70999 4.76655 6.50818 4.76655 6.26013C4.76655 6.01207 4.92919 5.81026 5.12912 5.81026Z" fill="#5D5D5D"/>
+<path d="M8.5789 3.44007L6.98694 0.682717C6.90482 0.540369 6.75769 0.455379 6.59337 0.455379C6.42903 0.455379 6.2819 0.540369 6.19981 0.682682L5.61507 1.69559L4.80143 0.28633C4.69792 0.107033 4.51254 0 4.3055 0C4.09849 0 3.91311 0.107033 3.80961 0.286312L1.54213 4.21369C0.977278 5.19205 0.966503 6.36585 1.51332 7.35361C1.56043 7.43871 1.66762 7.46951 1.75272 7.4224C1.83782 7.37527 1.86861 7.26812 1.8215 7.183C1.33508 6.30436 1.3447 5.26018 1.8472 4.3898L4.11466 0.462445C4.17207 0.362988 4.26725 0.352248 4.3055 0.352248C4.34377 0.352248 4.43896 0.362988 4.49637 0.462445L6.76384 4.38982C7.27694 5.27855 7.27694 6.33971 6.76384 7.22842C6.25073 8.11716 5.33171 8.64775 4.3055 8.64775C3.78466 8.64775 3.2798 8.50975 2.84552 8.24866C2.76216 8.19851 2.65395 8.22549 2.60382 8.30886C2.5537 8.39222 2.58065 8.50043 2.66402 8.55056C3.15312 8.84459 3.72071 9 4.30552 9C5.45908 9 6.49212 8.40357 7.06889 7.40456C7.19034 7.1942 7.28587 6.97519 7.35619 6.75128C7.80615 6.59424 8.19078 6.30197 8.46864 5.90563C8.74379 5.51319 8.88923 5.05587 8.88923 4.58313C8.88925 4.18688 8.78193 3.79162 8.5789 3.44007ZM8.18023 5.70342C7.99143 5.97271 7.74466 6.18497 7.45823 6.32689C7.57811 5.61219 7.4484 4.87099 7.06891 4.21367L5.81844 2.0478L6.5049 0.858709C6.53151 0.812584 6.57561 0.807592 6.59337 0.807592C6.6111 0.807592 6.65522 0.812566 6.68185 0.858744L8.27385 3.61617C8.44846 3.91852 8.537 4.24382 8.537 4.58309C8.537 4.97742 8.41029 5.37529 8.18023 5.70342Z" fill="#5D5D5D"/>
+<path d="M2.135 8.08444C2.23227 8.08444 2.31113 8.00559 2.31113 7.90831C2.31113 7.81104 2.23227 7.73218 2.135 7.73218C2.03772 7.73218 1.95886 7.81104 1.95886 7.90831C1.95886 8.00559 2.03772 8.08444 2.135 8.08444Z" fill="#5D5D5D"/>
+</svg>
--- a/assets/icons/location_pin.svg
+++ b/assets/icons/location_pin.svg
@ -0,0 +1,11 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9576_4022)">
+<path d="M8.00334 7.92855C9.28029 5.92481 9.11977 6.1748 9.15656 6.12255C9.62147 5.46682 9.86719 4.69505 9.86719 3.89062C9.86719 1.75734 8.13607 0 6 0C3.87089 0 2.13281 1.75388 2.13281 3.89062C2.13281 4.69453 2.38369 5.48651 2.86383 6.15108L3.99661 7.92858C2.78548 8.1147 0.726562 8.66934 0.726562 9.89062C0.726562 10.3358 1.01714 10.9703 2.40145 11.4647C3.36806 11.8099 4.64604 12 6 12C8.53184 12 11.2734 11.2858 11.2734 9.89062C11.2734 8.66913 9.21694 8.11507 8.00334 7.92855ZM3.45115 5.76434C3.44728 5.75829 3.44325 5.75238 3.43903 5.74657C3.03949 5.19691 2.83594 4.54549 2.83594 3.89062C2.83594 2.13239 4.2517 0.703125 6 0.703125C7.74466 0.703125 9.16406 2.13302 9.16406 3.89062C9.16406 4.54655 8.96435 5.17587 8.58642 5.71104C8.55255 5.75571 8.72925 5.48121 6 9.7638L3.45115 5.76434ZM6 11.2969C3.23452 11.2969 1.42969 10.484 1.42969 9.89062C1.42969 9.49181 2.35706 8.83605 4.41206 8.58045L5.70352 10.6069C5.76806 10.7082 5.87986 10.7695 5.99998 10.7695C6.12009 10.7695 6.23191 10.7082 6.29644 10.6069L7.58787 8.58045C9.64291 8.83605 10.5703 9.49181 10.5703 9.89062C10.5703 10.479 8.78173 11.2969 6 11.2969Z" fill="#023DFE" fill-opacity="0.7"/>
+<path d="M6 2.13281C5.03074 2.13281 4.24219 2.92137 4.24219 3.89062C4.24219 4.85988 5.03074 5.64844 6 5.64844C6.96926 5.64844 7.75781 4.85988 7.75781 3.89062C7.75781 2.92137 6.96926 2.13281 6 2.13281ZM6 4.94531C5.41845 4.94531 4.94531 4.47218 4.94531 3.89062C4.94531 3.30907 5.41845 2.83594 6 2.83594C6.58155 2.83594 7.05469 3.30907 7.05469 3.89062C7.05469 4.47218 6.58155 4.94531 6 4.94531Z" fill="#023DFE" fill-opacity="0.7"/>
+</g>
+<defs>
+<clipPath id="clip0_9576_4022">
+<rect width="12" height="12" fill="white"/>
+</clipPath>
+</defs>
+</svg>
--- a/assets/icons/thermometer.svg
+++ b/assets/icons/thermometer.svg
@ -0,0 +1,8 @@
+<svg width="10" height="9" viewBox="0 0 10 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.73509 5.83614V2.35986C4.73509 2.21423 4.61706 2.09619 4.47142 2.09619C4.32585 2.09619 4.20775 2.21423 4.20775 2.35986V5.83614C3.74426 5.95397 3.40039 6.37475 3.40039 6.87449C3.40039 7.46514 3.88084 7.94566 4.47142 7.94566C5.062 7.94566 5.54252 7.46514 5.54252 6.87449C5.54252 6.37475 5.19858 5.95397 4.73509 5.83614ZM4.47142 7.41831C4.17163 7.41831 3.92773 7.17435 3.92773 6.87449C3.92773 6.57456 4.17163 6.3306 4.47142 6.3306C4.77128 6.3306 5.01517 6.57456 5.01517 6.87449C5.01517 7.17435 4.77128 7.41831 4.47142 7.41831Z" fill="#5D5D5D"/>
+<path d="M5.78003 5.19832V1.30875C5.78003 0.587082 5.19302 0 4.47142 0C3.74989 0 3.16288 0.587082 3.16288 1.30875V5.19832C2.64872 5.60021 2.3457 6.21648 2.3457 6.87387C2.3457 8.04625 3.29932 9 4.47142 9C5.64359 9 6.59721 8.04625 6.59721 6.87387C6.59721 6.21648 6.29419 5.60021 5.78003 5.19832ZM4.47142 8.47266C3.59004 8.47266 2.87305 7.75546 2.87305 6.87387C2.87305 6.34357 3.13535 5.84878 3.57473 5.55029C3.64697 5.5012 3.69022 5.41949 3.69022 5.33215V1.30875C3.69022 0.877876 4.04069 0.527344 4.47142 0.527344C4.90222 0.527344 5.25269 0.877876 5.25269 1.30875V5.33215C5.25269 5.41949 5.29594 5.5012 5.36818 5.55029C5.80756 5.84878 6.06986 6.34357 6.06986 6.87387C6.06986 7.75546 5.3528 8.47266 4.47142 8.47266Z" fill="#5D5D5D"/>
+<path d="M7.38822 4.20972H6.57104C6.42541 4.20972 6.30737 4.32775 6.30737 4.47339C6.30737 4.61903 6.42541 4.73706 6.57104 4.73706H7.38822C7.53379 4.73706 7.65189 4.61903 7.65189 4.47339C7.65189 4.32775 7.53379 4.20972 7.38822 4.20972Z" fill="#5D5D5D"/>
+<path d="M7.38822 3.15527H6.57104C6.42541 3.15527 6.30737 3.27331 6.30737 3.41895C6.30737 3.56458 6.42541 3.68262 6.57104 3.68262H7.38822C7.53379 3.68262 7.65189 3.56458 7.65189 3.41895C7.65189 3.27331 7.53379 3.15527 7.38822 3.15527Z" fill="#5D5D5D"/>
+<path d="M7.38822 2.10059H6.57104C6.42541 2.10059 6.30737 2.21862 6.30737 2.36426C6.30737 2.5099 6.42541 2.62793 6.57104 2.62793H7.38822C7.53379 2.62793 7.65189 2.5099 7.65189 2.36426C7.65189 2.21862 7.53379 2.10059 7.38822 2.10059Z" fill="#5D5D5D"/>
+<path d="M6.57104 1.57324H7.38822C7.53379 1.57324 7.65189 1.45521 7.65189 1.30957C7.65189 1.164 7.53379 1.0459 7.38822 1.0459H6.57104C6.42541 1.0459 6.30737 1.164 6.30737 1.30957C6.30737 1.45521 6.42541 1.57324 6.57104 1.57324Z" fill="#5D5D5D"/>
+</svg>
--- a/lib/pages/analytics/models/range_of_aqi.dart
+++ b/lib/pages/analytics/models/range_of_aqi.dart
@ -0,0 +1,18 @@
+import 'package:equatable/equatable.dart';
+
+class RangeOfAqi extends Equatable {
+  final double min;
+  final double avg;
+  final double max;
+  final DateTime date;
+
+  const RangeOfAqi({
+    required this.min,
+    required this.avg,
+    required this.max,
+    required this.date,
+  });
+
+  @override
+  List<Object?> get props => [min, avg, max, date];
+}
--- a/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart
+++ b/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart
@ -0,0 +1,42 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
+import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart';
+
+part 'range_of_aqi_event.dart';
+part 'range_of_aqi_state.dart';
+
+class RangeOfAqiBloc extends Bloc<RangeOfAqiEvent, RangeOfAqiState> {
+  RangeOfAqiBloc(this._rangeOfAqiService) : super(const RangeOfAqiState()) {
+    on<LoadRangeOfAqiEvent>(_onLoadRangeOfAqiEvent);
+    on<ClearRangeOfAqiEvent>(_onClearRangeOfAqiEvent);
+  }
+
+  final RangeOfAqiService _rangeOfAqiService;
+
+  Future<void> _onLoadRangeOfAqiEvent(
+    LoadRangeOfAqiEvent event,
+    Emitter<RangeOfAqiState> emit,
+  ) async {
+    emit(
+      RangeOfAqiState(
+        status: RangeOfAqiStatus.loading,
+        rangeOfAqi: state.rangeOfAqi,
+      ),
+    );
+    try {
+      final rangeOfAqi = await _rangeOfAqiService.load(event.param);
+      emit(RangeOfAqiState(status: RangeOfAqiStatus.loaded, rangeOfAqi: rangeOfAqi));
+    } catch (e) {
+      emit(RangeOfAqiState(status: RangeOfAqiStatus.failure, errorMessage: '$e'));
+    }
+  }
+
+  void _onClearRangeOfAqiEvent(
+    ClearRangeOfAqiEvent event,
+    Emitter<RangeOfAqiState> emit,
+  ) {
+    emit(const RangeOfAqiState());
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_event.dart
+++ b/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_event.dart
@ -0,0 +1,21 @@
+part of 'range_of_aqi_bloc.dart';
+
+sealed class RangeOfAqiEvent extends Equatable {
+  const RangeOfAqiEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LoadRangeOfAqiEvent extends RangeOfAqiEvent {
+  const LoadRangeOfAqiEvent(this.param);
+
+  final GetRangeOfAqiParam param;
+
+  @override
+  List<Object> get props => [param];
+}
+
+class ClearRangeOfAqiEvent extends RangeOfAqiEvent {
+  const ClearRangeOfAqiEvent();
+}
--- a/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_state.dart
+++ b/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_state.dart
@ -0,0 +1,18 @@
+part of 'range_of_aqi_bloc.dart';
+
+enum RangeOfAqiStatus { initial, loading, loaded, failure }
+
+final class RangeOfAqiState extends Equatable {
+  const RangeOfAqiState({
+    this.rangeOfAqi = const [],
+    this.status = RangeOfAqiStatus.initial,
+    this.errorMessage,
+  });
+
+  final RangeOfAqiStatus status;
+  final List<RangeOfAqi> rangeOfAqi;
+  final String? errorMessage;
+
+  @override
+  List<Object?> get props => [status, rangeOfAqi, errorMessage];
+}
--- a/lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart
+++ b/lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart
@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
+import 'package:syncrow_web/pages/analytics/params/get_analytics_devices_param.dart';
+import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
+
+abstract final class FetchAirQualityDataHelper {
+  const FetchAirQualityDataHelper._();
+
+  static void loadAirQualityData(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    loadAnalyticsDevices(
+      context,
+      communityUuid: communityUuid,
+      spaceUuid: spaceUuid,
+    );
+    loadRangeOfAqi(
+      context,
+      spaceUuid: spaceUuid,
+      date: date,
+      aqiType: AqiType.aqi,
+    );
+  }
+
+  static void clearAllData(BuildContext context) {
+    context.read<AnalyticsDevicesBloc>().add(
+          const ClearAnalyticsDeviceEvent(),
+        );
+    context.read<RealtimeDeviceChangesBloc>().add(
+          const RealtimeDeviceChangesClosed(),
+        );
+
+    context.read<RangeOfAqiBloc>().add(const ClearRangeOfAqiEvent());
+  }
+
+  static void loadAnalyticsDevices(
+    BuildContext context, {
+    required String communityUuid,
+    required String spaceUuid,
+  }) {
+    context.read<AnalyticsDevicesBloc>().add(
+          LoadAnalyticsDevicesEvent(
+            param: GetAnalyticsDevicesParam(
+              communityUuid: communityUuid,
+              spaceUuid: spaceUuid,
+              deviceTypes: ['AQI'],
+              requestType: AnalyticsDeviceRequestType.energyManagement,
+            ),
+            onSuccess: (device) {
+              context.read<RealtimeDeviceChangesBloc>()
+                ..add(const RealtimeDeviceChangesClosed())
+                ..add(RealtimeDeviceChangesStarted(device.uuid));
+            },
+          ),
+        );
+  }
+
+  static void loadRangeOfAqi(
+    BuildContext context, {
+    required String spaceUuid,
+    required DateTime date,
+    required AqiType aqiType,
+  }) {
+    context.read<RangeOfAqiBloc>().add(
+          LoadRangeOfAqiEvent(
+            GetRangeOfAqiParam(
+              date: date,
+              spaceUuid: spaceUuid,
+              aqiType: aqiType,
+            ),
+          ),
+        );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart
+++ b/lib/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart
@ -0,0 +1,115 @@
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+abstract final class RangeOfAqiChartsHelper {
+  const RangeOfAqiChartsHelper._();
+
+  static const gradientData = <(Color color, String label)>[
+    (ColorsManager.goodGreen, 'Good'),
+    (ColorsManager.moderateYellow, 'Moderate'),
+    (ColorsManager.poorOrange, 'Poor'),
+    (ColorsManager.unhealthyRed, 'Unhealthy'),
+    (ColorsManager.severePink, 'Severe'),
+    (ColorsManager.hazardousPurple, 'Hazardous'),
+  ];
+
+  static FlTitlesData titlesData(BuildContext context, List<RangeOfAqi> data) {
+    final titlesData = EnergyManagementChartsHelper.titlesData(context);
+    return titlesData.copyWith(
+      bottomTitles: titlesData.bottomTitles.copyWith(
+        sideTitles: titlesData.bottomTitles.sideTitles.copyWith(
+          getTitlesWidget: (value, meta) => Padding(
+            padding: const EdgeInsetsDirectional.only(top: 20.0),
+            child: Text(
+              data.isNotEmpty ? data[value.toInt()].date.day.toString() : '',
+              style: context.textTheme.bodySmall?.copyWith(
+                fontSize: 12,
+                color: ColorsManager.lightGreyColor,
+              ),
+            ),
+          ),
+        ),
+      ),
+      leftTitles: titlesData.leftTitles.copyWith(
+        sideTitles: titlesData.leftTitles.sideTitles.copyWith(
+          reservedSize: 70,
+          interval: 50,
+          maxIncluded: false,
+          getTitlesWidget: (value, meta) {
+            final text = value >= 300 ? '301+' : value.toInt().toString();
+            return Padding(
+              padding: const EdgeInsetsDirectional.only(end: 12),
+              child: FittedBox(
+                alignment: AlignmentDirectional.centerStart,
+                fit: BoxFit.scaleDown,
+                child: Text(
+                  text,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    fontSize: 12,
+                    color: ColorsManager.lightGreyColor,
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  static List<LineTooltipItem?> getTooltipItems(
+    List<LineBarSpot> touchedSpots,
+    List<RangeOfAqi> chartData,
+  ) {
+    return touchedSpots.asMap().entries.map((entry) {
+      final index = entry.key;
+      final spot = entry.value;
+
+      final label = switch (spot.barIndex) {
+        0 => 'Max',
+        1 => 'Avg',
+        2 => 'Min',
+        _ => '',
+      };
+
+      final date = DateFormat('dd/MM').format(chartData[spot.x.toInt()].date);
+
+      return LineTooltipItem(
+        index == 0 ? '$date\n' : '',
+        const TextStyle(
+          color: ColorsManager.textPrimaryColor,
+          fontWeight: FontWeight.w600,
+          fontSize: 12,
+        ),
+        children: [
+          TextSpan(text: '$label: ${spot.y.toStringAsFixed(0)}'),
+        ],
+      );
+    }).toList();
+  }
+
+  static LineTouchData lineTouchData(
+    List<RangeOfAqi> chartData,
+  ) {
+    return LineTouchData(
+      touchTooltipData: LineTouchTooltipData(
+        getTooltipColor: (touchTooltipItem) => ColorsManager.whiteColors,
+        tooltipBorder: const BorderSide(
+          color: ColorsManager.semiTransparentBlack,
+        ),
+        tooltipRoundedRadius: 16,
+        showOnTopOfTheChartBoxArea: false,
+        tooltipPadding: const EdgeInsets.all(8),
+        getTooltipItems: (touchedSpots) => RangeOfAqiChartsHelper.getTooltipItems(
+          touchedSpots,
+          chartData,
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/views/air_quality_view.dart
+++ b/lib/pages/analytics/modules/air_quality/views/air_quality_view.dart
@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart';
+
+class AirQualityView extends StatelessWidget {
+  const AirQualityView({super.key});
+
+  static const _padding = EdgeInsetsDirectional.all(32);
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final isMediumOrLess = constraints.maxWidth <= 900;
+        final height = MediaQuery.sizeOf(context).height;
+        if (isMediumOrLess) {
+          return SingleChildScrollView(
+            padding: _padding,
+            child: Column(
+              spacing: 32,
+              children: [
+                SizedBox(
+                  height: height * 1.2,
+                  child: const AirQualityEndSideWidget(),
+                ),
+                SizedBox(height: height * 0.5, child: const RangeOfAqiChartBox()),
+                SizedBox(height: height * 0.5, child: const Placeholder()),
+              ],
+            ),
+          );
+        }
+
+        return SingleChildScrollView(
+          child: Container(
+            padding: _padding,
+            height: height * 1.1,
+            child: const Column(
+              children: [
+                Expanded(
+                  child: Row(
+                    spacing: 32,
+                    children: [
+                      Expanded(
+                        flex: 10,
+                        child: Column(
+                          spacing: 20,
+                          children: [
+                            Expanded(child: RangeOfAqiChartBox()),
+                            Expanded(child: Placeholder()),
+                          ],
+                        ),
+                      ),
+                      Expanded(flex: 6, child: AirQualityEndSideWidget()),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_gauge_and_info.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_gauge_and_info.dart
@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_gauge.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_humidity_and_temperature.dart';
+
+class AirQualityEndSideGaugeAndInfo extends StatelessWidget {
+  const AirQualityEndSideGaugeAndInfo({
+    super.key,
+    required this.temperature,
+    required this.humidity,
+    required this.aqiLevel,
+  });
+
+  final int temperature;
+  final int humidity;
+  final String aqiLevel;
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      flex: 2,
+      child: Row(
+        children: [
+          Expanded(
+            flex: 2,
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [Expanded(child: AqiGauge(aqi: aqi))],
+            ),
+          ),
+          const Spacer(),
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsetsDirectional.only(end: 20),
+              child: AqiHumidityAndTemperature(
+                temperature: temperature,
+                humidity: humidity,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  double get aqi => switch (aqiLevel) {
+        'level_1' => 25.0,
+        'level_2' => 75.0,
+        'level_3' => 125.0,
+        _ => 0.0,
+      };
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_live_indicator.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_live_indicator.dart
@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class AirQualityEndSideLiveIndicator extends StatelessWidget {
+  const AirQualityEndSideLiveIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Text(
+          'Entrance',
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.textPrimaryColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 14,
+          ),
+        ),
+        const Spacer(),
+        CircleAvatar(
+          backgroundColor: ColorsManager.green.withValues(
+            alpha: 0.5,
+          ),
+          radius: 2,
+        ),
+        const SizedBox(width: 4),
+        Text(
+          'Live',
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.green.withValues(alpha: 0.5),
+            fontWeight: FontWeight.w400,
+            fontSize: 8,
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart
@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart';
+import 'package:syncrow_web/pages/analytics/widgets/analytics_sidebar_header.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AirQualityEndSideWidget extends StatelessWidget {
+  const AirQualityEndSideWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration.copyWith(
+        borderRadius: BorderRadius.circular(30),
+      ),
+      padding: const EdgeInsetsDirectional.all(32),
+      child: const Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          AnalyticsSidebarHeader(title: 'AQI Sensor'),
+          Expanded(flex: 15, child: AqiDeviceInfo()),
+          SizedBox(height: 20),
+          Expanded(flex: 6, child: AqiLocationInfo()),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_device_info.dart
@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_gauge_and_info.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_live_indicator.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_sub_value_widget.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AqiDeviceInfo extends StatelessWidget {
+  const AqiDeviceInfo({super.key});
+
+  String _getValueForStatus(
+    List<Status> deviceStatusList,
+    String code, {
+    double defaultValue = 0,
+    String Function(int value)? formatter,
+  }) {
+    try {
+      final foundStatus = deviceStatusList.firstWhere((e) => e.code == code);
+      final value = foundStatus.value.toString();
+      final intValue = int.parse(value);
+      return formatter != null ? formatter(intValue) : intValue.toString();
+    } catch (e) {
+      return defaultValue.toString();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RealtimeDeviceChangesBloc, RealtimeDeviceChangesState>(
+      builder: (context, state) {
+        final status = state.deviceStatusList;
+        final humidityValue = _getValueForStatus(
+          status,
+          'humidity_value',
+          formatter: (value) => value.toStringAsFixed(0),
+        );
+
+        final tempValue = _getValueForStatus(
+          status,
+          'temp_current',
+          formatter: (value) => (value / 10).toStringAsFixed(0),
+        );
+        final pm25Value = _getValueForStatus(
+          status,
+          'pm25_value',
+          formatter: (value) => value.toString().padLeft(3, '0'),
+        );
+        final pm10Value = _getValueForStatus(
+          status,
+          'pm10',
+          formatter: (value) => value.toString().padLeft(3, '0'),
+        );
+        final co2Value = _getValueForStatus(
+          status,
+          'co2_value',
+          formatter: (value) => value.toString().padLeft(4, '0'),
+        );
+        final ch2oValue = _getValueForStatus(
+          status,
+          'ch2o_value',
+          formatter: (value) => (value / 100).toStringAsFixed(2),
+        );
+        final tvocValue = _getValueForStatus(
+          status,
+          'tvoc_value',
+          formatter: (value) => (value / 100).toStringAsFixed(2),
+        );
+
+        return Container(
+          decoration: secondarySection.copyWith(boxShadow: const []),
+          padding: const EdgeInsetsDirectional.all(20),
+          child: Expanded(
+            child: Column(
+              spacing: 6,
+              children: [
+                const AirQualityEndSideLiveIndicator(),
+                AirQualityEndSideGaugeAndInfo(
+                  aqiLevel: status
+                      .firstWhere(
+                        (e) => e.code == 'air_quality_index',
+                        orElse: () => Status(code: 'air_quality_index', value: ''),
+                      )
+                      .value
+                      .toString(),
+                  temperature: int.parse(tempValue),
+                  humidity: int.parse(humidityValue),
+                ),
+                const SizedBox(height: 20),
+                AqiSubValueWidget(
+                  range: (0, 999),
+                  label: AqiType.pm25.value,
+                  value: pm25Value,
+                  unit: AqiType.pm25.unit,
+                ),
+                AqiSubValueWidget(
+                  range: (0, 999),
+                  label: AqiType.pm10.value,
+                  value: pm10Value,
+                  unit: AqiType.pm10.unit,
+                ),
+                AqiSubValueWidget(
+                  range: (0, 5),
+                  label: AqiType.hcho.value,
+                  value: ch2oValue,
+                  unit: AqiType.hcho.unit,
+                ),
+                AqiSubValueWidget(
+                  range: (0, 999),
+                  label: AqiType.tvoc.value,
+                  value: tvocValue,
+                  unit: AqiType.tvoc.unit,
+                ),
+                AqiSubValueWidget(
+                  range: (0, 5000),
+                  label: AqiType.co2.value,
+                  value: co2Value,
+                  unit: AqiType.co2.unit,
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_gauge.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_gauge.dart
@ -0,0 +1,115 @@
+import 'package:flutter/material.dart';
+import 'package:gauge_indicator/gauge_indicator.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class AqiGauge extends StatelessWidget {
+  const AqiGauge({super.key, required this.aqi});
+
+  final double aqi;
+
+  static const _minRange = 0.0;
+  static const _goodRange = 50.0;
+  static const _moderateRange = 100.0;
+  static const _maxRange = 150.0;
+
+  @override
+  Widget build(BuildContext context) {
+    final (status, statusColor) = _getStatusData(aqi);
+    return AnimatedRadialGauge(
+      value: aqi,
+      debug: false,
+      duration: const Duration(milliseconds: 500),
+      curve: Curves.easeInOut,
+      initialValue: 0,
+      alignment: Alignment.bottomCenter,
+      builder: (context, child, value) {
+        return Align(
+          alignment: AlignmentDirectional.bottomCenter,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.bottomCenter,
+            child: Text.rich(
+              TextSpan(
+                text: 'Air Quality\n',
+                style: context.textTheme.bodySmall?.copyWith(
+                  color: ColorsManager.textPrimaryColor,
+                  fontWeight: FontWeight.w400,
+                  fontSize: 12,
+                ),
+                children: [
+                  TextSpan(
+                    text: status,
+                    style: context.textTheme.bodySmall?.copyWith(
+                      color: _darkenColor(statusColor),
+                      fontWeight: FontWeight.w400,
+                      fontSize: 30,
+                    ),
+                  ),
+                ],
+              ),
+              textAlign: TextAlign.center,
+            ),
+          ),
+        );
+      },
+      axis: GaugeAxis(
+        progressBar: const GaugeProgressBar.basic(color: Colors.transparent),
+        style: const GaugeAxisStyle(
+          cornerRadius: Radius.circular(16),
+          thickness: 14,
+          segmentSpacing: 4,
+        ),
+        min: _minRange,
+        max: _maxRange,
+        pointer: GaugePointer.circle(
+          position: const GaugePointerPosition.surface(),
+          radius: MediaQuery.sizeOf(context).width * 0.004,
+          color: ColorsManager.whiteColors,
+          border: GaugePointerBorder(
+            width: 6,
+            color: statusColor,
+          ),
+          shadow: const BoxShadow(
+            color: ColorsManager.blackColor,
+            blurRadius: 6,
+            offset: Offset(0, 2),
+          ),
+        ),
+        segments: const [
+          GaugeSegment(
+            from: _minRange,
+            to: _goodRange,
+            cornerRadius: Radius.circular(16),
+            color: ColorsManager.goodGreen,
+          ),
+          GaugeSegment(
+            from: _goodRange + 1,
+            to: _moderateRange,
+            cornerRadius: Radius.circular(16),
+            color: ColorsManager.moderateYellow,
+          ),
+          GaugeSegment(
+            from: _moderateRange + 1,
+            to: _maxRange,
+            cornerRadius: Radius.circular(16),
+            color: ColorsManager.poorOrange,
+          ),
+        ],
+      ),
+    );
+  }
+
+  (String status, Color color) _getStatusData(double value) {
+    return switch (value) {
+      <= _goodRange => ('Good', ColorsManager.goodGreen),
+      <= _moderateRange => ('Moderate', ColorsManager.moderateYellow),
+      _ => ('Poor', ColorsManager.poorOrange),
+    };
+  }
+
+  Color _darkenColor(Color color) {
+    final black = Colors.black.withValues(alpha: 0.8);
+    return Color.lerp(color, black, 0.4)!;
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_humidity_and_temperature.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_humidity_and_temperature.dart
@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class AqiHumidityAndTemperature extends StatelessWidget {
+  const AqiHumidityAndTemperature({
+    required this.temperature,
+    required this.humidity,
+    super.key,
+  });
+
+  final int temperature;
+  final int humidity;
+
+  static const iconSize = 12.0;
+  static const colorFilter = ColorFilter.mode(
+    ColorsManager.textPrimaryColor,
+    BlendMode.srcIn,
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return FittedBox(
+      fit: BoxFit.scaleDown,
+      alignment: AlignmentDirectional.centerStart,
+      child: DefaultTextStyle(
+        style: context.textTheme.bodySmall!.copyWith(
+          color: ColorsManager.textPrimaryColor,
+          fontWeight: FontWeight.w400,
+          fontSize: 16,
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _buildIconAndValue(Assets.temperatureAqiSidebar, '$temperature°C'),
+            const SizedBox(height: 10),
+            _buildIconAndValue(Assets.humidityAqiSidebar, '$humidity%'),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildIconAndValue(String icon, String value) {
+    return Row(
+      children: [
+        SvgPicture.asset(
+          icon,
+          height: iconSize,
+          width: iconSize,
+          colorFilter: colorFilter,
+        ),
+        const SizedBox(width: 4),
+        Text(value),
+      ],
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_location.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_location.dart
@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AqiLocation extends StatelessWidget {
+  const AqiLocation({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration.copyWith(
+        boxShadow: const [],
+        borderRadius: BorderRadius.circular(10),
+      ),
+      padding: const EdgeInsetsDirectional.all(10),
+      child: Row(
+        spacing: 10,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          _buildLocationPin(),
+          Expanded(
+            child: Text(
+              'Business Bay, Dubai - UAE',
+              style: context.textTheme.bodySmall?.copyWith(
+                color: ColorsManager.textPrimaryColor,
+                fontWeight: FontWeight.w400,
+                fontSize: 12,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildLocationPin() {
+    return SvgPicture.asset(
+      Assets.locationPin,
+      height: 12,
+      width: 12,
+      alignment: AlignmentDirectional.centerStart,
+      colorFilter: const ColorFilter.mode(
+        ColorsManager.vividBlue,
+        BlendMode.srcIn,
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info.dart
@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AqiLocationInfo extends StatelessWidget {
+  const AqiLocationInfo({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: secondarySection.copyWith(boxShadow: const []),
+      padding: const EdgeInsetsDirectional.all(20),
+      child: const Column(
+        spacing: 8,
+        children: [
+          AqiLocation(),
+          Expanded(
+            child: Row(
+              spacing: 8,
+              children: [
+                AqiLocationInfoCell(
+                  label: 'Temperature',
+                  value: ' 25°',
+                  svgPath: Assets.aqiTemperature,
+                ),
+                AqiLocationInfoCell(
+                  label: 'Humidity',
+                  value: '25%',
+                  svgPath: Assets.aqiHumidity,
+                ),
+                AqiLocationInfoCell(
+                  label: 'Air Quality',
+                  value: ' 120',
+                  svgPath: Assets.aqiAirQuality,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_location_info_cell.dart
@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class AqiLocationInfoCell extends StatelessWidget {
+  const AqiLocationInfoCell({
+    required this.label,
+    required this.value,
+    required this.svgPath,
+    super.key,
+  });
+
+  final String label;
+  final String value;
+  final String svgPath;
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: Container(
+        decoration: BoxDecoration(
+          color: ColorsManager.whiteColors,
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Stack(
+          children: [
+            Align(
+              alignment: AlignmentDirectional.topStart,
+              child: Padding(
+                padding: const EdgeInsetsDirectional.all(10),
+                child: SizedBox(
+                  height: 24,
+                  child: FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: AlignmentDirectional.topStart,
+                    child: Text(
+                      label,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.textPrimaryColor,
+                        fontWeight: FontWeight.w400,
+                        fontSize: 12,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            Align(
+              alignment: AlignmentDirectional.bottomEnd,
+              child: Padding(
+                padding: const EdgeInsetsDirectional.all(10),
+                child: SizedBox(
+                  height: 40,
+                  width: 120,
+                  child: FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: AlignmentDirectional.bottomEnd,
+                    child: Text(
+                      value,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.vividBlue.withValues(alpha: 0.7),
+                        fontWeight: FontWeight.w700,
+                        fontSize: 24,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            Align(
+              alignment: AlignmentDirectional.bottomStart,
+              child: SizedBox.square(
+                dimension: MediaQuery.sizeOf(context).width * 0.45,
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: AlignmentDirectional.bottomStart,
+                  child: SvgPicture.asset(svgPath),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_sub_value_widget.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_sub_value_widget.dart
@ -0,0 +1,158 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+final class _AqiRange {
+  const _AqiRange({required this.max, required this.color});
+
+  final double max;
+  final Color color;
+}
+
+class AqiSubValueWidget extends StatelessWidget {
+  const AqiSubValueWidget({
+    required this.label,
+    required this.value,
+    required this.unit,
+    required this.range,
+    super.key,
+  });
+
+  final String label;
+  final String value;
+  final String unit;
+  final (double min, double max) range;
+
+  double get _parsedValue => double.parse(value);
+
+  static const List<_AqiRange> _ranges = [
+    _AqiRange(max: 12, color: ColorsManager.goodGreen),
+    _AqiRange(max: 35, color: ColorsManager.poorOrange),
+    _AqiRange(max: 55, color: ColorsManager.poorOrange),
+    _AqiRange(max: 150, color: ColorsManager.unhealthyRed),
+    _AqiRange(max: 250, color: ColorsManager.severePink),
+    _AqiRange(max: 500, color: ColorsManager.hazardousPurple),
+  ];
+
+  static List<_AqiRange> _getRangesForValue((double min, double max) range) {
+    final (double min, double max) = range;
+    final rangeSize = (max - min) / 6;
+    return [
+      _AqiRange(max: min + rangeSize, color: ColorsManager.goodGreen),
+      _AqiRange(max: min + (rangeSize * 2), color: ColorsManager.poorOrange),
+      _AqiRange(max: min + (rangeSize * 3), color: ColorsManager.poorOrange),
+      _AqiRange(max: min + (rangeSize * 4), color: ColorsManager.unhealthyRed),
+      _AqiRange(max: min + (rangeSize * 5), color: ColorsManager.severePink),
+      _AqiRange(max: min, color: ColorsManager.hazardousPurple),
+    ];
+  }
+
+  int _getActiveSegmentByRange(double value, (double min, double max) range) {
+    final ranges = _getRangesForValue(range);
+    for (int i = 0; i < ranges.length; i++) {
+      if (value <= ranges[i].max) return i;
+    }
+    return ranges.length - 1;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final activeSegment = _getActiveSegmentByRange(_parsedValue, range);
+    return Expanded(
+      child: Container(
+        padding: const EdgeInsetsDirectional.all(10),
+        decoration: BoxDecoration(
+          color: ColorsManager.whiteColors,
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Row(
+          spacing: MediaQuery.sizeOf(context).width * 0.0075,
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            _buildLabel(context),
+            _buildSegmentedBar(activeSegment),
+            _buildValueAndUnit(context),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildValueAndUnit(BuildContext context) {
+    return Expanded(
+      child: FittedBox(
+        fit: BoxFit.scaleDown,
+        alignment: AlignmentDirectional.centerEnd,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Text(
+              value,
+              style: context.textTheme.titleMedium?.copyWith(
+                color: ColorsManager.blackColor,
+                fontWeight: FontWeight.w400,
+                fontSize: 14,
+              ),
+            ),
+            Text(
+              unit,
+              style: context.textTheme.bodySmall?.copyWith(
+                color: ColorsManager.blackColor,
+                fontWeight: FontWeight.w400,
+                fontSize: 10,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildSegmentedBar(int activeSegment) {
+    return Expanded(
+      flex: 4,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 12),
+        child: Row(
+          spacing: 4,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: List.generate(_ranges.length, (index) {
+            final isActive = index == activeSegment;
+            final color = _ranges[index].color.withValues(
+                  alpha: isActive ? 1.0 : 0.25,
+                );
+            return Expanded(
+              child: AnimatedContainer(
+                duration: const Duration(milliseconds: 150),
+                curve: Curves.linear,
+                height: 5,
+                decoration: BoxDecoration(
+                  color: color,
+                  borderRadius: BorderRadius.circular(4),
+                ),
+              ),
+            );
+          }),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildLabel(BuildContext context) {
+    return Expanded(
+      child: FittedBox(
+        fit: BoxFit.scaleDown,
+        alignment: AlignmentDirectional.centerStart,
+        child: Text(
+          label,
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.blackColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 14,
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart
@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+enum AqiType {
+  aqi('AQI', ''),
+  pm25('PM2.5', 'µg/m³'),
+  pm10('PM10', 'µg/m³'),
+  hcho('HCHO', 'mg/m³'),
+  tvoc('TVOC', 'µg/m³'),
+  co2('CO2', 'ppm');
+
+  const AqiType(this.value, this.unit);
+
+  final String value;
+  final String unit;
+}
+
+class AqiTypeDropdown extends StatefulWidget {
+  const AqiTypeDropdown({super.key, required this.onChanged});
+
+  final ValueChanged<AqiType?> onChanged;
+
+  @override
+  State<AqiTypeDropdown> createState() => _AqiTypeDropdownState();
+}
+
+class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
+  AqiType? _selectedItem = AqiType.aqi;
+
+  void _updateSelectedItem(AqiType? item) => setState(() => _selectedItem = item);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(16),
+        border: Border.all(
+          color: ColorsManager.greyColor,
+          width: 1,
+        ),
+      ),
+      child: DropdownButton<AqiType?>(
+        value: _selectedItem,
+        isDense: true,
+        borderRadius: BorderRadius.circular(16),
+        dropdownColor: ColorsManager.whiteColors,
+        underline: const SizedBox.shrink(),
+        icon: const RotatedBox(
+          quarterTurns: 1,
+          child: Icon(Icons.chevron_right, size: 24),
+        ),
+        style: _getTextStyle(context),
+        padding: const EdgeInsetsDirectional.symmetric(
+          horizontal: 12,
+          vertical: 2,
+        ),
+        items: AqiType.values
+            .map((e) => DropdownMenuItem(value: e, child: Text(e.value)))
+            .toList(),
+        onChanged: (value) {
+          _updateSelectedItem(value);
+          widget.onChanged(value);
+        },
+      ),
+    );
+  }
+
+  TextStyle? _getTextStyle(BuildContext context) {
+    return context.textTheme.labelSmall?.copyWith(
+      color: ColorsManager.textPrimaryColor,
+      fontWeight: FontWeight.w700,
+      fontSize: 12,
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart
@ -0,0 +1,97 @@
+import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class RangeOfAqiChart extends StatelessWidget {
+  final List<RangeOfAqi> chartData;
+
+  const RangeOfAqiChart({
+    super.key,
+    required this.chartData,
+  });
+
+  List<(List<double> values, Color color, Color? dotColor)> get _lines => [
+        (
+          chartData.map((e) => e.max).toList(),
+          ColorsManager.maxPurple,
+          ColorsManager.maxPurpleDot,
+        ),
+        (
+          chartData.map((e) => e.avg).toList(),
+          Colors.white,
+          null,
+        ),
+        (
+          chartData.map((e) => e.min).toList(),
+          ColorsManager.minBlue,
+          ColorsManager.minBlueDot,
+        ),
+      ];
+
+  @override
+  Widget build(BuildContext context) {
+    return LineChart(
+      LineChartData(
+        minY: 0,
+        maxY: 301,
+        clipData: const FlClipData.vertical(),
+        gridData: EnergyManagementChartsHelper.gridData(horizontalInterval: 50),
+        titlesData: RangeOfAqiChartsHelper.titlesData(context, chartData),
+        borderData: EnergyManagementChartsHelper.borderData(),
+        lineTouchData: RangeOfAqiChartsHelper.lineTouchData(chartData),
+        betweenBarsData: [
+          BetweenBarsData(
+            fromIndex: 0,
+            toIndex: 2,
+            gradient: LinearGradient(
+              begin: Alignment.bottomCenter,
+              end: Alignment.topCenter,
+              stops: [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
+              colors: RangeOfAqiChartsHelper.gradientData.map((e) {
+                final (color, _) = e;
+                return color.withValues(alpha: 0.6);
+              }).toList(),
+            ),
+          ),
+        ],
+        lineBarsData: _lines.map((e) {
+          final (values, color, dotColor) = e;
+          return _buildLine(values: values, color: color, dotColor: dotColor);
+        }).toList(),
+      ),
+      duration: Duration.zero,
+    );
+  }
+
+  FlDotData _buildDotData(Color color) {
+    return FlDotData(
+      show: true,
+      getDotPainter: (_, __, ___, ____) => FlDotCirclePainter(
+        radius: 2,
+        color: ColorsManager.whiteColors,
+        strokeWidth: 2,
+        strokeColor: color,
+      ),
+    );
+  }
+
+  LineChartBarData _buildLine({
+    required List<double> values,
+    required Color color,
+    Color? dotColor,
+  }) {
+    const invisibleDot = FlDotData(show: false);
+    return LineChartBarData(
+      spots: List.generate(values.length, (i) => FlSpot(i.toDouble(), values[i])),
+      isCurved: true,
+      color: color,
+      barWidth: 4,
+      isStrokeCapRound: true,
+      dotData: dotColor != null ? _buildDotData(dotColor) : invisibleDot,
+      belowBarData: BarAreaData(show: false),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart
@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart';
+import 'package:syncrow_web/pages/analytics/widgets/analytics_error_widget.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class RangeOfAqiChartBox extends StatelessWidget {
+  const RangeOfAqiChartBox({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RangeOfAqiBloc, RangeOfAqiState>(
+      builder: (context, state) {
+        return Container(
+          padding: const EdgeInsetsDirectional.all(30),
+          decoration: subSectionContainerDecoration.copyWith(
+            borderRadius: BorderRadius.circular(30),
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              if (state.errorMessage != null) ...[
+                AnalyticsErrorWidget(state.errorMessage),
+                const SizedBox(height: 10),
+              ],
+              RangeOfAqiChartTitle(
+                isLoading: state.status == RangeOfAqiStatus.loading,
+              ),
+              const SizedBox(height: 10),
+              const Divider(),
+              const SizedBox(height: 20),
+              Expanded(child: RangeOfAqiChart(chartData: state.rangeOfAqi)),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
--- a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart
@ -0,0 +1,82 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart';
+import 'package:syncrow_web/pages/analytics/widgets/charts_loading_widget.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+
+class RangeOfAqiChartTitle extends StatelessWidget {
+  const RangeOfAqiChartTitle({required this.isLoading, super.key});
+  final bool isLoading;
+
+  static const List<(Color color, String title, bool hasBorder)> _colors = [
+    (Color(0xFF962DFF), 'Max', false),
+    (Color(0xFF93AAFD), 'Min', false),
+    (Colors.transparent, 'Avg', true),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        ChartsLoadingWidget(isLoading: isLoading),
+        const Expanded(
+          flex: 3,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerStart,
+            child: ChartTitle(title: Text('Range of AQI')),
+          ),
+        ),
+        const Spacer(flex: 3),
+        ..._colors.map(
+          (e) {
+            final (color, title, hasBorder) = e;
+            return Expanded(
+              child: IntrinsicHeight(
+                child: FittedBox(
+                  fit: BoxFit.fitWidth,
+                  alignment: AlignmentDirectional.centerStart,
+                  child: Padding(
+                    padding: const EdgeInsetsDirectional.only(end: 16),
+                    child: ChartInformativeCell(
+                      title: Text(title),
+                      color: color,
+                      hasBorder: hasBorder,
+                    ),
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+        const Spacer(),
+        Expanded(
+          flex: 2,
+          child: FittedBox(
+            fit: BoxFit.scaleDown,
+            alignment: AlignmentDirectional.centerEnd,
+            child: AqiTypeDropdown(
+              onChanged: (value) {
+                final spaceTreeState = context.read<SpaceTreeBloc>().state;
+                final spaceUuid = spaceTreeState.selectedSpaces.firstOrNull;
+
+                if (spaceUuid == null) return;
+
+                FetchAirQualityDataHelper.loadRangeOfAqi(
+                  context,
+                  spaceUuid: spaceUuid,
+                  date: context.read<AnalyticsDatePickerBloc>().state.monthlyDate,
+                  aqiType: value ?? AqiType.aqi,
+                );
+              },
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
--- a/lib/pages/analytics/modules/analytics/enums/analytics_page_tab.dart
+++ b/lib/pages/analytics/modules/analytics/enums/analytics_page_tab.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/views/air_quality_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart';

@ -10,6 +11,10 @@ enum AnalyticsPageTab {
  occupancy(
    title: 'Occupancy',
    child: AnalyticsOccupancyView(),
+  ),
+  airQuality(
+    title: 'Air Quality',
+    child: AirQualityView(),
  );

  const AnalyticsPageTab({
--- a/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart
@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+final class AirQualityDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
+  @override
+  void onCommunitySelected(
+    BuildContext context,
+    CommunityModel community,
+    List<SpaceModel> spaces,
+  ) {
+    // Do nothing
+  }
+
+  @override
+  void onSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel space,
+  ) {
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final isSpaceSelected = spaceTreeBloc.state.selectedSpaces.contains(space.uuid);
+
+    if (isSpaceSelected) {
+      clearData(context);
+      return;
+    }
+
+    spaceTreeBloc
+      ..add(const SpaceTreeClearSelectionEvent())
+      ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+
+    FetchAirQualityDataHelper.loadAirQualityData(
+      context,
+      communityUuid: community.uuid,
+      spaceUuid: space.uuid ?? '',
+    );
+  }
+
+  @override
+  void onChildSpaceSelected(
+    BuildContext context,
+    CommunityModel community,
+    SpaceModel child,
+  ) {
+    return onSpaceSelected(context, community, child);
+  }
+
+  @override
+  void clearData(BuildContext context) {
+    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    FetchAirQualityDataHelper.clearAllData(context);
+  }
+}
--- a/lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart
@ -1,4 +1,5 @@
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/air_quality_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart';
@ -9,6 +10,7 @@ abstract final class AnalyticsDataLoadingStrategyFactory {
    return switch (tab) {
      AnalyticsPageTab.energyManagement => EnergyManagementDataLoadingStrategy(),
      AnalyticsPageTab.occupancy => OccupancyDataLoadingStrategy(),
+      AnalyticsPageTab.airQuality => AirQualityDataLoadingStrategy(),
    };
  }
 }
--- a/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart
@ -68,9 +68,7 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
    CommunityModel community,
    SpaceModel child,
  ) {
-    if (child.children.isNotEmpty) {
-      return onSpaceSelected(context, community, child);
-    }
+    return onSpaceSelected(context, community, child);
  }

  @override
--- a/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart
+++ b/lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart
@ -48,7 +48,7 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
    CommunityModel community,
    SpaceModel child,
  ) {
-    onSpaceSelected(context, community, child);
+    return onSpaceSelected(context, community, child);
  }

  @override
--- a/lib/pages/analytics/modules/analytics/views/analytics_page.dart
+++ b/lib/pages/analytics/modules/analytics/views/analytics_page.dart
@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
@ -20,6 +21,7 @@ import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_devi
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@ -94,6 +96,11 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
            ),
          ),
        ),
+        BlocProvider(
+          create: (context) => RangeOfAqiBloc(
+            FakeRangeOfAqiService(),
+          ),
+        ),
      ],
      child: const AnalyticsPageForm(),
    );
--- a/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart
+++ b/lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart
@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class ChartInformativeCell extends StatelessWidget {
+  const ChartInformativeCell({
+    super.key,
+    required this.title,
+    required this.color,
+    this.hasBorder = false,
+  });
+
+  final Widget title;
+  final Color color;
+  final bool hasBorder;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: MediaQuery.sizeOf(context).height * 0.0385,
+      padding: const EdgeInsetsDirectional.symmetric(
+        vertical: 8,
+        horizontal: 12,
+      ),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadiusDirectional.circular(8),
+        border: Border.all(
+          color: ColorsManager.greyColor,
+          width: 1,
+        ),
+      ),
+      child: FittedBox(
+        fit: BoxFit.scaleDown,
+        alignment: Alignment.center,
+        child: Row(
+          spacing: 6,
+          children: [
+            Container(
+              height: 8,
+              width: 8,
+              decoration: BoxDecoration(
+                color: color,
+                border: Border.all(color: ColorsManager.grayBorder),
+                shape: BoxShape.circle,
+              ),
+            ),
+            DefaultTextStyle(
+              style: const TextStyle(
+                color: ColorsManager.blackColor,
+                fontWeight: FontWeight.w400,
+                fontSize: 14,
+              ),
+              child: title,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
+++ b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart
@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper {
        sideTitles: SideTitles(
          showTitles: true,
          maxIncluded: false,
-          minIncluded: true,
+          minIncluded: false,
          interval: leftTitlesInterval,
          reservedSize: 110,
          getTitlesWidget: (value, meta) => Padding(
@ -50,7 +50,7 @@ abstract final class EnergyManagementChartsHelper {
                value.formatNumberToKwh,
                style: context.textTheme.bodySmall?.copyWith(
                  fontSize: 12,
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                ),
              ),
            ),
@ -93,12 +93,14 @@ abstract final class EnergyManagementChartsHelper {
    );
  }

-  static FlGridData gridData() {
+  static FlGridData gridData({
+    double horizontalInterval = 250,
+  }) {
    return FlGridData(
      show: true,
      drawVerticalLine: false,
      drawHorizontalLine: true,
-      horizontalInterval: 250,
+      horizontalInterval: horizontalInterval,
      getDrawingHorizontalLine: (value) {
        return FlLine(
          color: ColorsManager.greyColor,
--- a/lib/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart
@ -6,9 +6,14 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';

 class AnalyticsDeviceDropdown extends StatelessWidget {
-  const AnalyticsDeviceDropdown({required this.onChanged, super.key});
+  const AnalyticsDeviceDropdown({
+    required this.onChanged,
+    this.showSpaceUuid = false,
+    super.key,
+  });

  final ValueChanged<AnalyticsDevice> onChanged;
+  final bool showSpaceUuid;

  @override
  Widget build(BuildContext context) {
@ -72,17 +77,18 @@ class AnalyticsDeviceDropdown extends StatelessWidget {
            mainAxisSize: MainAxisSize.min,
            children: [
              Text(e.name),
-              if (spaceUuid != null)
-                FittedBox(
-                  fit: BoxFit.scaleDown,
-                  alignment: AlignmentDirectional.centerStart,
-                  child: Text(
-                    spaceUuid,
-                    style: _getTextStyle(context)?.copyWith(
-                      fontSize: 10,
+              if (showSpaceUuid)
+                if (spaceUuid != null)
+                  FittedBox(
+                    fit: BoxFit.scaleDown,
+                    alignment: AlignmentDirectional.centerStart,
+                    child: Text(
+                      spaceUuid,
+                      style: _getTextStyle(context)?.copyWith(
+                        fontSize: 10,
+                      ),
                    ),
                  ),
-                ),
            ],
          ),
        );
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart
@ -18,6 +18,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
  Widget build(BuildContext context) {
    return BarChart(
      BarChartData(
+
        gridData: EnergyManagementChartsHelper.gridData().copyWith(
          checkToShowHorizontalLine: (value) => true,
          horizontalInterval: 250,
@ -170,7 +171,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
              child: Text(
                month,
                style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.greyColor,
+                  color: ColorsManager.lightGreyColor,
                  fontSize: 11,
                ),
              ),
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart
@ -19,10 +19,12 @@ class EnergyConsumptionByPhasesChartBox extends StatelessWidget {
          decoration: secondarySection,
          child: Column(
            mainAxisSize: MainAxisSize.min,
-            spacing: 20,
            children: [
              AnalyticsErrorWidget(state.errorMessage),
-              EnergyConsumptionByPhasesTitle(isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,),
+              EnergyConsumptionByPhasesTitle(
+                isLoading: state.status == EnergyConsumptionByPhasesStatus.loading,
+              ),
+              const SizedBox(height: 20),
              Expanded(
                child: EnergyConsumptionByPhasesChart(
                  energyData: state.chartData,
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart.dart
@ -12,6 +12,7 @@ class EnergyConsumptionPerDeviceChart extends StatelessWidget {
  Widget build(BuildContext context) {
    return LineChart(
      LineChartData(
+        clipData: const FlClipData.vertical(),
        titlesData: EnergyManagementChartsHelper.titlesData(
          context,
          leftTitlesInterval: 250,
--- a/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_devices_list.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_devices_list.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/analytics_device.dart';
 import 'package:syncrow_web/pages/analytics/models/device_energy_data_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart';

 class EnergyConsumptionPerDeviceDevicesList extends StatelessWidget {
  const EnergyConsumptionPerDeviceDevicesList({
@ -42,42 +42,7 @@ class EnergyConsumptionPerDeviceDevicesList extends StatelessWidget {

    return Tooltip(
      message: '${device.name}\n${device.productDevice?.uuid ?? ''}',
-      child: Container(
-        height: MediaQuery.sizeOf(context).height * 0.0365,
-        padding: const EdgeInsetsDirectional.symmetric(
-          vertical: 8,
-          horizontal: 12,
-        ),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadiusDirectional.circular(8),
-          border: Border.all(
-            color: ColorsManager.greyColor,
-            width: 1,
-          ),
-        ),
-        child: FittedBox(
-          fit: BoxFit.scaleDown,
-          alignment: Alignment.center,
-          child: Row(
-            spacing: 6,
-            children: [
-              CircleAvatar(
-                radius: 4,
-                backgroundColor: deviceColor,
-              ),
-              Text(
-                device.name,
-                textAlign: TextAlign.center,
-                style: const TextStyle(
-                  color: ColorsManager.blackColor,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 14,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
+      child: ChartInformativeCell(title: Text(device.name), color: deviceColor),
    );
  }
 }
--- a/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart
@ -2,19 +2,16 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/models/power_clamp_energy_status.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/power_clamp_info/power_clamp_info_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart_box.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_status_widget.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_phases_data_widget.dart';
 import 'package:syncrow_web/pages/analytics/widgets/analytics_error_widget.dart';
+import 'package:syncrow_web/pages/analytics/widgets/analytics_sidebar_header.dart';
 import 'package:syncrow_web/pages/device_managment/power_clamp/models/power_clamp_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';

 class PowerClampEnergyDataWidget extends StatelessWidget {
@ -42,26 +39,18 @@ class PowerClampEnergyDataWidget extends StatelessWidget {
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
                AnalyticsErrorWidget(state.errorMessage),
-                _buildHeader(context),
-                Text(
-                  'Device ID:',
-                  style: context.textTheme.bodySmall?.copyWith(
-                    color: ColorsManager.textPrimaryColor,
-                    fontWeight: FontWeight.w400,
-                    fontSize: 12,
-                  ),
+                AnalyticsSidebarHeader(
+                  title: 'Smart Power Clamp',
+                  showSpaceUuid: true,
+                  onChanged: (device) {
+                    FetchEnergyManagementDataHelper.loadEnergyConsumptionByPhases(
+                      context,
+                      powerClampUuid: device.uuid,
+                      selectedDate:
+                          context.read<AnalyticsDatePickerBloc>().state.monthlyDate,
+                    );
+                  },
                ),
-                const SizedBox(height: 6),
-                SelectableText(
-                  context.watch<AnalyticsDevicesBloc>().state.selectedDevice?.uuid ??
-                      'N/A',
-                  style: context.textTheme.bodySmall?.copyWith(
-                    color: ColorsManager.blackColor,
-                    fontWeight: FontWeight.w400,
-                    fontSize: 12,
-                  ),
-                ),
-                const Divider(),
                Expanded(
                  flex: 2,
                  child: PowerClampEnergyStatusWidget(
@ -69,13 +58,18 @@ class PowerClampEnergyDataWidget extends StatelessWidget {
                      PowerClampEnergyStatus(
                        iconPath: Assets.powerActiveIcon,
                        title: 'Active',
-                        value: _valueFromCode('EnergyConsumed', generalDataPoints),
+                        value: _valueFromCode('ActivePower', generalDataPoints),
                        unit: 'W',
                      ),
                      PowerClampEnergyStatus(
                        iconPath: Assets.voltMeterIcon,
                        title: 'Current',
-                        value: _valueFromCode('Current', generalDataPoints),
+                        value: _valueFromCode('Current', generalDataPoints)
+                            .replaceAllMapped(
+                              RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
+                              (Match m) => '${m[1]}.',
+                            )
+                            .replaceAll('.0', ''),
                        unit: 'A',
                      ),
                      PowerClampEnergyStatus(
@ -106,51 +100,6 @@ class PowerClampEnergyDataWidget extends StatelessWidget {
    );
  }

-  Widget _buildHeader(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Expanded(
-          flex: 3,
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerStart,
-            child: SelectableText(
-              'Smart Power Clamp',
-              style: context.textTheme.headlineSmall?.copyWith(
-                fontWeight: FontWeight.w700,
-                color: ColorsManager.vividBlue.withValues(alpha: 0.6),
-                fontSize: 18,
-              ),
-            ),
-          ),
-        ),
-        const Spacer(),
-        Expanded(
-          flex: 2,
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerEnd,
-            child: AnalyticsDeviceDropdown(
-              onChanged: (value) {
-                FetchEnergyManagementDataHelper.loadEnergyConsumptionByPhases(
-                  context,
-                  powerClampUuid: value.uuid,
-                  selectedDate:
-                      context.read<AnalyticsDatePickerBloc>().state.monthlyDate,
-                );
-                FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
-                  context,
-                  deviceUuid: value.uuid,
-                );
-              },
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
  String _valueFromCode(String code, List<DataPoint> points) {
    return points
        .firstWhere((e) => e.code == code, orElse: () => DataPoint(value: '--'))
--- a/lib/pages/analytics/modules/energy_management/widgets/power_clamp_phases_data_widget.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/power_clamp_phases_data_widget.dart
@ -55,7 +55,7 @@ class PowerClampPhasesDataWidget extends StatelessWidget {
                    iconPath: Assets.powerActiveIcon,
                    title: 'Active Power',
                    value: _valueFromCode(
-                      code: 'ReactivePower$phaseSuffix',
+                      code: 'ActivePower$phaseSuffix',
                      points: phase?.dataPoints,
                    ),
                    unit: 'W',
@ -125,7 +125,48 @@ class PowerClampPhasesDataWidget extends StatelessWidget {
      (e) => e.code == code,
      orElse: () => DataPoint(value: '--'),
    );
+    final value = element?.value;
+    if (code.contains('Current')) {
+      return _formatCurrentValue(value?.toString());
+    }
+    if (code.contains('PowerFactor')) {
+      return _formatPowerFactor(value?.toString());
+    }
+    if (code.contains('Voltage')) {
+      return _formatVoltage(value?.toString());
+    }
+    return value?.toString() ?? '--';
+  }

-    return element?.value.toString() ?? '--';
+  String _formatCurrentValue(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    if (str.length == 1) return '${str[0]}.0';
+    return '${str[0]}.${str.substring(1)}';
+  }
+
+  String _formatPowerFactor(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    final intValue = int.tryParse(str);
+    if (intValue == null) return '--';
+    final doubleValue = intValue / 100;
+    return doubleValue.toStringAsFixed(2);
+  }
+
+  String _formatVoltage(String? value) {
+    if (value == null) return '--';
+    String str = value;
+    if (str.isEmpty || str == '--') return '--';
+    str = str.replaceAll(RegExp(r'[^0-9]'), '');
+    if (str.isEmpty) return '--';
+    if (str.length == 1) return '0.${str[0]}';
+    return '${str.substring(0, str.length - 1)}.${str.substring(str.length - 1)}';
  }
 }
--- a/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart
@ -14,6 +14,7 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
    return Expanded(
      child: LineChart(
        LineChartData(
+          clipData: const FlClipData.vertical(),
          titlesData: EnergyManagementChartsHelper.titlesData(
            context,
            leftTitlesInterval: 250,
@ -28,6 +29,7 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
        ),
        duration: Duration.zero,
        curve: Curves.easeIn,
+        
      ),
    );
  }
@ -35,9 +37,6 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
  List<LineChartBarData> get _lineBarsData {
    return [
      LineChartBarData(
-        preventCurveOvershootingThreshold: 0.1,
-        curveSmoothness: 0.55,
-        preventCurveOverShooting: true,
        spots: chartData
            .asMap()
            .entries
--- a/lib/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart
+++ b/lib/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart
@ -1,15 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/models/power_clamp_energy_status.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_status_widget.dart';
+import 'package:syncrow_web/pages/analytics/widgets/analytics_sidebar_header.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';

 class OccupancyEndSideBar extends StatelessWidget {
@ -27,28 +23,7 @@ class OccupancyEndSideBar extends StatelessWidget {
          child: Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
-              _buildHeader(context),
-              Text(
-                'Device ID:',
-                style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.textPrimaryColor,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 12,
-                ),
-              ),
-              const SizedBox(height: 6),
-              SelectableText(
-                context.watch<AnalyticsDevicesBloc>().state.selectedDevice?.uuid ??
-                    'N/A',
-                style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.blackColor,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 12,
-                ),
-              ),
-              const SizedBox(height: 10),
-              const Divider(height: 1, color: ColorsManager.greyColor),
-              const SizedBox(height: 50),
+              const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
              SizedBox(
                height: MediaQuery.sizeOf(context).height * 0.2,
                child: PowerClampEnergyStatusWidget(
@ -101,42 +76,4 @@ class OccupancyEndSideBar extends StatelessWidget {
        .toString();
    return value == 'null' ? defaultValue ?? '--' : value;
  }
-
-  Widget _buildHeader(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Expanded(
-          flex: 3,
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerStart,
-            child: SelectableText(
-              'Presnce Sensor',
-              style: context.textTheme.headlineSmall?.copyWith(
-                fontWeight: FontWeight.w700,
-                color: ColorsManager.vividBlue.withValues(alpha: 0.6),
-                fontSize: 18,
-              ),
-            ),
-          ),
-        ),
-        const Spacer(),
-        Expanded(
-          flex: 2,
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerEnd,
-            child: AnalyticsDeviceDropdown(
-              onChanged: (value) =>
-                  FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
-                context,
-                deviceUuid: value.uuid,
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
 }
--- a/lib/pages/analytics/params/get_range_of_aqi_param.dart
+++ b/lib/pages/analytics/params/get_range_of_aqi_param.dart
@ -0,0 +1,18 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+
+class GetRangeOfAqiParam extends Equatable {
+  final DateTime date;
+  final String spaceUuid;
+  final AqiType aqiType;
+
+  const GetRangeOfAqiParam(
+    {
+    required this.date,
+    required this.spaceUuid,
+    required this.aqiType,
+  });
+
+  @override
+  List<Object?> get props => [date, spaceUuid];
+}
--- a/lib/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart
+++ b/lib/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart
@ -0,0 +1,30 @@
+import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
+import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart';
+
+class FakeRangeOfAqiService implements RangeOfAqiService {
+  @override
+  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
+    return await Future.delayed(const Duration(milliseconds: 800), () {
+      final random = DateTime.now().millisecondsSinceEpoch;
+
+      return List.generate(30, (index) {
+        final date = DateTime(2025, 5, 1).add(Duration(days: index));
+
+        final min = ((random + index * 17) % 200).toDouble();
+        final avgDelta = ((random + index * 23) % 50).toDouble() + 20;
+        final maxDelta = ((random + index * 31) % 50).toDouble() + 30;
+
+        final avg = (min + avgDelta).clamp(0.0, 301.0);
+        final max = (avg + maxDelta).clamp(0.0, 301.0);
+
+        return RangeOfAqi(
+          min: min,
+          avg: avg,
+          max: max,
+          date: date,
+        );
+      });
+    });
+  }
+}
--- a/lib/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart
+++ b/lib/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart
@ -0,0 +1,6 @@
+import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
+import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
+
+abstract interface class RangeOfAqiService {
+  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param);
+}
--- a/lib/pages/analytics/widgets/analytics_sidebar_header.dart
+++ b/lib/pages/analytics/widgets/analytics_sidebar_header.dart
@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/analytics/models/analytics_device.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class AnalyticsSidebarHeader extends StatelessWidget {
+  const AnalyticsSidebarHeader({
+    required this.title,
+    this.showSpaceUuid = false,
+    this.onChanged,
+    super.key,
+  });
+
+  final String title;
+  final bool showSpaceUuid;
+  final void Function(AnalyticsDevice device)? onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Expanded(
+              flex: 2,
+              child: FittedBox(
+                alignment: AlignmentDirectional.centerStart,
+                fit: BoxFit.scaleDown,
+                child: SelectableText(
+                  title,
+                  style: context.textTheme.headlineSmall?.copyWith(
+                    fontWeight: FontWeight.w700,
+                    color: ColorsManager.vividBlue.withValues(alpha: 0.6),
+                    fontSize: 18,
+                  ),
+                ),
+              ),
+            ),
+            const Spacer(),
+            Expanded(
+              flex: 2,
+              child: FittedBox(
+                alignment: AlignmentDirectional.centerEnd,
+                fit: BoxFit.scaleDown,
+                child: AnalyticsDeviceDropdown(
+                  onChanged: (value) {
+                    context.read<AnalyticsDevicesBloc>().add(
+                          SelectAnalyticsDeviceEvent(value),
+                        );
+                    FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
+                      context,
+                      deviceUuid: value.uuid,
+                    );
+                    onChanged?.call(value);
+                  },
+                ),
+              ),
+            ),
+          ],
+        ),
+        Text(
+          'Device ID:',
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.textPrimaryColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 12,
+          ),
+        ),
+        const SizedBox(height: 6),
+        SelectableText(
+          context.watch<AnalyticsDevicesBloc>().state.selectedDevice?.uuid ?? 'N/A',
+          style: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.blackColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 12,
+          ),
+        ),
+        const SizedBox(height: 10),
+        const Divider(height: 1, color: ColorsManager.greyColor),
+        const SizedBox(height: 24),
+      ],
+    );
+  }
+}
--- a/lib/pages/common/custom_table.dart
+++ b/lib/pages/common/custom_table.dart
@ -21,6 +21,7 @@ class DynamicTable extends StatefulWidget {
  final List<String>? initialSelectedIds;
  final int uuidIndex;
  final Function(dynamic selectedRows)? onSelectionChanged;
+  final Function(int rowIndex)? onSettingsPressed;
  const DynamicTable({
    super.key,
    required this.headers,
@ -37,6 +38,7 @@ class DynamicTable extends StatefulWidget {
    this.initialSelectedIds,
    required this.uuidIndex,
    this.onSelectionChanged,
+    this.onSettingsPressed,
  });

  @override
@ -48,11 +50,20 @@ class _DynamicTableState extends State<DynamicTable> {
  bool _selectAll = false;
  final ScrollController _verticalScrollController = ScrollController();
  final ScrollController _horizontalScrollController = ScrollController();
-
+  late ScrollController _horizontalHeaderScrollController;
+  late ScrollController _horizontalBodyScrollController;
  @override
  void initState() {
    super.initState();
    _initializeSelection();
+    _horizontalHeaderScrollController = ScrollController();
+    _horizontalBodyScrollController = ScrollController();
+
+    // Synchronize horizontal scrolling
+    _horizontalBodyScrollController.addListener(() {
+      _horizontalHeaderScrollController
+          .jumpTo(_horizontalBodyScrollController.offset);
+    });
  }

  @override
@ -102,101 +113,87 @@ class _DynamicTableState extends State<DynamicTable> {
    context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
  }

+  @override
+  void dispose() {
+    _horizontalHeaderScrollController.dispose();
+    _horizontalBodyScrollController.dispose();
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Container(
      decoration: widget.cellDecoration,
-      child: Scrollbar(
-        controller: _verticalScrollController,
-        thumbVisibility: true,
-        trackVisibility: true,
-        child: Scrollbar(
-          controller: _horizontalScrollController,
-          thumbVisibility: true,
-          trackVisibility: true,
-          notificationPredicate: (notif) => notif.depth == 1,
-          child: SingleChildScrollView(
-            controller: _verticalScrollController,
+      child: Column(
+        children: [
+          Container(
+            decoration: widget.headerDecoration ??
+                const BoxDecoration(color: ColorsManager.boxColor),
            child: SingleChildScrollView(
-              controller: _horizontalScrollController,
              scrollDirection: Axis.horizontal,
+              physics: const NeverScrollableScrollPhysics(),
+              controller: _horizontalHeaderScrollController,
              child: SizedBox(
                width: widget.size.width,
-                child: Column(
+                child: Row(
                  children: [
-                    Container(
-                      decoration: widget.headerDecoration ??
-                          const BoxDecoration(
-                            color: ColorsManager.boxColor,
-                          ),
-                      child: Row(
-                        children: [
-                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                          ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(
-                                widget.headers[index], index);
-                          })
-                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
-                        ],
-                      ),
-                    ),
-                    widget.isEmpty
-                        ? SizedBox(
-                            height: widget.size.height * 0.5,
-                            width: widget.size.width,
-                            child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              children: [
-                                Row(
-                                  crossAxisAlignment: CrossAxisAlignment.center,
-                                  mainAxisAlignment: MainAxisAlignment.center,
-                                  children: [
-                                    Column(
-                                      children: [
-                                        SvgPicture.asset(Assets.emptyTable),
-                                        const SizedBox(
-                                          height: 15,
-                                        ),
-                                        Text(
-                                          widget.tableName == 'AccessManagement'
-                                              ? 'No Password '
-                                              : 'No Devices',
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .bodySmall!
-                                              .copyWith(
-                                                  color:
-                                                      ColorsManager.grayColor),
-                                        )
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              ],
-                            ),
-                          )
-                        : Column(
-                            children:
-                                List.generate(widget.data.length, (index) {
-                              final row = widget.data[index];
-                              return Row(
-                                children: [
-                                  if (widget.withCheckBox)
-                                    _buildRowCheckbox(
-                                        index, widget.size.height * 0.08),
-                                  ...row.map((cell) => _buildTableCell(
-                                      cell.toString(),
-                                      widget.size.height * 0.08)),
-                                ],
-                              );
-                            }),
-                          ),
+                    if (widget.withCheckBox) _buildSelectAllCheckbox(),
+                    ...List.generate(widget.headers.length, (index) {
+                      return _buildTableHeaderCell(
+                          widget.headers[index], index);
+                    }),
                  ],
                ),
              ),
            ),
          ),
-        ),
+          Expanded(
+            child: Scrollbar(
+              controller: _verticalScrollController,
+              thumbVisibility: true,
+              trackVisibility: true,
+              child: SingleChildScrollView(
+                controller: _verticalScrollController,
+                child: Scrollbar(
+                  controller: _horizontalBodyScrollController,
+                  thumbVisibility: false,
+                  trackVisibility: false,
+                  notificationPredicate: (notif) => notif.depth == 1,
+                  child: SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    controller: _horizontalBodyScrollController,
+                    child: SizedBox(
+                      width: widget.size.width,
+                      child: widget.isEmpty
+                          ? _buildEmptyState()
+                          : Column(
+                              children:
+                                  List.generate(widget.data.length, (rowIndex) {
+                                final row = widget.data[rowIndex];
+                                return Row(
+                                  children: [
+                                    if (widget.withCheckBox)
+                                      _buildRowCheckbox(
+                                          rowIndex, widget.size.height * 0.08),
+                                    ...row.asMap().entries.map((entry) {
+                                      return _buildTableCell(
+                                        entry.value.toString(),
+                                        widget.size.height * 0.08,
+                                        rowIndex: rowIndex,
+                                        columnIndex: entry.key,
+                                      );
+                                    }).toList(),
+                                  ],
+                                );
+                              }),
+                            ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
      ),
    );
  }
@ -218,6 +215,32 @@ class _DynamicTableState extends State<DynamicTable> {
    );
  }

+  Widget _buildEmptyState() => Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Column(
+                children: [
+                  SvgPicture.asset(Assets.emptyTable),
+                  const SizedBox(height: 15),
+                  Text(
+                    widget.tableName == 'AccessManagement'
+                        ? 'No Password '
+                        : 'No Devices',
+                    style: Theme.of(context)
+                        .textTheme
+                        .bodySmall!
+                        .copyWith(color: ColorsManager.grayColor),
+                  )
+                ],
+              ),
+            ],
+          ),
+        ],
+      );
  Widget _buildRowCheckbox(int index, double size) {
    return Container(
      width: 50,
@ -272,13 +295,23 @@ class _DynamicTableState extends State<DynamicTable> {
    );
  }

-  Widget _buildTableCell(String content, double size) {
+  Widget _buildTableCell(
+    String content,
+    double size, {
+    required int rowIndex,
+    required int columnIndex,
+  }) {
    bool isBatteryLevel = content.endsWith('%');
    double? batteryLevel;

    if (isBatteryLevel) {
      batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
    }
+    bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
+
+    if (isSettingsColumn) {
+      return _buildSettingsIcon(rowIndex, size);
+    }

    Color? statusColor;
    switch (content) {
@ -330,4 +363,23 @@ class _DynamicTableState extends State<DynamicTable> {
      ),
    );
  }
+
+  Widget _buildSettingsIcon(int rowIndex, double size) {
+    return Container(
+      height: size,
+      width: 120,
+      padding: const EdgeInsets.all(5.0),
+      decoration: const BoxDecoration(
+        border: Border(
+          bottom: BorderSide(color: ColorsManager.boxDivider, width: 1.0),
+        ),
+        color: Colors.white,
+      ),
+      alignment: Alignment.center,
+      child: IconButton(
+        icon: SvgPicture.asset(Assets.settings),
+        onPressed: () => widget.onSettingsPressed?.call(rowIndex),
+      ),
+    );
+  }
 }
--- a/lib/pages/device_managment/ac/bloc/ac_bloc.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
@ -1,21 +1,27 @@
 import 'dart:async';
-import 'package:dio/dio.dart';
+
 import 'package:firebase_database/firebase_database.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
 import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 class AcBloc extends Bloc<AcsEvent, AcsState> {
  late AcStatusModel deviceStatus;
  final String deviceId;
-  Timer? _timer;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
  Timer? _countdownTimer;

-  AcBloc({required this.deviceId}) : super(AcsInitialState()) {
+  AcBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(AcsInitialState()) {
    on<AcFetchDeviceStatusEvent>(_onFetchAcStatus);
    on<AcFetchBatchStatusEvent>(_onFetchAcBatchStatus);
    on<AcControlEvent>(_onAcControl);
@ -34,14 +40,14 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
  int scheduledMinutes = 0;

  FutureOr<void> _onFetchAcStatus(
-      AcFetchDeviceStatusEvent event, Emitter<AcsState> emit) async {
+    AcFetchDeviceStatusEvent event,
+    Emitter<AcsState> emit,
+  ) async {
    emit(AcsLoadingState());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
      deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
      if (deviceStatus.countdown1 != 0) {
-        // Convert API value to minutes
        final totalMinutes = deviceStatus.countdown1 * 6;
        scheduledHours = totalMinutes ~/ 60;
        scheduledMinutes = totalMinutes % 60;
@ -62,30 +68,24 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    }
  }

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

      stream.listen((DatabaseEvent event) async {
        if (event.snapshot.value == null) return;

-        if (_timer != null) {
-          await Future.delayed(const Duration(seconds: 1));
-        }
        Map<dynamic, dynamic> usersMap =
            event.snapshot.value as Map<dynamic, dynamic>;

        List<Status> statusList = [];

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

-        deviceStatus =
-            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        deviceStatus = AcStatusModel.fromJson(usersMap['productUuid'], statusList);
        if (!isClosed) {
          add(AcStatusUpdated(deviceStatus));
        }
@ -93,146 +93,44 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    } catch (_) {}
  }

-  void _onAcStatusUpdated(AcStatusUpdated event, Emitter<AcsState> emit) {
+  void _onAcStatusUpdated(
+    AcStatusUpdated event,
+    Emitter<AcsState> emit,
+  ) {
    deviceStatus = event.deviceStatus;
    emit(ACStatusLoaded(status: deviceStatus));
  }

  FutureOr<void> _onAcControl(
-      AcControlEvent event, Emitter<AcsState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
-    _updateLocalValue(event.code, event.value, emit);
-
+    AcControlEvent event,
+    Emitter<AcsState> emit,
+  ) async {
+    emit(AcsLoadingState());
+    _updateDeviceFunctionFromCode(event.code, event.value);
    emit(ACStatusLoaded(status: deviceStatus));

-    await _runDebounce(
-      isBatch: false,
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-    );
-  }
+    try {
+      final success = await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required dynamic value,
-    required dynamic oldValue,
-    required Emitter<AcsState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        if (e is DioException && e.response != null) {
-          debugPrint('Error response: ${e.response?.data}');
-        }
-        _revertValueAndEmit(id, code, oldValue, emit);
+      if (!success) {
+        emit(const AcsFailedState(error: 'Failed to control device'));
      }
-    });
-  }
-
-  void _revertValueAndEmit(
-      String deviceId, String code, dynamic oldValue, Emitter<AcsState> emit) {
-    _updateLocalValue(code, oldValue, emit);
-    emit(ACStatusLoaded(status: deviceStatus));
-  }
-
-  void _updateLocalValue(String code, dynamic value, Emitter<AcsState> emit) {
-    switch (code) {
-      case 'switch':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(acSwitch: value);
-        }
-        break;
-      case 'temp_set':
-        if (value is int) {
-          deviceStatus = deviceStatus.copyWith(tempSet: value);
-        }
-        break;
-      case 'mode':
-        if (value is String) {
-          deviceStatus = deviceStatus.copyWith(
-            modeString: value,
-          );
-        }
-        break;
-      case 'level':
-        if (value is String) {
-          deviceStatus = deviceStatus.copyWith(
-            fanSpeedsString: value,
-          );
-        }
-        break;
-      case 'child_lock':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(childLock: value);
-        }
-
-      case 'countdown_time':
-        if (value is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: value);
-        }
-        break;
-      default:
-        break;
-    }
-    emit(ACStatusLoaded(status: deviceStatus));
-  }
-
-  dynamic _getValueByCode(String code) {
-    switch (code) {
-      case 'switch':
-        return deviceStatus.acSwitch;
-      case 'temp_set':
-        return deviceStatus.tempSet;
-      case 'mode':
-        return deviceStatus.modeString;
-      case 'level':
-        return deviceStatus.fanSpeedsString;
-      case 'child_lock':
-        return deviceStatus.childLock;
-      case 'countdown_time':
-        return deviceStatus.countdown1;
-      default:
-        return null;
+    } catch (e) {
+      emit(AcsFailedState(error: e.toString()));
    }
  }

  FutureOr<void> _onFetchAcBatchStatus(
-      AcFetchBatchStatusEvent event, Emitter<AcsState> emit) async {
+    AcFetchBatchStatusEvent event,
+    Emitter<AcsState> emit,
+  ) async {
    emit(AcsLoadingState());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus =
-          AcStatusModel.fromJson(event.devicesIds.first, status.status);
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus = AcStatusModel.fromJson(event.devicesIds.first, status.status);
      emit(ACStatusLoaded(status: deviceStatus));
    } catch (e) {
      emit(AcsFailedState(error: e.toString()));
@ -240,25 +138,32 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
  }

  FutureOr<void> _onAcBatchControl(
-      AcBatchControlEvent event, Emitter<AcsState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
-    _updateLocalValue(event.code, event.value, emit);
-
+    AcBatchControlEvent event,
+    Emitter<AcsState> emit,
+  ) async {
+    emit(AcsLoadingState());
+    _updateDeviceFunctionFromCode(event.code, event.value);
    emit(ACStatusLoaded(status: deviceStatus));

-    await _runDebounce(
-      isBatch: true,
-      deviceId: event.devicesIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-    );
+    try {
+      final success = await batchControlDevicesService.batchControlDevices(
+        uuids: event.devicesIds,
+        code: event.code,
+        value: event.value,
+      );
+
+      if (!success) {
+        emit(const AcsFailedState(error: 'Failed to control devices'));
+      }
+    } catch (e) {
+      emit(AcsFailedState(error: e.toString()));
+    }
  }

-  FutureOr<void> _onFactoryReset(
-      AcFactoryResetEvent event, Emitter<AcsState> emit) async {
+  Future<void> _onFactoryReset(
+    AcFactoryResetEvent event,
+    Emitter<AcsState> emit,
+  ) async {
    emit(AcsLoadingState());
    try {
      final response = await DevicesManagementApi().factoryReset(
@ -275,9 +180,11 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    }
  }

-  void _onClose(OnClose event, Emitter<AcsState> emit) {
+  void _onClose(
+    OnClose event,
+    Emitter<AcsState> emit,
+  ) {
    _countdownTimer?.cancel();
-    _timer?.cancel();
  }

  void _handleIncreaseTime(IncreaseTimeEvent event, Emitter<AcsState> emit) {
@ -300,7 +207,10 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    ));
  }

-  void _handleDecreaseTime(DecreaseTimeEvent event, Emitter<AcsState> emit) {
+  void _handleDecreaseTime(
+    DecreaseTimeEvent event,
+    Emitter<AcsState> emit,
+  ) {
    if (state is! ACStatusLoaded) return;
    final currentState = state as ACStatusLoaded;
    int totalMinutes = (scheduledHours * 60) + scheduledMinutes;
@ -315,7 +225,9 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
  }

  Future<void> _handleToggleTimer(
-      ToggleScheduleEvent event, Emitter<AcsState> emit) async {
+    ToggleScheduleEvent event,
+    Emitter<AcsState> emit,
+  ) async {
    if (state is! ACStatusLoaded) return;
    final currentState = state as ACStatusLoaded;

@ -331,37 +243,44 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {

      try {
        final scaledValue = totalMinutes ~/ 6;
-        await _runDebounce(
-          isBatch: false,
-          deviceId: deviceId,
-          code: 'countdown_time',
-          value: scaledValue,
-          oldValue: scaledValue,
-          emit: emit,
+        final success = await controlDeviceService.controlDevice(
+          deviceUuid: deviceId,
+          status: Status(code: 'countdown_time', value: scaledValue),
        );
-        _startCountdownTimer(emit);
-        emit(currentState.copyWith(isTimerActive: timerActive));
+
+        if (success) {
+          _startCountdownTimer(emit);
+          emit(currentState.copyWith(isTimerActive: timerActive));
+        } else {
+          timerActive = false;
+          emit(const AcsFailedState(error: 'Failed to set timer'));
+        }
      } catch (e) {
        timerActive = false;
        emit(AcsFailedState(error: e.toString()));
      }
    } else {
-      await _runDebounce(
-        isBatch: false,
-        deviceId: deviceId,
-        code: 'countdown_time',
-        value: 0,
-        oldValue: 0,
-        emit: emit,
-      );
-      _countdownTimer?.cancel();
-      scheduledHours = 0;
-      scheduledMinutes = 0;
-      emit(currentState.copyWith(
-        isTimerActive: timerActive,
-        scheduledHours: 0,
-        scheduledMinutes: 0,
-      ));
+      try {
+        final success = await controlDeviceService.controlDevice(
+          deviceUuid: deviceId,
+          status: Status(code: 'countdown_time', value: 0),
+        );
+
+        if (success) {
+          _countdownTimer?.cancel();
+          scheduledHours = 0;
+          scheduledMinutes = 0;
+          emit(currentState.copyWith(
+            isTimerActive: timerActive,
+            scheduledHours: 0,
+            scheduledMinutes: 0,
+          ));
+        } else {
+          emit(const AcsFailedState(error: 'Failed to stop timer'));
+        }
+      } catch (e) {
+        emit(AcsFailedState(error: e.toString()));
+      }
    }
  }

@ -385,7 +304,10 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    });
  }

-  void _handleUpdateTimer(UpdateTimerEvent event, Emitter<AcsState> emit) {
+  void _handleUpdateTimer(
+    UpdateTimerEvent event,
+    Emitter<AcsState> emit,
+  ) {
    if (state is ACStatusLoaded) {
      final currentState = state as ACStatusLoaded;
      emit(currentState.copyWith(
@ -400,7 +322,6 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
      ApiCountdownValueEvent event, Emitter<AcsState> emit) {
    if (state is ACStatusLoaded) {
      final totalMinutes = event.apiValue * 6;
-      final scheduledHours = totalMinutes ~/ 60;
      scheduledMinutes = totalMinutes % 60;
      _startCountdownTimer(
        emit,
@ -409,6 +330,43 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
    }
  }

+  void _updateDeviceFunctionFromCode(String code, dynamic value) {
+    switch (code) {
+      case 'switch':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(acSwitch: value);
+        }
+        break;
+      case 'temp_set':
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(tempSet: value);
+        }
+        break;
+      case 'mode':
+        if (value is String) {
+          deviceStatus = deviceStatus.copyWith(modeString: value);
+        }
+        break;
+      case 'level':
+        if (value is String) {
+          deviceStatus = deviceStatus.copyWith(fanSpeedsString: value);
+        }
+        break;
+      case 'child_lock':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(childLock: value);
+        }
+        break;
+      case 'countdown_time':
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(countdown1: value);
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
  @override
  Future<void> close() {
    add(OnClose());
--- a/lib/pages/device_managment/ac/factories/ac_bloc_factory.dart
+++ b/lib/pages/device_managment/ac/factories/ac_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+
+abstract final class AcBlocFactory {
+  const AcBlocFactory._();
+
+  static AcBloc create({
+    required String deviceId,
+  }) {
+    return AcBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/ac/view/ac_device_batch_control.dart
+++ b/lib/pages/device_managment/ac/view/ac_device_batch_control.dart
@ -3,12 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
+import 'package:syncrow_web/pages/device_managment/ac/factories/ac_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_ac_mode.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_current_temp.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/batch_control_list/batch_fan_speed.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@ -26,8 +26,9 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo
    final isLarge = isLargeScreenSize(context);
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
-      create: (context) =>
-          AcBloc(deviceId: devicesIds.first)..add(AcFetchBatchStatusEvent(devicesIds)),
+      create: (context) => AcBlocFactory.create(
+        deviceId: devicesIds.first,
+      )..add(AcFetchBatchStatusEvent(devicesIds)),
      child: BlocBuilder<AcBloc, AcsState>(
        builder: (context, state) {
          if (state is ACStatusLoaded) {
--- a/lib/pages/device_managment/ac/view/ac_device_control.dart
+++ b/lib/pages/device_managment/ac/view/ac_device_control.dart
@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_event.dart';
 import 'package:syncrow_web/pages/device_managment/ac/bloc/ac_state.dart';
+import 'package:syncrow_web/pages/device_managment/ac/factories/ac_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/ac_mode.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/current_temp.dart';
 import 'package:syncrow_web/pages/device_managment/ac/view/control_list/fan_speed.dart';
@ -24,8 +25,9 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
    final isMedium = isMediumScreenSize(context);

    return BlocProvider(
-      create: (context) => AcBloc(deviceId: device.uuid!)
-        ..add(AcFetchDeviceStatusEvent(device.uuid!)),
+      create: (context) => AcBlocFactory.create(
+        deviceId: device.uuid!,
+      )..add(AcFetchDeviceStatusEvent(device.uuid!)),
      child: BlocBuilder<AcBloc, AcsState>(
        builder: (context, state) {
          final acBloc = BlocProvider.of<AcBloc>(context);
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/
 import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/two_gang_switch/two_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gateway.dart';
+import 'package:syncrow_web/pages/routines/models/pc/energy_clamp_functions.dart';
 import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
@ -248,6 +249,8 @@ SOS
      tempIcon = Assets.waterLeakNormal;
    } else if (type == DeviceType.NCPS) {
      tempIcon = Assets.sensors;
+    } else if (type == DeviceType.PC) {
+      tempIcon = Assets.powerClamp;
    } else {
      tempIcon = Assets.logoHorizontal;
    }
@ -393,6 +396,59 @@ SOS
          BacklightFunction(
              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
        ];
+      case 'PC':
+        return [
+          TotalEnergyConsumedStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          TotalActivePowerConsumedStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltagePhaseSequenceDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          TotalCurrentStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          FrequencyStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase A
+          EnergyConsumedAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PowerFactorAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentAStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase B
+          EnergyConsumedBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PowerFactorBStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // Phase C
+          EnergyConsumedCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          ActivePowerCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          VoltageCStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentCStatusFunction(
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
+          PowerFactorCStatusFunction(
+              deviceId: uuid ?? '',
+              deviceName: name ?? '',
+              type: 'IF'), 
+        ];

      default:
        return [];
@ -526,5 +582,6 @@ SOS
    "GD": DeviceType.GarageDoor,
    "WL": DeviceType.WaterLeak,
    "NCPS": DeviceType.NCPS,
+    "PC": DeviceType.PC,
  };
 }
--- a/lib/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart
+++ b/lib/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart
@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
@ -7,14 +5,21 @@ import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_e
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/help_description.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
  late CeilingSensorModel deviceStatus;
-  Timer? _timer;

-  CeilingSensorBloc({required this.deviceId}) : super(CeilingInitialState()) {
+  CeilingSensorBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(CeilingInitialState()) {
    on<CeilingInitialEvent>(_fetchCeilingSensorStatus);
    on<CeilingFetchDeviceStatusEvent>(_fetchCeilingSensorBatchControl);
    on<CeilingChangeValueEvent>(_changeValue);
@ -26,35 +31,34 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
    on<StatusUpdated>(_onStatusUpdated);
  }

-  void _fetchCeilingSensorStatus(
-      CeilingInitialEvent event, Emitter<CeilingSensorState> emit) async {
+  Future<void> _fetchCeilingSensorStatus(
+    CeilingInitialEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    emit(CeilingLoadingInitialState());
    try {
-      var response =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
      deviceStatus = CeilingSensorModel.fromJson(response.status);
      emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
      _listenToChanges(event.deviceId);
    } catch (e) {
      emit(CeilingFailedState(error: e.toString()));
-      return;
    }
  }

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

      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        if (event.snapshot.value == null) return;
+
+        final usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        final statusList = <Status>[];

-        List<Status> statusList = [];
        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
+          statusList.add(Status(code: element['code'], value: element['value']));
        });

        deviceStatus = CeilingSensorModel.fromJson(statusList);
@ -65,149 +69,127 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
    } catch (_) {}
  }

-  void _onStatusUpdated(StatusUpdated event, Emitter<CeilingSensorState> emit) {
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<CeilingSensorState> emit,
+  ) {
    deviceStatus = event.deviceStatus;
    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
  }

-  void _changeValue(
-      CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
+  Future<void> _changeValue(
+    CeilingChangeValueEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
-    if (event.code == 'sensitivity') {
-      deviceStatus.sensitivity = event.value;
-    } else if (event.code == 'none_body_time') {
-      deviceStatus.noBodyTime = event.value;
-    } else if (event.code == 'moving_max_dis') {
-      deviceStatus.maxDistance = event.value;
-    } else if (event.code == 'scene') {
-      deviceStatus.spaceType = getSpaceType(event.value);
-    }
+    _updateDeviceFunctionFromCode(event.code, event.value);
    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-    await _runDeBouncer(
-      deviceId: deviceId,
-      code: event.code,
-      value: event.value,
-      emit: emit,
-      isBatch: false,
-    );
+
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      emit(CeilingFailedState(error: e.toString()));
+    }
  }

  Future<void> _onBatchControl(
-      CeilingBatchControlEvent event, Emitter<CeilingSensorState> emit) async {
+    CeilingBatchControlEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
-    if (event.code == 'sensitivity') {
-      deviceStatus.sensitivity = event.value;
-    } else if (event.code == 'none_body_time') {
-      deviceStatus.noBodyTime = event.value;
-    } else if (event.code == 'moving_max_dis') {
-      deviceStatus.maxDistance = event.value;
-    } else if (event.code == 'scene') {
-      deviceStatus.spaceType = getSpaceType(event.value);
-    }
+    _updateDeviceFunctionFromCode(event.code, event.value);
    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-    await _runDeBouncer(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      emit: emit,
-      isBatch: true,
-    );
-  }

-  _runDeBouncer({
-    required dynamic deviceId,
-    required String code,
-    required dynamic value,
-    required Emitter<CeilingSensorState> emit,
-    required bool isBatch,
-  }) {
-    late String id;
+    try {
+      final success = await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );

-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          add(CeilingInitialEvent(id));
-        }
-        if (response == true && code == 'scene') {
-          emit(CeilingLoadingInitialState());
-          await Future.delayed(const Duration(seconds: 1));
-          add(CeilingInitialEvent(id));
-        }
-      } catch (_) {
-        await Future.delayed(const Duration(milliseconds: 500));
-        add(CeilingInitialEvent(id));
+      if (!success) {
+        emit(const CeilingFailedState(error: 'Failed to control devices'));
      }
-    });
+    } catch (e) {
+      emit(CeilingFailedState(error: e.toString()));
+    }
  }

-  FutureOr<void> _getDeviceReports(GetCeilingDeviceReportsEvent event,
-      Emitter<CeilingSensorState> emit) async {
+  void _updateDeviceFunctionFromCode(String code, dynamic value) {
+    switch (code) {
+      case 'sensitivity':
+        deviceStatus.sensitivity = value;
+        break;
+      case 'none_body_time':
+        deviceStatus.noBodyTime = value;
+        break;
+      case 'moving_max_dis':
+        deviceStatus.maxDistance = value;
+        break;
+      case 'scene':
+        deviceStatus.spaceType = getSpaceType(value);
+        break;
+      default:
+        break;
+    }
+  }
+
+  Future<void> _getDeviceReports(
+    GetCeilingDeviceReportsEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    if (event.code.isEmpty) {
      emit(ShowCeilingDescriptionState(description: reportString));
      return;
-    } else {
-      emit(CeilingReportsLoadingState());
-      // final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
-      // final to = DateTime.now().millisecondsSinceEpoch;
+    }

-      try {
-        // await DevicesManagementApi.getDeviceReportsByDate(deviceId, event.code, from.toString(), to.toString())
-        await DevicesManagementApi.getDeviceReports(deviceId, event.code)
-            .then((value) {
-          emit(CeilingReportsState(deviceReport: value));
-        });
-      } catch (e) {
-        emit(CeilingReportsFailedState(error: e.toString()));
-        return;
-      }
+    emit(CeilingReportsLoadingState());
+    try {
+      final value = await DevicesManagementApi.getDeviceReports(
+        deviceId,
+        event.code,
+      );
+      emit(CeilingReportsState(deviceReport: value));
+    } catch (e) {
+      emit(CeilingReportsFailedState(error: e.toString()));
    }
  }

  void _showDescription(
-      ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
+    ShowCeilingDescriptionEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) {
    emit(ShowCeilingDescriptionState(description: event.description));
  }

  void _backToGridView(
-      BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
+    BackToCeilingGridViewEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) {
    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
  }

-  FutureOr<void> _fetchCeilingSensorBatchControl(
-      CeilingFetchDeviceStatusEvent event,
-      Emitter<CeilingSensorState> emit) async {
+  Future<void> _fetchCeilingSensorBatchControl(
+    CeilingFetchDeviceStatusEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    emit(CeilingLoadingInitialState());
    try {
-      var response =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus = CeilingSensorModel.fromJson(response.status);
      emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
    } catch (e) {
      emit(CeilingFailedState(error: e.toString()));
-      return;
    }
  }

-  FutureOr<void> _onFactoryReset(
-      CeilingFactoryResetEvent event, Emitter<CeilingSensorState> emit) async {
+  Future<void> _onFactoryReset(
+    CeilingFactoryResetEvent event,
+    Emitter<CeilingSensorState> emit,
+  ) async {
    emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
    try {
      final response = await DevicesManagementApi().factoryReset(
--- a/lib/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart
+++ b/lib/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+
+abstract final class CeilingSensorBlocFactory {
+  const CeilingSensorBlocFactory._();
+
+  static CeilingSensorBloc create({
+    required String deviceId,
+  }) {
+    return CeilingSensorBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart
+++ b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_batch_control.dart
@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
+import 'package:syncrow_web/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_space_type.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart';
@ -23,8 +23,9 @@ class CeilingSensorBatchControlView extends StatelessWidget with HelperResponsiv
    final isLarge = isLargeScreenSize(context);
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
-      create: (context) => CeilingSensorBloc(deviceId: devicesIds.first)
-        ..add(CeilingFetchDeviceStatusEvent(devicesIds)),
+      create: (context) => CeilingSensorBlocFactory.create(
+        deviceId: devicesIds.first,
+      )..add(CeilingFetchDeviceStatusEvent(devicesIds)),
      child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
        builder: (context, state) {
          if (state is CeilingLoadingInitialState || state is CeilingReportsLoadingState) {
@ -110,7 +111,6 @@ class CeilingSensorBatchControlView extends StatelessWidget with HelperResponsiv
                ),
              ),
        ),
-        // FirmwareUpdateWidget(deviceId: devicesIds.first, version: 4),
        FactoryResetWidget(
          callFactoryReset: () {
            context.read<CeilingSensorBloc>().add(
--- a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart
+++ b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart
@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_state.dart';
+import 'package:syncrow_web/pages/device_managment/ceiling_sensor/factories/ceiling_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_space_type.dart';
@ -28,8 +29,9 @@ class CeilingSensorControlsView extends StatelessWidget
    final isLarge = isLargeScreenSize(context);
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
-      create: (context) => CeilingSensorBloc(deviceId: device.uuid ?? '')
-        ..add(CeilingInitialEvent(device.uuid ?? '')),
+      create: (context) => CeilingSensorBlocFactory.create(
+        deviceId: device.uuid ?? '',
+      )..add(CeilingInitialEvent(device.uuid ?? '')),
      child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
        builder: (context, state) {
          if (state is CeilingLoadingInitialState ||
--- a/lib/pages/device_managment/curtain/bloc/curtain_bloc.dart
+++ b/lib/pages/device_managment/curtain/bloc/curtain_bloc.dart
@ -1,17 +1,25 @@
 import 'dart:async';
+
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
  late bool deviceStatus;
  final String deviceId;
-  Timer? _timer;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;

-  CurtainBloc({required this.deviceId}) : super(CurtainInitial()) {
+  CurtainBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(CurtainInitial()) {
    on<CurtainFetchDeviceStatus>(_onFetchDeviceStatus);
    on<CurtainFetchBatchStatus>(_onFetchBatchStatus);
    on<CurtainControl>(_onCurtainControl);
@ -20,32 +28,31 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
    on<StatusUpdated>(_onStatusUpdated);
  }

-  FutureOr<void> _onFetchDeviceStatus(
-      CurtainFetchDeviceStatus event, Emitter<CurtainState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    CurtainFetchDeviceStatus event,
+    Emitter<CurtainState> emit,
+  ) async {
    emit(CurtainStatusLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
      deviceStatus = _checkStatus(status.status[0].value);
-
      emit(CurtainStatusLoaded(deviceStatus));
    } catch (e) {
      emit(CurtainError(e.toString()));
    }
  }

-  void _listenToChanges(String deviceId) {
+  void _listenToChanges(String deviceId, Emitter<CurtainState> emit) {
    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      final stream = ref.onValue;

      stream.listen((DatabaseEvent event) {
        final data = event.snapshot.value as Map<dynamic, dynamic>?;
        if (data == null) return;

-        List<Status> statusList = [];
+        final statusList = <Status>[];
        if (data['status'] != null) {
          for (var element in data['status']) {
            statusList.add(
@ -57,7 +64,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
          }
        }
        if (statusList.isNotEmpty) {
-          bool newStatus = _checkStatus(statusList[0].value);
+          final newStatus = _checkStatus(statusList[0].value);
          if (newStatus != deviceStatus) {
            deviceStatus = newStatus;
            if (!isClosed) {
@ -71,76 +78,32 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
    }
  }

-  void _onStatusUpdated(StatusUpdated event, Emitter<CurtainState> emit) {
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<CurtainState> emit,
+  ) {
    emit(CurtainStatusLoading());
    deviceStatus = event.deviceStatus;
    emit(CurtainStatusLoaded(deviceStatus));
  }

-  FutureOr<void> _onCurtainControl(
-      CurtainControl event, Emitter<CurtainState> emit) async {
-    final oldValue = deviceStatus;
-
+  Future<void> _onCurtainControl(
+    CurtainControl event,
+    Emitter<CurtainState> emit,
+  ) async {
+    emit(CurtainStatusLoading());
    _updateLocalValue(event.value, emit);

-    emit(CurtainStatusLoaded(deviceStatus));
-
-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
-  }
-
-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<CurtainState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
+    try {
+      final controlValue = event.value ? 'open' : 'close';
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: controlValue),
+      );
+    } catch (e) {
+      _updateLocalValue(!event.value, emit);
+      emit(CurtainControlError(e.toString()));
    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        final controlValue = value ? 'open' : 'close';
-
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, controlValue);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: controlValue));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(
-      String deviceId, bool oldValue, Emitter<CurtainState> emit) {
-    _updateLocalValue(oldValue, emit);
-    emit(CurtainStatusLoaded(deviceStatus));
-    emit(const CurtainControlError('Failed to control the device.'));
  }

  void _updateLocalValue(bool value, Emitter<CurtainState> emit) {
@ -152,41 +115,44 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
    return command.toLowerCase() == 'open';
  }

-  FutureOr<void> _onFetchBatchStatus(
-      CurtainFetchBatchStatus event, Emitter<CurtainState> emit) async {
+  Future<void> _onFetchBatchStatus(
+    CurtainFetchBatchStatus event,
+    Emitter<CurtainState> emit,
+  ) async {
    emit(CurtainStatusLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
-
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus = _checkStatus(status.status[0].value);
-
      emit(CurtainStatusLoaded(deviceStatus));
    } catch (e) {
      emit(CurtainError(e.toString()));
    }
  }

-  FutureOr<void> _onCurtainBatchControl(
-      CurtainBatchControl event, Emitter<CurtainState> emit) async {
-    final oldValue = deviceStatus;
-
+  Future<void> _onCurtainBatchControl(
+    CurtainBatchControl event,
+    Emitter<CurtainState> emit,
+  ) async {
+    emit(CurtainStatusLoading());
    _updateLocalValue(event.value, emit);

-    emit(CurtainStatusLoaded(deviceStatus));
-
-    await _runDebounce(
-      deviceId: event.devicesIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
+    try {
+      final controlValue = event.value ? 'open' : 'stop';
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.devicesIds,
+        code: event.code,
+        value: controlValue,
+      );
+    } catch (e) {
+      _updateLocalValue(!event.value, emit);
+      emit(CurtainControlError(e.toString()));
+    }
  }

-  FutureOr<void> _onFactoryReset(
-      CurtainFactoryReset event, Emitter<CurtainState> emit) async {
+  Future<void> _onFactoryReset(
+    CurtainFactoryReset event,
+    Emitter<CurtainState> emit,
+  ) async {
    emit(CurtainStatusLoading());
    try {
      final response = await DevicesManagementApi().factoryReset(
--- a/lib/pages/device_managment/curtain/factories/curtain_bloc_factory.dart
+++ b/lib/pages/device_managment/curtain/factories/curtain_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+
+abstract final class CurtainBlocFactory {
+  const CurtainBlocFactory._();
+
+  static CurtainBloc create({
+    required String deviceId,
+  }) {
+    return CurtainBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart
+++ b/lib/pages/device_managment/curtain/view/curtain_batch_status_view.dart
@ -5,6 +5,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
+import 'package:syncrow_web/pages/device_managment/curtain/factories/curtain_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -18,7 +19,7 @@ class CurtainBatchStatusView extends StatelessWidget with HelperResponsiveLayout
  Widget build(BuildContext context) {
    return BlocProvider(
      create: (context) =>
-          CurtainBloc(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)),
+          CurtainBlocFactory.create(deviceId: devicesIds.first)..add(CurtainFetchBatchStatus(devicesIds)),
      child: BlocBuilder<CurtainBloc, CurtainState>(
        builder: (context, state) {
          if (state is CurtainStatusLoading) {
--- a/lib/pages/device_managment/curtain/view/curtain_status_view.dart
+++ b/lib/pages/device_managment/curtain/view/curtain_status_view.dart
@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/common/curtain_toggle.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_state.dart';
+import 'package:syncrow_web/pages/device_managment/curtain/factories/curtain_bloc_factory.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

 class CurtainStatusControlsView extends StatelessWidget
@ -15,7 +16,7 @@ class CurtainStatusControlsView extends StatelessWidget
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => CurtainBloc(deviceId: deviceId)
+      create: (context) => CurtainBlocFactory.create(deviceId: deviceId)
        ..add(CurtainFetchDeviceStatus(deviceId)),
      child: BlocBuilder<CurtainBloc, CurtainState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/factories/device_bloc_dependencies_factory.dart
+++ b/lib/pages/device_managment/factories/device_bloc_dependencies_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+
+abstract final class DeviceBlocDependenciesFactory {
+  const DeviceBlocDependenciesFactory._();
+
+  static ControlDeviceService createControlDeviceService() {
+    return DebouncedControlDeviceService(
+      decoratee: RemoteControlDeviceService(),
+    );
+  }
+
+  static BatchControlDevicesService createBatchControlDevicesService() {
+    return DebouncedBatchControlDevicesService(
+      decoratee: RemoteBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
@ -1,6 +1,5 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';

 abstract final class FlushMountedPresenceSensorBlocFactory {
  const FlushMountedPresenceSensorBlocFactory._();
@ -10,12 +9,8 @@ abstract final class FlushMountedPresenceSensorBlocFactory {
  }) {
    return FlushMountedPresenceSensorBloc(
      deviceId: deviceId,
-      controlDeviceService: DebouncedControlDeviceService(
-        decoratee: RemoteControlDeviceService(),
-      ),
-      batchControlDevicesService: DebouncedBatchControlDevicesService(
-        decoratee: RemoteBatchControlDevicesService(),
-      ),
+      controlDeviceService: DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService: DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
    );
  }
 }
--- a/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
+++ b/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
@ -360,7 +360,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
          delay: deviceStatus.delay + Duration(minutes: 10));
      emit(GarageDoorLoadedState(status: deviceStatus));
      add(GarageDoorControlEvent(
-          deviceId: event.deviceId,
+          deviceId: deviceId,
          value: deviceStatus.delay.inSeconds,
          code: 'countdown_1'));
    } catch (e) {
--- a/lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart
+++ b/lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart
@ -1,11 +1,13 @@
 import 'dart:async';

-import 'package:bloc/bloc.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:meta/meta.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 part 'one_gang_glass_switch_event.dart';
@ -13,13 +15,16 @@ part 'one_gang_glass_switch_state.dart';

 class OneGangGlassSwitchBloc
    extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
-  OneGangGlassStatusModel deviceStatus;
-  Timer? _timer;
+  late OneGangGlassStatusModel deviceStatus;
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;

-  OneGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = OneGangGlassStatusModel(
-            uuid: deviceId, switch1: false, countDown: 0),
-        super(OneGangGlassSwitchInitial()) {
+  OneGangGlassSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(OneGangGlassSwitchInitial()) {
    on<OneGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
    on<OneGangGlassSwitchControl>(_onControl);
    on<OneGangGlassSwitchBatchControl>(_onBatchControl);
@ -28,160 +33,140 @@ class OneGangGlassSwitchBloc
    on<StatusUpdated>(_onStatusUpdated);
  }

-  Future<void> _onFetchDeviceStatus(OneGangGlassSwitchFetchDeviceEvent event,
-      Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    OneGangGlassSwitchFetchDeviceEvent event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) async {
    emit(OneGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId);
-      deviceStatus =
-          OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
+      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
      emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(OneGangGlassSwitchError(e.toString()));
    }
  }

-  _listenToChanges(deviceId) {
+  void _listenToChanges(
+    String deviceId,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) {
    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      final stream = ref.onValue;

      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;

-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus = OneGangGlassStatusModel.fromJson(
-            usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
+        final statusList = <Status>[];
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          final newStatus = OneGangGlassStatusModel.fromJson(deviceId, statusList);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
+              add(StatusUpdated(deviceStatus));
+            }
+          }
        }
      });
-    } catch (_) {}
+    } catch (e) {
+      emit(OneGangGlassSwitchError('Failed to listen to changes: $e'));
+    }
  }

  void _onStatusUpdated(
-      StatusUpdated event, Emitter<OneGangGlassSwitchState> emit) {
+    StatusUpdated event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) {
+    emit(OneGangGlassSwitchLoading());
    deviceStatus = event.deviceStatus;
    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
  }

-  Future<void> _onControl(OneGangGlassSwitchControl event,
-      Emitter<OneGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onControl(
+    OneGangGlassSwitchControl event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) async {
+    emit(OneGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
-  }
-
-  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event,
-      Emitter<OneGangGlassSwitchState> emit) async {
-    emit(OneGangGlassSwitchLoading());
    try {
-      final response = await DevicesManagementApi()
-          .factoryReset(event.factoryReset, event.deviceId);
-      if (!response) {
-        emit(OneGangGlassSwitchError('Failed to reset device'));
-      } else {
-        emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
-      }
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
      emit(OneGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event,
-      Emitter<OneGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onBatchControl(
+    OneGangGlassSwitchBatchControl event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) async {
+    emit(OneGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(OneGangGlassSwitchError(e.toString()));
+    }
  }

  Future<void> _onFetchBatchStatus(
-      OneGangGlassSwitchFetchBatchStatusEvent event,
-      Emitter<OneGangGlassSwitchState> emit) async {
+    OneGangGlassSwitchFetchBatchStatusEvent event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) async {
    emit(OneGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus = OneGangGlassStatusModel.fromJson(
-          event.deviceIds.first, status.status);
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus =
+          OneGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
      emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(OneGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<OneGangGlassSwitchState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-
-    _timer = Timer(const Duration(milliseconds: 500), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
+  Future<void> _onFactoryReset(
+    OneGangGlassFactoryResetEvent event,
+    Emitter<OneGangGlassSwitchState> emit,
+  ) async {
+    emit(OneGangGlassSwitchLoading());
+    try {
+      final response = await DevicesManagementApi().factoryReset(
+        event.factoryReset,
+        event.deviceId,
+      );
+      if (!response) {
+        emit(OneGangGlassSwitchError('Failed to reset device'));
+      } else {
+        add(OneGangGlassSwitchFetchDeviceEvent(event.deviceId));
      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
-      Emitter<OneGangGlassSwitchState> emit) {
-    _updateLocalValue(code, oldValue);
-    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
+    } catch (e) {
+      emit(OneGangGlassSwitchError(e.toString()));
+    }
  }

  void _updateLocalValue(String code, bool value) {
@ -189,19 +174,4 @@ class OneGangGlassSwitchBloc
      deviceStatus = deviceStatus.copyWith(switch1: value);
    }
  }
-
-  bool _getValueByCode(String code) {
-    switch (code) {
-      case 'switch_1':
-        return deviceStatus.switch1;
-      default:
-        return false;
-    }
-  }
-
-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
 }
--- a/lib/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart
+++ b/lib/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
+
+abstract final class OneGangGlassSwitchBlocFactory {
+  const OneGangGlassSwitchBlocFactory._();
+
+  static OneGangGlassSwitchBloc create({
+    required String deviceId,
+  }) {
+    return OneGangGlassSwitchBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart
+++ b/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_batch_control_view.dart
@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -16,7 +16,7 @@ class OneGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => OneGangGlassSwitchBloc(deviceId: deviceIds.first)
+      create: (context) => OneGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
        ..add(OneGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
      child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_switch_control_view.dart
+++ b/lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_switch_control_view.dart
@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@ -9,13 +10,13 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
  final String deviceId;

-  const OneGangGlassSwitchControlView({required this.deviceId, Key? key}) : super(key: key);
+  const OneGangGlassSwitchControlView({required this.deviceId, super.key});

  @override
  Widget build(BuildContext context) {
    return BlocProvider(
      create: (context) =>
-          OneGangGlassSwitchBloc(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
+          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
      child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
        builder: (context, state) {
          if (state is OneGangGlassSwitchLoading) {
--- a/lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart
+++ b/lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart
@ -6,12 +6,21 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sta
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

-class WallLightSwitchBloc
-    extends Bloc<WallLightSwitchEvent, WallLightSwitchState> {
-  WallLightSwitchBloc({required this.deviceId})
-      : super(WallLightSwitchInitial()) {
+class WallLightSwitchBloc extends Bloc<WallLightSwitchEvent, WallLightSwitchState> {
+  late WallLightStatusModel deviceStatus;
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
+
+  WallLightSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(WallLightSwitchInitial()) {
    on<WallLightSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
    on<WallLightSwitchControl>(_onControl);
    on<WallLightSwitchFetchBatchEvent>(_onFetchBatchStatus);
@ -20,143 +29,114 @@ class WallLightSwitchBloc
    on<StatusUpdated>(_onStatusUpdated);
  }

-  late WallLightStatusModel deviceStatus;
-  final String deviceId;
-  Timer? _timer;
-
-  FutureOr<void> _onFetchDeviceStatus(WallLightSwitchFetchDeviceEvent event,
-      Emitter<WallLightSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    WallLightSwitchFetchDeviceEvent event,
+    Emitter<WallLightSwitchState> emit,
+  ) async {
    emit(WallLightSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-
-      deviceStatus =
-          WallLightStatusModel.fromJson(event.deviceId, status.status);
-      _listenToChanges(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
+      deviceStatus = WallLightStatusModel.fromJson(event.deviceId, status.status);
      emit(WallLightSwitchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(WallLightSwitchError(e.toString()));
    }
  }

-  _listenToChanges(deviceId) {
+  void _listenToChanges(
+    String deviceId,
+    Emitter<WallLightSwitchState> emit,
+  ) {
    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      final stream = ref.onValue;

      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;

-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            WallLightStatusModel.fromJson(usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
+        final statusList = <Status>[];
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          final newStatus = WallLightStatusModel.fromJson(deviceId, statusList);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
+              add(StatusUpdated(deviceStatus));
+            }
+          }
        }
      });
-    } catch (_) {}
+    } catch (e) {
+      emit(WallLightSwitchError('Failed to listen to changes: $e'));
+    }
  }

  void _onStatusUpdated(
-      StatusUpdated event, Emitter<WallLightSwitchState> emit) {
+    StatusUpdated event,
+    Emitter<WallLightSwitchState> emit,
+  ) {
+    emit(WallLightSwitchLoading());
    deviceStatus = event.deviceStatus;
    emit(WallLightSwitchStatusLoaded(deviceStatus));
  }

-  FutureOr<void> _onControl(
-      WallLightSwitchControl event, Emitter<WallLightSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onControl(
+    WallLightSwitchControl event,
+    Emitter<WallLightSwitchState> emit,
+  ) async {
+    emit(WallLightSwitchLoading());
    _updateLocalValue(event.code, event.value);
-
    emit(WallLightSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(WallLightSwitchError(e.toString()));
+    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<WallLightSwitchState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-
-    _timer = Timer(const Duration(milliseconds: 500), () async {
-      try {
-        late bool response;
-
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
-      Emitter<WallLightSwitchState> emit) {
-    _updateLocalValue(code, oldValue);
+  Future<void> _onBatchControl(
+    WallLightSwitchBatchControl event,
+    Emitter<WallLightSwitchState> emit,
+  ) async {
+    emit(WallLightSwitchLoading());
+    _updateLocalValue(event.code, event.value);
    emit(WallLightSwitchStatusLoaded(deviceStatus));
-  }

-  void _updateLocalValue(String code, bool value) {
-    if (code == 'switch_1') {
-      deviceStatus = deviceStatus.copyWith(switch1: value);
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.devicesIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(WallLightSwitchError(e.toString()));
    }
  }

-  bool _getValueByCode(String code) {
-    switch (code) {
-      case 'switch_1':
-        return deviceStatus.switch1;
-      default:
-        return false;
-    }
-  }
-
-  Future<void> _onFetchBatchStatus(WallLightSwitchFetchBatchEvent event,
-      Emitter<WallLightSwitchState> emit) async {
+  Future<void> _onFetchBatchStatus(
+    WallLightSwitchFetchBatchEvent event,
+    Emitter<WallLightSwitchState> emit,
+  ) async {
    emit(WallLightSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus =
          WallLightStatusModel.fromJson(event.devicesIds.first, status.status);
      emit(WallLightSwitchStatusLoaded(deviceStatus));
@ -165,32 +145,10 @@ class WallLightSwitchBloc
    }
  }

-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
-
-  FutureOr<void> _onBatchControl(WallLightSwitchBatchControl event,
-      Emitter<WallLightSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
-    _updateLocalValue(event.code, event.value);
-
-    emit(WallLightSwitchStatusLoaded(deviceStatus));
-
-    await _runDebounce(
-      deviceId: event.devicesIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
-  }
-
-  FutureOr<void> _onFactoryReset(
-      WallLightFactoryReset event, Emitter<WallLightSwitchState> emit) async {
+  Future<void> _onFactoryReset(
+    WallLightFactoryReset event,
+    Emitter<WallLightSwitchState> emit,
+  ) async {
    emit(WallLightSwitchLoading());
    try {
      final response = await DevicesManagementApi().factoryReset(
@ -198,12 +156,18 @@ class WallLightSwitchBloc
        event.deviceId,
      );
      if (!response) {
-        emit(WallLightSwitchError('Failed'));
+        emit(WallLightSwitchError('Failed to reset device'));
      } else {
-        emit(WallLightSwitchStatusLoaded(deviceStatus));
+        add(WallLightSwitchFetchDeviceEvent(event.deviceId));
      }
    } catch (e) {
      emit(WallLightSwitchError(e.toString()));
    }
  }
+
+  void _updateLocalValue(String code, bool value) {
+    if (code == 'switch_1') {
+      deviceStatus = deviceStatus.copyWith(switch1: value);
+    }
+  }
 }
--- a/lib/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart
+++ b/lib/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
+
+abstract final class WallLightSwitchBlocFactory {
+  const WallLightSwitchBlocFactory._();
+
+  static WallLightSwitchBloc create({
+    required String deviceId,
+  }) {
+    return WallLightSwitchBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart
+++ b/lib/pages/device_managment/one_gang_switch/view/wall_light_batch_control.dart
@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
+import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -18,7 +18,7 @@ class WallLightBatchControlView extends StatelessWidget with HelperResponsiveLay
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => WallLightSwitchBloc(deviceId: deviceIds.first)
+      create: (context) => WallLightSwitchBlocFactory.create(deviceId: deviceIds.first)
        ..add(WallLightSwitchFetchBatchEvent(deviceIds)),
      child: BlocBuilder<WallLightSwitchBloc, WallLightSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/one_gang_switch/view/wall_light_device_control.dart
+++ b/lib/pages/device_managment/one_gang_switch/view/wall_light_device_control.dart
@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
+import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -15,7 +16,7 @@ class WallLightDeviceControl extends StatelessWidget
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => WallLightSwitchBloc(deviceId: deviceId)
+      create: (context) => WallLightSwitchBlocFactory.create(deviceId: deviceId)
        ..add(WallLightSwitchFetchDeviceEvent(deviceId)),
      child: BlocBuilder<WallLightSwitchBloc, WallLightSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/shared/device_control_dialog.dart
+++ b/lib/pages/device_managment/shared/device_control_dialog.dart
@ -157,7 +157,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
            ),
          ),
          const SizedBox(width: 10),
-          Text(
+          SelectableText(
            value,
            style: TextStyle(
              fontSize: 16,
--- a/lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart
+++ b/lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart
@ -1,11 +1,14 @@
 import 'dart:async';

-import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:meta/meta.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/models/three_gang_glass_switch.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 part 'three_gang_glass_switch_event.dart';
@ -13,19 +16,16 @@ part 'three_gang_glass_switch_state.dart';

 class ThreeGangGlassSwitchBloc
    extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
-  ThreeGangGlassStatusModel deviceStatus;
-  Timer? _timer;
+  late ThreeGangGlassStatusModel deviceStatus;
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;

-  ThreeGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = ThreeGangGlassStatusModel(
-            uuid: deviceId,
-            switch1: false,
-            countDown1: 0,
-            switch2: false,
-            countDown2: 0,
-            switch3: false,
-            countDown3: 0),
-        super(ThreeGangGlassSwitchInitial()) {
+  ThreeGangGlassSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(ThreeGangGlassSwitchInitial()) {
    on<ThreeGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
    on<ThreeGangGlassSwitchControl>(_onControl);
    on<ThreeGangGlassSwitchBatchControl>(_onBatchControl);
@ -34,188 +34,154 @@ class ThreeGangGlassSwitchBloc
    on<StatusUpdated>(_onStatusUpdated);
  }

-  Future<void> _onFetchDeviceStatus(ThreeGangGlassSwitchFetchDeviceEvent event,
-      Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    ThreeGangGlassSwitchFetchDeviceEvent event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) async {
    emit(ThreeGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
      deviceStatus =
          ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
-      _listenToChanges(event.deviceId);
      emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(ThreeGangGlassSwitchError(e.toString()));
    }
  }

-  _listenToChanges(deviceId) {
+  void _listenToChanges(
+    String deviceId,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) {
    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      final stream = ref.onValue;

      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;

-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus = ThreeGangGlassStatusModel.fromJson(
-            usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
+        final statusList = <Status>[];
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          final newStatus = ThreeGangGlassStatusModel.fromJson(deviceId, statusList);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
+              add(StatusUpdated(deviceStatus));
+            }
+          }
        }
      });
-    } catch (_) {}
+    } catch (e) {
+      emit(ThreeGangGlassSwitchError('Failed to listen to changes: $e'));
+    }
  }

  void _onStatusUpdated(
-      StatusUpdated event, Emitter<ThreeGangGlassSwitchState> emit) {
+    StatusUpdated event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) {
+    emit(ThreeGangGlassSwitchLoading());
    deviceStatus = event.deviceStatus;
    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
  }

-  Future<void> _onControl(ThreeGangGlassSwitchControl event,
-      Emitter<ThreeGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onControl(
+    ThreeGangGlassSwitchControl event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) async {
+    emit(ThreeGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(ThreeGangGlassSwitchError(e.toString()));
+    }
  }

-  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event,
-      Emitter<ThreeGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onBatchControl(
+    ThreeGangGlassSwitchBatchControl event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) async {
+    emit(ThreeGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(ThreeGangGlassSwitchError(e.toString()));
+    }
  }

  Future<void> _onFetchBatchStatus(
-      ThreeGangGlassSwitchFetchBatchStatusEvent event,
-      Emitter<ThreeGangGlassSwitchState> emit) async {
+    ThreeGangGlassSwitchFetchBatchStatusEvent event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) async {
    emit(ThreeGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(
-          event.deviceIds.first, status.status);
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus =
+          ThreeGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
      emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(ThreeGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event,
-      Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onFactoryReset(
+    ThreeGangGlassFactoryReset event,
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) async {
    emit(ThreeGangGlassSwitchLoading());
    try {
-      final response = await DevicesManagementApi()
-          .factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi().factoryReset(
+        event.factoryReset,
+        event.deviceId,
+      );
      if (!response) {
-        emit(ThreeGangGlassSwitchError('Failed'));
+        emit(ThreeGangGlassSwitchError('Failed to reset device'));
      } else {
-        emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
+        add(ThreeGangGlassSwitchFetchDeviceEvent(event.deviceId));
      }
    } catch (e) {
      emit(ThreeGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<ThreeGangGlassSwitchState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-
-    _timer = Timer(const Duration(milliseconds: 500), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
-      Emitter<ThreeGangGlassSwitchState> emit) {
-    _updateLocalValue(code, oldValue);
-    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
-  }
-
  void _updateLocalValue(String code, bool value) {
-    if (code == 'switch_1') {
-      deviceStatus = deviceStatus.copyWith(switch1: value);
-    } else if (code == 'switch_2') {
-      deviceStatus = deviceStatus.copyWith(switch2: value);
-    } else if (code == 'switch_3') {
-      deviceStatus = deviceStatus.copyWith(switch3: value);
-    }
-  }
-
-  bool _getValueByCode(String code) {
    switch (code) {
      case 'switch_1':
-        return deviceStatus.switch1;
+        deviceStatus = deviceStatus.copyWith(switch1: value);
+        break;
      case 'switch_2':
-        return deviceStatus.switch2;
+        deviceStatus = deviceStatus.copyWith(switch2: value);
+        break;
      case 'switch_3':
-        return deviceStatus.switch3;
-      default:
-        return false;
+        deviceStatus = deviceStatus.copyWith(switch3: value);
+        break;
    }
  }
-
-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
 }
--- a/lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_event.dart
+++ b/lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_event.dart
@ -1,7 +1,10 @@
 part of 'three_gang_glass_switch_bloc.dart';

@immutable
-abstract class ThreeGangGlassSwitchEvent {}
+abstract class ThreeGangGlassSwitchEvent extends Equatable {
+  @override
+  List<Object?> get props => [];
+}

 class ThreeGangGlassSwitchFetchDeviceEvent extends ThreeGangGlassSwitchEvent {
  final String deviceId;
@ -19,6 +22,9 @@ class ThreeGangGlassSwitchControl extends ThreeGangGlassSwitchEvent {
    required this.code,
    required this.value,
  });
+
+  @override
+  List<Object?> get props => [deviceId, code, value];
 }

 class ThreeGangGlassSwitchBatchControl extends ThreeGangGlassSwitchEvent {
@ -31,6 +37,9 @@ class ThreeGangGlassSwitchBatchControl extends ThreeGangGlassSwitchEvent {
    required this.code,
    required this.value,
  });
+
+  @override
+  List<Object?> get props => [deviceIds, code, value];
 }

 class ThreeGangGlassSwitchFetchBatchStatusEvent
@ -38,6 +47,9 @@ class ThreeGangGlassSwitchFetchBatchStatusEvent
  final List<String> deviceIds;

  ThreeGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
+
+  @override
+  List<Object?> get props => [deviceIds];
 }

 class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
@ -48,6 +60,9 @@ class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
    required this.deviceId,
    required this.factoryReset,
  });
+
+  @override
+  List<Object?> get props => [deviceId, factoryReset];
 }

 class StatusUpdated extends ThreeGangGlassSwitchEvent {
--- a/lib/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart
+++ b/lib/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
+
+abstract final class ThreeGangGlassSwitchBlocFactory {
+  const ThreeGangGlassSwitchBlocFactory._();
+
+  static ThreeGangGlassSwitchBloc create({
+    required String deviceId,
+  }) {
+    return ThreeGangGlassSwitchBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart
+++ b/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_batch_control_view.dart
@ -5,6 +5,7 @@ import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/models/three_gang_glass_switch.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -16,7 +17,7 @@ class ThreeGangGlassSwitchBatchControlView extends StatelessWidget with HelperRe
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => ThreeGangGlassSwitchBloc(deviceId: deviceIds.first)
+      create: (context) => ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
        ..add(ThreeGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
      child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart
+++ b/lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -16,7 +17,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
  Widget build(BuildContext context) {
    return BlocProvider(
      create: (context) =>
-          ThreeGangGlassSwitchBloc(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
+          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
      child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
        builder: (context, state) {
          if (state is ThreeGangGlassSwitchLoading) {
--- a/lib/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart
+++ b/lib/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart
@ -1,12 +1,14 @@
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-
 import 'dart:async';
-import 'package:bloc/bloc.dart';
+import 'dart:developer';
+
 import 'package:equatable/equatable.dart';
 import 'package:firebase_database/firebase_database.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 part 'living_room_event.dart';
@ -15,9 +17,14 @@ part 'living_room_state.dart';
 class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
  late LivingRoomStatusModel deviceStatus;
  final String deviceId;
-  Timer? _timer;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;

-  LivingRoomBloc({required this.deviceId}) : super(LivingRoomInitial()) {
+  LivingRoomBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(LivingRoomInitial()) {
    on<LivingRoomFetchDeviceStatusEvent>(_onFetchDeviceStatus);
    on<LivingRoomControl>(_livingRoomControl);
    on<LivingRoomBatchControl>(_livingRoomBatchControl);
@ -26,156 +33,108 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
    on<StatusUpdated>(_onStatusUpdated);
  }

-  FutureOr<void> _onFetchDeviceStatus(LivingRoomFetchDeviceStatusEvent event,
-      Emitter<LivingRoomState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    LivingRoomFetchDeviceStatusEvent event,
+    Emitter<LivingRoomState> emit,
+  ) async {
    emit(LivingRoomDeviceStatusLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus =
-          LivingRoomStatusModel.fromJson(event.deviceId, status.status);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
      _listenToChanges(deviceId);
+      deviceStatus = LivingRoomStatusModel.fromJson(event.deviceId, status.status);
      emit(LivingRoomDeviceStatusLoaded(deviceStatus));
    } catch (e) {
      emit(LivingRoomDeviceManagementError(e.toString()));
    }
  }

-  FutureOr<void> _livingRoomControl(
-      LivingRoomControl event, Emitter<LivingRoomState> emit) async {
-    final oldValue = _getValueByCode(event.code);
+  void _listenToChanges(String deviceId) {
+    try {
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;

+        List<Status> statusList = [];
+        eventsMap['status'].forEach((element) {
+          statusList.add(
+            Status(code: element['code'], value: element['value']),
+          );
+        });
+
+        deviceStatus = LivingRoomStatusModel.fromJson(deviceId, statusList);
+        add(StatusUpdated(deviceStatus));
+      });
+    } catch (_) {
+      log('Error listening to changes');
+    }
+  }
+
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<LivingRoomState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+  }
+
+  Future<void> _livingRoomControl(
+    LivingRoomControl event,
+    Emitter<LivingRoomState> emit,
+  ) async {
+    emit(LivingRoomDeviceStatusLoading());
    _updateLocalValue(event.code, event.value);
-
    emit(LivingRoomDeviceStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(LivingRoomDeviceManagementError(e.toString()));
+    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required dynamic value,
-    required dynamic oldValue,
-    required Emitter<LivingRoomState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
-      Emitter<LivingRoomState> emit) {
-    _updateLocalValue(code, oldValue);
+  Future<void> _livingRoomBatchControl(
+    LivingRoomBatchControl event,
+    Emitter<LivingRoomState> emit,
+  ) async {
+    emit(LivingRoomDeviceStatusLoading());
+    _updateLocalValue(event.code, event.value);
    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
-  }

-  void _updateLocalValue(String code, dynamic value) {
-    switch (code) {
-      case 'switch_1':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(switch1: value);
-        }
-        break;
-      case 'switch_2':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(switch2: value);
-        }
-        break;
-      case 'switch_3':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(switch3: value);
-        }
-        break;
-      default:
-        break;
-    }
-    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
-  }
-
-  dynamic _getValueByCode(String code) {
-    switch (code) {
-      case 'switch_1':
-        return deviceStatus.switch1;
-      case 'switch_2':
-        return deviceStatus.switch2;
-      case 'switch_3':
-        return deviceStatus.switch3;
-      default:
-        return null;
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.devicesIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(LivingRoomDeviceManagementError(e.toString()));
    }
  }

-  FutureOr<void> _livingRoomFetchBatchControl(
-      LivingRoomFetchBatchEvent event, Emitter<LivingRoomState> emit) async {
+  Future<void> _livingRoomFetchBatchControl(
+    LivingRoomFetchBatchEvent event,
+    Emitter<LivingRoomState> emit,
+  ) async {
    emit(LivingRoomDeviceStatusLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus =
          LivingRoomStatusModel.fromJson(event.devicesIds.first, status.status);
-      // for (var deviceId in event.devicesIds) {
-      //   _listenToChanges(deviceId);
-      // }
      emit(LivingRoomDeviceStatusLoaded(deviceStatus));
    } catch (e) {
      emit(LivingRoomDeviceManagementError(e.toString()));
    }
  }

-  FutureOr<void> _livingRoomBatchControl(
-      LivingRoomBatchControl event, Emitter<LivingRoomState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
-    _updateLocalValue(event.code, event.value);
-
-    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
-
-    await _runDebounce(
-      deviceId: event.devicesIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
-  }
-
-  FutureOr<void> _livingRoomFactoryReset(
-      LivingRoomFactoryResetEvent event, Emitter<LivingRoomState> emit) async {
+  Future<void> _livingRoomFactoryReset(
+    LivingRoomFactoryResetEvent event,
+    Emitter<LivingRoomState> emit,
+  ) async {
    emit(LivingRoomDeviceStatusLoading());
    try {
      final response = await DevicesManagementApi().factoryReset(
@ -183,42 +142,28 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
        event.uuid,
      );
      if (!response) {
-        emit(const LivingRoomDeviceManagementError('Failed'));
+        emit(const LivingRoomDeviceManagementError('Failed to reset device'));
      } else {
-        emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+        add(LivingRoomFetchDeviceStatusEvent(event.uuid));
      }
    } catch (e) {
      emit(LivingRoomDeviceManagementError(e.toString()));
    }
  }

-  _listenToChanges(deviceId) {
-    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+  void _updateLocalValue(String code, dynamic value) {
+    if (value is! bool) return;

-      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
-
-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            LivingRoomStatusModel.fromJson(usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
-        }
-      });
-    } catch (_) {}
-  }
-
-  void _onStatusUpdated(StatusUpdated event, Emitter<LivingRoomState> emit) {
-    deviceStatus = event.deviceStatus;
-    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+    switch (code) {
+      case 'switch_1':
+        deviceStatus = deviceStatus.copyWith(switch1: value);
+        break;
+      case 'switch_2':
+        deviceStatus = deviceStatus.copyWith(switch2: value);
+        break;
+      case 'switch_3':
+        deviceStatus = deviceStatus.copyWith(switch3: value);
+        break;
+    }
  }
 }
--- a/lib/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart
+++ b/lib/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
+
+abstract final class LivingRoomBlocFactory {
+  const LivingRoomBlocFactory._();
+
+  static LivingRoomBloc create({
+    required String deviceId,
+  }) {
+    return LivingRoomBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart
+++ b/lib/pages/device_managment/three_gang_switch/view/living_room_batch_controls.dart
@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -17,7 +18,7 @@ class LivingRoomBatchControlsView extends StatelessWidget with HelperResponsiveL
  Widget build(BuildContext context) {
    return BlocProvider(
      create: (context) =>
-          LivingRoomBloc(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)),
+          LivingRoomBlocFactory.create(deviceId: deviceIds.first)..add(LivingRoomFetchBatchEvent(deviceIds)),
      child: BlocBuilder<LivingRoomBloc, LivingRoomState>(
        builder: (context, state) {
          if (state is LivingRoomDeviceStatusLoading) {
--- a/lib/pages/device_managment/three_gang_switch/view/living_room_device_control.dart
+++ b/lib/pages/device_managment/three_gang_switch/view/living_room_device_control.dart
@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -14,7 +15,7 @@ class LivingRoomDeviceControlsView extends StatelessWidget
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => LivingRoomBloc(deviceId: deviceId)
+      create: (context) => LivingRoomBlocFactory.create(deviceId: deviceId)
        ..add(LivingRoomFetchDeviceStatusEvent(deviceId)),
      child: BlocBuilder<LivingRoomBloc, LivingRoomState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart
+++ b/lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart
@ -1,26 +1,33 @@
 import 'dart:async';
+import 'dart:developer';
+
 import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
 import 'package:firebase_database/firebase_database.dart';
-import 'package:meta/meta.dart';
+import 'package:flutter/foundation.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
+
 part 'two_gang_glass_switch_event.dart';
 part 'two_gang_glass_switch_state.dart';

 class TwoGangGlassSwitchBloc
    extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
-  TwoGangGlassStatusModel deviceStatus;
-  Timer? _timer;
-  TwoGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = TwoGangGlassStatusModel(
-            uuid: deviceId,
-            switch1: false,
-            countDown1: 0,
-            switch2: false,
-            countDown2: 0),
-        super(TwoGangGlassSwitchInitial()) {
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
+
+  late TwoGangGlassStatusModel deviceStatus;
+
+  TwoGangGlassSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(TwoGangGlassSwitchInitial()) {
    on<TwoGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
    on<TwoGangGlassSwitchControl>(_onControl);
    on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
@ -29,14 +36,14 @@ class TwoGangGlassSwitchBloc
    on<StatusUpdated>(_onStatusUpdated);
  }

-  Future<void> _onFetchDeviceStatus(TwoGangGlassSwitchFetchDeviceEvent event,
-      Emitter<TwoGangGlassSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    TwoGangGlassSwitchFetchDeviceEvent event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
    emit(TwoGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus =
-          TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus = TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
      _listenToChanges(event.deviceId);
      emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
    } catch (e) {
@ -46,200 +53,121 @@ class TwoGangGlassSwitchBloc

  void _listenToChanges(String deviceId) {
    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      ref.onValue.listen((DatabaseEvent event) {
-        if (event.snapshot.value == null) return;
+      final ref = FirebaseDatabase.instance.ref(
+        'device-status/$deviceId',
+      );
+
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;

-        Map<dynamic, dynamic> data =
-            event.snapshot.value as Map<dynamic, dynamic>;
        List<Status> statusList = [];
-
-        data['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
+        eventsMap['status'].forEach((element) {
+          statusList.add(Status(code: element['code'], value: element['value']));
        });

-        // Parse the new status and add the event
-        final updatedStatus =
-            TwoGangGlassStatusModel.fromJson(data['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(updatedStatus));
-        }
+        deviceStatus = TwoGangGlassStatusModel.fromJson(deviceId, statusList);
+        add(StatusUpdated(deviceStatus));
      });
-    } catch (e) {
-      // Handle errors and emit an error state if necessary
-      if (!isClosed) {
-        // add(TwoGangGlassSwitchError('Error listening to updates: $e'));
-      }
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'TwoGangGlassSwitchBloc._listenToChanges',
+      );
    }
  }

-  Future<void> _onControl(TwoGangGlassSwitchControl event,
-      Emitter<TwoGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onControl(
+    TwoGangGlassSwitchControl event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangGlassSwitchError(e.toString()));
+    }
  }

-  Future<void> _onBatchControl(TwoGangGlassSwitchBatchControl event,
-      Emitter<TwoGangGlassSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
+  Future<void> _onBatchControl(
+    TwoGangGlassSwitchBatchControl event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
    _updateLocalValue(event.code, event.value);
    emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangGlassSwitchError(e.toString()));
+    }
  }

  Future<void> _onFetchBatchStatus(
-      TwoGangGlassSwitchFetchBatchStatusEvent event,
-      Emitter<TwoGangGlassSwitchState> emit) async {
+    TwoGangGlassSwitchFetchBatchStatusEvent event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
    emit(TwoGangGlassSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
      deviceStatus = TwoGangGlassStatusModel.fromJson(
-          event.deviceIds.first, status.status);
+        event.deviceIds.first,
+        status.status,
+      );
      emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(TwoGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _onFactoryReset(TwoGangGlassFactoryReset event,
-      Emitter<TwoGangGlassSwitchState> emit) async {
+  Future<void> _onFactoryReset(
+    TwoGangGlassFactoryReset event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
    emit(TwoGangGlassSwitchLoading());
    try {
-      final response = await DevicesManagementApi()
-          .factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi().factoryReset(
+        event.factoryReset,
+        event.deviceId,
+      );
      if (!response) {
-        emit(TwoGangGlassSwitchError('Failed'));
+        emit(TwoGangGlassSwitchError('Failed to reset device'));
      } else {
-        emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+        add(TwoGangGlassSwitchFetchDeviceEvent(event.deviceId));
      }
    } catch (e) {
      emit(TwoGangGlassSwitchError(e.toString()));
    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<TwoGangGlassSwitchState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-
-    _timer = Timer(const Duration(milliseconds: 500), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
-      Emitter<TwoGangGlassSwitchState> emit) {
-    _updateLocalValue(code, oldValue);
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
  }

  void _updateLocalValue(String code, bool value) {
-    if (code == 'switch_1') {
-      deviceStatus = deviceStatus.copyWith(switch1: value);
-    } else if (code == 'switch_2') {
-      deviceStatus = deviceStatus.copyWith(switch2: value);
-    }
-  }
-
-  bool _getValueByCode(String code) {
    switch (code) {
      case 'switch_1':
-        return deviceStatus.switch1;
+        deviceStatus = deviceStatus.copyWith(switch1: value);
+        break;
      case 'switch_2':
-        return deviceStatus.switch2;
-      default:
-        return false;
+        deviceStatus = deviceStatus.copyWith(switch2: value);
+        break;
    }
  }
-
-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
-
-  // _listenToChanges(deviceId) {
-  //   try {
-  //     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>;
-
-  //       List<Status> statusList = [];
-  //       usersMap['status'].forEach((element) {
-  //         statusList
-  //             .add(Status(code: element['code'], value: element['value']));
-  //       });
-
-  //       deviceStatus = TwoGangGlassStatusModel.fromJson(
-  //           usersMap['productUuid'], statusList);
-  //       if (!isClosed) {
-  //         add(StatusUpdated(deviceStatus));
-  //       }
-  //     });
-  //   } catch (_) {}
-  // }
-
-  void _onStatusUpdated(
-      StatusUpdated event, Emitter<TwoGangGlassSwitchState> emit) {
-    // Update the local deviceStatus with the new status from the event
-    deviceStatus = event.deviceStatus;
-    // Emit the new state with the updated status
-    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
-  }
 }
--- a/lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_event.dart
+++ b/lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_event.dart
@ -1,12 +1,17 @@
 part of 'two_gang_glass_switch_bloc.dart';

@immutable
-abstract class TwoGangGlassSwitchEvent {}
+abstract class TwoGangGlassSwitchEvent extends Equatable {
+  const TwoGangGlassSwitchEvent();
+}

 class TwoGangGlassSwitchFetchDeviceEvent extends TwoGangGlassSwitchEvent {
  final String deviceId;

-  TwoGangGlassSwitchFetchDeviceEvent(this.deviceId);
+  const TwoGangGlassSwitchFetchDeviceEvent(this.deviceId);
+
+  @override
+  List<Object> get props => [deviceId];
 }

 class TwoGangGlassSwitchControl extends TwoGangGlassSwitchEvent {
@ -14,11 +19,14 @@ class TwoGangGlassSwitchControl extends TwoGangGlassSwitchEvent {
  final String code;
  final bool value;

-  TwoGangGlassSwitchControl({
+  const TwoGangGlassSwitchControl({
    required this.deviceId,
    required this.code,
    required this.value,
  });
+
+  @override
+  List<Object> get props => [deviceId, code, value];
 }

 class TwoGangGlassSwitchBatchControl extends TwoGangGlassSwitchEvent {
@ -26,33 +34,43 @@ class TwoGangGlassSwitchBatchControl extends TwoGangGlassSwitchEvent {
  final String code;
  final bool value;

-  TwoGangGlassSwitchBatchControl({
+  const TwoGangGlassSwitchBatchControl({
    required this.deviceIds,
    required this.code,
    required this.value,
  });
+
+  @override
+  List<Object> get props => [deviceIds, code, value];
 }

 class TwoGangGlassSwitchFetchBatchStatusEvent extends TwoGangGlassSwitchEvent {
  final List<String> deviceIds;

-  TwoGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
+  const TwoGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
+
+  @override
+  List<Object> get props => [deviceIds];
 }

 class TwoGangGlassFactoryReset extends TwoGangGlassSwitchEvent {
  final String deviceId;
  final FactoryResetModel factoryReset;

-  TwoGangGlassFactoryReset({
+  const TwoGangGlassFactoryReset({
    required this.deviceId,
    required this.factoryReset,
  });
+
+  @override
+  List<Object> get props => [deviceId, factoryReset];
 }

 class StatusUpdated extends TwoGangGlassSwitchEvent {
  final TwoGangGlassStatusModel deviceStatus;
-  StatusUpdated(this.deviceStatus);
+
+  const StatusUpdated(this.deviceStatus);
+
  @override
  List<Object> get props => [deviceStatus];
 }
-
--- a/lib/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart
+++ b/lib/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
+
+abstract final class TwoGangGlassSwitchBlocFactory {
+  const TwoGangGlassSwitchBlocFactory._();
+
+  static TwoGangGlassSwitchBloc create({
+    required String deviceId,
+  }) {
+    return TwoGangGlassSwitchBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart
+++ b/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_batch_control_view.dart
@ -5,6 +5,7 @@ import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_
 // import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -16,7 +17,7 @@ class TwoGangGlassSwitchBatchControlView extends StatelessWidget with HelperResp
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceIds.first)
+      create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceIds.first)
        ..add(TwoGangGlassSwitchFetchBatchStatusEvent(deviceIds)),
      child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart
+++ b/lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -15,7 +16,7 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-        create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceId)
+        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
        child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
          builder: (context, state) {
--- a/lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart
+++ b/lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart
@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:developer';

 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@ -6,10 +7,22 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sta
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
-  TwoGangSwitchBloc({required this.deviceId}) : super(TwoGangSwitchInitial()) {
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
+
+  late TwoGangStatusModel deviceStatus;
+
+  TwoGangSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(TwoGangSwitchInitial()) {
    on<TwoGangSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
    on<TwoGangSwitchControl>(_onControl);
    on<TwoGangSwitchFetchBatchEvent>(_onFetchBatchStatus);
@ -18,16 +31,13 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
    on<StatusUpdated>(_onStatusUpdated);
  }

-  late TwoGangStatusModel deviceStatus;
-  final String deviceId;
-  Timer? _timer;
-
-  FutureOr<void> _onFetchDeviceStatus(TwoGangSwitchFetchDeviceEvent event,
-      Emitter<TwoGangSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(
+    TwoGangSwitchFetchDeviceEvent event,
+    Emitter<TwoGangSwitchState> emit,
+  ) async {
    emit(TwoGangSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
      deviceStatus = TwoGangStatusModel.fromJson(event.deviceId, status.status);
      _listenToChanges(event.deviceId);
      emit(TwoGangSwitchStatusLoaded(deviceStatus));
@ -36,131 +46,91 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
    }
  }

-  FutureOr<void> _onControl(
-      TwoGangSwitchControl event, Emitter<TwoGangSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
+  void _listenToChanges(String deviceId) {
+    try {
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');

+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        eventsMap['status'].forEach((element) {
+          statusList.add(
+            Status(code: element['code'], value: element['value']),
+          );
+        });
+
+        deviceStatus = TwoGangStatusModel.fromJson(deviceId, statusList);
+        add(StatusUpdated(deviceStatus));
+      });
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'TwoGangSwitchBloc._listenToChanges',
+      );
+    }
+  }
+
+  Future<void> _onControl(
+    TwoGangSwitchControl event,
+    Emitter<TwoGangSwitchState> emit,
+  ) async {
+    emit(TwoGangSwitchLoading());
    _updateLocalValue(event.code, event.value);
-
    emit(TwoGangSwitchStatusLoaded(deviceStatus));

-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: false,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangSwitchError(e.toString()));
+    }
  }

-  Future<void> _runDebounce({
-    required dynamic deviceId,
-    required String code,
-    required bool value,
-    required bool oldValue,
-    required Emitter<TwoGangSwitchState> emit,
-    required bool isBatch,
-  }) async {
-    late String id;
-
-    if (deviceId is List) {
-      id = deviceId.first;
-    } else {
-      id = deviceId;
-    }
-
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-
-    _timer = Timer(const Duration(milliseconds: 500), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          _revertValueAndEmit(id, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(id, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
-      Emitter<TwoGangSwitchState> emit) {
-    _updateLocalValue(code, oldValue);
+  Future<void> _onBatchControl(
+    TwoGangSwitchBatchControl event,
+    Emitter<TwoGangSwitchState> emit,
+  ) async {
+    emit(TwoGangSwitchLoading());
+    _updateLocalValue(event.code, event.value);
    emit(TwoGangSwitchStatusLoaded(deviceStatus));
-  }

-  void _updateLocalValue(String code, bool value) {
-    if (code == 'switch_1') {
-      deviceStatus = deviceStatus.copyWith(switch1: value);
-    }
-
-    if (code == 'switch_2') {
-      deviceStatus = deviceStatus.copyWith(switch2: value);
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceId,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangSwitchError(e.toString()));
    }
  }

-  bool _getValueByCode(String code) {
-    switch (code) {
-      case 'switch_1':
-        return deviceStatus.switch1;
-      case 'switch_2':
-        return deviceStatus.switch2;
-      default:
-        return false;
-    }
-  }
-
-  Future<void> _onFetchBatchStatus(TwoGangSwitchFetchBatchEvent event,
-      Emitter<TwoGangSwitchState> emit) async {
+  Future<void> _onFetchBatchStatus(
+    TwoGangSwitchFetchBatchEvent event,
+    Emitter<TwoGangSwitchState> emit,
+  ) async {
    emit(TwoGangSwitchLoading());
    try {
-      final status =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
-      deviceStatus =
-          TwoGangStatusModel.fromJson(event.devicesIds.first, status.status);
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus = TwoGangStatusModel.fromJson(
+        event.devicesIds.first,
+        status.status,
+      );
      emit(TwoGangSwitchStatusLoaded(deviceStatus));
    } catch (e) {
      emit(TwoGangSwitchError(e.toString()));
    }
  }

-  @override
-  Future<void> close() {
-    _timer?.cancel();
-    return super.close();
-  }
-
-  FutureOr<void> _onBatchControl(
-      TwoGangSwitchBatchControl event, Emitter<TwoGangSwitchState> emit) async {
-    final oldValue = _getValueByCode(event.code);
-
-    _updateLocalValue(event.code, event.value);
-
-    emit(TwoGangSwitchStatusLoaded(deviceStatus));
-
-    await _runDebounce(
-      deviceId: event.deviceId,
-      code: event.code,
-      value: event.value,
-      oldValue: oldValue,
-      emit: emit,
-      isBatch: true,
-    );
-  }
-
-  FutureOr<void> _onFactoryReset(
-      TwoGangFactoryReset event, Emitter<TwoGangSwitchState> emit) async {
+  Future<void> _onFactoryReset(
+    TwoGangFactoryReset event,
+    Emitter<TwoGangSwitchState> emit,
+  ) async {
    emit(TwoGangSwitchLoading());
    try {
      final response = await DevicesManagementApi().factoryReset(
@ -168,42 +138,31 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
        event.deviceId,
      );
      if (!response) {
-        emit(TwoGangSwitchError('Failed'));
+        emit(TwoGangSwitchError('Failed to reset device'));
      } else {
-        emit(TwoGangSwitchStatusLoaded(deviceStatus));
+        add(TwoGangSwitchFetchDeviceEvent(event.deviceId));
      }
    } catch (e) {
      emit(TwoGangSwitchError(e.toString()));
    }
  }

-  _listenToChanges(deviceId) {
-    try {
-      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>;
-
-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            TwoGangStatusModel.fromJson(usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
-        }
-      });
-    } catch (_) {}
-  }
-
-  void _onStatusUpdated(StatusUpdated event, Emitter<TwoGangSwitchState> emit) {
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<TwoGangSwitchState> emit,
+  ) {
    deviceStatus = event.deviceStatus;
    emit(TwoGangSwitchStatusLoaded(deviceStatus));
  }
+
+  void _updateLocalValue(String code, bool value) {
+    switch (code) {
+      case 'switch_1':
+        deviceStatus = deviceStatus.copyWith(switch1: value);
+        break;
+      case 'switch_2':
+        deviceStatus = deviceStatus.copyWith(switch2: value);
+        break;
+    }
+  }
 }
--- a/lib/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart
+++ b/lib/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
+
+abstract final class TwoGangSwitchBlocFactory {
+  const TwoGangSwitchBlocFactory._();
+
+  static TwoGangSwitchBloc create({
+    required String deviceId,
+  }) {
+    return TwoGangSwitchBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart
+++ b/lib/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart
@ -24,16 +24,16 @@ class TwoGangStatusModel {
    for (var status in jsonList) {
      switch (status.code) {
        case 'switch_1':
-          switch1 = status.value ?? false;
+          switch1 = bool.tryParse(status.value.toString()) ?? false;
          break;
        case 'countdown_1':
-          countDown = status.value ?? 0;
+          countDown = int.tryParse(status.value.toString()) ?? 0;
          break;
        case 'switch_2':
-          switch2 = status.value ?? false;
+          switch2 = bool.tryParse(status.value.toString()) ?? false;
          break;
        case 'countdown_2':
-          countDown2 = status.value ?? 0;
+          countDown2 = int.tryParse(status.value.toString()) ?? 0;
          break;
      }
    }
--- a/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart
+++ b/lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart
@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
+import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -18,7 +18,7 @@ class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayou
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => TwoGangSwitchBloc(deviceId: deviceIds.first)
+      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
        ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
      child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart
+++ b/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart
@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
+import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -15,7 +16,7 @@ class TwoGangDeviceControlView extends StatelessWidget
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-      create: (context) => TwoGangSwitchBloc(deviceId: deviceId)
+      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceId)
        ..add(TwoGangSwitchFetchDeviceEvent(deviceId)),
      child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
@ -1,18 +1,28 @@
 import 'dart:async';
+import 'dart:developer';
+
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';

 class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
  final String deviceId;
-  late WallSensorModel deviceStatus;
-  Timer? _timer;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;

-  WallSensorBloc({required this.deviceId}) : super(WallSensorInitialState()) {
+  late WallSensorModel deviceStatus;
+
+  WallSensorBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(WallSensorInitialState()) {
    on<WallSensorFetchStatusEvent>(_fetchWallSensorStatus);
    on<WallSensorFetchBatchStatusEvent>(_fetchWallSensorBatchControl);
    on<WallSensorChangeValueEvent>(_changeValue);
@ -24,28 +34,28 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
    on<WallSensorRealtimeUpdateEvent>(_onRealtimeUpdate);
  }

-  void _fetchWallSensorStatus(
-      WallSensorFetchStatusEvent event, Emitter<WallSensorState> emit) async {
+  Future<void> _fetchWallSensorStatus(
+    WallSensorFetchStatusEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
    emit(WallSensorLoadingInitialState());
    try {
-      var response = await DevicesManagementApi().getDeviceStatus(deviceId);
+      final response = await DevicesManagementApi().getDeviceStatus(deviceId);
      deviceStatus = WallSensorModel.fromJson(response.status);
-      emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
      _listenToChanges(deviceId);
+      emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
    } catch (e) {
      emit(WallSensorFailedState(error: e.toString()));
-      return;
    }
  }

-  // Fetch batch status
-  FutureOr<void> _fetchWallSensorBatchControl(
-      WallSensorFetchBatchStatusEvent event,
-      Emitter<WallSensorState> emit) async {
+  Future<void> _fetchWallSensorBatchControl(
+    WallSensorFetchBatchStatusEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
    emit(WallSensorLoadingInitialState());
    try {
-      var response =
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
      deviceStatus = WallSensorModel.fromJson(response.status);
      emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
    } catch (e) {
@ -54,132 +64,105 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
  }

  void _listenToChanges(String deviceId) {
-    DatabaseReference ref =
-        FirebaseDatabase.instance.ref('device-status/$deviceId');
-    ref.onValue.listen((DatabaseEvent event) {
-      final data = event.snapshot.value as Map<dynamic, dynamic>?;
-      if (data == null) return;
+    try {
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');

-      final statusList = (data['status'] as List?)
-          ?.map((e) => Status(code: e['code'], value: e['value']))
-          .toList();
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;

-      if (statusList != null) {
-        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
+        List<Status> statusList = [];
+        eventsMap['status'].forEach((element) {
+          statusList.add(
+            Status(code: element['code'], value: element['value']),
+          );
+        });
+
+        deviceStatus = WallSensorModel.fromJson(statusList);
        if (!isClosed) {
-          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
+          add(WallSensorRealtimeUpdateEvent(deviceStatus));
        }
-      }
-    });
+      });
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'WallSensorBloc._listenToChanges',
+      );
+    }
  }

-
-  void _changeValue(
-      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
+  Future<void> _changeValue(
+    WallSensorChangeValueEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-    if (event.code == 'far_detection') {
-      deviceStatus.farDetection = event.value;
-    } else if (event.code == 'motionless_sensitivity') {
-      deviceStatus.motionlessSensitivity = event.value;
-    } else if (event.code == 'motion_sensitivity_value') {
-      deviceStatus.motionSensitivity = event.value;
-    } else if (event.code == 'no_one_time') {
-      deviceStatus.noBodyTime = event.value;
-    }
+    _updateLocalValue(event.code, event.value);
    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-    await _runDeBouncer(
-      deviceId: deviceId,
-      code: event.code,
-      value: event.value,
-      isBatch: false,
-      emit: emit,
-    );
+
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, event.value == 0 ? 1 : 0);
+      emit(WallSensorFailedState(error: e.toString()));
+    }
  }

  Future<void> _onBatchControl(
-      WallSensorBatchControlEvent event, Emitter<WallSensorState> emit) async {
+    WallSensorBatchControlEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-    if (event.code == 'far_detection') {
-      deviceStatus.farDetection = event.value;
-    } else if (event.code == 'motionless_sensitivity') {
-      deviceStatus.motionlessSensitivity = event.value;
-    } else if (event.code == 'motion_sensitivity_value') {
-      deviceStatus.motionSensitivity = event.value;
-    } else if (event.code == 'no_one_time') {
-      deviceStatus.noBodyTime = event.value;
-    }
+    _updateLocalValue(event.code, event.value);
    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-    await _runDeBouncer(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      emit: emit,
-      isBatch: true,
-    );
-  }
-
-  _runDeBouncer({
-    required dynamic deviceId,
-    required String code,
-    required dynamic value,
-    required Emitter<WallSensorState> emit,
-    required bool isBatch,
-  }) {
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        late bool response;
-        if (isBatch) {
-          response = await DevicesManagementApi()
-              .deviceBatchControl(deviceId, code, value);
-        } else {
-          response = await DevicesManagementApi()
-              .deviceControl(deviceId, Status(code: code, value: value));
-        }
-
-        if (!response) {
-          add(WallSensorFetchStatusEvent());
-        }
-      } catch (_) {
-        await Future.delayed(const Duration(milliseconds: 500));
-        add(WallSensorFetchStatusEvent());
-      }
-    });
-  }
-
-  FutureOr<void> _getDeviceReports(
-      GetDeviceReportsEvent event, Emitter<WallSensorState> emit) async {
-    emit(DeviceReportsLoadingState());
-    // final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
-    // final to = DateTime.now().millisecondsSinceEpoch;

    try {
-      // await DevicesManagementApi.getDeviceReportsByDate(
-      //         deviceId, event.code, from.toString(), to.toString())
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
-          .then((value) {
-        emit(DeviceReportsState(deviceReport: value, code: event.code));
-      });
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(WallSensorFailedState(error: e.toString()));
+    }
+  }
+
+  Future<void> _getDeviceReports(
+    GetDeviceReportsEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
+    emit(DeviceReportsLoadingState());
+    try {
+      final reports = await DevicesManagementApi.getDeviceReports(
+        deviceId,
+        event.code,
+      );
+      emit(DeviceReportsState(deviceReport: reports, code: event.code));
    } catch (e) {
      emit(DeviceReportsFailedState(error: e.toString()));
-      return;
    }
  }

  void _showDescription(
-      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
+    ShowDescriptionEvent event,
+    Emitter<WallSensorState> emit,
+  ) {
    emit(WallSensorShowDescriptionState(description: event.description));
  }

  void _backToGridView(
-      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
+    BackToGridViewEvent event,
+    Emitter<WallSensorState> emit,
+  ) {
    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
  }

-  FutureOr<void> _onFactoryReset(
-      WallSensorFactoryResetEvent event, Emitter<WallSensorState> emit) async {
+  Future<void> _onFactoryReset(
+    WallSensorFactoryResetEvent event,
+    Emitter<WallSensorState> emit,
+  ) async {
    emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
    try {
      final response = await DevicesManagementApi().factoryReset(
@ -187,9 +170,9 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
        event.deviceId,
      );
      if (!response) {
-        emit(const WallSensorFailedState(error: 'Failed'));
+        emit(const WallSensorFailedState(error: 'Failed to reset device'));
      } else {
-        emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+        add(WallSensorFetchStatusEvent());
      }
    } catch (e) {
      emit(WallSensorFailedState(error: e.toString()));
@ -200,7 +183,23 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
    WallSensorRealtimeUpdateEvent event,
    Emitter<WallSensorState> emit,
  ) {
-    deviceStatus = event.deviceStatus;
-    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+    emit(WallSensorUpdateState(wallSensorModel: event.deviceStatus));
+  }
+
+  void _updateLocalValue(String code, dynamic value) {
+    switch (code) {
+      case 'far_detection':
+        deviceStatus.farDetection = value;
+        break;
+      case 'motionless_sensitivity':
+        deviceStatus.motionlessSensitivity = value;
+        break;
+      case 'motion_sensitivity_value':
+        deviceStatus.motionSensitivity = value;
+        break;
+      case 'no_one_time':
+        deviceStatus.noBodyTime = value;
+        break;
+    }
  }
 }
--- a/lib/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart
+++ b/lib/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart
@ -0,0 +1,18 @@
+import 'package:syncrow_web/pages/device_managment/factories/device_bloc_dependencies_factory.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
+
+abstract final class WallSensorBlocFactory {
+  const WallSensorBlocFactory._();
+
+  static WallSensorBloc create({
+    required String deviceId,
+  }) {
+    return WallSensorBloc(
+      deviceId: deviceId,
+      controlDeviceService:
+          DeviceBlocDependenciesFactory.createControlDeviceService(),
+      batchControlDevicesService:
+          DeviceBlocDependenciesFactory.createBatchControlDevicesService(),
+    );
+  }
+}
--- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart
+++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_batch_control.dart
@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_state.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';

@ -21,7 +22,7 @@ class WallSensorBatchControlView extends StatelessWidget with HelperResponsiveLa
    final isLarge = isLargeScreenSize(context);
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
-      create: (context) => WallSensorBloc(deviceId: devicesIds.first)
+      create: (context) => WallSensorBlocFactory.create(deviceId: devicesIds.first)
        ..add(WallSensorFetchBatchStatusEvent(devicesIds)),
      child: BlocBuilder<WallSensorBloc, WallSensorState>(
        builder: (context, state) {
--- a/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
+++ b/lib/pages/device_managment/wall_sensor/view/wall_sensor_conrtols.dart
@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_status.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/factories/wall_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@ -26,7 +27,7 @@ class WallSensorControlsView extends StatelessWidget with HelperResponsiveLayout
    final isMedium = isMediumScreenSize(context);
    return BlocProvider(
      create: (context) =>
-          WallSensorBloc(deviceId: device.uuid!)..add(WallSensorFetchStatusEvent()),
+          WallSensorBlocFactory.create(deviceId: device.uuid!)..add(WallSensorFetchStatusEvent()),
      child: BlocBuilder<WallSensorBloc, WallSensorState>(
        builder: (context, state) {
          if (state is WallSensorLoadingInitialState || state is DeviceReportsLoadingState) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Faris Armoush	d1df33b31e	Refactor `WallSensorBloc` to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and real-time status updates from Firebase, including optimized parsing logic for device status values.	2025-06-03 11:15:06 +03:00
Faris Armoush	6a36405530	Refactor `TwoGangSwitchBloc` to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and real-time status updates from Firebase, including parsing logic for device status values.	2025-06-03 10:48:01 +03:00
Faris Armoush	88a7607395	Refactor `TwoGangGlassSwitchBloc` to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and state updates, including real-time status listening from Firebase.	2025-06-03 10:33:33 +03:00
Faris Armoush	f58ddf76da	Refactor `LivingRoomBloc` to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and state updates, including real-time status listening from Firebase.	2025-06-03 10:19:10 +03:00
Faris Armoush	a71a66034c	Refactor `ThreeGangGlassSwitchBloc` to integrate new service dependencies and utilize a factory for instantiation. Enhanced event handling methods for improved error management and state updates.	2025-06-03 09:49:26 +03:00
Faris Armoush	b06a23cc60	Refactor `WallLightSwitchBloc` to integrate new service dependencies and utilize a factory for instantiation. Improved event handling methods for better error management and state updates.	2025-06-02 16:40:13 +03:00
Faris Armoush	5595bb7f25	Refactor `OneGangGlassSwitchBloc` to utilize new service dependencies and implement a factory for instantiation. Enhanced event handling methods for improved error management and state updates.	2025-06-02 16:35:55 +03:00
Faris Armoush	77d39bfc53	Refactor `CurtainBloc` to use new service dependencies and implement a factory for instantiation. Updated event handling methods for improved error management and state updates.	2025-06-02 11:26:30 +03:00
Faris Armoush	3bd2bd114b	migrate `CeilingSensorBloc` to use the new services.	2025-06-02 11:13:56 +03:00
Faris Armoush	f98636a2e5	Migrated `AcBloc` single/batch controls the new services.	2025-06-02 10:44:43 +03:00
Faris Armoush	19548e99ab	indentation and formatting of `WaterHeaterBloc`.	2025-06-02 10:20:05 +03:00
Faris Armoush	b60c674496	Created a factory for the `WaterHeaterBloc`, and injected the necessary dependenices.	2025-06-02 10:12:53 +03:00
Faris Armoush	6f3dfb607e	Extracted single/batch control services creation into a factory for ease of reusablility for the sake of this migration.	2025-06-02 10:11:23 +03:00
Faris Armoush	62dabf1ce2	Made values in `DeviceControlDialog` selectable for a better UX.	2025-06-02 10:10:50 +03:00
Faris Armoush	15ea1b4c5a	Merge pull request #221 from SyncrowIOT/enable-hot-reload enable hot reload on web.	2025-06-01 16:00:46 +03:00
Faris Armoush	17f6985dbf	enable hot reload on web.	2025-06-01 15:59:29 +03:00
mohammadnemer1	d1ddf75a42	Merge pull request #219 from SyncrowIOT/SP-1607-FE-Adjust-Padding-Between-Comparison-Signs-for-Visual-Consistency Sp 1607 fe adjust padding between comparison signs for visual consistency	2025-06-01 15:50:53 +03:00
mohammad	78f42dacf6	Adjust ConditionToggle widget dimensions and colors for improved UI consistency	2025-06-01 14:37:42 +03:00
mohammadnemer1	fdabfe5d95	Merge pull request #217 from SyncrowIOT/SP-1584-FE-Block-Energy-Device-from-Being-Added-to-Then-Section-with-Validation-Message Refactor energy clamp dialog to handle empty functions list gracefully	2025-06-01 14:13:53 +03:00
mohammad	8916000696	Refactor visibility logic in Energy Clamp Dialog to handle empty functions list more elegantly	2025-06-01 14:11:21 +03:00
mohammad	305d695358	Refactor energy clamp dialog to handle empty functions list gracefully	2025-06-01 13:12:58 +03:00
Faris Armoush	cde79fc168	Merge pull request #212 from SyncrowIOT/SP-1594-FE-Implement-Real-Time-AQI-Data-Panel-for-Selected-Sensor Sp 1594 fe implement real time aqi data panel for selected sensor	2025-05-29 15:27:08 +03:00
Faris Armoush	283a0dd536	Updated `AqiSubValueWidget` to use minimum value for range calculations, improving accuracy in AQI range display.	2025-05-29 14:59:03 +03:00
Faris Armoush	5636fbe6c9	sorted constructor dependencies.	2025-05-29 14:57:26 +03:00
Faris Armoush	3d4c17214c	Refactored `AqiGauge` to consolidate status text and color logic into a single method, improving code readability and maintainability.	2025-05-29 14:56:56 +03:00
Faris Armoush	b95f4063d9	removed unused widget.	2025-05-29 14:54:53 +03:00
Faris Armoush	bc289a0ddf	removed testing code.	2025-05-29 14:45:03 +03:00
Faris Armoush	d9448d9709	Merge pull request #209 from SyncrowIOT/SP-1546-FE-Garage-door-opener-Countdown-counter-is-throwing-Device-not-found-error Refactor event handling in GarageDoorBloc to use local variable for d…	2025-05-29 14:39:40 +03:00
Faris Armoush	7bd0c061d4	enhanced design of `AqiLocation`.	2025-05-29 13:29:52 +03:00
Faris Armoush	36ddebb5ae	Implemented new gauge design.	2025-05-29 13:28:44 +03:00
Faris Armoush	43cb985e74	finished integrating realtime data.	2025-05-29 13:05:49 +03:00
mohammad	7bfd08238e	Refactor event handling in GarageDoorBloc to use local variable for deviceId	2025-05-29 12:19:04 +03:00
Faris Armoush	94b4aa7c46	Extracted big widgets into smaller ones, and integrated aqi device info with `RealtimeChangesBloc`.	2025-05-29 11:26:21 +03:00
mohammad	0a9d53e5bd	Refactor ConditionToggle widget to display icons with corresponding conditions	2025-05-29 10:48:12 +03:00
Faris Armoush	3d133581ff	Implemented and used a reusable widget for analytics sidebars headers.	2025-05-29 09:59:27 +03:00
Faris Armoush	a75e6a89a9	Enhanced responsiveness of `AqiLocationInfoCell`.	2025-05-29 09:24:29 +03:00
mohammadnemer1	010960c89b	Merge pull request #208 from SyncrowIOT/SP-1603-FE-Freeze-First-Row-in-All-Table-Views-Across-the-Platform Refactor table layout to accommodate dynamic table size	2025-05-28 16:57:56 +03:00
mohammad	fccf395c38	Update function names to follow consistent naming convention in name_filter.dart and users_page.dart	2025-05-28 16:56:51 +03:00
Faris Armoush	cc5f107ccb	Extracted `AqiHumidityAndTemperature` into its own widget and file.	2025-05-28 16:55:36 +03:00
mohammad	7c65b874eb	Refactor table layout to accommodate dynamic table size	2025-05-28 16:40:44 +03:00
Faris Armoush	79c5fe1651	add icons for side bar info (humidity and tempreture).	2025-05-28 16:13:23 +03:00
Faris Armoush	fd186a00fd	add shadow to pointer to match the design.	2025-05-28 15:41:18 +03:00
Faris Armoush	5b91ceb639	enhanced animation of `AqiGague`	2025-05-28 15:33:28 +03:00
Faris Armoush	5d3ef95cb7	Refactor `AqiGauge` to use constants for range values, to allow for ease of change, and readability.	2025-05-28 15:30:12 +03:00
Faris Armoush	a87b11d084	adjusted the size of `AqiGauge` and removed unnecessary code.	2025-05-28 15:25:17 +03:00
Faris Armoush	7c69c7ddbd	fixed responsiveness of end side bar.	2025-05-28 15:19:26 +03:00
Faris Armoush	16dc066440	removed unnecessary comment.	2025-05-28 14:57:16 +03:00
Faris Armoush	9a41e0c4f5	moved `ApiGauge` to its own file.	2025-05-28 14:50:46 +03:00
Faris Armoush	a23370471c	improved sizing of `AqiLocationInfoCell`.	2025-05-28 14:39:41 +03:00
Faris Armoush	25db6ec687	Created `pull_request_template.md` .	2025-05-28 14:24:03 +03:00
Faris Armoush	595966d306	implemented gauge.	2025-05-28 14:22:35 +03:00
Faris Armoush	fc330d6e17	Making good progress towards finalizing the end side bar.	2025-05-28 09:32:58 +03:00
Faris Armoush	42319cc4f9	added `unit` property to `AqiType`.	2025-05-27 16:56:01 +03:00
Faris Armoush	aded80fb9a	modified sizing of `AirQualityView`.	2025-05-27 16:55:43 +03:00
Faris Armoush	077c6e99d6	added aqi informative icons.	2025-05-27 16:55:17 +03:00
Faris Armoush	1f444ccfcb	Created `AqiLocationInfoCell` widget.	2025-05-27 16:11:13 +03:00
Faris Armoush	fe716baba7	created `AqiLocation` widget.	2025-05-27 16:10:58 +03:00
Faris Armoush	34279cfdae	added `location_pin.svg` icon.	2025-05-27 16:10:49 +03:00
Faris Armoush	0bf34c66aa	Animated `AqiSubValueWidget`.	2025-05-27 15:45:32 +03:00
Faris Armoush	7726ceecb8	made `AqiSubValueWidget` use the correct colors.	2025-05-27 15:21:45 +03:00
Faris Armoush	ae2078d28c	Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1594-FE-Implement-Real-Time-AQI-Data-Panel-for-Selected-Sensor	2025-05-27 15:17:59 +03:00
Faris Armoush	7f5d2ca6ea	Merge pull request #206 from SyncrowIOT/SP-1592-FE-Build-AQI-Breakdown-Percentage-Chart-with-Standard-Color-Codes SP-1592-FE-Build-AQI-Breakdown-Percentage-Chart-with-Standard-Color-Codes	2025-05-27 15:17:10 +03:00
Faris Armoush	5a5173c19b	Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1592-FE-Build-AQI-Breakdown-Percentage-Chart-with-Standard-Color-Codes	2025-05-27 15:16:37 +03:00
Faris Armoush	83363b4c50	Made `RangeOfAqiChart._lines` colors use `ColorsManager` colors instead of statically defining them in the widget itself using Hex codes.	2025-05-27 15:15:29 +03:00
Faris Armoush	95eca869c9	Implemented `AqiSubValueWidget`.	2025-05-27 15:12:11 +03:00
mohammadnemer1	6ebdc59966	Merge pull request #207 from SyncrowIOT/Fix-Bugs-Related-TextForm-Routine Add 'PC' device to routine	2025-05-27 14:56:11 +03:00
Faris Armoush	5f3a0c74ac	Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1592-FE-Build-AQI-Breakdown-Percentage-Chart-with-Standard-Color-Codes	2025-05-27 14:06:48 +03:00
Faris Armoush	03009ed276	made a `RangeOfAqiChart._lines` a getter.	2025-05-27 13:21:42 +03:00
Faris Armoush	a1142eb38c	gave range of aqi chart a tooltip that shows the necessary data.	2025-05-27 13:17:05 +03:00
Faris Armoush	1aa7bf2162	fixed charts clipping overflow in chart.	2025-05-27 12:37:36 +03:00
Faris Armoush	043820f84f	does not emit an entirely new state when we already have chart data on loading.	2025-05-27 12:33:48 +03:00
Faris Armoush	d90d3d4026	added loading state to range of aqi chart.	2025-05-27 12:29:06 +03:00
Faris Armoush	3ac5254abf	fixed bug in total energy consumption chart.	2025-05-27 12:26:21 +03:00
Faris Armoush	f5d926f5a2	modify left side titles.	2025-05-27 12:21:59 +03:00
mohammadnemer1	c1d6db8bba	Merge branch 'dev' into Fix-Bugs-Related-TextForm-Routine	2025-05-27 09:56:07 +03:00
mohammad	50fc5f9562	Add 'PC' device to routine	2025-05-27 09:54:21 +03:00
Faris Armoush	1b0d8d446c	modified flex's values.	2025-05-27 09:47:06 +03:00
Faris Armoush	8a5173f429	made font size of `AqiTypeDropdown` slightly smaller.	2025-05-27 09:36:35 +03:00
Faris Armoush	bee8652d03	responsivness	2025-05-26 16:59:44 +03:00
Faris Armoush	9546d7bdd1	fixed titles widget for bottom title.	2025-05-26 16:56:38 +03:00
Faris Armoush	cb4956f915	made range of aqi fake data random and not linear.	2025-05-26 16:56:25 +03:00
Faris Armoush	ec7b0aa078	shows `AnalyticsErrorWidget` and spacing under it only when there is an error.	2025-05-26 15:58:34 +03:00
Faris Armoush	296b03e1aa	shows month data instead of index on bottom titles of `RangeOfAqiChart`.	2025-05-26 15:54:56 +03:00
Faris Armoush	177c7f1030	Responsiveness of `RangeOfAqiChartTitle`.	2025-05-26 15:49:38 +03:00
Faris Armoush	3746c36a71	Merge pull request #205 from SyncrowIOT/sp-1493-data-foramtting-2.0 sp-1493-data-formatting-2.0.	2025-05-26 15:19:18 +03:00
Faris Armoush	0b4337fb6c	sp-1493-data-formatting-2.0.	2025-05-26 15:17:29 +03:00
Faris Armoush	171dc52e28	Created `AqiTypeDropdown`.	2025-05-26 15:10:30 +03:00
Faris Armoush	642d8e9591	Merge pull request #204 from SyncrowIOT/SP-1493-data-formatting SP-1493-data-formatting	2025-05-26 14:24:46 +03:00
Faris Armoush	5a8ef578c3	SP-1493-data-formatting	2025-05-26 14:16:43 +03:00
Faris Armoush	63ca98895f	moved `RangeOfAqiChartTitle`.	2025-05-26 13:27:12 +03:00
Faris Armoush	7e54cfdccd	Implemented min, max, average informative cells to `RangeOfAqiChartBox`.	2025-05-26 13:25:14 +03:00
Faris Armoush	fb4d44450f	Disabled animation in `RangeOfAqiChart`.	2025-05-26 11:25:12 +03:00
Faris Armoush	12e4285b14	removed unnecessary `Stack` widget from `RangeOfAqiChart`.	2025-05-26 11:24:53 +03:00
Faris Armoush	82adbcf4df	loads and clears aqi range data in `FetchAirQualityDataHelper`.	2025-05-26 11:24:00 +03:00
Faris Armoush	7305d511bc	Added `spaceUuid` to `GetRangeOfAqiParam` model.	2025-05-26 11:23:33 +03:00
Faris Armoush	61acaa17c5	fixed typo.	2025-05-26 11:22:11 +03:00
Faris Armoush	4af81bcc10	make the aqi range chart read its data from `RangeOfAqiBloc`.	2025-05-26 11:22:05 +03:00
Faris Armoush	d4dd7a19ba	make the generated fake aqi range data, look better on the chart.	2025-05-26 11:21:42 +03:00
Faris Armoush	9ab906d24c	Injected `RangeOfAqiBloc` into `AnalyticsPage`.	2025-05-26 11:10:23 +03:00
Faris Armoush	5c57143ea5	Created `RangeOfAqiBloc` along with its events, and state.	2025-05-26 11:09:45 +03:00
Faris Armoush	4a3085e1b4	Created `RangeOfAqiService` along with its fake implementation until the API is ready.	2025-05-26 11:00:57 +03:00
Faris Armoush	eb8ba1806c	Created `GetRangeOfAqiParam` model.	2025-05-26 10:59:07 +03:00
Faris Armoush	902419f9c4	Created `RangeOfAqi` model.	2025-05-26 10:58:05 +03:00
Faris Armoush	926bcd9a5d	Extracted lines data into a helper method for ease of readability.	2025-05-26 10:48:04 +03:00
Faris Armoush	33f9add78a	Extracted some logic of `RangeOfAqiChart` into a helper class.	2025-05-26 10:41:36 +03:00
Faris Armoush	563a3e1cf5	Refactored `RangeOfAqiChart` to consolidate line chart creation into a reusable method, improving code maintainability and reducing duplication.	2025-05-26 10:31:21 +03:00
Faris Armoush	791b71276a	populated linear data for `RangeOfAqiChart`, for a more pleasant dev experience and debugging.	2025-05-26 10:29:38 +03:00
Faris Armoush	24e3eb2311	extracted titlesData into a private factory method to enahnce readability.	2025-05-26 10:18:15 +03:00
Faris Armoush	82006e9aaf	Implemented the side titles of `RangeOfAqiChart`.	2025-05-26 10:12:52 +03:00
Faris Armoush	cedef666f6	Merge pull request #202 from SyncrowIOT/SP-1493-rework SP-1493 rework	2025-05-26 10:03:10 +03:00
Faris Armoush	a10d998ec6	Merge pull request #203 from SyncrowIOT/SP-1513-rework SP-1513-rework	2025-05-26 10:02:49 +03:00
Faris Armoush	ed50ac03d3	Merge pull request #201 from SyncrowIOT/SP-1492-landing_page_analytics_button_design SP-1492-landing_page_analytics_button_design	2025-05-26 09:57:23 +03:00
Faris Armoush	cd2eb46f49	Implemented the overall design of `RangeOfAqiChart`, whats left is 100% matching it with the figma design.	2025-05-26 09:50:53 +03:00
Faris Armoush	39351a710d	Added aqi info colors to `ColorsManager`.	2025-05-25 12:18:09 +03:00
Faris Armoush	c8fe4e3baa	Created an initial version of `RangeOfAqiChart`.	2025-05-25 12:01:45 +03:00
Faris Armoush	12deceb7d3	SP-1513-rework	2025-05-25 11:35:01 +03:00
Faris Armoush	9d27ed2dc5	SP-1506 rework, coloring and padding.	2025-05-25 11:13:24 +03:00
Faris Armoush	a878b9328a	SP-1493 rework, can select a subspace in sidebar even when the space has no child-spaces.	2025-05-25 11:06:36 +03:00
Faris Armoush	0f9227a6f5	Merge pull request #200 from SyncrowIOT/SP-1591-FE-Implement-Space-Level-Structure-Selection-and-Air-Quality-Device-Dropdown Sp 1591 fe implement space level structure selection and air quality device dropdown	2025-05-22 15:59:19 +03:00
Faris Armoush	5b13962d41	removed unnecessary * 1 calculation of height.	2025-05-22 15:57:03 +03:00
Faris Armoush	8c53d5322a	SP-1591	2025-05-22 15:53:18 +03:00
Faris Armoush	af4d37939b	Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1591-FE-Implement-Space-Level-Structure-Selection-and-Air-Quality-Device-Dropdown	2025-05-22 15:48:47 +03:00
Faris Armoush	d43c1847ff	SP-1591	2025-05-22 15:44:19 +03:00
Faris Armoush	4c5b390887	Fixed typos.	2025-05-22 15:42:49 +03:00
Faris Armoush	5eeac01666	cannot select a community in `AirQualityDataLoadingStrategy`.	2025-05-22 15:35:04 +03:00
Faris Armoush	717d698378	can select child spaces with children in `AirQualityDataLoadingStrategy`.	2025-05-22 15:23:42 +03:00
Faris Armoush	9adbbb9a2d	Integrated and implemented devices dropdown into the newly created widget `AirQualityEndSideWidget`.	2025-05-22 15:19:50 +03:00
Faris Armoush	e792dbd72f	SP-1591/ Implement business logic in `AirQualityDataLoadingStrategy` for community structure loading strategy.	2025-05-22 14:58:42 +03:00
Faris Armoush	d2eea33714	Prepared `AirQualityView` layout and structure with PlaceHolder widgets.	2025-05-22 12:24:13 +03:00
Faris Armoush	5a61647fe4	Prepared and created the necessary component for the air quality loading strategy for the side bar selection, and for loading data in different parts of the UI.	2025-05-21 16:49:30 +03:00
Faris Armoush	568b6be354	Created `AirQualityView` widget for the new Air Quality analytics module.	2025-05-21 16:46:38 +03:00