Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1218

Connect real time

android/app/build.gradle

@@ -1,5 +1,9 @@
 plugins {
     id "com.android.application"
+    // START: FlutterFire Configuration
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+    // END: FlutterFire Configuration
     id "kotlin-android"
     id "dev.flutter.flutter-gradle-plugin"
 }

android/app/google-services.json

@@ -0,0 +1,68 @@
+{
+  "project_info": {
+    "project_number": "427332280600",
+    "firebase_url": "https://test2-8a3d2-default-rtdb.firebaseio.com",
+    "project_id": "test2-8a3d2",
+    "storage_bucket": "test2-8a3d2.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:550f67441246cb1a0c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:bb6047adeeb80fb00c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow_application"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:2bc36fbe82994a3e0c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow_web"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/settings.gradle

@@ -20,6 +20,10 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
+    // START: FlutterFire Configuration
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    id "com.google.firebase.crashlytics" version "2.8.1" apply false
+    // END: FlutterFire Configuration
     id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 

assets/icons/delete_space_model.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.4 2.10938H11.7333V1.58203C11.7333 0.709699 11.0156 0 10.1333 0H5.86667C4.98443 0 4.26667 0.709699 4.26667 1.58203V2.10938H1.6C0.71776 2.10938 0 2.81907 0 3.69141C0 4.392 0.463111 4.9873 1.1024 5.19472L2.05369 16.5493C2.1222 17.3628 2.82258 18 3.64814 18H12.3519C13.1775 18 13.8778 17.3628 13.9464 16.5491L14.8976 5.19469C15.5369 4.9873 16 4.392 16 3.69141C16 2.81907 15.2822 2.10938 14.4 2.10938ZM5.33333 1.58203C5.33333 1.29125 5.57259 1.05469 5.86667 1.05469H10.1333C10.4274 1.05469 10.6667 1.29125 10.6667 1.58203V2.10938H5.33333V1.58203ZM12.8833 16.4618C12.8605 16.7329 12.6271 16.9453 12.3519 16.9453H3.64814C3.37298 16.9453 3.13952 16.7329 3.11673 16.462L2.17934 5.27344H13.8207L12.8833 16.4618ZM14.4 4.21875H1.6C1.30592 4.21875 1.06667 3.98218 1.06667 3.69141C1.06667 3.40063 1.30592 3.16406 1.6 3.16406H14.4C14.6941 3.16406 14.9333 3.40063 14.9333 3.69141C14.9333 3.98218 14.6941 4.21875 14.4 4.21875Z" fill="#999999"/>
+<path d="M5.86561 15.3307L5.33228 6.82286C5.31404 6.53215 5.05957 6.31106 4.76698 6.32916C4.47297 6.3472 4.24943 6.59744 4.26764 6.88811L4.80097 15.396C4.8185 15.6756 5.05331 15.8907 5.33278 15.8907C5.64165 15.8907 5.88456 15.6335 5.86561 15.3307Z" fill="#999999"/>
+<path d="M7.99989 6.32812C7.70534 6.32812 7.46655 6.56423 7.46655 6.85547V15.3633C7.46655 15.6545 7.70534 15.8906 7.99989 15.8906C8.29443 15.8906 8.53322 15.6545 8.53322 15.3633V6.85547C8.53322 6.56423 8.29443 6.32812 7.99989 6.32812Z" fill="#999999"/>
+<path d="M11.233 6.32915C10.9396 6.31112 10.6859 6.53215 10.6677 6.82285L10.1343 15.3307C10.1162 15.6213 10.3397 15.8716 10.6337 15.8896C10.9278 15.9076 11.1808 15.6865 11.199 15.3959L11.7323 6.8881C11.7505 6.5974 11.527 6.34715 11.233 6.32915Z" fill="#999999"/>
+</svg>

firebase.json

@@ -0,0 +1 @@
+{"flutter":{"platforms":{"android":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:android:2bc36fbe82994a3e0c7e6d","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:ios:14346b200780dc760c7e6d","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:ios:14346b200780dc760c7e6d","uploadDebugSymbols":true,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"test2-8a3d2","configurations":{"android":"1:427332280600:android:2bc36fbe82994a3e0c7e6d","ios":"1:427332280600:ios:14346b200780dc760c7e6d","macos":"1:427332280600:ios:14346b200780dc760c7e6d","web":"1:427332280600:web:ad50516a87a35a1a0c7e6d","windows":"1:427332280600:web:f7a25537ccd5a7bd0c7e6d"}}}}}}

ios/Runner.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		E44A9405B1EB1B638DD05A58 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ABF0EC746A2D686A0ED574F /* Pods_RunnerTests.framework */; };
+		F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B14AB50E8716720E10D074BD /* GoogleService-Info.plist */; };
 		FF49F60EC38658783D8D66DA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AFAE479A87ECDEBD5D6EB30 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -64,6 +65,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B14AB50E8716720E10D074BD /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		D3AD250AADBF93406007C9EB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -138,6 +140,7 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				1454C118FFCECEEDF59152D2 /* Pods */,
 				20A3C64D2B1CFED5A81C3251 /* Frameworks */,
+				B14AB50E8716720E10D074BD /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -199,6 +202,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				33590C9CD073D3D5EBA02CDE /* [CP] Embed Pods Frameworks */,
+				7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -264,6 +268,7 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -303,6 +308,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\"\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --platform=ios --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
+	<key>GCM_SENDER_ID</key>
+	<string>427332280600</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.example.syncrowWeb</string>
+	<key>PROJECT_ID</key>
+	<string>test2-8a3d2</string>
+	<key>STORAGE_BUCKET</key>
+	<string>test2-8a3d2.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:427332280600:ios:14346b200780dc760c7e6d</string>
+	<key>DATABASE_URL</key>
+	<string>https://test2-8a3d2-default-rtdb.firebaseio.com</string>
+</dict>
+</plist>

lib/common/dialog_textfield_dropdown.dart

@@ -20,15 +20,22 @@ class DialogTextfieldDropdown extends StatefulWidget {
 
 class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   bool _isOpen = false;
-  late OverlayEntry _overlayEntry;
+  OverlayEntry? _overlayEntry;
   final TextEditingController _controller = TextEditingController();
-  late List<String> _filteredItems; // Filtered items list
+  final FocusNode _focusNode = FocusNode();
+  List<String> _filteredItems = [];
 
   @override
   void initState() {
     super.initState();
-    _controller.text = widget.initialValue ?? 'Select Tag';
+    _controller.text = widget.initialValue ?? '';
-    _filteredItems = List.from(widget.items); // Initialize filtered items
+    _filteredItems = List.from(widget.items);
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus) {
+        _closeDropdown();
+      }
+    });
   }
 
   void _toggleDropdown() {
@@ -41,13 +48,16 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
 
   void _openDropdown() {
     _overlayEntry = _createOverlayEntry();
-    Overlay.of(context).insert(_overlayEntry);
+    Overlay.of(context).insert(_overlayEntry!);
     _isOpen = true;
   }
 
   void _closeDropdown() {
-    _overlayEntry.remove();
+    if (_isOpen && _overlayEntry != null) {
-    _isOpen = false;
+      _overlayEntry!.remove();
+      _overlayEntry = null;
+      _isOpen = false;
+    }
   }
 
   OverlayEntry _createOverlayEntry() {
@@ -58,9 +68,7 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
     return OverlayEntry(
       builder: (context) {
         return GestureDetector(
-          onTap: () {
+          onTap: _closeDropdown,
-            _closeDropdown();
-          },
           behavior: HitTestBehavior.translucent,
           child: Stack(
             children: [
@@ -72,40 +80,44 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
                   elevation: 4.0,
                   child: Container(
                     color: ColorsManager.whiteColors,
-                    constraints: const BoxConstraints(
+                    constraints: const BoxConstraints(maxHeight: 200.0),
-                      maxHeight: 200.0,
+                    child: StatefulBuilder(
-                    ),
+                      builder: (context, setStateDropdown) {
-                    child: ListView.builder(
+                        return ListView.builder(
-                      shrinkWrap: true,
+                          shrinkWrap: true,
-                      itemCount: _filteredItems.length,
+                          itemCount: _filteredItems.length,
-                      itemBuilder: (context, index) {
+                          itemBuilder: (context, index) {
-                        final item = _filteredItems[index];
+                            final item = _filteredItems[index];
-                        return Container(
+
-                          decoration: const BoxDecoration(
+                            return Container(
-                            border: Border(
+                              decoration: const BoxDecoration(
-                              bottom: BorderSide(
+                                border: Border(
-                                color: ColorsManager.lightGrayBorderColor,
+                                  bottom: BorderSide(
-                                width: 1.0,
+                                    color: ColorsManager.lightGrayBorderColor,
+                                    width: 1.0,
+                                  ),
+                                ),
                               ),
-                            ),
+                              child: ListTile(
-                          ),
+                                title: Text(item,
-                          child: ListTile(
+                                    style: Theme.of(context)
-                            title: Text(item,
+                                        .textTheme
-                                style: Theme.of(context)
+                                        .bodyMedium
-                                    .textTheme
+                                        ?.copyWith(
-                                    .bodyMedium
+                                            color: ColorsManager
-                                    ?.copyWith(
+                                                .textPrimaryColor)),
-                                        color: ColorsManager.textPrimaryColor)),
+                                onTap: () {
-                            onTap: () {
+                                  _controller.text = item;
-                              _controller.text = item;
+                                  widget.onSelected(item);
-                              widget.onSelected(item);
+                                  setState(() {
-                              setState(() {
+                                    _filteredItems
-                                _filteredItems
+                                        .remove(item); // Remove selected item
-                                    .remove(item); // Remove selected item
+                                  });
-                              });
+                                  _closeDropdown();
-                              _closeDropdown();
+                                },
-                            },
+                              ),
-                          ),
+                            );
+                          },
                         );
                       },
                     ),
@@ -122,7 +134,8 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: _toggleDropdown,
+      onTap: () => FocusScope.of(context).unfocus(),
+      behavior: HitTestBehavior.opaque,
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
         decoration: BoxDecoration(
@@ -135,23 +148,26 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
             Expanded(
               child: TextFormField(
                 controller: _controller,
-                onChanged: (value) {
+                focusNode: _focusNode,
-                  setState(() {
+                onFieldSubmitted: (value) {
-                    _filteredItems = widget.items
-                        .where((item) =>
-                            item.toLowerCase().contains(value.toLowerCase()))
-                        .toList(); // Filter items dynamically
-                  });
                   widget.onSelected(value);
+                  _closeDropdown();
+                },
+                onTapOutside: (event) {
+                  widget.onSelected(_controller.text);
+                  _closeDropdown();
                 },
                 style: Theme.of(context).textTheme.bodyMedium,
                 decoration: const InputDecoration(
-                  hintText: 'Enter or Select tag',
+                  hintText: 'Enter or Select a tag',
                   border: InputBorder.none,
                 ),
               ),
             ),
-            const Icon(Icons.arrow_drop_down),
+            GestureDetector(
+              onTap: _toggleDropdown,
+              child: const Icon(Icons.arrow_drop_down),
+            ),
           ],
         ),
       ),

lib/common/widgets/custom_expansion_tile.dart

@@ -56,24 +56,6 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
       children: [
         Row(
           children: [
-            // Checkbox with independent state management
-            Checkbox(
-              value: false,
-              onChanged: (bool? value) {
-                setState(() {});
-              },
-              side: WidgetStateBorderSide.resolveWith((states) {
-                return const BorderSide(color: ColorsManager.grayBorder);
-              }),
-              fillColor: WidgetStateProperty.resolveWith((states) {
-                if (states.contains(WidgetState.selected)) {
-                  return ColorsManager.grayBorder;
-                } else {
-                  return ColorsManager.checkBoxFillColor;
-                }
-              }),
-              checkColor: ColorsManager.whiteColors,
-            ),
             // Expand/collapse icon, now wrapped in a GestureDetector for specific onTap
             if (widget.children != null && widget.children!.isNotEmpty)
               GestureDetector(
@@ -84,7 +66,9 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   });
                 },
                 child: Icon(
-                  _isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+                  _isExpanded
+                      ? Icons.keyboard_arrow_down
+                      : Icons.keyboard_arrow_right,
                   color: ColorsManager.lightGrayColor,
                   size: 16.0, // Adjusted size for better alignment
                 ),
@@ -101,8 +85,10 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   _capitalizeFirstLetter(widget.title),
                   style: TextStyle(
                     color: widget.isSelected
-                        ? ColorsManager.blackColor // Change color to black when selected
+                        ? ColorsManager
-                        : ColorsManager.lightGrayColor, // Gray when not selected
+                            .blackColor // Change color to black when selected
+                        : ColorsManager
+                            .lightGrayColor, // Gray when not selected
                     fontWeight: FontWeight.w400,
                   ),
                 ),
@@ -111,7 +97,9 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
           ],
         ),
         // The expanded section (children) that shows when the tile is expanded
-        if (_isExpanded && widget.children != null && widget.children!.isNotEmpty)
+        if (_isExpanded &&
+            widget.children != null &&
+            widget.children!.isNotEmpty)
           Padding(
             padding: const EdgeInsets.only(left: 48.0), // Indented children
             child: Column(

lib/common/widgets/search_bar.dart

@@ -3,18 +3,33 @@ import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class CustomSearchBar extends StatelessWidget {
+class CustomSearchBar extends StatefulWidget {
   final TextEditingController? controller;
   final String hintText;
+  final String? searchQuery;
   final Function(String)? onSearchChanged; // Callback for search input changes
 
   const CustomSearchBar({
     super.key,
     this.controller,
+    this.searchQuery = '',
     this.hintText = 'Search',
     this.onSearchChanged,
   });
 
+  @override
+  State<CustomSearchBar> createState() => _CustomSearchBarState();
+}
+
+class _CustomSearchBarState extends State<CustomSearchBar> {
+  @override
+  void dispose() {
+    if (widget.controller != null) {
+      widget.controller!.dispose();
+    }
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -36,16 +51,17 @@ class CustomSearchBar extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(12),
         ),
-        child: TextField(
+        child: TextFormField(
-          controller: controller,
+          controller: widget.controller,
+          initialValue: widget.searchQuery,
           style: const TextStyle(
             color: Colors.black,
           ),
-          onChanged: onSearchChanged, // Call the callback on text change
+          onChanged: widget.onSearchChanged, // Call the callback on text change
           decoration: InputDecoration(
             filled: true,
             fillColor: ColorsManager.textFieldGreyColor,
-            hintText: hintText,
+            hintText: widget.hintText,
             hintStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
                   color: ColorsManager.lightGrayColor,
                   fontSize: 12,

lib/common/widgets/spaces_side_tree.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpacesSideTree extends StatefulWidget {
-  final List<CommunityModel> communities;
-  final String? selectedSpaceUuid;
-  const SpacesSideTree({
-    super.key,
-    required this.communities,
-    this.selectedSpaceUuid,
-  });
-
-  @override
-  State<SpacesSideTree> createState() => _SpacesSideTreeState();
-}
-
-class _SpacesSideTreeState extends State<SpacesSideTree> {
-  String _searchQuery = '';
-  String? _selectedSpaceUuid;
-  String? _selectedId;
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}

lib/firebase_options_dev.dart

@@ -0,0 +1,93 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptionsDev {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+        return windows;
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0',
+    appId: '1:427332280600:web:ad50516a87a35a1a0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    authDomain: 'test2-8a3d2.firebaseapp.com',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    measurementId: 'G-Z1RTTTV5H9',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0',
+    appId: '1:427332280600:android:2bc36fbe82994a3e0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
+    appId: '1:427332280600:ios:14346b200780dc760c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    iosBundleId: 'com.example.syncrowWeb',
+  );
+
+  static const FirebaseOptions macos = FirebaseOptions(
+    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
+    appId: '1:427332280600:ios:14346b200780dc760c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    iosBundleId: 'com.example.syncrowWeb',
+  );
+
+  static const FirebaseOptions windows = FirebaseOptions(
+    apiKey: 'AIzaSyDizKjPC5rdkEjDxwXjM-RU5unB0Ziq3iw',
+    appId: '1:427332280600:web:f7a25537ccd5a7bd0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    authDomain: 'test2-8a3d2.firebaseapp.com',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    measurementId: 'G-4LFVXEXWKY',
+  );
+}

lib/firebase_options_prod.dart

@@ -0,0 +1,77 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptionsStaging {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for macos - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyDP9GpYfLE8gHTj3kZ1hW8fx_FkJqOqSQk',
+    appId: '1:786692570726:android:0ef7079c2b978d4417b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyAWlRiuJ75FMlf2_UDdri1voWKvkaSHtRg',
+    appId: '1:786692570726:ios:455a6fcff77e130f17b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+    iosBundleId: 'com.example.syncrow.app',
+  );
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyDyGaQ3sZhb4meaY6sGke-YglhdhJ2is8Q',
+    appId: '1:786692570726:web:93c931e6701797b317b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    authDomain: 'syncrow-staging.firebaseapp.com',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+    measurementId: 'G-CZ3J3G6LMQ',
+  );
+}

lib/main.dart

@@ -1,8 +1,11 @@
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
+import 'package:syncrow_web/firebase_options_dev.dart';
+import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
@@ -13,22 +16,26 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment =
+        String.fromEnvironment('FLAVOR', defaultValue: 'production');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
+    );
     initialSetup();
   } catch (_) {}
   runApp(MyApp());
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({
+
-    super.key,
+  MyApp({super.key});
-  });
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -49,7 +56,8 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(
+              create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -70,6 +78,8 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));

lib/main_dev.dart

@@ -0,0 +1,84 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:go_router/go_router.dart';
+import 'package:syncrow_web/firebase_options_dev.dart';
+import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.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/visitor_password/bloc/visitor_password_bloc.dart';
+import 'package:syncrow_web/services/locator.dart';
+import 'package:syncrow_web/utils/app_routes.dart';
+import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/theme/theme.dart';
+
+Future<void> main() async {
+  try {
+    const environment =
+        String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    await dotenv.load(fileName: '.env.$environment');
+    WidgetsFlutterBinding.ensureInitialized();
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptionsDev.currentPlatform,
+    );
+    initialSetup();
+  } catch (_) {}
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  MyApp({
+    super.key,
+  });
+
+  final GoRouter _router = GoRouter(
+    initialLocation: RoutesConst.auth,
+    routes: AppRoutes.getRoutes(),
+    redirect: (context, state) async {
+      String checkToken = await AuthBloc.getTokenAndValidate();
+      final loggedIn = checkToken == 'Success';
+      final goingToLogin = state.uri.toString() == RoutesConst.auth;
+
+      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
+      if (loggedIn && goingToLogin) return RoutesConst.home;
+
+      return null;
+    },
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+        providers: [
+          BlocProvider(
+              create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider<VisitorPasswordBloc>(
+            create: (context) => VisitorPasswordBloc(),
+          ),
+          BlocProvider<RoutineBloc>(
+            create: (context) => RoutineBloc(),
+          ),
+          BlocProvider<SpaceTreeBloc>(
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+          ),
+        ],
+        child: MaterialApp.router(
+          debugShowCheckedModeBanner: false,
+          scrollBehavior: const MaterialScrollBehavior().copyWith(
+            dragDevices: {
+              PointerDeviceKind.mouse,
+              PointerDeviceKind.touch,
+              PointerDeviceKind.stylus,
+              PointerDeviceKind.unknown,
+            },
+          ),
+          theme: myTheme,
+          routerConfig: _router,
+        ));
+  }
+}

lib/pages/access_management/bloc/access_bloc.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
 import 'package:syncrow_web/pages/access_management/model/password_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -30,8 +31,9 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
   Future<void> _onFetchTableData(
       FetchTableData event, Emitter<AccessState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       emit(AccessLoaded());
-      data = await AccessMangApi().fetchVisitorPassword();
+      data = await AccessMangApi().fetchVisitorPassword(projectUuid);
       filteredData = data;
       updateTabsCount();
       emit(TableLoaded(data));
@@ -88,8 +90,8 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
         return Theme(
           data: ThemeData.light().copyWith(
             colorScheme: ColorScheme.light(
-              primary: ColorsManager.blackColor, 
+              primary: ColorsManager.blackColor,
-              onPrimary: Colors.white, 
+              onPrimary: Colors.white,
               onSurface: ColorsManager.grayColor,
             ),
             textButtonTheme: TextButtonThemeData(

lib/pages/access_management/view/access_management.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
 import 'package:syncrow_web/pages/common/custom_table.dart';
@@ -17,6 +18,7 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/style.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
@@ -27,19 +29,19 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
     final isLargeScreen = isLargeScreenSize(context);
     final isSmallScreen = isSmallScreenSize(context);
     final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
 
     return WebScaffold(
         enableMenuSidebar: false,
-        appBarTitle: FittedBox(
+        appBarTitle: Text(
-          child: Text(
+          'Access Management',
-            'Access Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
-            style: Theme.of(context).textTheme.headlineLarge,
-          ),
         ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(
-            create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
             child: BlocConsumer<AccessBloc, AccessState>(
                 listener: (context, state) {},
                 builder: (context, state) {
@@ -93,11 +95,14 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                   return [
                                     item.passwordName,
                                     item.passwordType.value,
-                                    accessBloc.timestampToDate(item.effectiveTime),
+                                    accessBloc
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.deviceName.toString(),
                                     item.authorizerEmail.toString(),
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.passwordStatus.value,
                                   ];
                                 }).toList(),
@@ -108,7 +113,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 })));
   }
 
-  Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) {
+  Wrap _buildVisitorAdminPasswords(
+      BuildContext context, AccessBloc accessBloc) {
     return Wrap(
       spacing: 10,
       runSpacing: 10,
@@ -134,7 +140,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               borderRadius: 8,
               child: Text(
                 'Create Visitor Password ',
-                style: context.textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 12),
+                style: context.textTheme.titleSmall!
+                    .copyWith(color: Colors.white, fontSize: 12),
               )),
         ),
         // Container(
@@ -172,8 +179,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                  emailAuthorizer:
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -191,8 +200,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                  emailAuthorizer:
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -221,7 +232,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));
@@ -249,8 +261,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               description: '',
               onSubmitted: (value) {
                 accessBloc.add(FilterDataEvent(
-                    emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                    emailAuthorizer:
-                    selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex:
+                        BlocProvider.of<AccessBloc>(context).selectedIndex,
                     passwordName: accessBloc.passwordName.text.toLowerCase(),
                     startTime: accessBloc.effectiveTimeTimeStamp,
                     endTime: accessBloc.expirationTimeTimeStamp));
@@ -274,7 +288,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));

lib/pages/auth/bloc/auth_bloc.dart

@@ -9,9 +9,13 @@ import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.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/services/auth_api.dart';
 import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 
 class AuthBloc extends Bloc<AuthEvent, AuthState> {
@@ -31,8 +35,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController =
+  final TextEditingController forgetPasswordController = TextEditingController();
-      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -49,8 +52,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(
+    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -87,8 +89,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(
+        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
-            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -98,8 +99,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(
+  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
-      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -115,8 +115,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage =
+      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
-          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -130,9 +129,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(
+    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
-        isButtonEnabled: event.isButtonEnabled,
-        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -180,18 +177,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         return;
       }
 
-
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(
+        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
-            key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
         user = UserModel.fromToken(token);
         loginEmailController.clear();
         loginPasswordController.clear();
-        debugPrint("token " + token.accessToken);
         emit(LoginSuccess());
       } else {
         emit(const LoginFailure(error: 'Something went wrong'));
@@ -342,14 +336,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
+      final firstLaunch =
-              StringsManager.firstLaunch) ??
+          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
-          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(
+      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
-          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -402,9 +394,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours
+        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
-            .toString()
-            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -442,8 +432,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  static logout() {
+  static Future<void> logout(BuildContext context) async {
-    const storage = FlutterSecureStorage();
+    final storage = FlutterSecureStorage();
+    ProjectManager.clearProjectUUID();
+    context.read<SpaceTreeBloc>().add(ClearAllData());
     storage.deleteAll();
   }
 }

lib/pages/auth/model/project_model.dart

@@ -0,0 +1,27 @@
+class Project {
+  final String uuid;
+  final String name;
+  final String description;
+
+  const Project({
+    required this.uuid,
+    required this.name,
+    required this.description,
+  });
+
+  factory Project.fromJson(Map<String, dynamic> json) {
+    return Project(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'description': description,
+    };
+  }
+}

lib/pages/auth/model/user_model.dart

@@ -1,3 +1,4 @@
+import 'package:syncrow_web/pages/auth/model/project_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 
 class UserModel {
@@ -13,6 +14,7 @@ class UserModel {
   final bool? hasAcceptedWebAgreement;
   final DateTime? webAgreementAcceptedAt;
   final UserRole? role;
+  final Project? project;
 
   UserModel({
     required this.uuid,
@@ -26,6 +28,7 @@ class UserModel {
     required this.hasAcceptedWebAgreement,
     required this.webAgreementAcceptedAt,
     required this.role,
+    required this.project,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
@@ -43,6 +46,8 @@ class UserModel {
           ? DateTime.parse(json['webAgreementAcceptedAt'])
           : null,
       role: json['role'] != null ? UserRole.fromJson(json['role']) : null,
+      project:
+          json['project'] != null ? Project.fromJson(json['project']) : null,
     );
   }
 
@@ -64,6 +69,7 @@ class UserModel {
       phoneNumber: null,
       isEmailVerified: null,
       isAgreementAccepted: null,
+      project: null
     );
   }
 

lib/pages/auth/view/forget_password_page.dart

@@ -8,6 +8,8 @@ class ForgetPasswordPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return const ResponsiveLayout(
-        desktopBody: ForgetPasswordWebPage(), mobileBody: ForgetPasswordWebPage());
+        tablet: ForgetPasswordWebPage(),
+        desktopBody: ForgetPasswordWebPage(),
+        mobileBody: ForgetPasswordWebPage());
   }
 }

lib/pages/auth/view/login_page.dart

@@ -9,6 +9,8 @@ class LoginPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return const ResponsiveLayout(
-        desktopBody: LoginWebPage(), mobileBody: LoginWebPage());
+        tablet: LoginWebPage(),
+        desktopBody: LoginWebPage(),
+        mobileBody: LoginWebPage());
   }
 }

lib/pages/common/bloc/project_manager.dart

@@ -0,0 +1,19 @@
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+
+class ProjectManager {
+  static Future<String?> getProjectUUID() async {
+    final projectUuid = await SharedPreferencesHelper.readStringFromSP(
+        StringsManager.projectKey);
+    return projectUuid.isNotEmpty ? projectUuid : null;
+  }
+
+  static Future<void> setProjectUUID(String newUUID) async {
+    await SharedPreferencesHelper.saveStringToSP(
+        StringsManager.projectKey, newUUID);
+  }
+
+  static Future<void> clearProjectUUID() async {
+    await SharedPreferencesHelper.removeValueFromSP(StringsManager.projectKey);
+  }
+}

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -1,5 +1,6 @@
 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';
@@ -19,6 +20,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     on<AcControlEvent>(_onAcControl);
     on<AcBatchControlEvent>(_onAcBatchControl);
     on<AcFactoryResetEvent>(_onFactoryReset);
+    on<AcStatusUpdated>(_onAcStatusUpdated);
   }
 
   FutureOr<void> _onFetchAcStatus(
@@ -28,12 +30,64 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(ACStatusLoaded(deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
     }
   }
 
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> 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']));
+        });
+
+        deviceStatus =
+            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(AcStatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onAcStatusUpdated(AcStatusUpdated event, Emitter<AcsState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(ACStatusLoaded(deviceStatus));
+  }
+
+  // Future<void> testFirebaseConnection() async {
+  //   // Reference to a test node in your database
+  //   final testRef = FirebaseDatabase.instance.ref("test");
+
+  //   // Write a test value
+  //   await testRef.set("Hello, Firebase!");
+
+  //   // Listen for changes on the test node
+  //   testRef.onValue.listen((DatabaseEvent event) {
+  //     final data = event.snapshot.value;
+  //     print("Data from Firebase: $data");
+  //     // If you see "Hello, Firebase!" printed in your console, it means the connection works.
+  //   });
+  // }
+
   FutureOr<void> _onAcControl(
       AcControlEvent event, Emitter<AcsState> emit) async {
     final oldValue = _getValueByCode(event.code);

lib/pages/device_managment/ac/bloc/ac_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 
 sealed class AcsEvent extends Equatable {
@@ -7,6 +8,7 @@ sealed class AcsEvent extends Equatable {
   @override
   List<Object> get props => [];
 }
+class AcUpdated extends AcsEvent {}
 
 class AcFetchDeviceStatusEvent extends AcsEvent {
   final String deviceId;
@@ -16,7 +18,10 @@ class AcFetchDeviceStatusEvent extends AcsEvent {
   @override
   List<Object> get props => [deviceId];
 }
-
+class AcStatusUpdated extends AcsEvent {
+  final AcStatusModel deviceStatus;
+  AcStatusUpdated(this.deviceStatus);
+}
 class AcFetchBatchStatusEvent extends AcsEvent {
   final List<String> devicesIds;
 

lib/pages/device_managment/ac/view/ac_device_control.dart

@@ -24,7 +24,8 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => AcBloc(deviceId: device.uuid!)..add(AcFetchDeviceStatusEvent(device.uuid!)),
+      create: (context) => AcBloc(deviceId: device.uuid!)
+        ..add(AcFetchDeviceStatusEvent(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           if (state is ACStatusLoaded) {
@@ -98,7 +99,8 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                       ),
                       Text(
                         'h',
-                        style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                        style: context.textTheme.bodySmall!
+                            .copyWith(color: ColorsManager.blackColor),
                       ),
                       Text(
                         '30',
@@ -107,7 +109,9 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                           fontWeight: FontWeight.bold,
                         ),
                       ),
-                      Text('m', style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor)),
+                      Text('m',
+                          style: context.textTheme.bodySmall!
+                              .copyWith(color: ColorsManager.blackColor)),
                       IconButton(
                         padding: const EdgeInsets.all(0),
                         onPressed: () {},

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -1,14 +1,19 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 part 'device_managment_event.dart';
 part 'device_managment_state.dart';
 
-class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementState> {
+class DeviceManagementBloc
+    extends Bloc<DeviceManagementEvent, DeviceManagementState> {
   int _selectedIndex = 0;
   List<AllDevicesModel> _devices = [];
   int _onlineCount = 0;
@@ -31,19 +36,25 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     on<UpdateSelection>(_onUpdateSelection);
   }
 
-  Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onFetchDevices(
+      FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '');
+        devices = await DevicesManagementApi()
+            .fetchDevices('', '', projectUuid );
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
           for (var space in spacesList) {
-            devices.addAll(await DevicesManagementApi().fetchDevices(community, space));
+            devices.addAll(await DevicesManagementApi().fetchDevices(
+                community, space, projectUuid));
           }
         }
       }
@@ -66,7 +77,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onFilterDevices(FilterDevices event, Emitter<DeviceManagementState> emit) async {
+  void _onFilterDevices(
+      FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
         switch (event.filter) {
@@ -97,7 +109,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  Future<void> _onResetFilters(ResetFilters event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onResetFilters(
+      ResetFilters event, Emitter<DeviceManagementState> emit) async {
     currentProductName = '';
     _selectedDevices.clear();
     _filteredDevices = List.from(_devices);
@@ -113,7 +126,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     ));
   }
 
-  void _onResetSelectedDevices(ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
+  void _onResetSelectedDevices(
+      ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
     _selectedDevices.clear();
 
     if (state is DeviceManagementLoaded) {
@@ -139,12 +153,14 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSelectedFilterChanged(SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
+  void _onSelectedFilterChanged(
+      SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
     _selectedIndex = event.selectedIndex;
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(
+      SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -155,7 +171,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
     List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
 
-    bool isControlButtonEnabled = _checkIfControlButtonEnabled(clonedSelectedDevices);
+    bool isControlButtonEnabled =
+        _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
       emit(DeviceManagementLoaded(
@@ -164,7 +181,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     } else if (state is DeviceManagementFiltered) {
@@ -174,13 +192,15 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     }
   }
 
-  void _onUpdateSelection(UpdateSelection event, Emitter<DeviceManagementState> emit) {
+  void _onUpdateSelection(
+      UpdateSelection event, Emitter<DeviceManagementState> emit) {
     List<AllDevicesModel> selectedDevices = [];
     List<AllDevicesModel> devicesToSelectFrom = [];
 
@@ -223,7 +243,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
   bool _checkIfControlButtonEnabled(List<AllDevicesModel> selectedDevices) {
     if (selectedDevices.length > 1) {
-      final productTypes = selectedDevices.map((device) => device.productType).toSet();
+      final productTypes =
+          selectedDevices.map((device) => device.productType).toSet();
       return productTypes.length == 1;
     } else if (selectedDevices.length == 1) {
       return true;
@@ -234,8 +255,10 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   void _calculateDeviceCounts() {
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
-    _lowBatteryCount =
+    _lowBatteryCount = _devices
-        _devices.where((device) => device.batteryLevel != null && device.batteryLevel! < 20).length;
+        .where((device) =>
+            device.batteryLevel != null && device.batteryLevel! < 20)
+        .length;
   }
 
   String _getFilterFromIndex(int index) {
@@ -251,7 +274,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(
+      SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.productName == null || event.productName!.isEmpty)) {
@@ -280,22 +304,33 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
-            (device.community?.name?.toLowerCase().contains(event.community!.toLowerCase()) ??
+            (device.community?.name
+                    ?.toLowerCase()
+                    .contains(event.community!.toLowerCase()) ??
                 false);
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
                 device.spaces!.isNotEmpty &&
-                device.spaces![0].spaceName!.toLowerCase().contains(event.unitName!.toLowerCase()));
+                device.spaces![0].spaceName!
+                    .toLowerCase()
+                    .contains(event.unitName!.toLowerCase()));
         final matchesProductName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.name?.toLowerCase().contains(event.productName!.toLowerCase()) ?? false);
+            (device.name
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
         final matchesDeviceName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.categoryName?.toLowerCase().contains(event.productName!.toLowerCase()) ??
+            (device.categoryName
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
                 false);
 
-        return matchesCommunity && matchesUnit && (matchesProductName || matchesDeviceName);
+        return matchesCommunity &&
+            matchesUnit &&
+            (matchesProductName || matchesDeviceName);
       }).toList();
 
       emit(DeviceManagementFiltered(

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@@ -9,6 +10,7 @@ import 'package:syncrow_web/pages/routines/view/routines_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
@@ -19,17 +21,17 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(FetchDevices(context)),
+          create: (context) =>
+              DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(
-        appBarTitle: FittedBox(
+        appBarTitle: Text(
-          child: Text(
+          'Device Management',
-            'Device Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
-            style: Theme.of(context).textTheme.headlineLarge,
-          ),
         ),
-        centerBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
+        centerBody:
+            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           return Row(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -41,12 +43,16 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
+                  context.read<DeviceManagementBloc>().add(FetchDevices(context));
                 },
                 child: Text(
                   'Devices',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: !state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
+                    color: !state.routineTab
-                    fontWeight: !state.routineTab ? FontWeight.w700 : FontWeight.w400,
+                        ? ColorsManager.whiteColors
+                        : ColorsManager.grayColor,
+                    fontWeight:
+                        !state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -55,13 +61,18 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
-                  context.read<RoutineBloc>().add(const TriggerSwitchTabsEvent(isRoutineTab: true));
+                  context
+                      .read<RoutineBloc>()
+                      .add(const TriggerSwitchTabsEvent(isRoutineTab: true));
                 },
                 child: Text(
                   'Routines',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
+                    color: state.routineTab
-                    fontWeight: state.routineTab ? FontWeight.w700 : FontWeight.w400,
+                        ? ColorsManager.whiteColors
+                        : ColorsManager.grayColor,
+                    fontWeight:
+                        state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -69,7 +80,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           );
         }),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
+        scaffoldBody:
+            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           if (state.routineTab) {
             return const RoutinesView();
           }
@@ -84,7 +96,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
               } else if (deviceState is DeviceManagementLoaded) {
                 return DeviceManagementBody(devices: deviceState.devices);
               } else if (deviceState is DeviceManagementFiltered) {
-                return DeviceManagementBody(devices: deviceState.filteredDevices);
+                return DeviceManagementBody(
+                    devices: deviceState.filteredDevices);
               } else {
                 return const Center(child: Text('Error fetching Devices'));
               }

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -8,7 +8,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_search_filters.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_batch_control_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_control_dialog.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/format_date_time.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -69,7 +68,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               },
             )),
             Expanded(
-              flex: 3,
+              flex: 4,
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
@@ -95,7 +94,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                               const DeviceSearchFilters(),
                               const SizedBox(height: 12),
                               Container(
-                                height: 45,
+                                // height: 45,
                                 width: 125,
                                 decoration: containerDecoration,
                                 child: Center(

lib/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart

@@ -1,5 +1,6 @@
 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/ceiling_sensor/bloc/ceiling_event.dart';
@@ -22,42 +23,55 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     on<ShowCeilingDescriptionEvent>(_showDescription);
     on<BackToCeilingGridViewEvent>(_backToGridView);
     on<CeilingFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   void _fetchCeilingSensorStatus(
       CeilingInitialEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      var response =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(event.deviceId);
     } catch (e) {
       emit(CeilingFailedState(error: e.toString()));
       return;
     }
   }
 
-  // _listenToChanges() {
+  _listenToChanges(deviceId) {
-  //   try {
+    try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref =
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) {
+      stream.listen((DatabaseEvent event) {
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        Map<dynamic, dynamic> usersMap =
-  //       List<StatusModel> statusList = [];
+            event.snapshot.value as Map<dynamic, dynamic>;
 
-  //       usersMap['status'].forEach((element) {
+        List<Status> statusList = [];
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
+        usersMap['status'].forEach((element) {
-  //       });
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = WallSensorModel.fromJson(statusList);
+        deviceStatus = CeilingSensorModel.fromJson(statusList);
-  //       add(WallSensorUpdatedEvent());
+        if (!isClosed) {
-  //     });
+          add(StatusUpdated(deviceStatus));
-  //   } catch (_) {}
+        }
-  // }
+      });
+    } catch (_) {}
+  }
 
-  void _changeValue(CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
+  void _onStatusUpdated(StatusUpdated event, Emitter<CeilingSensorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
+  }
+
+  void _changeValue(
+      CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
     if (event.code == 'sensitivity') {
       deviceStatus.sensitivity = event.value;
@@ -122,7 +136,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -143,8 +158,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     });
   }
 
-  FutureOr<void> _getDeviceReports(
+  FutureOr<void> _getDeviceReports(GetCeilingDeviceReportsEvent event,
-      GetCeilingDeviceReportsEvent event, Emitter<CeilingSensorState> emit) async {
+      Emitter<CeilingSensorState> emit) async {
     if (event.code.isEmpty) {
       emit(ShowCeilingDescriptionState(description: reportString));
       return;
@@ -155,7 +170,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
 
       try {
         // await DevicesManagementApi.getDeviceReportsByDate(deviceId, event.code, from.toString(), to.toString())
-        await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
+        await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+            .then((value) {
           emit(CeilingReportsState(deviceReport: value));
         });
       } catch (e) {
@@ -165,19 +181,23 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     }
   }
 
-  void _showDescription(ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
+  void _showDescription(
+      ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
     emit(ShowCeilingDescriptionState(description: event.description));
   }
 
-  void _backToGridView(BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
+  void _backToGridView(
+      BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
   }
 
   FutureOr<void> _fetchCeilingSensorBatchControl(
-      CeilingFetchDeviceStatusEvent event, Emitter<CeilingSensorState> emit) async {
+      CeilingFetchDeviceStatusEvent event,
+      Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
     } catch (e) {

lib/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 
 abstract class CeilingSensorEvent extends Equatable {
   const CeilingSensorEvent();
@@ -83,3 +84,12 @@ class CeilingFactoryResetEvent extends CeilingSensorEvent {
   @override
   List<Object> get props => [devicesId, factoryResetModel];
 }
+
+
+
+class StatusUpdated extends CeilingSensorEvent {
+  final CeilingSensorModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/curtain/bloc/curtain_bloc.dart

@@ -1,4 +1,5 @@
 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';
@@ -16,6 +17,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<CurtainControl>(_onCurtainControl);
     on<CurtainBatchControl>(_onCurtainBatchControl);
     on<CurtainFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(
@@ -24,7 +26,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-
+      _listenToChanges(event.deviceId);
       deviceStatus = _checkStatus(status.status[0].value);
 
       emit(CurtainStatusLoaded(deviceStatus));
@@ -33,6 +35,48 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     }
   }
 
+  void _listenToChanges(String deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;
+
+        List<Status> statusList = [];
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          bool newStatus = _checkStatus(statusList[0].value);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
+              add(StatusUpdated(deviceStatus));
+            }
+          }
+        }
+      });
+    } catch (e) {
+      emit(CurtainError('Failed to listen to changes: $e'));
+    }
+  }
+
+  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;

lib/pages/device_managment/curtain/bloc/curtain_event.dart

@@ -60,3 +60,7 @@ class CurtainFactoryReset extends CurtainEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+class StatusUpdated extends CurtainEvent {
+  final bool deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+}

lib/pages/device_managment/door_lock/bloc/door_lock_bloc.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 
 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/door_lock/bloc/door_lock_event.dart';
@@ -18,6 +19,39 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
     //on<DoorLockControl>(_onDoorLockControl);
     on<UpdateLockEvent>(_updateLock);
     on<DoorLockFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
+  }
+
+  _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 =
+            DoorLockStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<DoorLockState> emit) {
+    emit(DoorLockStatusLoading());
+
+    deviceStatus = event.deviceStatus;
+    emit(DoorLockStatusLoaded(deviceStatus));
   }
 
   FutureOr<void> _onFetchDeviceStatus(
@@ -28,6 +62,8 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           DoorLockStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
+
       emit(DoorLockStatusLoaded(deviceStatus));
     } catch (e) {
       emit(DoorLockControlError(e.toString()));

lib/pages/device_managment/door_lock/bloc/door_lock_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/door_lock/models/door_lock_status_model.dart';
 
 sealed class DoorLockEvent extends Equatable {
   const DoorLockEvent();
@@ -51,3 +52,10 @@ class DoorLockFactoryReset extends DoorLockEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends DoorLockEvent {
+  final DoorLockStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_event.dart';
@@ -39,31 +40,68 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     on<GarageDoorFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<GarageDoorFactoryResetEvent>(_onFactoryReset);
     on<EditGarageDoorScheduleEvent>(_onEditSchedule);
+    on<StatusUpdated>(_onStatusUpdated);
+  }
+  _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 =
+            GarageDoorStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
   }
 
-  void _fetchGarageDoorStatus(GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
+  void _onStatusUpdated(StatusUpdated event, Emitter<GarageDoorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(GarageDoorLoadedState(status: deviceStatus));
+  }
+
+  void _fetchGarageDoorStatus(
+      GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      var response =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = GarageDoorStatusModel.fromJson(deviceId, response.status);
+      _listenToChanges(deviceId);
       emit(GarageDoorLoadedState(status: deviceStatus));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
   }
 
-  Future<void> _onFetchBatchStatus(GarageDoorFetchBatchStatusEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onFetchBatchStatus(GarageDoorFetchBatchStatusEvent event,
+      Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      final status =
-      deviceStatus = GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus =
+          GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
       emit(GarageDoorBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(GarageDoorBatchControlError(e.toString()));
     }
   }
 
-  Future<void> _addSchedule(AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _addSchedule(
+      AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         category: event.category,
@@ -71,9 +109,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
+      bool success =
+          await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
+        add(FetchGarageDoorSchedulesEvent(
+            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }
@@ -82,16 +122,19 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _onUpdateCountdownAlarm(UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
+  void _onUpdateCountdownAlarm(
+      UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
-        status: currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
+        status:
+            currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
       ));
     }
   }
 
-  void _onUpdateTrTimeCon(UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
+  void _onUpdateTrTimeCon(
+      UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -100,7 +143,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event,
+      Emitter<GarageDoorState> emit) async {
     try {
       final updatedSchedules = deviceStatus.schedules?.map((schedule) {
         if (schedule.scheduleId == event.scheduleId) {
@@ -127,12 +171,15 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event,
+      Emitter<GarageDoorState> emit) async {
     try {
-      bool success = await DevicesManagementApi().deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
+      bool success = await DevicesManagementApi()
+          .deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
       if (success) {
-        final updatedSchedules =
+        final updatedSchedules = deviceStatus.schedules
-            deviceStatus.schedules?.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
+            ?.where((schedule) => schedule.scheduleId != event.scheduleId)
+            .toList();
         deviceStatus = deviceStatus.copyWith(schedules: updatedSchedules);
         emit(GarageDoorLoadedState(status: deviceStatus));
       } else {
@@ -143,11 +190,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event,
+      Emitter<GarageDoorState> emit) async {
     emit(ScheduleGarageLoadingState());
     try {
-      List<ScheduleModel> schedules =
+      List<ScheduleModel> schedules = await DevicesManagementApi()
-          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
+          .getDeviceSchedules(deviceStatus.uuid, event.category);
       deviceStatus = deviceStatus.copyWith(schedules: schedules);
       emit(
         GarageDoorLoadedState(
@@ -165,30 +213,37 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSelectedTime(UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSelectedTime(
+      UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(selectedTime: event.selectedTime));
     }
   }
 
-  Future<void> _updateSelectedDay(UpdateSelectedDayEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSelectedDay(
+      UpdateSelectedDayEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       List<bool> updatedDays = List.from(currentState.selectedDays);
       updatedDays[event.dayIndex] = event.isSelected;
-      emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
+      emit(currentState.copyWith(
+          selectedDays: updatedDays, selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _updateFunctionOn(UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateFunctionOn(
+      UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
-      emit(currentState.copyWith(functionOn: event.functionOn, selectedTime: currentState.selectedTime));
+      emit(currentState.copyWith(
+          functionOn: event.functionOn,
+          selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _initializeAddSchedule(InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _initializeAddSchedule(
+      InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -200,20 +255,25 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchRecords(FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _fetchRecords(
+      FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorReportsLoadingState());
     try {
-      final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
+      final from = DateTime.now()
+          .subtract(const Duration(days: 30))
+          .millisecondsSinceEpoch;
       final to = DateTime.now().millisecondsSinceEpoch;
       final DeviceReport records =
-          await DevicesManagementApi.getDeviceReportsByDate(event.deviceId, 'switch_1', from.toString(), to.toString());
+          await DevicesManagementApi.getDeviceReportsByDate(
+              event.deviceId, 'switch_1', from.toString(), to.toString());
       emit(GarageDoorReportsState(deviceReport: records));
     } catch (e) {
       emit(GarageDoorReportsFailedState(error: e.toString()));
     }
   }
 
-  Future<void> _onBatchControl(GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onBatchControl(
+      GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
     final oldValue = event.code == 'switch_1' ? deviceStatus.switch1 : false;
 
     _updateLocalValue(event.code, event.value);
@@ -233,11 +293,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _backToGridView(BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
+  void _backToGridView(
+      BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
-  void _handleUpdate(GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
+  void _handleUpdate(
+      GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
@@ -253,9 +315,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       late bool status;
       await Future.delayed(const Duration(milliseconds: 500));
       if (isBatch) {
-        status = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+        status = await DevicesManagementApi()
+            .deviceBatchControl(deviceId, code, value);
       } else {
-        status = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+        status = await DevicesManagementApi()
+            .deviceControl(deviceId, Status(code: code, value: value));
       }
 
       if (!status) {
@@ -270,10 +334,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _onFactoryReset(GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onFactoryReset(
+      GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(const GarageDoorErrorState(message: 'Failed to reset device'));
       } else {
@@ -284,34 +350,47 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _increaseDelay(IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
+  void _increaseDelay(
+      IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
-      deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay + Duration(minutes: 10));
+      deviceStatus = deviceStatus.copyWith(
+          delay: deviceStatus.delay + Duration(minutes: 10));
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
+      add(GarageDoorControlEvent(
+          deviceId: event.deviceId,
+          value: deviceStatus.delay.inSeconds,
+          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     // }
   }
 
-  void _decreaseDelay(DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
+  void _decreaseDelay(
+      DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
       if (deviceStatus.delay.inMinutes > 10) {
-        deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay - Duration(minutes: 10));
+        deviceStatus = deviceStatus.copyWith(
+            delay: deviceStatus.delay - Duration(minutes: 10));
       }
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
+      add(GarageDoorControlEvent(
+          deviceId: event.deviceId,
+          value: deviceStatus.delay.inSeconds,
+          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     //}
   }
 
-  void _garageDoorControlEvent(GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
+  void _garageDoorControlEvent(
-    final oldValue = event.code == 'countdown_1' ? deviceStatus.countdown1 : deviceStatus.switch1;
+      GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
+    final oldValue = event.code == 'countdown_1'
+        ? deviceStatus.countdown1
+        : deviceStatus.switch1;
     _updateLocalValue(event.code, event.value);
     emit(GarageDoorLoadedState(status: deviceStatus));
     final success = await _runDeBouncer(
@@ -327,7 +406,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _revertValue(String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
+  void _revertValue(
+      String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
     switch (code) {
       case 'switch_1':
         if (oldValue is bool) {
@@ -336,7 +416,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (oldValue is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: oldValue, delay: Duration(seconds: oldValue));
+          deviceStatus = deviceStatus.copyWith(
+              countdown1: oldValue, delay: Duration(seconds: oldValue));
         }
         break;
       // Add other cases if needed
@@ -358,7 +439,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (value is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: value, delay: Duration(seconds: value));
+          deviceStatus = deviceStatus.copyWith(
+              countdown1: value, delay: Duration(seconds: value));
         }
         break;
       case 'countdown_alarm':
@@ -401,7 +483,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     return super.close();
   }
 
-  FutureOr<void> _onEditSchedule(EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  FutureOr<void> _onEditSchedule(
+      EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         scheduleId: event.scheduleId,
@@ -410,9 +493,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success = await DevicesManagementApi().editScheduleRecord(deviceId, newSchedule);
+      bool success = await DevicesManagementApi()
+          .editScheduleRecord(deviceId, newSchedule);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
+        add(FetchGarageDoorSchedulesEvent(
+            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }

lib/pages/device_managment/garage_door/bloc/garage_door_event.dart

@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
 
 abstract class GarageDoorEvent extends Equatable {
   const GarageDoorEvent();
@@ -25,7 +26,8 @@ class GarageDoorControlEvent extends GarageDoorEvent {
   final dynamic value;
   final String code;
 
-  const GarageDoorControlEvent({required this.deviceId, required this.value, required this.code});
+  const GarageDoorControlEvent(
+      {required this.deviceId, required this.value, required this.code});
 
   @override
   List<Object?> get props => [deviceId, value];
@@ -121,7 +123,8 @@ class FetchGarageDoorRecordsEvent extends GarageDoorEvent {
   final String deviceId;
   final String code;
 
-  const FetchGarageDoorRecordsEvent({required this.deviceId, required this.code});
+  const FetchGarageDoorRecordsEvent(
+      {required this.deviceId, required this.code});
 
   @override
   List<Object?> get props => [deviceId, code];
@@ -232,3 +235,10 @@ class GarageDoorFactoryResetEvent extends GarageDoorEvent {
   @override
   List<Object?> get props => [factoryReset, deviceId];
 }
+
+class StatusUpdated extends GarageDoorEvent {
+  final GarageDoorStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/main_door_sensor/bloc/main_door_sensor_bloc.dart

@@ -1,5 +1,6 @@
 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';
@@ -16,6 +17,7 @@ class MainDoorSensorBloc
     on<MainDoorSensorFetchBatchEvent>(_onFetchBatchStatus);
     on<MainDoorSensorReportsEvent>(_fetchReports);
     on<MainDoorSensorFactoryReset>(_factoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late MainDoorSensorStatusModel deviceStatus;
@@ -28,7 +30,7 @@ class MainDoorSensorBloc
       final status = await DevicesManagementApi()
           .getDeviceStatus(event.deviceId)
           .then((value) => value.status);
-
+      _listenToChanges(event.deviceId);
       deviceStatus = MainDoorSensorStatusModel.fromJson(event.deviceId, status);
       emit(MainDoorSensorDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -156,4 +158,35 @@ class MainDoorSensorBloc
       emit(MainDoorSensorFailedState(error: 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 = MainDoorSensorStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<MainDoorSensorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(MainDoorSensorDeviceStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/main_door_sensor/bloc/main_door_sensor_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/device_managment/main_door_sensor/models/main_door_status_model.dart';
 
 import '../../all_devices/models/factory_reset_model.dart';
 
@@ -71,3 +72,10 @@ class MainDoorSensorFactoryReset extends MainDoorSensorEvent {
   MainDoorSensorFactoryReset(
       {required this.deviceId, required this.factoryReset});
 }
+
+class StatusUpdated extends MainDoorSensorEvent {
+  final MainDoorSensorStatusModel deviceStatus;
+   StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.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';
@@ -10,33 +11,71 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'one_gang_glass_switch_event.dart';
 part 'one_gang_glass_switch_state.dart';
 
-class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
+class OneGangGlassSwitchBloc
+    extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
   OneGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
   OneGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = OneGangGlassStatusModel(uuid: deviceId, switch1: false, countDown: 0),
+      : deviceStatus = OneGangGlassStatusModel(
+            uuid: deviceId, switch1: false, countDown: 0),
         super(OneGangGlassSwitchInitial()) {
     on<OneGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<OneGangGlassSwitchControl>(_onControl);
     on<OneGangGlassSwitchBatchControl>(_onBatchControl);
     on<OneGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<OneGangGlassFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
+  Future<void> _onFetchDeviceStatus(OneGangGlassSwitchFetchDeviceEvent event,
-      OneGangGlassSwitchFetchDeviceEvent event, Emitter<OneGangGlassSwitchState> emit) async {
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
-      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId);
+      deviceStatus =
+          OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onControl(OneGangGlassSwitchControl event, Emitter<OneGangGlassSwitchState> emit) async {
+  _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 = OneGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<OneGangGlassSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
+  Future<void> _onControl(OneGangGlassSwitchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -52,10 +91,12 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     );
   }
 
-  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event, Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(OneGangGlassSwitchError('Failed to reset device'));
       } else {
@@ -66,7 +107,8 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     }
   }
 
-  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event, Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -83,11 +125,14 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
   }
 
   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);
+      final status =
-      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = OneGangGlassStatusModel.fromJson(
+          event.deviceIds.first, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
@@ -117,9 +162,11 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -131,7 +178,8 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<OneGangGlassSwitchState> emit) {
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<OneGangGlassSwitchState> emit) {
     _updateLocalValue(code, oldValue);
     emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
   }

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_event.dart

@@ -39,6 +39,11 @@ class OneGangGlassSwitchFetchBatchStatusEvent extends OneGangGlassSwitchEvent {
   OneGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
 }
 
+class StatusUpdated extends OneGangGlassSwitchEvent {
+  final OneGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+}
+
 class OneGangGlassFactoryResetEvent extends OneGangGlassSwitchEvent {
   final FactoryResetModel factoryReset;
   final String deviceId;

lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart

@@ -1,5 +1,6 @@
 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/one_gang_switch/bloc/wall_light_switch_event.dart';
@@ -16,6 +17,7 @@ class WallLightSwitchBloc
     on<WallLightSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<WallLightSwitchBatchControl>(_onBatchControl);
     on<WallLightFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WallLightStatusModel deviceStatus;
@@ -31,12 +33,44 @@ class WallLightSwitchBloc
 
       deviceStatus =
           WallLightStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(WallLightSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(WallLightSwitchError(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 =
+            WallLightStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<WallLightSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WallLightSwitchStatusLoaded(deviceStatus));
+  }
+
   FutureOr<void> _onControl(
       WallLightSwitchControl event, Emitter<WallLightSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);

lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 
 class WallLightSwitchEvent extends Equatable {
   @override
@@ -57,3 +58,10 @@ class WallLightFactoryReset extends WallLightSwitchEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends WallLightSwitchEvent {
+  final WallLightStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.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';
@@ -10,7 +11,8 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'three_gang_glass_switch_event.dart';
 part 'three_gang_glass_switch_state.dart';
 
-class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
+class ThreeGangGlassSwitchBloc
+    extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
   ThreeGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
@@ -29,21 +31,57 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     on<ThreeGangGlassSwitchBatchControl>(_onBatchControl);
     on<ThreeGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<ThreeGangGlassFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
+  Future<void> _onFetchDeviceStatus(ThreeGangGlassSwitchFetchDeviceEvent event,
-      ThreeGangGlassSwitchFetchDeviceEvent event, Emitter<ThreeGangGlassSwitchState> emit) async {
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onControl(ThreeGangGlassSwitchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  _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 = ThreeGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<ThreeGangGlassSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
+  Future<void> _onControl(ThreeGangGlassSwitchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -59,7 +97,8 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     );
   }
 
-  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -76,21 +115,26 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
   }
 
   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);
+      final status =
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceIds.first, status.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'));
       } else {
@@ -124,9 +168,11 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -138,7 +184,8 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<ThreeGangGlassSwitchState> emit) {
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<ThreeGangGlassSwitchState> emit) {
     _updateLocalValue(code, oldValue);
     emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
   }

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_event.dart

@@ -49,3 +49,10 @@ class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
     required this.factoryReset,
   });
 }
+
+class StatusUpdated extends ThreeGangGlassSwitchEvent {
+  final ThreeGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart

@@ -3,6 +3,7 @@
 import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.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';
@@ -22,6 +23,7 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
     on<LivingRoomBatchControl>(_livingRoomBatchControl);
     on<LivingRoomFetchBatchEvent>(_livingRoomFetchBatchControl);
     on<LivingRoomFactoryResetEvent>(_livingRoomFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(LivingRoomFetchDeviceStatusEvent event,
@@ -32,6 +34,7 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           LivingRoomStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(deviceId);
       emit(LivingRoomDeviceStatusLoaded(deviceStatus));
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
@@ -144,6 +147,9 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
           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()));
@@ -185,4 +191,34 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
       emit(LivingRoomDeviceManagementError(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 =
+            LivingRoomStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<LivingRoomState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/three_gang_switch/bloc/living_room_event.dart

@@ -58,3 +58,10 @@ class LivingRoomFactoryResetEvent extends LivingRoomEvent {
   @override
   List<Object> get props => [uuid, factoryReset];
 }
+
+class StatusUpdated extends LivingRoomEvent {
+  final LivingRoomStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart

@@ -1,12 +1,11 @@
 import 'dart:async';
-
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.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/devices_mang_api.dart';
-
 part 'two_gang_glass_switch_event.dart';
 part 'two_gang_glass_switch_state.dart';
 
@@ -14,7 +13,6 @@ class TwoGangGlassSwitchBloc
     extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
   TwoGangGlassStatusModel deviceStatus;
   Timer? _timer;
-
   TwoGangGlassSwitchBloc({required String deviceId})
       : deviceStatus = TwoGangGlassStatusModel(
             uuid: deviceId,
@@ -28,6 +26,7 @@ class TwoGangGlassSwitchBloc
     on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
     on<TwoGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<TwoGangGlassFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchDeviceStatus(TwoGangGlassSwitchFetchDeviceEvent event,
@@ -38,12 +37,44 @@ class TwoGangGlassSwitchBloc
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangGlassSwitchError(e.toString()));
     }
   }
 
+  void _listenToChanges(String deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      ref.onValue.listen((DatabaseEvent event) {
+        if (event.snapshot.value == null) return;
+
+        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']));
+        });
+
+        // Parse the new status and add the event
+        final updatedStatus =
+            TwoGangGlassStatusModel.fromJson(data['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(updatedStatus));
+        }
+      });
+    } catch (e) {
+      // Handle errors and emit an error state if necessary
+      if (!isClosed) {
+        // add(TwoGangGlassSwitchError('Error listening to updates: $e'));
+      }
+    }
+  }
+
   Future<void> _onControl(TwoGangGlassSwitchControl event,
       Emitter<TwoGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
@@ -178,4 +209,37 @@ class TwoGangGlassSwitchBloc
     _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));
+  }
 }

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_event.dart

@@ -48,3 +48,11 @@ class TwoGangGlassFactoryReset extends TwoGangGlassSwitchEvent {
     required this.factoryReset,
   });
 }
+
+class StatusUpdated extends TwoGangGlassSwitchEvent {
+  final TwoGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart

@@ -6,7 +6,8 @@ import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class TwoGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
+class TwoGangGlassSwitchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const TwoGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -14,25 +15,25 @@ class TwoGangGlassSwitchControlView extends StatelessWidget with HelperResponsiv
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) =>
+        create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceId)
-          TwoGangGlassSwitchBloc(deviceId: deviceId)..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
+          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
-      child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
+        child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
-        builder: (context, state) {
+          builder: (context, state) {
-          if (state is TwoGangGlassSwitchLoading) {
+            if (state is TwoGangGlassSwitchLoading) {
-            return const Center(child: CircularProgressIndicator());
+              return const Center(child: CircularProgressIndicator());
-          } else if (state is TwoGangGlassSwitchStatusLoaded) {
+            } else if (state is TwoGangGlassSwitchStatusLoaded) {
-            return _buildStatusControls(context, state.status);
+              return _buildStatusControls(context, state.status);
-          } else if (state is TwoGangGlassSwitchError) {
+            } else if (state is TwoGangGlassSwitchError) {
-            return const Center(child: Text('Error fetching status'));
+              return Center(child: Text(state.message));
-          } else {
+            } else {
-            return const Center(child: CircularProgressIndicator());
+              return const Center(child: CircularProgressIndicator());
-          }
+            }
-        },
+          },
-      ),
+        ));
-    );
   }
 
-  Widget _buildStatusControls(BuildContext context, TwoGangGlassStatusModel status) {
+  Widget _buildStatusControls(
+      BuildContext context, TwoGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart

@@ -1,5 +1,6 @@
 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/two_gang_switch/bloc/two_gang_switch_event.dart';
@@ -14,6 +15,7 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     on<TwoGangSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<TwoGangSwitchBatchControl>(_onBatchControl);
     on<TwoGangFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late TwoGangStatusModel deviceStatus;
@@ -26,8 +28,8 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-
       deviceStatus = TwoGangStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(emit);
       emit(TwoGangSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangSwitchError(e.toString()));
@@ -174,4 +176,34 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
       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) {
+    deviceStatus = event.deviceStatus;
+    emit(TwoGangSwitchStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 
 class TwoGangSwitchEvent extends Equatable {
   @override
@@ -57,3 +58,10 @@ class TwoGangFactoryReset extends TwoGangSwitchEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends TwoGangSwitchEvent {
+  final TwoGangStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -1,4 +1,5 @@
 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/wall_sensor/bloc/wall_event.dart';
@@ -29,7 +30,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(emit);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -38,10 +39,12 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
 
   // Fetch batch status
   FutureOr<void> _fetchWallSensorBatchControl(
-      WallSensorFetchBatchStatusEvent event, Emitter<WallSensorState> emit) async {
+      WallSensorFetchBatchStatusEvent event,
+      Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
     } catch (e) {
@@ -49,26 +52,30 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  // _listenToChanges() {
+  _listenToChanges(Emitter<WallSensorState> emit) {
-  //   try {
+    try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      DatabaseReference ref =
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) {
+      stream.listen((DatabaseEvent event) {
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
+        Map<dynamic, dynamic> usersMap =
-  //       List<StatusModel> statusList = [];
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<Status> statusList = [];
 
-  //       usersMap['status'].forEach((element) {
+        usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
+          statusList
-  //       });
+              .add(Status(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = WallSensorModel.fromJson(statusList);
+        deviceStatus = WallSensorModel.fromJson(statusList);
-  //       add(WallSensorUpdatedEvent());
+        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-  //     });
+      });
-  //   } catch (_) {}
+    } catch (_) {}
-  // }
+  }
 
-  void _changeValue(WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
+  void _changeValue(
+      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
     if (event.code == 'far_detection') {
       deviceStatus.farDetection = event.value;
@@ -125,7 +132,8 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -150,7 +158,8 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     try {
       // await DevicesManagementApi.getDeviceReportsByDate(
       //         deviceId, event.code, from.toString(), to.toString())
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+          .then((value) {
         emit(DeviceReportsState(deviceReport: value, code: event.code));
       });
     } catch (e) {
@@ -159,11 +168,13 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  void _showDescription(ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
+  void _showDescription(
+      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorShowDescriptionState(description: event.description));
   }
 
-  void _backToGridView(BackToGridViewEvent event, Emitter<WallSensorState> emit) {
+  void _backToGridView(
+      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
   }
 

lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart

@@ -4,6 +4,7 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
@@ -34,6 +35,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<EditWaterHeaterScheduleEvent>(_onEditSchedule);
     on<DeleteScheduleEvent>(_onDeleteSchedule);
     on<UpdateScheduleEntryEvent>(_onUpdateSchedule);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WaterHeaterStatusModel deviceStatus;
@@ -78,7 +80,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     final currentState = state as WaterHeaterDeviceStatusLoaded;
     final updatedDays = List<bool>.from(currentState.selectedDays);
     updatedDays[event.index] = event.value;
-    emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
+    emit(currentState.copyWith(
+        selectedDays: updatedDays, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateFunctionOn(
@@ -86,7 +89,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     Emitter<WaterHeaterState> emit,
   ) {
     final currentState = state as WaterHeaterDeviceStatusLoaded;
-    emit(currentState.copyWith(functionOn: event.isOn, selectedTime: currentState.selectedTime));
+    emit(currentState.copyWith(
+        functionOn: event.isOn, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateScheduleEvent(
@@ -101,7 +105,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         ));
       }
       if (event.scheduleMode == ScheduleModes.countdown) {
-        final countdownRemaining = Duration(hours: event.hours, minutes: event.minutes);
+        final countdownRemaining =
+            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.countdown,
@@ -111,11 +116,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           countdownRemaining: countdownRemaining,
         ));
 
-        if (!currentState.isCountdownActive! && countdownRemaining > Duration.zero) {
+        if (!currentState.isCountdownActive! &&
+            countdownRemaining > Duration.zero) {
           _startCountdownTimer(emit, countdownRemaining);
         }
       } else if (event.scheduleMode == ScheduleModes.inching) {
-        final inchingDuration = Duration(hours: event.hours, minutes: event.minutes);
+        final inchingDuration =
+            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.inching,
@@ -217,7 +224,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
       try {
         final status = await DevicesManagementApi().deviceControl(
           event.deviceId,
-          Status(code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
+          Status(
+              code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
         );
         if (!status) {
           emit(const WaterHeaterFailedState(error: 'Failed to stop schedule.'));
@@ -235,8 +243,10 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      final status =
-      deviceStatus = WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
 
       if (deviceStatus.scheduleMode == ScheduleModes.countdown) {
         final countdownRemaining = Duration(
@@ -300,11 +310,42 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           isInchingActive: false,
         ));
       }
+      _listenToChanges(event.deviceId);
     } catch (e) {
       emit(WaterHeaterFailedState(error: 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 = WaterHeaterStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<WaterHeaterState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
+  }
+
   void _startCountdownTimer(
     Emitter<WaterHeaterState> emit,
     Duration countdownRemaining,
@@ -334,8 +375,10 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
-      if (currentState.countdownRemaining != null && currentState.countdownRemaining! > Duration.zero) {
+      if (currentState.countdownRemaining != null &&
-        final newRemaining = currentState.countdownRemaining! - const Duration(minutes: 1);
+          currentState.countdownRemaining! > Duration.zero) {
+        final newRemaining =
+            currentState.countdownRemaining! - const Duration(minutes: 1);
 
         if (newRemaining <= Duration.zero) {
           _countdownTimer?.cancel();
@@ -430,7 +473,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _revertValue(String code, dynamic oldValue, void Function(WaterHeaterState state) emit) {
+  void _revertValue(String code, dynamic oldValue,
+      void Function(WaterHeaterState state) emit) {
     _updateLocalValue(code, oldValue);
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
@@ -477,12 +521,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     return super.close();
   }
 
-  FutureOr<void> _getSchedule(GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _getSchedule(
+      GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
     emit(ScheduleLoadingState());
 
     try {
-      List<ScheduleModel> schedules =
+      List<ScheduleModel> schedules = await DevicesManagementApi()
-          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
+          .getDeviceSchedules(deviceStatus.uuid, event.category);
 
       emit(WaterHeaterDeviceStatusLoaded(
         deviceStatus,
@@ -514,7 +559,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, currentState.status.uuid);
+      bool success = await DevicesManagementApi()
+          .addScheduleRecord(newSchedule, currentState.status.uuid);
 
       if (success) {
         add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid));
@@ -525,7 +571,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
@@ -594,11 +641,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi().deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
+      bool success = await DevicesManagementApi()
+          .deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
 
       if (success) {
-        final updatedSchedules =
+        final updatedSchedules = currentState.schedules
-            currentState.schedules.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
+            .where((schedule) => schedule.scheduleId != event.scheduleId)
+            .toList();
 
         emit(currentState.copyWith(schedules: updatedSchedules));
       } else {
@@ -608,12 +657,15 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event,
+      Emitter<WaterHeaterState> emit) async {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesUuid);
+      final status =
-      deviceStatus = WaterHeaterStatusModel.fromJson(event.devicesUuid.first, status.status);
+          await DevicesManagementApi().getBatchStatus(event.devicesUuid);
+      deviceStatus = WaterHeaterStatusModel.fromJson(
+          event.devicesUuid.first, status.status);
 
       emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -621,7 +673,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 

lib/pages/device_managment/water_heater/bloc/water_heater_event.dart

@@ -54,6 +54,15 @@ final class WaterHeaterFetchStatusEvent extends WaterHeaterEvent {
 
 final class DecrementCountdownEvent extends WaterHeaterEvent {}
 
+
+class StatusUpdated extends WaterHeaterEvent {
+  final WaterHeaterStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+
+
 final class AddScheduleEvent extends WaterHeaterEvent {
   final List<bool> selectedDays;
   final TimeOfDay time;

lib/pages/device_managment/water_leak/bloc/water_leak_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/water_leak/bloc/water_leak_event.dart';
@@ -21,6 +22,7 @@ class WaterLeakBloc extends Bloc<WaterLeakEvent, WaterLeakState> {
     on<FetchWaterLeakBatchStatusEvent>(_onFetchBatchStatus);
     on<FetchWaterLeakReportsEvent>(_onFetchWaterLeakReports);
     on<WaterLeakFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchWaterLeakStatus(
@@ -30,12 +32,43 @@ class WaterLeakBloc extends Bloc<WaterLeakEvent, WaterLeakState> {
       final response =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = WaterLeakStatusModel.fromJson(deviceId, response.status);
+      _listenToChanges();
       emit(WaterLeakLoadedState(deviceStatus!));
     } catch (e) {
       emit(WaterLeakErrorState(e.toString()));
     }
   }
 
+  _listenToChanges() {
+    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 =
+            WaterLeakStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus!));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<WaterLeakState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WaterLeakLoadedState(deviceStatus!));
+  }
+
   Future<void> _onControl(
       WaterLeakControlEvent event, Emitter<WaterLeakState> emit) async {
     final oldValue = deviceStatus!.watersensorState;

lib/pages/device_managment/water_leak/bloc/water_leak_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/water_leak/model/water_leak_status_model.dart';
 
 abstract class WaterLeakEvent extends Equatable {
   const WaterLeakEvent();
@@ -17,6 +18,13 @@ class FetchWaterLeakStatusEvent extends WaterLeakEvent {
   List<Object> get props => [deviceId];
 }
 
+class StatusUpdated extends WaterLeakEvent {
+  final WaterLeakStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+
 class WaterLeakControlEvent extends WaterLeakEvent {
   final String deviceId;
   final String code;

lib/pages/home/bloc/home_bloc.dart

@@ -1,16 +1,20 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
-// import 'package:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.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/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -47,10 +51,16 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid =
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
+
+      if (user != null && user!.project != null) {
+        await ProjectManager.setProjectUUID(user!.project!.uuid);
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>().add(InitialEvent());
+      }
       add(FetchTermEvent());
+      add(FetchPolicyEvent());
+
       emit(HomeInitial());
     } catch (e) {
       return;
@@ -61,8 +71,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      add(FetchPolicyEvent());
+      emit(HomeInitial());
-      emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -72,18 +81,17 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
-      emit(PolicyAgreement());
+      emit(HomeInitial());
     } catch (e) {
+      debugPrint("Error fetching policy: $e");
       return;
     }
   }
 
-  Future _confirmUserAgreement(
+  Future _confirmUserAgreement(ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
-      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid =
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
     } catch (e) {
@@ -103,10 +111,11 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   List<HomeItemModel> homeItems = [
     HomeItemModel(
-      title: 'Access',
+      title: 'Access Management',
       icon: Assets.accessIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.accessManagementPage);
       },
       color: null,
@@ -116,21 +125,24 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.spaseManagementIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.spacesManagementPage);
       },
       color: ColorsManager.primaryColor,
     ),
     HomeItemModel(
-      title: 'Devices',
+      title: 'Devices Management',
       icon: Assets.devicesIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         BlocProvider.of<RoutineBloc>(context)
             .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.deviceManagementPage);
       },
       color: ColorsManager.primaryColor,
     ),
+    
     // HomeItemModel(
     //   title: 'Move in',
     //   icon: Assets.moveinIcon,

lib/pages/home/view/agreement_and_privacy_dialog.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -162,7 +164,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
               children: [
                 InkWell(
                   onTap: () {
-                    AuthBloc.logout();
+                    AuthBloc.logout(context);
                     context.go(RoutesConst.auth);
                   },
                   child: const Text("Cancel"),

lib/pages/home/view/home_page_web.dart

@@ -9,103 +9,121 @@ import 'package:syncrow_web/pages/home/view/home_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class HomeWebPage extends StatelessWidget {
+class HomeWebPage extends StatefulWidget {
   const HomeWebPage({super.key});
 
+  @override
+  State<HomeWebPage> createState() => _HomeWebPageState();
+}
+
+class _HomeWebPageState extends State<HomeWebPage> {
+  // Flag to track whether the dialog is already shown.
+  bool _dialogShown = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final homeBloc = BlocProvider.of<HomeBloc>(context);
+    homeBloc.add(FetchUserInfo());
+  }
+
   @override
   Widget build(BuildContext context) {
     Size size = MediaQuery.of(context).size;
     final homeBloc = BlocProvider.of<HomeBloc>(context);
 
     return PopScope(
-        canPop: false,
+      canPop: false,
-        onPopInvoked: (didPop) => false,
+      onPopInvoked: (didPop) => false,
-        child: BlocConsumer<HomeBloc, HomeState>(
+      child: BlocConsumer<HomeBloc, HomeState>(
-          listener: (BuildContext context, state) {
+        listener: (BuildContext context, state) {
-            if (state is HomeInitial) {
+          if (state is HomeInitial) {
-              if (homeBloc.user!.hasAcceptedWebAgreement == false) {
+            if (homeBloc.user!.hasAcceptedWebAgreement == false && !_dialogShown) {
-                Future.delayed(const Duration(seconds: 2), () {
+              _dialogShown = true; // Set the flag to true to indicate the dialog is showing.
-                  showDialog(
+              Future.delayed(const Duration(seconds: 1), () {
-                    context: context,
+                showDialog(
-                    barrierDismissible: false,
+                  context: context,
-                    builder: (BuildContext context) {
+                  barrierDismissible: false,
-                      return AgreementAndPrivacyDialog(
+                  builder: (BuildContext context) {
-                        terms: homeBloc.terms,
+                    return AgreementAndPrivacyDialog(
-                        policy: homeBloc.policy,
+                      terms: homeBloc.terms,
-                      );
+                      policy: homeBloc.policy,
-                    },
+                    );
-                  ).then((v) {
+                  },
-                    if (v != null) {
+                ).then((v) {
-                      homeBloc.add(ConfirmUserAgreementEvent());
+                  _dialogShown = false;
-                      homeBloc.add(const FetchUserInfo());
+                  if (v != null) {
-                    }
+                    homeBloc.add(ConfirmUserAgreementEvent());
-                  });
+                    homeBloc.add(const FetchUserInfo());
+                  }
                 });
-              }
+              });
             }
-          },
+          }
-          builder: (context, state) {
+        },
-            return WebScaffold(
+        builder: (context, state) {
-              enableMenuSidebar: false,
+          return WebScaffold(
-              appBarTitle: Row(
+            enableMenuSidebar: false,
+            appBarTitle: Row(
+              children: [
+                SvgPicture.asset(
+                  Assets.loginLogo,
+                  width: 150,
+                ),
+              ],
+            ),
+            scaffoldBody: SizedBox(
+              height: size.height,
+              width: size.width,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  SvgPicture.asset(
+                  Column(
-                    Assets.loginLogo,
+                    mainAxisAlignment: MainAxisAlignment.center,
-                    width: 150,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      SizedBox(height: size.height * 0.1),
+                      Text(
+                        'ACCESS YOUR APPS',
+                        style: Theme.of(context)
+                            .textTheme
+                            .headlineLarge!
+                            .copyWith(color: Colors.black, fontSize: 40),
+                      ),
+                      const SizedBox(height: 30),
+                      Expanded(
+                        flex: 4,
+                        child: SizedBox(
+                          height: size.height * 0.6,
+                          width: size.width * 0.68,
+                          child: GridView.builder(
+                            itemCount: 3, // Change this count if needed.
+                            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 3, // Adjust as needed.
+                              crossAxisSpacing: 20.0,
+                              mainAxisSpacing: 20.0,
+                              childAspectRatio: 1.5,
+                            ),
+                            itemBuilder: (context, index) {
+                              return HomeCard(
+                                index: index,
+                                active: homeBloc.homeItems[index].active!,
+                                name: homeBloc.homeItems[index].title!,
+                                img: homeBloc.homeItems[index].icon!,
+                                onTap: () => homeBloc.homeItems[index].onPress(context),
+                              );
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
                 ],
               ),
-              scaffoldBody: SizedBox(
+            ),
-                height: size.height,
+          );
-                width: size.width,
+        },
-                child: Row(
+      ),
-                  mainAxisAlignment: MainAxisAlignment.center,
+    );
-                  children: [
-                    Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        SizedBox(height: size.height * 0.1),
-                        Text(
-                          'ACCESS YOUR APPS',
-                          style: Theme.of(context)
-                              .textTheme
-                              .headlineLarge!
-                              .copyWith(color: Colors.black, fontSize: 40),
-                        ),
-                        const SizedBox(height: 30),
-                        Expanded(
-                          flex: 4,
-                          child: SizedBox(
-                            height: size.height * 0.6,
-                            width: size.width * 0.68,
-                            child: GridView.builder(
-                              itemCount: 3, //8
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3, //4
-                                crossAxisSpacing: 20.0,
-                                mainAxisSpacing: 20.0,
-                                childAspectRatio: 1.5,
-                              ),
-                              itemBuilder: (context, index) {
-                                return HomeCard(
-                                  index: index,
-                                  active: homeBloc.homeItems[index].active!,
-                                  name: homeBloc.homeItems[index].title!,
-                                  img: homeBloc.homeItems[index].icon!,
-                                  onTap: () => homeBloc.homeItems[index].onPress(context),
-                                );
-                              },
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-        ));
   }
 }

lib/pages/roles_and_permission/model/edit_user_model.dart

@@ -219,6 +219,9 @@ class UserSpaceModel {
   final double x;
   final double y;
   final String icon;
+  final String communityUuid;
+
+  //communityUuid
 
   UserSpaceModel({
     required this.uuid,
@@ -231,22 +234,23 @@ class UserSpaceModel {
     required this.x,
     required this.y,
     required this.icon,
+    required this.communityUuid,
   });
 
   /// Create a [UserSpaceModel] from JSON data
   factory UserSpaceModel.fromJson(Map<String, dynamic> json) {
     return UserSpaceModel(
-      uuid: json['uuid'] as String,
+        uuid: json['uuid'] as String,
-      createdAt: json['createdAt'] as String,
+        createdAt: json['createdAt'] as String,
-      updatedAt: json['updatedAt'] as String,
+        updatedAt: json['updatedAt'] as String,
-      spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
+        spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
-      spaceName: json['spaceName'] as String,
+        spaceName: json['spaceName'] as String,
-      invitationCode: json['invitationCode'] as String?,
+        invitationCode: json['invitationCode'] as String?,
-      disabled: json['disabled'] as bool,
+        disabled: json['disabled'] as bool,
-      x: (json['x'] as num).toDouble(),
+        x: (json['x'] as num).toDouble(),
-      y: (json['y'] as num).toDouble(),
+        y: (json['y'] as num).toDouble(),
-      icon: json['icon'] as String,
+        icon: json['icon'] as String,
-    );
+        communityUuid: json['communityUuid'] as String);
   }
 
   /// Convert the [UserSpaceModel] to JSON
@@ -262,6 +266,7 @@ class UserSpaceModel {
       'x': x,
       'y': y,
       'icon': icon,
+      'communityUuid': communityUuid
     };
   }
 }

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -1,5 +1,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/edit_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/role_type_model.dart';
@@ -7,11 +9,14 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialo
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/permission_option_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/tree_node_model.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';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/user_permission.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
   UsersBloc() : super(UsersInitial()) {
@@ -61,8 +66,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   void isCompleteSpacesFun(
       CheckSpacesStepStatus event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-    List<String> selectedIds = getSelectedIds(updatedCommunities);
+    var spaceBloc =
-    isCompleteSpaces = selectedIds.isNotEmpty;
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+
+    isCompleteSpaces = spaceBloc.state.selectedCommunities.isNotEmpty;
     emit(ChangeStatusSteps());
   }
 
@@ -74,18 +81,23 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    return await CommunitySpaceManagementApi().getSpaceHierarchy(communityUuid);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await CommunitySpaceManagementApi()
+        .getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   List<TreeNode> updatedCommunities = [];
   List<TreeNode> spacesNodes = [];
-  List<String> communityIds = []; 
+  List<String> communityIds = [];
   _onLoadCommunityAndSpaces(
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities();
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
       communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
@@ -102,12 +114,19 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
+      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+// This variable holds the full original list.
+  List<TreeNode> originalCommunities = [];
+
+// This variable holds the working list that may be filtered.
+
+// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -123,12 +142,39 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }).toList();
   }
 
+// Optional helper method to deep clone a TreeNode.
+  TreeNode _cloneNode(TreeNode node) {
+    return TreeNode(
+      uuid: node.uuid,
+      title: node.title,
+      isChecked: node.isChecked,
+      isHighlighted: node.isHighlighted,
+      isExpanded: node.isExpanded,
+      children: node.children.map(_cloneNode).toList(),
+    );
+  }
+
+// Clone an entire list of tree nodes.
+  List<TreeNode> _cloneNodes(List<TreeNode> nodes) {
+    return nodes.map(_cloneNode).toList();
+  }
+
+// Your search event handler.
   void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
+
+    // If the search term is empty, restore the original list.
     if (event.searchTerm!.isEmpty) {
+      // Clear any highlights on the restored copy.
+      updatedCommunities = _cloneNodes(originalCommunities);
       _clearHighlights(updatedCommunities);
     } else {
-      _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+      // Start with a fresh clone of the original tree.
+      List<TreeNode> freshClone = _cloneNodes(originalCommunities);
+
+      _searchAndHighlightNodes(freshClone, event.searchTerm!);
+
+      updatedCommunities = _filterNodes(freshClone, event.searchTerm!);
     }
     emit(ChangeStatusSteps());
   }
@@ -155,6 +201,91 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
+  List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+    List<TreeNode> filteredNodes = [];
+    for (var node in nodes) {
+      bool isMatch =
+          node.title.toLowerCase().contains(searchTerm.toLowerCase());
+      List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+      if (isMatch || filteredChildren.isNotEmpty) {
+        node.isHighlighted = isMatch;
+        node.children = filteredChildren;
+        filteredNodes.add(node);
+      }
+    }
+    return filteredNodes;
+  }
+
+  // List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
+  //   return spaces.map((space) {
+  //     List<TreeNode> childNodes =
+  //         space.children.isNotEmpty ? _buildTreeNodes(space.children) : [];
+  //     return TreeNode(
+  //       uuid: space.uuid!,
+  //       title: space.name,
+  //       isChecked: false,
+  //       isHighlighted: false,
+  //       isExpanded: childNodes.isNotEmpty,
+  //       children: childNodes,
+  //     );
+  //   }).toList();
+  // }
+
+  // void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
+  //   emit(UsersLoadingState());
+  //   if (event.searchTerm!.isEmpty) {
+  //     _clearHighlights(updatedCommunities);
+  //   } else {
+  //     _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+  //     updatedCommunities = _filterNodes(updatedCommunities, event.searchTerm!);
+  //   }
+  //   emit(ChangeStatusSteps());
+  // }
+
+  // void _clearHighlights(List<TreeNode> nodes) {
+  //   for (var node in nodes) {
+  //     node.isHighlighted = false;
+  //     if (node.children.isNotEmpty) {
+  //       _clearHighlights(node.children);
+  //     }
+  //   }
+  // }
+
+  // bool _searchAndHighlightNodes(List<TreeNode> nodes, String searchTerm) {
+  //   bool anyMatch = false;
+  //   for (var node in nodes) {
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+  //     bool childMatch = _searchAndHighlightNodes(node.children, searchTerm);
+  //     node.isHighlighted = isMatch || childMatch;
+
+  //     anyMatch = anyMatch || node.isHighlighted;
+  //   }
+  //   return anyMatch;
+  // }
+
+  // List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+  //   List<TreeNode> filteredNodes = [];
+  //   for (var node in nodes) {
+  //     // Check if the current node's title contains the search term.
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+
+  //     // Recursively filter the children.
+  //     List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+
+  //     // If the current node is a match or any of its children are, include it.
+  //     if (isMatch || filteredChildren.isNotEmpty) {
+  //       // Optionally, update any properties (like isHighlighted) if you still need them.
+  //       node.isHighlighted = isMatch;
+  //       // Replace the children with the filtered ones.
+  //       node.children = filteredChildren;
+  //       filteredNodes.add(node);
+  //     }
+  //   }
+  //   return filteredNodes;
+  // }
+
   List<String> selectedIds = [];
 
   List<String> getSelectedIds(List<TreeNode> nodes) {
@@ -209,20 +340,24 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      // List<String> selectedIds =
-          .where((id) => !communityIds.contains(id))
+      //     getSelectedIds(updatedCommunities).where((id) => !communityIds.contains(id)).toList();
-          .toList();
+
+      List<String> selectedSpacesId = getSelectedSpacesIds();
+      // List<String> selectedIds = getSelectedIds(updatedCommunities);
 
       bool res = await UserPermissionApi().sendInviteUser(
-        email: emailController.text,
+          email: emailController.text,
-        firstName: firstNameController.text,
+          firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
+          jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
+          lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
+          phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
+          roleUuid: roleSelected,
-        spaceUuids: selectedIds, 
+          spaceUuids: selectedSpacesId,
-      );
+          projectUuid: projectUuid);
 
       if (res) {
         showCustomDialog(
@@ -251,23 +386,31 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
+  List<String> getSelectedSpacesIds() {
+    List<String> selectedSpacesId = [];
+    var spaceBloc =
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+    for (var community in spaceBloc.state.selectedCommunities) {
+      selectedSpacesId
+          .addAll(spaceBloc.state.selectedCommunityAndSpaces[community] ?? []);
+    }
+    return selectedSpacesId;
+  }
 
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-          .where((id) => !communityIds.contains(id)) 
-          .toList();
 
       bool res = await UserPermissionApi().editInviteUser(
-        userId: event.userId,
+          userId: event.userId,
-        firstName: firstNameController.text,
+          firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
+          jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
+          lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
+          phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
+          roleUuid: roleSelected,
-        spaceUuids: selectedIds,
+          spaceUuids: getSelectedSpacesIds(),
-      );
+          projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
           barrierDismissible: false,
@@ -372,8 +515,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     emit(UsersLoadingState());
 
     try {
+      var spaceBloc =
+          NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (event.uuid?.isNotEmpty ?? false) {
-        final res = await UserPermissionApi().fetchUserById(event.uuid);
+        final res =
+            await UserPermissionApi().fetchUserById(event.uuid, projectUuid);
 
         if (res != null) {
           // Populate the text controllers
@@ -383,13 +531,20 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneController.text = res.phoneNumber ?? '';
           jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
-          if (updatedCommunities.isNotEmpty) {
+          res.spaces.map((space) {
-            // Create a list of UUIDs to mark
+            selectedIds.add(space.uuid);
-            final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
+            CommunityModel community = spaceBloc.state.communityList
-            // Print all IDs and mark nodes in updatedCommunities
+                .firstWhere((item) => item.uuid == space.communityUuid);
-            debugPrint('Printing and marking nodes in updatedCommunities:');
+            spaceBloc.add(OnSpaceSelected(community, space.uuid, []));
-            _printAndMarkNodes(updatedCommunities, uuidsToMark);
+          }).toList();
-          }
+
+          // if (updatedCommunities.isNotEmpty) {
+          //   // Create a list of UUIDs to mark
+          //   final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
+          //   // Print all IDs and mark nodes in updatedCommunities
+          //   debugPrint('Printing and marking nodes in updatedCommunities:');
+          //   _printAndMarkNodes(updatedCommunities, uuidsToMark);
+          // }
           final roleId = roles
               .firstWhere((element) =>
                   element.type ==
@@ -482,4 +637,16 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
     return null;
   }
+
+  @override
+  Future<void> close() {
+    emailController.dispose();
+    firstNameController.dispose();
+    lastNameController.dispose();
+    emailController.dispose();
+    phoneController.dispose();
+    jobTitleController.dispose();
+    roleSearchController.dispose();
+    return super.close();
+  }
 }

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -24,7 +24,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          ..add(const LoadCommunityAndSpacesEvent())
+          // ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent()),
         child: BlocConsumer<UsersBloc, UsersState>(
             listener: (context, state) {},
@@ -34,8 +34,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               return Dialog(
                   child: Container(
                 decoration: const BoxDecoration(
-                    color: Colors.white,
+                    color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
-                    borderRadius: BorderRadius.all(Radius.circular(20))),
                 width: 900,
                 child: Column(
                   children: [
@@ -64,8 +63,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(
+                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
-                                      3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -113,15 +111,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(
+                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
-                                        const CheckStepStatus(isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole
+                                    _blocRole.add(const CheckSpacesStepStatus());
-                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole
+                                  _blocRole.add(SendInviteUsers(context: context));
-                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -129,11 +124,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics ==
+                                              _blocRole.isCompleteBasics == false ||
-                                                  false ||
+                                              _blocRole.isCompleteRolePermissions == false) &&
-                                              _blocRole
-                                                      .isCompleteRolePermissions ==
-                                                  false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -204,12 +196,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -236,12 +224,16 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
     return GestureDetector(
       onTap: () {
         setState(() {
-          currentStep = step;
           bloc.add(const CheckStepStatus(isEditUser: false));
+          currentStep = step;
+          Future.delayed(const Duration(milliseconds: 500), () {
+            bloc.add(const CheckStepStatus(isEditUser: false));
+          });
           if (step3 == 3) {
-            bloc.add(const CheckRoleStepStatus());
+            Future.delayed(const Duration(seconds: 1), () {
+              bloc.add(const CheckRoleStepStatus());
+            });
           }
-          
         });
       },
       child: Column(
@@ -268,12 +260,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -330,12 +318,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -46,117 +46,120 @@ class BasicsView extends StatelessWidget {
             ),
             Row(
               children: [
-                SizedBox(
+                Flexible(
-                  width: MediaQuery.of(context).size.width * 0.18,
+                  child: SizedBox(
-                  height: MediaQuery.of(context).size.width * 0.08,
+                    // width: MediaQuery.of(context).size.width * 0.18,
-                  child: Column(
+                    height: MediaQuery.of(context).size.width * 0.08,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                    child: Column(
-                    children: [
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      SizedBox(
+                      children: [
-                          child: Row(
+                        SizedBox(
-                        children: [
+                            child: Row(
-                          const Text(
+                          children: [
-                            " * ",
+                            const Text(
-                            style: TextStyle(
+                              " * ",
-                              color: ColorsManager.red,
+                              style: TextStyle(
-                              fontWeight: FontWeight.w900,
+                                color: ColorsManager.red,
-                              fontSize: 15,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
                             ),
-                          ),
+                            Text(
-                          Text(
+                              'First Name',
-                            'First Name',
-                            style: context.textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 13,
-                            ),
-                          ),
-                        ],
-                      )),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: TextFormField(
-                          style:
-                              const TextStyle(color: ColorsManager.blackColor),
-                          // onChanged: (value) {
-                          //   Future.delayed(const Duration(milliseconds: 200),
-                          //       () {
-                          //     _blocRole.add(const ValidateBasicsStep());
-                          //   });
-                          // },
-                          controller: _blocRole.firstNameController,
-                          decoration: inputTextFormDeco(
-                            hintText: "Enter first name",
-                          ).copyWith(
-                            hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                fontWeight: FontWeight.w400,
-                                fontSize: 12,
-                                color: ColorsManager.textGray),
-                          ),
-                          validator: (value) {
-                            if (value == null || value.isEmpty) {
-                              return 'Enter first name';
-                            }
-                            return null;
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 10),
-                SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.18,
-                  height: MediaQuery.of(context).size.width * 0.08,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                          child: Row(
-                        children: [
-                          const Text(
-                            " * ",
-                            style: TextStyle(
-                              color: ColorsManager.red,
-                              fontWeight: FontWeight.w900,
-                              fontSize: 15,
-                            ),
-                          ),
-                          Text('Last Name',
                               style: context.textTheme.bodyMedium?.copyWith(
                                 fontWeight: FontWeight.w400,
                                 fontSize: 13,
-                              )),
+                              ),
-                        ],
+                            ),
-                      )),
+                          ],
-                      Padding(
+                        )),
-                        padding: const EdgeInsets.all(8.0),
+                        Padding(
-                        child: TextFormField(
+                          padding: const EdgeInsets.all(8.0),
-                          // onChanged: (value) {
+                          child: TextFormField(
-                          //   Future.delayed(const Duration(milliseconds: 200),
+                            style: const TextStyle(
-                          //       () {
+                                color: ColorsManager.blackColor),
-                          //     _blocRole.add(ValidateBasicsStep());
+                            // onChanged: (value) {
-                          //   });
+                            //   Future.delayed(const Duration(milliseconds: 200),
-                          // },
+                            //       () {
-                          controller: _blocRole.lastNameController,
+                            //     _blocRole.add(const ValidateBasicsStep());
-                          style: const TextStyle(color: Colors.black),
+                            //   });
-                          decoration:
+                            // },
-                              inputTextFormDeco(hintText: "Enter last name")
+                            controller: _blocRole.firstNameController,
-                                  .copyWith(
+                            decoration: inputTextFormDeco(
-                                      hintStyle: context
+                              hintText: "Enter first name",
-                                          .textTheme.bodyMedium
+                            ).copyWith(
-                                          ?.copyWith(
+                              hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                              fontWeight: FontWeight.w400,
+                                  fontWeight: FontWeight.w400,
-                                              fontSize: 12,
+                                  fontSize: 12,
-                                              color: ColorsManager.textGray)),
+                                  color: ColorsManager.textGray),
-                          validator: (value) {
+                            ),
-                            if (value == null || value.isEmpty) {
+                            validator: (value) {
-                              return 'Enter last name';
+                              if (value == null || value.isEmpty) {
-                            }
+                                return 'Enter first name';
-                            return null;
+                              }
-                          },
+                              return null;
+                            },
+                          ),
                         ),
-                      ),
+                      ],
-                    ],
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 10),
+                Flexible(
+                  child: SizedBox(
+                    // width: MediaQuery.of(context).size.width * 0.18,
+                    height: MediaQuery.of(context).size.width * 0.08,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SizedBox(
+                            child: Row(
+                          children: [
+                            const Text(
+                              " * ",
+                              style: TextStyle(
+                                color: ColorsManager.red,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
+                            ),
+                            Text('Last Name',
+                                style: context.textTheme.bodyMedium?.copyWith(
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 13,
+                                )),
+                          ],
+                        )),
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: TextFormField(
+                            // onChanged: (value) {
+                            //   Future.delayed(const Duration(milliseconds: 200),
+                            //       () {
+                            //     _blocRole.add(ValidateBasicsStep());
+                            //   });
+                            // },
+                            controller: _blocRole.lastNameController,
+                            style: const TextStyle(color: Colors.black),
+                            decoration:
+                                inputTextFormDeco(hintText: "Enter last name")
+                                    .copyWith(
+                                        hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
+                                                fontWeight: FontWeight.w400,
+                                                fontSize: 12,
+                                                color: ColorsManager.textGray)),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Enter last name';
+                              }
+                              return null;
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';

lib/pages/roles_and_permission/users_page/add_user_dialog/view/edit_user_dialog.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@@ -25,13 +26,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          ..add(const LoadCommunityAndSpacesEvent())
+          // ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent())
           ..add(GetUserByIdEvent(uuid: widget.userId)),
         child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
           if (state is SpacesLoadedState) {
-            BlocProvider.of<UsersBloc>(context)
+            BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
-                .add(GetUserByIdEvent(uuid: widget.userId));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -39,8 +39,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
           return Dialog(
               child: Container(
             decoration: const BoxDecoration(
-                color: Colors.white,
+                color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
-                borderRadius: BorderRadius.all(Radius.circular(20))),
             width: 900,
             child: Column(
               children: [
@@ -69,8 +68,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(
+                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
-                                  3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -118,15 +116,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole
+                                _blocRole.add(CheckStepStatus(isEditUser: true));
-                                    .add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole.add(EditInviteUsers(
+                              _blocRole
-                                  context: context,
+                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
-                                   userId: widget.userId!));
                             }
                           });
                         },
@@ -135,8 +131,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions ==
+                                          _blocRole.isCompleteRolePermissions == false) &&
-                                              false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -209,12 +204,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -272,12 +263,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -334,12 +321,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                        ? ColorsManager.blackColor
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/spaces_access_view.dart

@@ -1,14 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
-import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
-import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.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 SpacesAccessView extends StatelessWidget {
   final String? userId;
@@ -27,10 +22,8 @@ class SpacesAccessView extends StatelessWidget {
             children: [
               Text(
                 'Spaces access',
-                style: context.textTheme.bodyLarge?.copyWith(
+                style: context.textTheme.bodyLarge
-                    fontWeight: FontWeight.w700,
+                    ?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, color: Colors.black),
-                    fontSize: 20,
-                    color: Colors.black),
               ),
               const SizedBox(
                 height: 35,
@@ -42,77 +35,78 @@ class SpacesAccessView extends StatelessWidget {
               const SizedBox(
                 height: 25,
               ),
-              Expanded(
+              Expanded(child: SpaceTreeView(onSelect: () {}))
-                child: SizedBox(
+              // Expanded(
-                  child: Column(
+              //   child: SizedBox(
-                    children: [
+              //     child: Column(
-                      Expanded(
+              //       children: [
-                        flex: 2,
+              //         Expanded(
-                        child: Container(
+              //           flex: 2,
-                          decoration: const BoxDecoration(
+              //           child: Container(
-                            color: ColorsManager.circleRolesBackground,
+              //             decoration: const BoxDecoration(
-                            borderRadius: BorderRadius.only(
+              //               color: ColorsManager.circleRolesBackground,
-                                topRight: Radius.circular(20),
+              //               borderRadius: BorderRadius.only(
-                                topLeft: Radius.circular(20)),
+              //                   topRight: Radius.circular(20),
-                          ),
+              //                   topLeft: Radius.circular(20)),
-                          child: Padding(
+              //             ),
-                            padding: const EdgeInsets.all(8.0),
+              //             child: Padding(
-                            child: Row(
+              //               padding: const EdgeInsets.all(8.0),
-                              children: [
+              //               child: Row(
-                                Expanded(
+              //                 children: [
-                                  child: Container(
+              //                   Expanded(
-                                    decoration: BoxDecoration(
+              //                     child: Container(
-                                        borderRadius: const BorderRadius.all(
+              //                       decoration: BoxDecoration(
-                                            Radius.circular(20)),
+              //                           borderRadius: const BorderRadius.all(
-                                        border: Border.all(
+              //                               Radius.circular(20)),
-                                            color: ColorsManager.grayBorder)),
+              //                           border: Border.all(
-                                    child: TextFormField(
+              //                               color: ColorsManager.grayBorder)),
-                                      style:
+              //                       child: TextFormField(
-                                          const TextStyle(color: Colors.black),
+              //                         style:
-                                      // controller: _blocRole.firstNameController,
+              //                             const TextStyle(color: Colors.black),
-                                      onChanged: (value) {
+              //                         // controller: _blocRole.firstNameController,
-                                        _blocRole.add(SearchAnode(
+              //                         onChanged: (value) {
-                                            nodes: _blocRole.updatedCommunities,
+              //                           _blocRole.add(SearchAnode(
-                                            searchTerm: value));
+              //                               nodes: _blocRole.updatedCommunities,
-                                      },
+              //                               searchTerm: value));
-                                      decoration: textBoxDecoration(radios: 20)!
+              //                         },
-                                          .copyWith(
+              //                         decoration: textBoxDecoration(radios: 20)!
-                                        fillColor: Colors.white,
+              //                             .copyWith(
-                                        suffixIcon: Padding(
+              //                           fillColor: Colors.white,
-                                          padding:
+              //                           suffixIcon: Padding(
-                                              const EdgeInsets.only(right: 16),
+              //                             padding:
-                                          child: SvgPicture.asset(
+              //                                 const EdgeInsets.only(right: 16),
-                                            Assets.textFieldSearch,
+              //                             child: SvgPicture.asset(
-                                            width: 24,
+              //                               Assets.textFieldSearch,
-                                            height: 24,
+              //                               width: 24,
-                                          ),
+              //                               height: 24,
-                                        ),
+              //                             ),
-                                        hintStyle: context.textTheme.bodyMedium
+              //                           ),
-                                            ?.copyWith(
+              //                           hintStyle: context.textTheme.bodyMedium
-                                                fontWeight: FontWeight.w400,
+              //                               ?.copyWith(
-                                                fontSize: 12,
+              //                                   fontWeight: FontWeight.w400,
-                                                color: ColorsManager.textGray),
+              //                                   fontSize: 12,
-                                      ),
+              //                                   color: ColorsManager.textGray),
-                                    ),
+              //                         ),
-                                  ),
+              //                       ),
-                                ),
+              //                     ),
-                              ],
+              //                   ),
-                            ),
+              //                 ],
-                          ),
+              //               ),
-                        ),
+              //             ),
-                      ),
+              //           ),
-                      Expanded(
+              //         ),
-                          flex: 7,
+              //         Expanded(
-                          child: Container(
+              //             flex: 7,
-                              color: ColorsManager.circleRolesBackground,
+              //             child: Container(
-                              padding: const EdgeInsets.all(8.0),
+              //                 color: ColorsManager.circleRolesBackground,
-                              child: Container(
+              //                 padding: const EdgeInsets.all(8.0),
-                                  color: ColorsManager.whiteColors,
+              //                 child: Container(
-                                  child: TreeView(userId: userId))))
+              //                     color: ColorsManager.whiteColors,
-                    ],
+              //                     child: TreeView(userId: userId))))
-                  ),
+              //       ],
-                ),
+              //     ),
-              ),
+              //   ),
+              // ),
             ],
           ),
         ),

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart

@@ -1,10 +1,13 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart';
 import 'package:syncrow_web/services/user_permission.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   UserTableBloc() : super(TableInitial()) {
@@ -27,7 +30,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   int currentPage = 1;
   List<RolesUserModel> users = [];
   List<RolesUserModel> initialUsers = [];
+
+  List<RolesUserModel> totalUsersCount = [];
   String currentSortOrder = '';
+
+  String currentSortJopTitle = '';
+  String currentSortRole = '';
+  String currentSortCreatedDate = '';
+  String currentSortStatus = '';
+  String currentSortCreatedBy = '';
+
   String currentSortOrderDate = '';
   List<String> roleTypes = [];
   List<String> jobTitle = [];
@@ -37,10 +49,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _getUsers(GetUsers event, Emitter<UserTableState> emit) async {
     emit(UsersLoadingState());
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
-      users = await UserPermissionApi().fetchUsers();
+      users = await UserPermissionApi().fetchUsers(projectUuid);
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -60,6 +74,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
+      totalUsersCount = initialUsers;
       add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -86,31 +101,13 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _changeUserStatus(
       ChangeUserStatus event, Emitter<UserTableState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
-      bool res = await UserPermissionApi().changeUserStatusById(
+      bool res = await UserPermissionApi().changeUserStatusById(event.userId,
-          event.userId, event.newStatus == "disabled" ? false : true);
+          event.newStatus == "disabled" ? false : true, projectUuid);
       if (res == true) {
         add(const GetUsers());
-        // users = users.map((user) {
-        //   if (user.uuid == event.userId) {
-        //     return RolesUserModel(
-        //       uuid: user.uuid,
-        //       createdAt: user.createdAt,
-        //       email: user.email,
-        //       firstName: user.firstName,
-        //       lastName: user.lastName,
-        //       roleType: user.roleType,
-        //       status: event.newStatus,
-        //       isEnabled: event.newStatus == "disabled" ? false : true,
-        //       invitedBy: user.invitedBy,
-        //       phoneNumber: user.phoneNumber,
-        //       jobTitle: user.jobTitle,
-        //       createdDate: user.createdDate,
-        //       createdTime: user.createdTime,
-        //     );
-        //   }
-        //   return user;
-        // }).toList();
       }
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -128,7 +125,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -136,8 +132,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           .toString()
           .toLowerCase()
           .compareTo(b.firstName.toString().toLowerCase()));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByNameDesc(
@@ -150,13 +150,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(initialUsers);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByDateNewestToOldest(
@@ -222,6 +225,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _searchUsers(
       SearchUsers event, Emitter<UserTableState> emit) async {
     try {
+      emit(TableSearch());
       final query = event.query.toLowerCase();
       final filteredUsers = initialUsers.where((user) {
         final fullName = "${user.firstName} ${user.lastName}".toLowerCase();
@@ -250,7 +254,8 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   }
 
   void _handlePageChange(ChangePage event, Emitter<UserTableState> emit) {
-    const itemsPerPage = 10;
+    currentPage = event.pageNumber;
+    const itemsPerPage = 20;
     final startIndex = (event.pageNumber - 1) * itemsPerPage;
     final endIndex = startIndex + itemsPerPage;
     if (startIndex >= users.length) {
@@ -287,9 +292,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortJopTitle = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -311,9 +322,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = "";
-    }
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortRole = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -335,9 +353,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+    } else {}
-      currentSortOrder = "";
+    currentSortOrder = '';
-    }
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -371,14 +395,17 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
+      totalUsersCount = filteredUsers;
-      currentSortOrder = "";
+    } else {}
-    }
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortCreatedBy = '';
+    currentSortOrderDate = "";
 
     emit(UsersLoadedState(users: filteredUsers));
   }
 
-
   void _resetAllFilters(Emitter<UserTableState> emit) {
     selectedRoles.clear();
     selectedJobTitles.clear();

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart

@@ -9,7 +9,10 @@ final class TableInitial extends UserTableState {
   @override
   List<Object> get props => [];
 }
-
+final class TableSearch extends UserTableState {
+  @override
+  List<Object> get props => [];
+}
 final class RolesLoadingState extends UserTableState {
   @override
   List<Object> get props => [];

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -13,6 +13,8 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/vi
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/de_activate_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/name_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/user_table.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/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -25,7 +27,7 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton({required String title, required Function()? onTap}) {
+    Widget actionButton({bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -33,9 +35,11 @@ class UsersPage extends StatelessWidget {
           child: Text(
             title,
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: title == "Delete"
+                  color: isActive == false && title != "Delete"
-                      ? ColorsManager.red
+                      ? Colors.grey
-                      : ColorsManager.spaceColor,
+                      : title == "Delete"
+                          ? ColorsManager.red
+                          : ColorsManager.spaceColor,
                   fontWeight: FontWeight.w400,
                 ),
           ),
@@ -56,8 +60,7 @@ class UsersPage extends StatelessWidget {
                     : ColorsManager.disabledPink.withOpacity(0.5),
           ),
           child: Padding(
-            padding:
+            padding: const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
-                const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -81,15 +84,12 @@ class UsersPage extends StatelessWidget {
     }
 
     Widget changeIconStatus(
-        {required String userId,
+        {required String userId, required String status, required Function()? onTap}) {
-        required String status,
-        required Function()? onTap}) {
       return Center(
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding:
+            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
-                const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
             child: SvgPicture.asset(
               status == "invited"
                   ? Assets.invitedIcon
@@ -129,9 +129,12 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            context
+                            final bloc = context.read<UserTableBloc>();
-                                .read<UserTableBloc>()
+                            bloc.add(FilterClearEvent());
-                                .add(SearchUsers(value));
+                            bloc.add(SearchUsers(value));
+                            if (value == '') {
+                              bloc.add(ChangePage(1));
+                            }
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -154,6 +157,7 @@ class UsersPage extends StatelessWidget {
                       const SizedBox(width: 20),
                       InkWell(
                         onTap: () {
+                          context.read<SpaceTreeBloc>().add(ClearCachedData());
                           showDialog(
                             context: context,
                             barrierDismissible: false,
@@ -192,14 +196,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const SortUsersByNameAsc());
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameAsc());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const SortUsersByNameDesc());
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameDesc());
                           },
                         );
                       }
@@ -208,9 +208,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.jobTitle)
                             item: _blocRole.selectedJobTitles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
@@ -222,7 +221,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortJopTitle,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -233,14 +232,14 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByJobEvent(
                               selectedJob: selectedItems,
-                              sortOrder: _blocRole.currentSortOrder,
+                              sortOrder: _blocRole.currentSortJopTitle,
                             ));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                         );
                       }
@@ -250,9 +249,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.roleTypes)
                             item: _blocRole.selectedRoles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 4,
@@ -263,7 +261,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortRole,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -272,16 +270,15 @@ class UsersPage extends StatelessWidget {
                                 .map((entry) => entry.key)
                                 .toList();
                             Navigator.of(context).pop();
-                            context.read<UserTableBloc>().add(
+                            context.read<UserTableBloc>().add(FilterUsersByRoleEvent(
-                                FilterUsersByRoleEvent(
+                                selectedRoles: selectedItems,
-                                    selectedRoles: selectedItems,
+                                sortOrder: _blocRole.currentSortRole));
-                                    sortOrder: _blocRole.currentSortOrder));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                         );
                       }
@@ -290,14 +287,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -306,9 +299,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.createdBy)
                             item: _blocRole.selectedCreatedBy.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 1,
@@ -319,7 +311,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortCreatedBy,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -330,13 +322,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByCreatedEvent(
                                 selectedCreatedBy: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortCreatedBy));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                         );
                       }
@@ -346,9 +338,8 @@ class UsersPage extends StatelessWidget {
                             item: _blocRole.selectedStatuses.contains(item),
                         };
 
-                        final RenderBox overlay = Overlay.of(context)
+                        final RenderBox overlay =
-                            .context
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
-                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
@@ -359,7 +350,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortStatus,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -370,13 +361,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByDeActevateEvent(
                                 selectedActivate: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortStatus));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                         );
                       }
@@ -385,14 +376,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrderDate,
                           aToZTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -419,46 +406,46 @@ class UsersPage extends StatelessWidget {
                         Text(user.createdTime ?? ''),
                         Text(user.invitedBy),
                         status(
-                          status: user.isEnabled == false
+                          status: user.isEnabled == false ? 'disabled' : user.status,
-                              ? 'disabled'
-                              : user.status,
                         ),
                         changeIconStatus(
-                          status: user.isEnabled == false
+                          status: user.isEnabled == false ? 'disabled' : user.status,
-                              ? 'disabled'
-                              : user.status,
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  context.read<UserTableBloc>().add(
+                                  context.read<UserTableBloc>().add(ChangeUserStatus(
-                                      ChangeUserStatus(
+                                      userId: user.uuid,
-                                          userId: user.uuid,
+                                      newStatus:
-                                          newStatus: user.isEnabled == false
+                                          user.isEnabled == false ? 'disabled' : user.status));
-                                              ? 'disabled'
-                                              : user.status));
                                 }
                               : null,
                         ),
                         Row(
                           children: [
-                            actionButton(
+                            user.isEnabled != false
-                              title: "Edit",
+                                ? actionButton(
-                              onTap: () {
+                                    isActive: true,
-                                showDialog(
+                                    title: "Edit",
-                                  context: context,
+                                    onTap: () {
-                                  barrierDismissible: false,
+                                      context.read<SpaceTreeBloc>().add(ClearCachedData());
-                                  builder: (BuildContext context) {
+                                      showDialog(
-                                    return EditUserDialog(userId: user.uuid);
+                                        context: context,
-                                  },
+                                        barrierDismissible: false,
-                                ).then((v) {
+                                        builder: (BuildContext context) {
-                                  if (v != null) {
+                                          return EditUserDialog(userId: user.uuid);
-                                    if (v != null) {
+                                        },
-                                      _blocRole.add(const GetUsers());
+                                      ).then((v) {
-                                    }
+                                        if (v != null) {
-                                  }
+                                          if (v != null) {
-                                });
+                                            _blocRole.add(const GetUsers());
-                              },
+                                          }
-                            ),
+                                        }
+                                      });
+                                    },
+                                  )
+                                : actionButton(
+                                    title: "Edit",
+                                  ),
                             actionButton(
                               title: "Delete",
                               onTap: () {
@@ -466,13 +453,10 @@ class UsersPage extends StatelessWidget {
                                   context: context,
                                   barrierDismissible: false,
                                   builder: (BuildContext context) {
-                                    return DeleteUserDialog(
+                                    return DeleteUserDialog(onTapDelete: () async {
-                                        onTapDelete: () async {
                                       try {
-                                        _blocRole.add(DeleteUserEvent(
+                                        _blocRole.add(DeleteUserEvent(user.uuid, context));
-                                            user.uuid, context));
+                                        await Future.delayed(const Duration(seconds: 2));
-                                        await Future.delayed(
-                                            const Duration(seconds: 2));
                                         return true;
                                       } catch (e) {
                                         return false;
@@ -502,21 +486,14 @@ class UsersPage extends StatelessWidget {
                             visiblePagesCount: 4,
                             buttonRadius: 10,
                             selectedButtonColor: ColorsManager.secondaryColor,
-                            buttonUnSelectedBorderColor:
+                            buttonUnSelectedBorderColor: ColorsManager.grayBorder,
-                                ColorsManager.grayBorder,
+                            lastPageIcon: const Icon(Icons.keyboard_double_arrow_right),
-                            lastPageIcon:
+                            firstPageIcon: const Icon(Icons.keyboard_double_arrow_left),
-                                const Icon(Icons.keyboard_double_arrow_right),
+                            totalPages:
-                            firstPageIcon:
+                                (_blocRole.totalUsersCount.length / _blocRole.itemsPerPage).ceil(),
-                                const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.users.length /
-                                    _blocRole.itemsPerPage)
-                                .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              _blocRole.currentPage = pageNumber;
+                              context.read<UserTableBloc>().add(ChangePage(pageNumber));
-                              context
-                                  .read<UserTableBloc>()
-                                  .add(ChangePage(pageNumber));
                             },
                           ),
                         ),

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_state.dart';
@@ -8,6 +9,7 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bl
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/users_page.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class RolesAndPermissionPage extends StatelessWidget {
@@ -26,11 +28,10 @@ class RolesAndPermissionPage extends StatelessWidget {
               ? const Center(child: CircularProgressIndicator())
               : WebScaffold(
                   enableMenuSidebar: false,
-                  appBarTitle: FittedBox(
+                  appBarTitle: Text(
-                    child: Text(
+                    'Roles & Permissions',
-                      'Roles & Permissions',
+                    style:
-                      style: Theme.of(context).textTheme.headlineLarge,
+                        ResponsiveTextTheme.of(context).deviceManagementTitle,
-                    ),
                   ),
                   rightBody: const NavigateHomeGridView(),
                   centerBody: Row(

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -3,6 +3,8 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
@@ -10,17 +12,22 @@ import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
 
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
 
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
@@ -54,11 +61,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(
+        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes());
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation());
     }
   }
 
@@ -80,8 +88,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
+    int index = updatedIfItems.indexWhere(
-        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -90,18 +98,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(
+      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
+    int index = currentItems.indexWhere(
-        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -112,22 +123,26 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(
+      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction =
+          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(
+                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode ==
+                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -137,13 +152,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction
+              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+        currentSelectedFunctions[event.uniqueCustomId] =
-          ..addAll(selectedFunction);
+            List.from(currentFunctions)..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -152,18 +169,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(
+      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
-
+    List<ScenesModel> scenes = [];
     try {
-      spaceId = event.spaceId;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      communityId = event.communityId;
 
-      List<ScenesModel> scenes = [];
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-
+      var spaceBloc = context.read<SpaceTreeBloc>();
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
+      for (var communityId in spaceBloc.state.selectedCommunities) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId);
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+        }
       }
+
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -174,18 +197,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadScenesErrorMessage: 'Failed to load scenes',
           errorMessage: '',
           loadAutomationErrorMessage: '',
-          scenes: []));
+          scenes: scenes));
     }
   }
 
-  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(
+      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
+    List<ScenesModel> automations = [];
 
     try {
-      spaceId = event.spaceId;
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      List<ScenesModel> automations = [];
+      var spaceBloc = context.read<SpaceTreeBloc>();
-      if (spaceId.isNotEmpty) {
+      for (var communityId in spaceBloc.state.selectedCommunities) {
-        automations = await SceneApi.getAutomation(event.spaceId);
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          automations.addAll(await SceneApi.getAutomation(spaceId));
+        }
       }
       emit(state.copyWith(
         automations: automations,
@@ -197,18 +226,20 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadAutomationErrorMessage: 'Failed to load automations',
           errorMessage: '',
           loadScenesErrorMessage: '',
-          automations: []));
+          automations: automations));
     }
   }
 
-  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(
+      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(
+      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -222,7 +253,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(
+      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -235,7 +267,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -280,8 +313,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
       final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         iconId: state.selectedIcon ?? '',
         showInDevice: true,
         sceneName: state.routineName ?? '',
@@ -292,8 +328,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createScene(createSceneModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -308,7 +344,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(
+      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -329,7 +366,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -404,9 +442,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           );
         });
       }).toList();
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -421,8 +461,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createAutomation(createAutomationModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -439,17 +479,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(
+      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(
+          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -460,7 +504,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(
+            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -472,18 +517,23 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(
+      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(
+      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
+  (
-      _createCardData(
+    List<Map<String, dynamic>>,
+    List<Map<String, dynamic>>,
+    Map<String, List<DeviceFunctionData>>
+  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -516,7 +566,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath':
+                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -552,8 +603,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'deviceId':
-        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
+            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay'
+            ? 'Delay'
+            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -596,7 +650,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(
+      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -644,10 +699,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                ? const Uuid().v4()
+            'uniqueCustomId':
-                : action.entityId,
+                action.type == 'automation' || action.actionExecutor == 'delay'
+                    ? const Uuid().v4()
+                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -682,7 +739,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -754,7 +812,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(
+      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -778,17 +837,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) {
+  FutureOr<void> _deleteScene(
+      DeleteScene event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(isLoading: true));
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
       if (state.isTabToRun) {
-        SceneApi.deleteScene(unitUuid: spaceId, sceneId: state.sceneId ?? '');
+        await SceneApi.deleteScene(
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            sceneId: state.sceneId ?? '');
       } else {
-        SceneApi.deleteAutomation(unitUuid: spaceId, automationId: state.automationId ?? '');
+        await SceneApi.deleteAutomation(
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            automationId: state.automationId ?? '');
       }
 
-      add(LoadScenes(spaceId, communityId));
+      add(const LoadScenes());
-      add(LoadAutomation(spaceId));
+      add(const LoadAutomation());
       add(ResetRoutineState());
       emit(state.copyWith(isLoading: false, createRoutineView: false));
     } catch (e) {
@@ -813,10 +879,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(
+      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices('', '');
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<AllDevicesModel> devices = [];
+
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          devices.addAll(await DevicesManagementApi()
+              .fetchDevices(communityId, spaceId, projectUuid));
+        }
+      }
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {
@@ -824,7 +904,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(
+      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -838,7 +919,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -891,11 +973,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result =
+          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadScenes());
-        add(LoadAutomation(spaceId));
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -910,7 +993,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(
+      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1005,8 +1089,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -1018,13 +1105,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
+      final result = await SceneApi.updateAutomation(
-          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
+          createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
+        add(LoadAutomation());
-        add(LoadScenes(spaceId, communityId));
+        add(LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1052,7 +1139,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails =
+          await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1120,13 +1208,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId =
+        final deviceId = action.actionExecutor == 'delay'
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+            ? '${action.entityId}_delay'
+            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1157,7 +1247,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1199,10 +1290,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
+      final ifItems = deviceIfCards.values
+          .where((card) => card['type'] == 'condition')
+          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
+              card['type'] == 'action' ||
+              card['type'] == 'automation' ||
+              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(

lib/pages/routines/bloc/routine_bloc/routine_event.dart

@@ -27,22 +27,24 @@ class AddToThenContainer extends RoutineEvent {
 }
 
 class LoadScenes extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
-  final String communityId;
+  // final String communityId;
+  // final BuildContext context;
 
-  const LoadScenes(this.spaceId, this.communityId);
+  const LoadScenes();
 
   @override
-  List<Object> get props => [spaceId, communityId];
+  List<Object> get props => [];
 }
 
 class LoadAutomation extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
+  // final BuildContext context;
 
-  const LoadAutomation(this.spaceId);
+  const LoadAutomation();
 
   @override
-  List<Object> get props => [spaceId];
+  List<Object> get props => [];
 }
 
 class AddFunctionToRoutine extends RoutineEvent {

lib/pages/routines/view/routines_view.dart

@@ -7,7 +7,6 @@ import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_vie
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/snack_bar.dart';
 
 class RoutinesView extends StatefulWidget {
   const RoutinesView({super.key});
@@ -20,7 +19,7 @@ class _RoutinesViewState extends State<RoutinesView> {
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+    // context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
   @override
@@ -32,65 +31,70 @@ class _RoutinesViewState extends State<RoutinesView> {
         }
         return Row(
           children: [
-            Expanded(
+            Expanded(child: SpaceTreeView(
-                child:
+              onSelect: () {
-                    // SideSpacesView(
+                context.read<RoutineBloc>()
-                    //   onSelectAction: (String communityId, String spaceId) {
+                  ..add(const LoadScenes())
-                    //     // context.read<RoutineBloc>()
+                  ..add(const LoadAutomation());
-                    //     //   ..add(LoadScenes(spaceId, communityId))
+              },
-                    //     //   ..add(LoadAutomation(spaceId));
-                    //   },
-                    // )
-                    SpaceTreeView(
-              onSelect: () {},
             )),
             Expanded(
-              flex: 3,
+              flex: 4,
-              child: Padding(
+              child: ListView(children: [
-                padding: const EdgeInsets.all(16),
+                Container(
-                child: Row(
+                  padding: const EdgeInsets.all(16),
-                  children: [
+                  height: MediaQuery.sizeOf(context).height,
-                    Column(
+                  child: Column(
-                      mainAxisSize: MainAxisSize.min,
+                    mainAxisSize: MainAxisSize.min,
-                      crossAxisAlignment: CrossAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
-                      children: [
+                    children: [
-                        Text(
+                      Text(
-                          "Create New Routines",
+                        "Create New Routines",
-                          style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                color: ColorsManager.grayColor,
+                              color: ColorsManager.grayColor,
-                                fontWeight: FontWeight.bold,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      const SizedBox(
+                        height: 10,
+                      ),
+                      RoutineViewCard(
+                        onTap: () {
+                          if (context.read<SpaceTreeBloc>().state.selectedCommunities.length == 1 &&
+                              context.read<SpaceTreeBloc>().state.selectedSpaces.length == 1) {
+                            context.read<RoutineBloc>().add(
+                                  (ResetRoutineState()),
+                                );
+                            BlocProvider.of<RoutineBloc>(context).add(
+                              const CreateNewRoutineViewEvent(createRoutineView: true),
+                            );
+                          } else {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                    context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
+                                        ? 'Please select a space'
+                                        : 'Please select only one space to proceed'),
                               ),
-                        ),
+                            );
-                        const SizedBox(
+                            // CustomSnackBar.redSnackBar(
-                          height: 10,
+                            //     context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
-                        ),
+                            //         ? 'Please select a space'
-                        RoutineViewCard(
+                            //         : 'Please select only one space to proceed');
-                          onTap: () {
+                          }
-                            if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
+                        },
-                                context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
+                        icon: Icons.add,
-                              context.read<RoutineBloc>().add(
+                        textString: '',
-                                    (ResetRoutineState()),
+                      ),
-                                  );
+                      const SizedBox(
-                              BlocProvider.of<RoutineBloc>(context).add(
+                        height: 15,
-                                const CreateNewRoutineViewEvent(createRoutineView: true),
+                      ),
-                              );
+                      const Expanded(child: FetchRoutineScenesAutomation()),
-                            } else {
+                    ],
-                              CustomSnackBar.redSnackBar('Please select a space');
+                  ),
-                            }
-                          },
-                          icon: Icons.add,
-                          textString: '',
-                        ),
-                        const SizedBox(
-                          height: 15,
-                        ),
-                        const Expanded(child: FetchRoutineScenesAutomation()),
-                      ],
-                    ),
-                  ],
                 ),
-              ),
+              ]),
             ),
           ],
         );

lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -20,10 +20,6 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override

lib/pages/routines/widgets/routine_devices.dart

@@ -4,9 +4,20 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
-class RoutineDevices extends StatelessWidget {
+class RoutineDevices extends StatefulWidget {
   const RoutineDevices({super.key});
 
+  @override
+  State<RoutineDevices> createState() => _RoutineDevicesState();
+}
+
+class _RoutineDevicesState extends State<RoutineDevices> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(

lib/pages/routines/widgets/scenes_and_automations.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ScenesAndAutomations extends StatefulWidget {
@@ -19,9 +18,8 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
+      ..add(const LoadScenes())
-          context.read<SpaceTreeBloc>().selectedCommunityId))
+      ..add(const LoadAutomation());
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -6,9 +7,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
@@ -16,17 +14,49 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<OnCommunitySelected>(_onCommunitySelected);
     on<OnSpaceSelected>(_onSpaceSelected);
     on<SearchQueryEvent>(_onSearch);
+    on<ClearAllData>(_clearAllData);
+    on<ClearCachedData>(_clearCachedData);
+    on<OnCommunityAdded>(_onCommunityAdded);
+    on<OnCommunityUpdated>(_onCommunityUpdate);
+  }
+
+  void _onCommunityUpdate(
+    OnCommunityUpdated event,
+    Emitter<SpaceTreeState> emit,
+  ) async {
+    emit(SpaceTreeLoadingState());
+
+    try {
+      final updatedCommunity = event.updatedCommunity;
+      final updatedCommunities =
+          List<CommunityModel>.from(state.communityList);
+
+      final index = updatedCommunities
+          .indexWhere((community) => community.uuid == updatedCommunity.uuid);
+
+      if (index != -1) {
+        updatedCommunities[index] = updatedCommunity;
+        emit(state.copyWith(communitiesList: updatedCommunities));
+      } else {
+        emit(SpaceTreeErrorState('Community not found in the list.'));
+      }
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error updating community: $e'));
+    }
   }
 
   _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
     emit(SpaceTreeLoadingState());
     try {
-      List<CommunityModel> communities = await CommunitySpaceManagementApi().fetchCommunities();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
-          List<SpaceModel> spaces =
+          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
-              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid);
+              .getSpaceHierarchy(community.uuid, projectUuid);
 
           return CommunityModel(
             uuid: community.uuid,
@@ -41,15 +71,27 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       );
 
       emit(state.copyWith(
-          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
+          communitiesList: updatedCommunities,
+          expandedCommunity: [],
+          expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
+  void _onCommunityAdded(
+      OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
+    final updatedCommunities = List<CommunityModel>.from(state.communityList);
+    updatedCommunities.add(event.newCommunity);
+
+    emit(state.copyWith(communitiesList: updatedCommunities));
+  }
+
+  _onCommunityExpanded(
+      OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
+      List<String> updatedExpandedCommunityList =
+          List.from(state.expandedCommunities);
 
       if (updatedExpandedCommunityList.contains(event.communityId)) {
         updatedExpandedCommunityList.remove(event.communityId);
@@ -81,13 +123,19 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
+  _onCommunitySelected(
+      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSelectedSpaces =
-      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+          List.from(state.selectedSpaces.toSet().toList());
-      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSoldChecks =
+          List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces =
+          Map.from(state.selectedCommunityAndSpaces);
+      List<String> selectedSpacesInCommunity =
+          communityAndSpaces[event.communityId] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -95,14 +143,16 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         // Select the community and all its children
         updatedSelectedCommunities.add(event.communityId);
         updatedSelectedSpaces.addAll(childrenIds);
+        selectedSpacesInCommunity.addAll(childrenIds);
       } else {
         // Unselect the community and all its children
         updatedSelectedCommunities.remove(event.communityId);
         updatedSelectedSpaces.removeWhere(childrenIds.contains);
         updatedSoldChecks.removeWhere(childrenIds.contains);
+        selectedSpacesInCommunity.removeWhere(childrenIds.contains);
       }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityId] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
@@ -118,9 +168,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSelectedSpaces =
-      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+          List.from(state.selectedSpaces.toSet().toList());
-      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSoldChecks =
+          List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces =
+          Map.from(state.selectedCommunityAndSpaces);
+
+      List<String> selectedSpacesInCommunity =
+          communityAndSpaces[event.communityModel.uuid] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -135,14 +191,19 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           !updatedSoldChecks.contains(event.spaceId)) {
         // First click: Select the space and all its children
         updatedSelectedSpaces.add(event.spaceId);
-        updatedSelectedCommunities.add(event.communityId);
+        updatedSelectedCommunities.add(event.communityModel.uuid);
+        selectedSpacesInCommunity.add(event.spaceId);
+
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
+          selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
+        List<String> spaces =
+            _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
+          if (!updatedSelectedSpaces.contains(space) &&
+              !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -150,31 +211,48 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           childrenIds.isNotEmpty &&
           isChildSelected) {
         // Second click: Unselect space but keep children
+        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         updatedSoldChecks.add(event.spaceId);
       } else {
         // Third click: Unselect space and all its children
+        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.removeWhere(childrenIds.contains);
           updatedSoldChecks.removeWhere(childrenIds.contains);
+          selectedSpacesInCommunity.removeWhere(childrenIds.contains);
         }
         updatedSoldChecks.remove(event.spaceId);
 
-        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
+        List<String> parents =
-        if (!_parentSelected(parents, updatedSelectedSpaces)) {
+            _getThePathToChild(event.communityModel.uuid, event.spaceId)
+                .toSet()
+                .toList();
+
+        if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
-        }
+          updatedSelectedCommunities.remove(event.communityModel.uuid);
-        if (!_anySpacesSelectedInCommunity(
+        } else {
-            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
+          // Check if any parent has selected children
-          updatedSelectedCommunities.remove(event.communityId);
+          for (String space in parents) {
+            if (!_noChildrenSelected(
+                event.communityModel, space, updatedSelectedSpaces, parents)) {
+              updatedSoldChecks.remove(space);
+            }
+          }
+
+          if (!_anySpacesSelectedInCommunity(
+              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
+            updatedSelectedCommunities.remove(event.communityModel.uuid);
+          }
         }
       }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityModel.uuid] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
+          selectedCommunities: updatedSelectedCommunities.toSet().toList(),
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
@@ -184,12 +262,24 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _parentSelected(List<String> parents, List<String> selectedSpaces) {
+  _noChildrenSelected(CommunityModel community, String spaceId,
-    for (String space in parents) {
+      List<String> selectedSpaces, List<String> parents) {
-      if (selectedSpaces.contains(space)) {
+    if (selectedSpaces.contains(spaceId)) {
-        return true;
+      return true;
+    }
+
+    List<SpaceModel> children = _getAllChildSpaces(community.spaces);
+    for (var child in children) {
+      if (spaceId == child.uuid) {
+        List<String> ids = _getAllChildIds(child.children);
+        for (var id in ids) {
+          if (selectedSpaces.contains(id)) {
+            return true;
+          }
+        }
       }
     }
+
     return false;
   }
 
@@ -200,16 +290,55 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity =
+        final containsQueryInCommunity = community.name
-            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+            .toLowerCase()
-        final containsQueryInSpaces =
+            .contains(event.searchQuery.toLowerCase());
-            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+        final containsQueryInSpaces = community.spaces.any(
+            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
 
       emit(state.copyWith(
-          filteredCommunity: filteredCommunity, isSearching: event.searchQuery.isNotEmpty));
+          filteredCommunity: filteredCommunity,
+          isSearching: event.searchQuery.isNotEmpty,
+          searchQuery: event.searchQuery));
+    } catch (e) {
+      emit(const SpaceTreeErrorState('Something went wrong'));
+    }
+  }
+
+  _clearAllData(ClearAllData event, Emitter<SpaceTreeState> emit) async {
+    try {
+      emit(state.copyWith(
+          communitiesList: [],
+          filteredCommunity: [],
+          isSearching: false,
+          soldCheck: [],
+          selectedSpaces: [],
+          selectedCommunities: [],
+          selectedCommunityAndSpaces: {},
+          searchQuery: '',
+          expandedSpaces: [],
+          expandedCommunity: []));
+    } catch (e) {
+      emit(const SpaceTreeErrorState('Something went wrong'));
+    }
+  }
+
+  _clearCachedData(ClearCachedData event, Emitter<SpaceTreeState> emit) async {
+    try {
+      emit(state.copyWith(
+          communitiesList: state.communityList,
+          filteredCommunity: [],
+          isSearching: false,
+          soldCheck: [],
+          selectedSpaces: [],
+          selectedCommunities: [],
+          selectedCommunityAndSpaces: {},
+          searchQuery: '',
+          expandedSpaces: [],
+          expandedCommunity: []));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -218,8 +347,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren =
+    final matchesChildren = space.children.any((child) =>
-        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
+        _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -230,21 +359,26 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids;
+    return ids.toSet().toList();
   }
 
-  bool _anySpacesSelectedInCommunity(
+  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
-      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
+    List<SpaceModel> children = [];
+    for (var child in spaces) {
+      children.add(child);
+      children.addAll(_getAllChildSpaces(child.children));
+    }
+    return children;
+  }
+
+  bool _anySpacesSelectedInCommunity(CommunityModel community,
+      List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
-    for (var community in state.communityList) {
+    List<String> ids = _getAllChildIds(community.spaces);
-      if (community.uuid == communityId) {
+    for (var id in ids) {
-        List<String> ids = _getAllChildIds(community.spaces);
+      result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
-        for (var id in ids) {
+      if (result) {
-          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+        return result;
-          if (result) {
-            return result;
-          }
-        }
       }
     }
     return result;
@@ -267,7 +401,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
+  List<String> _getAllParentsIds(
+      SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');
@@ -288,4 +423,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     ids.removeLast();
     return [];
   }
+
+  @override
+  Future<void> close() async {
+    super.close();
+  }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.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';
 
 class SpaceTreeEvent extends Equatable {
@@ -49,14 +50,14 @@ class OnSpaceExpanded extends SpaceTreeEvent {
 }
 
 class OnSpaceSelected extends SpaceTreeEvent {
-  final String communityId;
   final String spaceId;
   final List<SpaceModel> children;
+  final CommunityModel communityModel;
 
-  const OnSpaceSelected(this.communityId, this.spaceId, this.children);
+  const OnSpaceSelected(this.communityModel, this.spaceId, this.children);
 
   @override
-  List<Object> get props => [communityId, spaceId, children];
+  List<Object> get props => [communityModel, spaceId, children];
 }
 
 class SearchQueryEvent extends SpaceTreeEvent {
@@ -67,3 +68,24 @@ class SearchQueryEvent extends SpaceTreeEvent {
   @override
   List<Object> get props => [searchQuery];
 }
+
+class OnCommunityAdded extends SpaceTreeEvent {
+  final CommunityModel newCommunity;
+  const OnCommunityAdded(this.newCommunity);
+
+  @override
+  List<Object> get props => [newCommunity];
+}
+
+class OnCommunityUpdated extends SpaceTreeEvent {
+  final CommunityModel updatedCommunity;
+  const OnCommunityUpdated(this.updatedCommunity);
+
+  @override
+  List<Object> get props => [updatedCommunity];
+}
+
+
+class ClearAllData extends SpaceTreeEvent {}
+
+class ClearCachedData extends SpaceTreeEvent {}

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -11,6 +11,7 @@ class SpaceTreeState extends Equatable {
   final List<String> selectedSpaces;
   final List<String> soldCheck;
   final bool isSearching;
+  final String searchQuery;
 
   const SpaceTreeState(
       {this.communityList = const [],
@@ -21,7 +22,8 @@ class SpaceTreeState extends Equatable {
       this.selectedSpaces = const [],
       this.soldCheck = const [],
       this.isSearching = false,
-      this.selectedCommunityAndSpaces = const {}});
+      this.selectedCommunityAndSpaces = const {},
+      this.searchQuery = ''});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -32,7 +34,8 @@ class SpaceTreeState extends Equatable {
       List<String>? selectedSpaces,
       List<String>? soldCheck,
       bool? isSearching,
-      Map<String, List<String>>? selectedCommunityAndSpaces}) {
+      Map<String, List<String>>? selectedCommunityAndSpaces,
+      String? searchQuery}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -42,7 +45,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces: selectedSpaces ?? this.selectedSpaces,
         soldCheck: soldCheck ?? this.soldCheck,
         isSearching: isSearching ?? this.isSearching,
-        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
+        searchQuery: searchQuery ?? this.searchQuery);
   }
 
   @override
@@ -55,7 +59,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces,
         soldCheck,
         isSearching,
-        selectedCommunityAndSpaces
+        selectedCommunityAndSpaces,
+        searchQuery
       ];
 }
 

lib/pages/space_tree/view/space_tree_view.dart

@@ -10,10 +10,23 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class SpaceTreeView extends StatelessWidget {
+class SpaceTreeView extends StatefulWidget {
   final Function onSelect;
   const SpaceTreeView({required this.onSelect, super.key});
 
+  @override
+  State<SpaceTreeView> createState() => _SpaceTreeViewState();
+}
+
+class _SpaceTreeViewState extends State<SpaceTreeView> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
@@ -21,79 +34,162 @@ class SpaceTreeView extends StatelessWidget {
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: subSectionContainerDecoration,
-        // padding: const EdgeInsets.all(16.0),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
                   CustomSearchBar(
+                    searchQuery: state.searchQuery,
                     onSearchChanged: (query) {
                       context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
                     },
                   ),
                   const SizedBox(height: 16),
                   Expanded(
-                    child: Padding(
+                    child: ListView(
-                      padding: const EdgeInsets.all(8.0),
+                      shrinkWrap: true,
-                      child: list.isEmpty
+                      scrollDirection: Axis.horizontal,
-                          ? Center(
+                      children: [
-                              child: Text(
+                        Container(
-                                'No results found',
+                          width: MediaQuery.sizeOf(context).width * 0.5,
-                                style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          padding: const EdgeInsets.all(8.0),
-                                      color: ColorsManager.lightGrayColor, // Gray when not selected
+                          child: list.isEmpty
-                                      fontWeight: FontWeight.w400,
+                              ? Center(
+                                  child: Text(
+                                    'No results found',
+                                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                          color: ColorsManager.lightGrayColor,
+                                          fontWeight: FontWeight.w400,
+                                        ),
+                                  ),
+                                )
+                              : Scrollbar(
+                                  scrollbarOrientation: ScrollbarOrientation.left,
+                                  thumbVisibility: true,
+                                  controller: _scrollController,
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(left: 16),
+                                    child: ListView(
+                                      controller: _scrollController,
+                                      shrinkWrap: true,
+                                      children: list
+                                          .map(
+                                            (community) => CustomExpansionTileSpaceTree(
+                                              title: community.name,
+                                              isSelected: state.selectedCommunities
+                                                  .contains(community.uuid),
+                                              isSoldCheck: state.selectedCommunities
+                                                  .contains(community.uuid),
+                                              onExpansionChanged: () {
+                                                context
+                                                    .read<SpaceTreeBloc>()
+                                                    .add(OnCommunityExpanded(community.uuid));
+                                              },
+                                              isExpanded: state.expandedCommunities
+                                                  .contains(community.uuid),
+                                              onItemSelected: () {
+                                                context.read<SpaceTreeBloc>().add(
+                                                    OnCommunitySelected(
+                                                        community.uuid, community.spaces));
+                                                widget.onSelect();
+                                              },
+                                              children: community.spaces.map((space) {
+                                                return CustomExpansionTileSpaceTree(
+                                                  title: space.name,
+                                                  isExpanded:
+                                                      state.expandedSpaces.contains(space.uuid),
+                                                  onItemSelected: () {
+                                                    context.read<SpaceTreeBloc>().add(
+                                                        OnSpaceSelected(community, space.uuid ?? '',
+                                                            space.children));
+                                                    widget.onSelect();
+                                                  },
+                                                  onExpansionChanged: () {
+                                                    context.read<SpaceTreeBloc>().add(
+                                                        OnSpaceExpanded(
+                                                            community.uuid, space.uuid ?? ''));
+                                                  },
+                                                  isSelected:
+                                                      state.selectedSpaces.contains(space.uuid) ||
+                                                          state.soldCheck.contains(space.uuid),
+                                                  isSoldCheck: state.soldCheck.contains(space.uuid),
+                                                  children: _buildNestedSpaces(
+                                                      context, state, space, community),
+                                                );
+                                              }).toList(),
+                                            ),
+                                          )
+                                          .toList(),
                                     ),
-                              ),
+                                  ),
-                            )
+                                ),
-                          : ListView(
+                        ),
-                              shrinkWrap: true,
+                      ],
-                              children: list
-                                  .map(
-                                    (community) => CustomExpansionTileSpaceTree(
-                                      title: community.name,
-                                      isSelected:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      isSoldCheck:
-                                          state.selectedCommunities.contains(community.uuid),
-                                      onExpansionChanged: () {
-                                        context
-                                            .read<SpaceTreeBloc>()
-                                            .add(OnCommunityExpanded(community.uuid));
-                                      },
-                                      isExpanded:
-                                          state.expandedCommunities.contains(community.uuid),
-                                      onItemSelected: () {
-                                        context.read<SpaceTreeBloc>().add(
-                                            OnCommunitySelected(community.uuid, community.spaces));
-
-                                        onSelect();
-                                      },
-                                      children: community.spaces.map((space) {
-                                        return CustomExpansionTileSpaceTree(
-                                          title: space.name,
-                                          isExpanded: state.expandedSpaces.contains(space.uuid),
-                                          onItemSelected: () {
-                                            context.read<SpaceTreeBloc>().add(OnSpaceSelected(
-                                                community.uuid, space.uuid ?? '', space.children));
-                                            onSelect();
-                                          },
-                                          onExpansionChanged: () {
-                                            context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(community.uuid, space.uuid ?? ''));
-                                          },
-                                          isSelected: state.selectedSpaces.contains(space.uuid) ||
-                                              state.soldCheck.contains(space.uuid),
-                                          isSoldCheck: state.soldCheck.contains(space.uuid),
-                                          children: _buildNestedSpaces(
-                                              context, state, space, community.uuid),
-                                        );
-                                      }).toList(),
-                                    ),
-                                  )
-                                  .toList(),
-                            ),
                     ),
                   ),
+
+                  // Expanded(
+                  //   child: Padding(
+                  //     padding: const EdgeInsets.all(8.0),
+                  //     child: list.isEmpty
+                  //         ? Center(
+                  //             child: Text(
+                  //               'No results found',
+                  //               style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  //                     color: ColorsManager.lightGrayColor, // Gray when not selected
+                  //                     fontWeight: FontWeight.w400,
+                  //                   ),
+                  //             ),
+                  //           )
+                  //         : ListView(
+                  //             shrinkWrap: true,
+                  //             children: list
+                  //                 .map(
+                  //                   (community) => CustomExpansionTileSpaceTree(
+                  //                     title: community.name,
+                  //                     isSelected:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     isSoldCheck:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     onExpansionChanged: () {
+                  //                       context
+                  //                           .read<SpaceTreeBloc>()
+                  //                           .add(OnCommunityExpanded(community.uuid));
+                  //                     },
+                  //                     isExpanded:
+                  //                         state.expandedCommunities.contains(community.uuid),
+                  //                     onItemSelected: () {
+                  //                       context.read<SpaceTreeBloc>().add(
+                  //                           OnCommunitySelected(community.uuid, community.spaces));
+
+                  //                       onSelect();
+                  //                     },
+                  //                     children: community.spaces.map((space) {
+                  //                       return CustomExpansionTileSpaceTree(
+                  //                         title: space.name,
+                  //                         isExpanded: state.expandedSpaces.contains(space.uuid),
+                  //                         onItemSelected: () {
+                  //                           context.read<SpaceTreeBloc>().add(OnSpaceSelected(
+                  //                               community.uuid, space.uuid ?? '', space.children));
+                  //                           onSelect();
+                  //                         },
+                  //                         onExpansionChanged: () {
+                  //                           context.read<SpaceTreeBloc>().add(
+                  //                               OnSpaceExpanded(community.uuid, space.uuid ?? ''));
+                  //                         },
+                  //                         isSelected: state.selectedSpaces.contains(space.uuid) ||
+                  //                             state.soldCheck.contains(space.uuid),
+                  //                         isSoldCheck: state.soldCheck.contains(space.uuid),
+                  //                         children: _buildNestedSpaces(
+                  //                             context, state, space, community.uuid),
+                  //                       );
+                  //                     }).toList(),
+                  //                   ),
+                  //                 )
+                  //                 .toList(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -101,7 +197,7 @@ class SpaceTreeView extends StatelessWidget {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
+      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
         isSelected:
@@ -112,13 +208,13 @@ class SpaceTreeView extends StatelessWidget {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
+              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
-          onSelect();
+          widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
         },
-        children: _buildNestedSpaces(context, state, child, communityId),
+        children: _buildNestedSpaces(context, state, child, community),
       );
     }).toList();
   }

lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart

@@ -1,4 +1,8 @@
+import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.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/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -13,7 +17,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_updat
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
-import 'package:syncrow_web/utils/constants/action_enum.dart';
+import 'package:syncrow_web/utils/constants/action_enum.dart' as custom_action;
 
 class SpaceManagementBloc
     extends Bloc<SpaceManagementEvent, SpaceManagementState> {
@@ -22,11 +26,16 @@ class SpaceManagementBloc
   final SpaceModelManagementApi _spaceModelApi;
 
   List<ProductModel>? _cachedProducts;
+  List<SpaceTemplateModel>? _cachedSpaceModels;
+  final SpaceTreeBloc _spaceTreeBloc;
 
-  SpaceManagementBloc(this._api, this._productApi, this._spaceModelApi)
+  SpaceManagementBloc(
-      : super(SpaceManagementInitial()) {
+    this._api,
+    this._productApi,
+    this._spaceModelApi,
+    this._spaceTreeBloc,
+  ) : super(SpaceManagementInitial()) {
     on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
-    on<UpdateSpacePositionEvent>(_onUpdateSpacePosition);
     on<CreateCommunityEvent>(_onCreateCommunity);
     on<SelectCommunityEvent>(_onSelectCommunity);
     on<DeleteCommunityEvent>(_onCommunityDelete);
@@ -37,6 +46,88 @@ class SpaceManagementBloc
     on<NewCommunityEvent>(_onNewCommunity);
     on<BlankStateEvent>(_onBlankState);
     on<SpaceModelLoadEvent>(_onLoadSpaceModel);
+    on<UpdateSpaceModelCache>(_updateSpaceModelCache);
+    on<DeleteSpaceModelFromCache>(_deleteSpaceModelFromCache);
+  }
+
+  Future<void> _updateSpaceModelCache(
+      UpdateSpaceModelCache event, Emitter<SpaceManagementState> emit) async {
+    if (_cachedSpaceModels != null) {
+      _cachedSpaceModels = _cachedSpaceModels!.map((model) {
+        return model.uuid == event.updatedModel.uuid
+            ? event.updatedModel
+            : model;
+      }).toList();
+    } else {
+      _cachedSpaceModels = await fetchSpaceModels();
+    }
+
+    emit(SpaceModelLoaded(
+      communities: state is SpaceManagementLoaded
+          ? (state as SpaceManagementLoaded).communities
+          : [],
+      products: _cachedProducts ?? [],
+      spaceModels: List.from(_cachedSpaceModels ?? []),
+    ));
+  }
+
+  void _deleteSpaceModelFromCache(DeleteSpaceModelFromCache event,
+      Emitter<SpaceManagementState> emit) async {
+    if (_cachedSpaceModels != null) {
+      _cachedSpaceModels = _cachedSpaceModels!
+          .where((model) => model.uuid != event.deletedUuid)
+          .toList();
+    } else {
+      _cachedSpaceModels = await fetchSpaceModels();
+    }
+
+    emit(SpaceModelLoaded(
+      communities: state is SpaceManagementLoaded
+          ? (state as SpaceManagementLoaded).communities
+          : [],
+      products: _cachedProducts ?? [],
+      spaceModels: List.from(_cachedSpaceModels ?? []),
+    ));
+  }
+
+  void updateCachedSpaceModels(List<SpaceTemplateModel> updatedModels) {
+    _cachedSpaceModels = List.from(updatedModels);
+  }
+
+  void addToCachedSpaceModels(SpaceTemplateModel newModel) {
+    _cachedSpaceModels?.add(newModel);
+  }
+
+  Future<List<SpaceTemplateModel>> fetchSpaceModels() async {
+    try {
+      if (_cachedSpaceModels != null) {
+        return _cachedSpaceModels!;
+      }
+
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<SpaceTemplateModel> allSpaceModels = [];
+
+      bool hasNext = true;
+      int page = 1;
+
+      while (hasNext) {
+        final spaceModels = await _spaceModelApi.listSpaceModels(
+            page: page, projectId: projectUuid);
+        if (spaceModels.isNotEmpty) {
+          allSpaceModels.addAll(spaceModels);
+          page++;
+        } else {
+          hasNext = false;
+        }
+      }
+
+      _cachedSpaceModels = allSpaceModels;
+
+      return allSpaceModels;
+    } catch (e) {
+      return [];
+    }
   }
 
   void _onUpdateCommunity(
@@ -45,9 +136,11 @@ class SpaceManagementBloc
   ) async {
     final previousState = state;
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(SpaceManagementLoading());
-      final success =
+      final success = await _api.updateCommunity(
-          await _api.updateCommunity(event.communityUuid, event.name);
+          event.communityUuid, event.name, projectUuid);
       if (success) {
         if (previousState is SpaceManagementLoaded) {
           final updatedCommunities =
@@ -55,11 +148,13 @@ class SpaceManagementBloc
           for (var community in updatedCommunities) {
             if (community.uuid == event.communityUuid) {
               community.name = event.name;
+              _spaceTreeBloc.add(OnCommunityAdded(community));
+
               break;
             }
           }
 
-          var prevSpaceModels = await fetchSpaceModels(previousState);
+          var prevSpaceModels = await fetchSpaceModels();
 
           emit(SpaceManagementLoaded(
             communities: updatedCommunities,
@@ -76,42 +171,6 @@ class SpaceManagementBloc
     }
   }
 
-  Future<List<SpaceTemplateModel>> fetchSpaceModels(
-      SpaceManagementState previousState) async {
-    try {
-      List<SpaceTemplateModel> allSpaces = [];
-      List<SpaceTemplateModel> prevSpaceModels = [];
-
-      if (previousState is SpaceManagementLoaded ||
-          previousState is BlankState) {
-        prevSpaceModels = List<SpaceTemplateModel>.from(
-          (previousState as dynamic).spaceModels ?? [],
-        );
-        allSpaces.addAll(prevSpaceModels);
-      }
-
-      if (prevSpaceModels.isEmpty) {
-        bool hasNext = true;
-        int page = 1;
-
-        while (hasNext) {
-          final spaces = await _spaceModelApi.listSpaceModels(page: page);
-          if (spaces.isNotEmpty) {
-            allSpaces.addAll(spaces);
-            page++;
-          } else {
-            hasNext = false;
-          }
-        }
-        prevSpaceModels = await _spaceModelApi.listSpaceModels(page: 1);
-      }
-
-      return allSpaces;
-    } catch (e) {
-      return [];
-    }
-  }
-
   void _onloadProducts() async {
     if (_cachedProducts == null) {
       final products = await _productApi.fetchProducts();
@@ -132,7 +191,9 @@ class SpaceManagementBloc
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    return await _api.getSpaceHierarchy(communityUuid);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await _api.getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   Future<void> _onNewCommunity(
@@ -147,7 +208,7 @@ class SpaceManagementBloc
         return;
       }
 
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+      var prevSpaceModels = await fetchSpaceModels();
 
       emit(BlankState(
         communities: event.communities,
@@ -163,7 +224,11 @@ class SpaceManagementBloc
       BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
     try {
       final previousState = state;
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+
+      var prevSpaceModels = await fetchSpaceModels();
 
       if (previousState is SpaceManagementLoaded ||
           previousState is BlankState) {
@@ -176,25 +241,31 @@ class SpaceManagementBloc
         return;
       }
 
-      final communities = await _api.fetchCommunities();
+      if (communities.isEmpty) {
-      final updatedCommunities =
+        communities = await _api.fetchCommunities(projectUuid);
-          await Future.wait(communities.map((community) async {
-        final spaces = await _fetchSpacesForCommunity(community.uuid);
 
-        return CommunityModel(
+        List<CommunityModel> updatedCommunities = await Future.wait(
-          uuid: community.uuid,
+          communities.map((community) async {
-          createdAt: community.createdAt,
+            List<SpaceModel> spaces =
-          updatedAt: community.updatedAt,
+                await _fetchSpacesForCommunity(community.uuid);
-          name: community.name,
+            return CommunityModel(
-          description: community.description,
+              uuid: community.uuid,
-          spaces: spaces,
+              createdAt: community.createdAt,
-          region: community.region,
+              updatedAt: community.updatedAt,
+              name: community.name,
+              description: community.description,
+              spaces: spaces,
+              region: community.region,
+            );
+          }).toList(),
         );
-      }));
+
+        communities = updatedCommunities;
+      }
 
       emit(BlankState(
         spaceModels: prevSpaceModels,
-        communities: updatedCommunities,
+        communities: communities,
         products: _cachedProducts ?? [],
       ));
     } catch (error) {
@@ -206,36 +277,39 @@ class SpaceManagementBloc
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevState = state;
+    var spaceBloc = event.context.read<SpaceTreeBloc>();
-    emit(SpaceManagementLoading());
+    _onloadProducts();
-    try {
-      _onloadProducts();
-      List<CommunityModel> communities = await _api.fetchCommunities();
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
+    // Wait until `communityList` is loaded
-        communities.map((community) async {
+    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
-          List<SpaceModel> spaces =
-              await _fetchSpacesForCommunity(community.uuid);
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces, // New spaces list
-            region: community.region,
-          );
-        }).toList(),
-      );
 
-      final prevSpaceModels = await fetchSpaceModels(prevState);
+    // Fetch space models after communities are available
-      emit(SpaceManagementLoaded(
+    final prevSpaceModels = await fetchSpaceModels();
-          communities: updatedCommunities,
+    emit(SpaceManagementLoaded(
-          products: _cachedProducts ?? [],
+      communities: communities,
-          spaceModels: prevSpaceModels));
+      products: _cachedProducts ?? [],
-    } catch (e) {
+      spaceModels: prevSpaceModels,
-      emit(SpaceManagementError('Error loading communities and spaces: $e'));
+    ));
+  }
+
+  Future<List<CommunityModel>> _waitForCommunityList(
+      SpaceTreeBloc spaceBloc) async {
+    // Check if communityList is already populated
+    if (spaceBloc.state.communityList.isNotEmpty) {
+      return spaceBloc.state.communityList;
     }
+
+    final completer = Completer<List<CommunityModel>>();
+    final subscription = spaceBloc.stream.listen((state) {
+      if (state.communityList.isNotEmpty) {
+        completer.complete(state.communityList);
+      }
+    });
+
+    // Return the list once available, then cancel the listener
+    final communities = await completer.future;
+    await subscription.cancel();
+    return communities;
   }
 
   void _onCommunityDelete(
@@ -244,10 +318,12 @@ class SpaceManagementBloc
   ) async {
     try {
       emit(SpaceManagementLoading());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      final success = await _api.deleteCommunity(event.communityUuid);
+      final success =
+          await _api.deleteCommunity(event.communityUuid, projectUuid);
       if (success) {
-        add(LoadCommunityAndSpacesEvent());
+        //  add(LoadCommunityAndSpacesEvent());
       } else {
         emit(const SpaceManagementError('Failed to delete the community.'));
       }
@@ -257,11 +333,6 @@ class SpaceManagementBloc
     }
   }
 
-  void _onUpdateSpacePosition(
-    UpdateSpacePositionEvent event,
-    Emitter<SpaceManagementState> emit,
-  ) {}
-
   void _onCreateCommunity(
     CreateCommunityEvent event,
     Emitter<SpaceManagementState> emit,
@@ -270,9 +341,11 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
 
     try {
-      CommunityModel? newCommunity =
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-          await _api.createCommunity(event.name, event.description);
+
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+      CommunityModel? newCommunity = await _api.createCommunity(
+          event.name, event.description, projectUuid);
+      var prevSpaceModels = await fetchSpaceModels();
 
       if (newCommunity != null) {
         if (previousState is SpaceManagementLoaded ||
@@ -281,6 +354,8 @@ class SpaceManagementBloc
             (previousState as dynamic).communities,
           );
           final updatedCommunities = prevCommunities..add(newCommunity);
+          _spaceTreeBloc.add(OnCommunityAdded(newCommunity));
+
           emit(SpaceManagementLoaded(
               spaceModels: prevSpaceModels,
               communities: updatedCommunities,
@@ -375,8 +450,6 @@ class SpaceManagementBloc
           event.communityUuid,
           emit,
         );
-      } else {
-        add(LoadCommunityAndSpacesEvent());
       }
     } catch (e) {
       emit(SpaceManagementError('Error saving spaces: $e'));
@@ -393,13 +466,15 @@ class SpaceManagementBloc
     String communityUuid,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevSpaceModels = await fetchSpaceModels(previousState);
+    var prevSpaceModels = await fetchSpaceModels();
 
     final communities = List<CommunityModel>.from(previousState.communities);
 
     for (var community in communities) {
       if (community.uuid == communityUuid) {
         community.spaces = allSpaces;
+        _spaceTreeBloc.add(OnCommunityUpdated(community));
+
         emit(SpaceManagementLoaded(
             communities: communities,
             products: _cachedProducts ?? [],
@@ -414,6 +489,7 @@ class SpaceManagementBloc
   Future<List<SpaceModel>> saveSpacesHierarchically(
       List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -422,7 +498,7 @@ class SpaceManagementBloc
     for (var parent in parentsToDelete) {
       try {
         if (parent.uuid != null) {
-          await _api.deleteSpace(communityUuid, parent.uuid!);
+          await _api.deleteSpace(communityUuid, parent.uuid!, projectUuid);
         }
       } catch (e) {
         rethrow;
@@ -435,7 +511,8 @@ class SpaceManagementBloc
         if (space.uuid != null && space.uuid!.isNotEmpty) {
           List<TagModelUpdate> tagUpdates = [];
 
-          final prevSpace = await _api.getSpace(communityUuid, space.uuid!);
+          final prevSpace =
+              await _api.getSpace(communityUuid, space.uuid!, projectUuid);
           final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
           final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
           final List<SubspaceModel>? newSubspaces = space.subspaces;
@@ -449,13 +526,15 @@ class SpaceManagementBloc
                     .any((subspace) => subspace.uuid == prevSubspace.uuid);
                 if (!existsInNew) {
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.delete, uuid: prevSubspace.uuid));
+                      action: custom_action.Action.delete,
+                      uuid: prevSubspace.uuid));
                 }
               }
             } else if (prevSubspaces != null && newSubspaces == null) {
               for (var prevSubspace in prevSubspaces) {
                 subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                    action: Action.delete, uuid: prevSubspace.uuid));
+                    action: custom_action.Action.delete,
+                    uuid: prevSubspace.uuid));
               }
             }
 
@@ -468,14 +547,14 @@ class SpaceManagementBloc
                   if (newSubspace.tags != null) {
                     for (var tag in newSubspace.tags!) {
                       tagUpdates.add(TagModelUpdate(
-                          action: Action.add,
+                          action: custom_action.Action.add,
                           uuid: tag.uuid == '' ? null : tag.uuid,
                           tag: tag.tag,
                           productUuid: tag.product?.uuid));
                     }
                   }
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.add,
+                      action: custom_action.Action.add,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagUpdates));
                 }
@@ -494,7 +573,7 @@ class SpaceManagementBloc
                   final List<TagModelUpdate> tagSubspaceUpdates =
                       processTagUpdates(prevSubspace.tags, newSubspace.tags);
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.update,
+                      action: custom_action.Action.update,
                       uuid: newSubspace.uuid,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagSubspaceUpdates));
@@ -504,17 +583,17 @@ class SpaceManagementBloc
           }
 
           final response = await _api.updateSpace(
-            communityId: communityUuid,
+              communityId: communityUuid,
-            spaceId: space.uuid!,
+              spaceId: space.uuid!,
-            name: space.name,
+              name: space.name,
-            parentId: space.parent?.uuid,
+              parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
+              isPrivate: space.isPrivate,
-            position: space.position,
+              position: space.position,
-            icon: space.icon,
+              icon: space.icon,
-            subspaces: subspaceUpdates,
+              subspaces: subspaceUpdates,
-            tags: tagUpdates,
+              tags: tagUpdates,
-            direction: space.incomingConnection?.direction,
+              direction: space.incomingConnection?.direction,
-          );
+              projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
           final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@@ -533,17 +612,17 @@ class SpaceManagementBloc
               [];
 
           final response = await _api.createSpace(
-            communityId: communityUuid,
+              communityId: communityUuid,
-            name: space.name,
+              name: space.name,
-            parentId: space.parent?.uuid,
+              parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
+              isPrivate: space.isPrivate,
-            position: space.position,
+              position: space.position,
-            icon: space.icon,
+              icon: space.icon,
-            direction: space.incomingConnection?.direction,
+              direction: space.incomingConnection?.direction,
-            spaceModelUuid: space.spaceModel?.uuid,
+              spaceModelUuid: space.spaceModel?.uuid,
-            tags: tagBodyModels,
+              tags: tagBodyModels,
-            subspaces: createSubspaceBodyModels,
+              subspaces: createSubspaceBodyModels,
-          );
+              projectId: projectUuid);
           space.uuid = response?.uuid;
         }
       } catch (e) {
@@ -581,33 +660,42 @@ class SpaceManagementBloc
   void _onLoadSpaceModel(
       SpaceModelLoadEvent event, Emitter<SpaceManagementState> emit) async {
     emit(SpaceManagementLoading());
+
     try {
       var prevState = state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      List<CommunityModel> communities = spaceBloc.state.communityList;
 
-      List<CommunityModel> communities = await _api.fetchCommunities();
+      var prevSpaceModels = await fetchSpaceModels();
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
+      if (communities.isEmpty) {
-        communities.map((community) async {
+        communities = await _api.fetchCommunities(projectUuid);
-          List<SpaceModel> spaces =
-              await _fetchSpacesForCommunity(community.uuid);
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces, // New spaces list
-            region: community.region,
-          );
-        }).toList(),
-      );
 
-      var prevSpaceModels = await fetchSpaceModels(prevState);
+        List<CommunityModel> updatedCommunities = await Future.wait(
+          communities.map((community) async {
+            List<SpaceModel> spaces =
+                await _fetchSpacesForCommunity(community.uuid);
+            return CommunityModel(
+              uuid: community.uuid,
+              createdAt: community.createdAt,
+              updatedAt: community.updatedAt,
+              name: community.name,
+              description: community.description,
+              spaces: spaces,
+              region: community.region,
+            );
+          }).toList(),
+        );
+
+        communities = updatedCommunities;
+      }
 
       emit(SpaceModelLoaded(
-          communities: updatedCommunities,
+        communities: communities,
-          products: _cachedProducts ?? [],
+        products: _cachedProducts ?? [],
-          spaceModels: prevSpaceModels));
+        spaceModels: prevSpaceModels,
+      ));
     } catch (e) {
       emit(SpaceManagementError('Error loading communities and spaces: $e'));
     }
@@ -623,7 +711,7 @@ class SpaceManagementBloc
     if (prevTags == null && newTags != null) {
       for (var newTag in newTags) {
         tagUpdates.add(TagModelUpdate(
-          action: Action.add,
+          action: custom_action.Action.add,
           tag: newTag.tag,
           uuid: newTag.uuid,
           productUuid: newTag.product?.uuid,
@@ -639,14 +727,14 @@ class SpaceManagementBloc
           final existsInNew =
               newTags.any((newTag) => newTag.uuid == prevTag.uuid);
           if (!existsInNew) {
-            tagUpdates
+            tagUpdates.add(TagModelUpdate(
-                .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+                action: custom_action.Action.delete, uuid: prevTag.uuid));
           }
         }
       } else if (prevTags != null && newTags == null) {
         for (var prevTag in prevTags) {
-          tagUpdates
+          tagUpdates.add(TagModelUpdate(
-              .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+              action: custom_action.Action.delete, uuid: prevTag.uuid));
         }
       }
 
@@ -659,7 +747,7 @@ class SpaceManagementBloc
           if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
               !processedTags.contains(newTag.tag)) {
             tagUpdates.add(TagModelUpdate(
-                action: Action.add,
+                action: custom_action.Action.add,
                 tag: newTag.tag,
                 uuid: newTag.uuid == '' ? null : newTag.uuid,
                 productUuid: newTag.product?.uuid));
@@ -676,7 +764,7 @@ class SpaceManagementBloc
           final newTag = newTagMap[prevTag.uuid];
           if (newTag != null) {
             tagUpdates.add(TagModelUpdate(
-              action: Action.update,
+              action: custom_action.Action.update,
               uuid: newTag.uuid,
               tag: newTag.tag,
             ));

lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart

@@ -1,16 +1,23 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.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'; // Import for Offset
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart'; // Import for Offset
 
 abstract class SpaceManagementEvent extends Equatable {
   const SpaceManagementEvent();
 
   @override
-  List<Object> get props => [];
+  List<Object?> get props => [];
 }
 
-class LoadCommunityAndSpacesEvent extends SpaceManagementEvent {}
+class LoadCommunityAndSpacesEvent extends SpaceManagementEvent {
+  final BuildContext context;
+
+  const LoadCommunityAndSpacesEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
 
 class DeleteCommunityEvent extends SpaceManagementEvent {
   final String communityUuid;
@@ -74,14 +81,12 @@ class UpdateSpacePositionEvent extends SpaceManagementEvent {
 class CreateCommunityEvent extends SpaceManagementEvent {
   final String name;
   final String description;
+  final BuildContext context;
 
-  const CreateCommunityEvent({
+  const CreateCommunityEvent(this.name, this.description, this.context);
-    required this.name,
-    required this.description,
-  });
 
   @override
-  List<Object> get props => [name, description];
+  List<Object?> get props => [name, description, context];
 }
 
 class UpdateCommunityEvent extends SpaceManagementEvent {
@@ -141,7 +146,28 @@ class LoadSpaceHierarchyEvent extends SpaceManagementEvent {
   List<Object> get props => [communityId];
 }
 
+class BlankStateEvent extends SpaceManagementEvent {
+  final BuildContext context;
 
-class BlankStateEvent extends SpaceManagementEvent {}
+  const BlankStateEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
 
-class SpaceModelLoadEvent extends SpaceManagementEvent {}
+class SpaceModelLoadEvent extends SpaceManagementEvent {
+  final BuildContext context;
+
+  const SpaceModelLoadEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
+
+class UpdateSpaceModelCache extends SpaceManagementEvent {
+  final SpaceTemplateModel updatedModel;
+  UpdateSpaceModelCache(this.updatedModel);
+}
+
+class DeleteSpaceModelFromCache extends SpaceManagementEvent {
+  final String deletedUuid;
+  DeleteSpaceModelFromCache(this.deletedUuid);
+}

lib/pages/spaces_management/all_spaces/bloc/space_management_state.dart

@@ -30,10 +30,6 @@ class SpaceManagementLoaded extends SpaceManagementState {
       this.spaceModels});
 }
 
-class SpaceModelManagenetLoaded extends SpaceManagementState {
-  SpaceModelManagenetLoaded();
-}
-
 class BlankState extends SpaceManagementState {
   final List<CommunityModel> communities;
   final List<ProductModel> products;
@@ -75,3 +71,4 @@ class SpaceModelLoaded extends SpaceManagementState {
   @override
   List<Object> get props => [communities, products, spaceModels];
 }
+

lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart

@@ -1,6 +1,9 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
@@ -10,6 +13,7 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/view/cent
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class SpaceManagementPage extends StatefulWidget {
@@ -28,16 +32,22 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (_) => SpaceManagementBloc(_api, _productApi, _spaceModelApi)
+          create: (context) => SpaceManagementBloc(
-            ..add(LoadCommunityAndSpacesEvent()),
+            _api,
+            _productApi,
+            _spaceModelApi,
+            BlocProvider.of<SpaceTreeBloc>(context),
+          )..add(LoadCommunityAndSpacesEvent(this.context)),
         ),
         BlocProvider(
-          create: (_) => CenterBodyBloc(),
+          create: (context) => CenterBodyBloc(),
         ),
       ],
       child: WebScaffold(
-        appBarTitle: Text('Space Management',
+        appBarTitle: Text(
-            style: Theme.of(context).textTheme.headlineLarge),
+          'Space Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+        ),
         enableMenuSidebar: false,
         centerBody: CenterBodyWidget(),
         rightBody: const NavigateHomeGridView(),
@@ -54,6 +64,7 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
                 shouldNavigateToSpaceModelPage: false,
               );
             } else if (state is SpaceManagementLoaded) {
+
               return LoadedSpaceView(
                 communities: state.communities,
                 selectedCommunity: state.selectedCommunity,

lib/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart

@@ -73,17 +73,14 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
       context: parentContext,
       builder: (context) => CreateCommunityDialog(
         isEditMode: false,
-        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
+        existingCommunityNames:
+            widget.communities.map((community) => community.name).toList(),
         onCreateCommunity: (String communityName, String description) {
           parentContext.read<SpaceManagementBloc>().add(
-                CreateCommunityEvent(
+                CreateCommunityEvent(communityName, description, context),
-                  name: communityName,
-                  description: description,
-                ),
               );
         },
       ),
     );
   }
-
 }

lib/pages/spaces_management/all_spaces/widgets/community_tile.dart

@@ -21,15 +21,17 @@ class CommunityTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return CustomExpansionTile(
+    return Padding(
-      title: title,
+        padding: const EdgeInsets.only(left: 16.0),
-      initiallyExpanded: isExpanded,
+        child: CustomExpansionTile(
-      isSelected: isSelected,
+          title: title,
-      onExpansionChanged: (bool expanded) {
+          initiallyExpanded: isExpanded,
-        onExpansionChanged(title, expanded);
+          isSelected: isSelected,
-      },
+          onExpansionChanged: (bool expanded) {
-      onItemSelected: onItemSelected,
+            onExpansionChanged(title, expanded);
-      children: children ?? [],
+          },
-    );
+          onItemSelected: onItemSelected,
+          children: children ?? [],
+        ));
   }
 }

lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
@@ -39,23 +40,34 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void initState() {
     super.initState();
+
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
+  @override
   @override
   void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
     super.didUpdateWidget(oldWidget);
+
     if (widget.spaceModels != oldWidget.spaceModels) {
-      setState(() {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-        _spaceModels = List.from(widget.spaceModels ?? []);
+        if (mounted) {
+          setState(() {
+            _spaceModels = List.from(widget.spaceModels ?? []);
+          });
+        }
       });
     }
   }
 
   void _onSpaceModelsUpdated(List<SpaceTemplateModel> updatedModels) {
     if (mounted && updatedModels != _spaceModels) {
-      setState(() {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-        _spaceModels = updatedModels;
+        if (mounted) {
+          setState(() {
+            _spaceModels = updatedModels;
+          });
+        }
       });
     }
   }
@@ -65,28 +77,36 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
+        widget.shouldNavigateToSpaceModelPage
-          children: [
+            ? _spaceModels.isNotEmpty
-            SidebarWidget(
+                ? Row(
-              communities: widget.communities,
+                    children: [
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                      SizedBox(
-                  widget.selectedCommunity?.uuid ??
+                          width: 300, child: SpaceTreeView(onSelect: () {})),
-                  '',
+                      Expanded(
-            ),
+                        child: BlocProvider(
-            widget.shouldNavigateToSpaceModelPage
+                          create: (context) => SpaceModelBloc(
-                ? Expanded(
+                            api: SpaceModelManagementApi(),
-                    child: BlocProvider(
+                            initialSpaceModels: _spaceModels,
-                      create: (context) => SpaceModelBloc(
+                          ),
-                        api: SpaceModelManagementApi(),
+                          child: SpaceModelPage(
-                        initialSpaceModels: _spaceModels,
+                            products: widget.products,
+                            onSpaceModelsUpdated: _onSpaceModelsUpdated,
+                          ),
+                        ),
                       ),
-                      child: SpaceModelPage(
+                    ],
-                        products: widget.products,
-                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
-                      ),
-                    ),
                   )
-                : CommunityStructureArea(
+                : const Center(child: CircularProgressIndicator())
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                        widget.selectedCommunity?.uuid ??
+                        '',
+                  ),
+                  CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
                     selectedSpace: widget.selectedSpace,
                     spaces: widget.selectedCommunity?.spaces ?? [],
@@ -94,8 +114,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                     communities: widget.communities,
                     spaceModels: _spaceModels,
                   ),
-          ],
+                ],
-        ),
+              ),
         const GradientCanvasBorderWidget(),
       ],
     );

lib/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart

@@ -4,7 +4,9 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 
 class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
-  AssignTagBloc() : super(AssignTagInitial()) {
+  final List<String> allTags;
+
+  AssignTagBloc(this.allTags) : super(AssignTagInitial()) {
     on<InitializeTags>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -16,25 +18,25 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
-      final allTags = <Tag>[];
+      final tags = <Tag>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => Tag(
               tag: '',
@@ -45,10 +47,14 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagLoaded(
-          tags: allTags,
+        tags: tags,
-          isSaveEnabled: _validateTags(allTags),
+        updatedTags: updatedTags, 
-          errorMessage: ''));
+        isSaveEnabled: _validateTags(tags),
+        errorMessage: '',
+      ));
     });
 
     on<UpdateTagEvent>((event, emit) {
@@ -56,10 +62,13 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+
+        final updatedTags = _calculateAvailableTags(allTags, tags);
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -72,12 +81,15 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
 
-        // Use copyWith for immutability
+        // Update the location
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -92,6 +104,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -102,38 +115,37 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       final currentState = state;
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
-        final updatedTags = List<Tag>.from(currentState.tags)
+        final tags = List<Tag>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        // Recalculate available tags
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
-          tags: updatedTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(updatedTags),
+          updatedTags: updatedTags,
-          errorMessage: _getValidationError(updatedTags),
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
-      } else {
-        emit(const AssignTagLoaded(
-            tags: [],
-            isSaveEnabled: false,
-            errorMessage: 'Failed to delete tag'));
       }
     });
   }
 
+  // Validate the tags for duplicates or empty values
   bool _validateTags(List<Tag> tags) {
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
+    return uniqueTags.length == tags.length && !hasEmptyTag;
-    return isValid;
   }
 
+  // Get validation error for duplicate tags
   String? _getValidationError(List<Tag> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
+    final nonEmptyTags = tags
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
-    final duplicateTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -149,4 +161,15 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(List<String> allTags, List<Tag> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

lib/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart

@@ -1,6 +1,5 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 abstract class AssignTagState extends Equatable {
   const AssignTagState();
@@ -15,17 +14,21 @@ class AssignTagLoading extends AssignTagState {}
 
 class AssignTagLoaded extends AssignTagState {
   final List<Tag> tags;
+  final List<String> updatedTags; 
+
   final bool isSaveEnabled;
-  final String?  errorMessage;
+  final String? errorMessage;
 
   const AssignTagLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     required this.errorMessage,
   });
 
   @override
-  List<Object> get props => [tags, isSaveEnabled, errorMessage ?? ''];
+  List<Object> get props =>
+      [tags, updatedTags, isSaveEnabled, errorMessage ?? ''];
 }
 
 class AssignTagError extends AssignTagState {

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -14,6 +14,7 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -47,7 +48,7 @@ class AssignTagDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-      create: (_) => AssignTagBloc()
+      create: (_) => AssignTagBloc(allTags ?? [])
         ..add(InitializeTags(
           initialTags: initialTags,
           addedProducts: addedProducts,
@@ -119,8 +120,6 @@ class AssignTagDialog extends StatelessWidget {
                             : List.generate(state.tags.length, (index) {
                                 final tag = state.tags[index];
                                 final controller = controllers[index];
-                                final availableTags = getAvailableTags(
-                                    allTags ?? [], state.tags, tag);
 
                                 return DataRow(
                                   cells: [
@@ -180,7 +179,9 @@ class AssignTagDialog extends StatelessWidget {
                                           width: double
                                               .infinity, // Ensure full width for dropdown
                                           child: DialogTextfieldDropdown(
-                                            items: availableTags,
+                                            key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                            items: state.updatedTags,
                                             initialValue: tag.tag,
                                             onSelected: (value) {
                                               controller.text = value;
@@ -306,15 +307,4 @@ class AssignTagDialog extends StatelessWidget {
       ),
     );
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    List<String> availableTagsForTagModel = TagHelper.getAvailableTags<Tag>(
-      allTags: allTags,
-      currentTags: currentTags,
-      currentTag: currentTag,
-      getTag: (tag) => tag.tag ?? '',
-    );
-    return availableTagsForTagModel;
-  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_bloc.dart

@@ -5,7 +5,9 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 
 class AssignTagModelBloc
     extends Bloc<AssignTagModelEvent, AssignTagModelState> {
-  AssignTagModelBloc() : super(AssignTagModelInitial()) {
+  final List<String> allTags;
+
+  AssignTagModelBloc(this.allTags) : super(AssignTagModelInitial()) {
     on<InitializeTagModels>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -17,25 +19,25 @@ class AssignTagModelBloc
         }
       }
 
-      final allTags = <TagModel>[];
+      final tags = <TagModel>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => TagModel(
               tag: '',
@@ -46,9 +48,12 @@ class AssignTagModelBloc
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagModelLoaded(
-          tags: allTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(allTags),
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
           errorMessage: ''));
     });
 
@@ -57,9 +62,12 @@ class AssignTagModelBloc
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
         final tags = List<TagModel>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -77,9 +85,13 @@ class AssignTagModelBloc
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       }
     });
@@ -93,6 +105,7 @@ class AssignTagModelBloc
 
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -104,24 +117,22 @@ class AssignTagModelBloc
 
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
-        final updatedTags = List<TagModel>.from(currentState.tags)
+        final tags = List<TagModel>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
-          tags: updatedTags,
+          tags: tags,
-          isSaveEnabled: _validateTags(updatedTags),
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
-      } else {
+      } 
-        emit(const AssignTagModelLoaded(
-          tags: [],
-          isSaveEnabled: false,
-        ));
-      }
     });
   }
 
   bool _validateTags(List<TagModel> tags) {
-    
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
     final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
@@ -129,14 +140,14 @@ class AssignTagModelBloc
   }
 
   String? _getValidationError(List<TagModel> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
     // Check for duplicate tags
-    final duplicateTags = tags
+
+    final nonEmptyTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -152,4 +163,16 @@ class AssignTagModelBloc
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(
+      List<String> allTags, List<TagModel> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart

@@ -17,14 +17,17 @@ class AssignTagModelLoaded extends AssignTagModelState {
   final bool isSaveEnabled;
   final String? errorMessage;
 
+  final List<String> updatedTags;
+
   const AssignTagModelLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     this.errorMessage,
   });
 
   @override
-  List<Object?> get props => [tags, isSaveEnabled, errorMessage];
+  List<Object?> get props => [tags, updatedTags, isSaveEnabled, errorMessage];
 }
 
 class AssignTagModelError extends AssignTagModelState {

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -16,6 +16,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dialog/c
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagModelsDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -56,7 +57,7 @@ class AssignTagModelsDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-        create: (_) => AssignTagModelBloc()
+        create: (_) => AssignTagModelBloc(allTags ?? [])
           ..add(InitializeTagModels(
             initialTags: initialTags,
             addedProducts: addedProducts,
@@ -134,9 +135,6 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags =
-                                        TagHelper.getAvailableTagModels(
-                                            allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -196,7 +194,9 @@ class AssignTagModelsDialog extends StatelessWidget {
                                               width: double
                                                   .infinity, // Ensure full width for dropdown
                                               child: DialogTextfieldDropdown(
-                                                items: availableTags,
+                                                 key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                                items: state.updatedTags,
                                                 initialValue: tag.tag,
                                                 onSelected: (value) {
                                                   controller.text = value;

lib/pages/spaces_management/helper/tag_helper.dart

@@ -299,7 +299,7 @@ class TagHelper {
 
   static Map<String, dynamic> updateSubspaceTagModels(
       List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    return TagHelper.updateTags<TagModel>(
+    final result = TagHelper.updateTags<TagModel>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -310,6 +310,34 @@ class TagHelper {
       setSubspaceTags: (subspace, tags) => subspace.tags = tags,
       checkTagExistInSubspace: checkTagExistInSubspaceModels,
     );
+
+    final processedTags = result['updatedTags'] as List<TagModel>;
+    final processedSubspaces =
+        List<SubspaceTemplateModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          // Find the updated tag inside processedTags
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
   }
 
   static int? checkTagExistInSubspace(Tag tag, List<dynamic>? subspaces) {
@@ -328,7 +356,7 @@ class TagHelper {
 
   static Map<String, dynamic> processTags(
       List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    return TagHelper.updateTags<Tag>(
+    final result = TagHelper.updateTags<Tag>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -339,6 +367,33 @@ class TagHelper {
       setSubspaceTags: (subspace, tags) => subspace.tags = tags,
       checkTagExistInSubspace: checkTagExistInSubspace,
     );
+
+    final processedTags = result['updatedTags'] as List<Tag>;
+    final processedSubspaces =
+        List<SubspaceModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
   }
 
   static List<String> getAllTagValues(

lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
@@ -18,6 +19,8 @@ class CreateSpaceModelBloc
   CreateSpaceModelBloc(this._api) : super(CreateSpaceModelInitial()) {
     on<CreateSpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         late SpaceTemplateModel spaceTemplate = event.spaceTemplate;
 
         final tagBodyModels =
@@ -40,7 +43,8 @@ class CreateSpaceModelBloc
             tags: tagBodyModels,
             subspaceModels: subspaceTemplateBodyModels);
 
-        final newSpaceTemplate = await _api.createSpaceModel(spaceModelBody);
+        final newSpaceTemplate =
+            await _api.createSpaceModel(spaceModelBody, projectUuid);
         spaceTemplate.uuid = newSpaceTemplate?.uuid ?? '';
 
         if (newSpaceTemplate != null) {
@@ -201,9 +205,11 @@ class CreateSpaceModelBloc
 
     on<ModifySpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         if (event.spaceTemplate.uuid != null) {
-          final prevSpaceModel =
+          final prevSpaceModel = await _api.getSpaceModel(
-              await _api.getSpaceModel(event.spaceTemplate.uuid ?? '');
+              event.spaceTemplate.uuid ?? '', projectUuid);
 
           final newSpaceModel = event.updatedSpaceTemplate;
           String? spaceModelName;
@@ -287,7 +293,7 @@ class CreateSpaceModelBloc
               subspaceModels: subspaceUpdates);
 
           final res = await _api.updateSpaceModel(
-              spaceModelBody, prevSpaceModel?.uuid ?? '');
+              spaceModelBody, prevSpaceModel?.uuid ?? '', projectUuid);
 
           if (res != null) {
             emit(CreateSpaceModelLoaded(newSpaceModel));

lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart

@@ -1,4 +1,7 @@
+import 'dart:developer';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@@ -11,17 +14,23 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
     required this.api,
     required List<SpaceTemplateModel> initialSpaceModels,
   }) : super(SpaceModelLoaded(spaceModels: initialSpaceModels)) {
+    log('Initial Space Models in: ${initialSpaceModels.map((e) => e.toJson()).toList()}');
+
     on<CreateSpaceModel>(_onCreateSpaceModel);
     on<UpdateSpaceModel>(_onUpdateSpaceModel);
+    on<DeleteSpaceModel>(_onDeleteSpaceModel);
   }
 
   Future<void> _onCreateSpaceModel(
       CreateSpaceModel event, Emitter<SpaceModelState> emit) async {
     final currentState = state;
+
     if (currentState is SpaceModelLoaded) {
       try {
-        final newSpaceModel =
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-            await api.getSpaceModel(event.newSpaceModel.uuid ?? '');
+
+        final newSpaceModel = await api.getSpaceModel(
+            event.newSpaceModel.uuid ?? '', projectUuid);
 
         if (newSpaceModel != null) {
           final updatedSpaceModels =
@@ -40,8 +49,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
     final currentState = state;
     if (currentState is SpaceModelLoaded) {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         final newSpaceModel =
-            await api.getSpaceModel(event.spaceModelUuid ?? '');
+            await api.getSpaceModel(event.spaceModelUuid, projectUuid);
         if (newSpaceModel != null) {
           final updatedSpaceModels = currentState.spaceModels.map((model) {
             return model.uuid == event.spaceModelUuid ? newSpaceModel : model;
@@ -53,4 +64,28 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
       }
     }
   }
+
+  Future<void> _onDeleteSpaceModel(
+      DeleteSpaceModel event, Emitter<SpaceModelState> emit) async {
+    final currentState = state;
+
+    if (currentState is SpaceModelLoaded) {
+      try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        final deletedSuccessfully =
+            await api.deleteSpaceModel(event.spaceModelUuid, projectUuid);
+
+        if (deletedSuccessfully) {
+          final updatedSpaceModels = currentState.spaceModels
+              .where((model) => model.uuid != event.spaceModelUuid)
+              .toList();
+
+          emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
+        }
+      } catch (e) {
+        emit(SpaceModelError(message: e.toString()));
+      }
+    }
+  }
 }

lib/pages/spaces_management/space_model/bloc/space_model_event.dart

@@ -34,3 +34,12 @@ class UpdateSpaceModel extends SpaceModelEvent {
   @override
   List<Object?> get props => [spaceModelUuid];
 }
+
+class DeleteSpaceModel extends SpaceModelEvent {
+  final String spaceModelUuid;
+
+  DeleteSpaceModel({required this.spaceModelUuid});
+
+  @override
+  List<Object?> get props => [spaceModelUuid];
+}

lib/pages/spaces_management/space_model/view/space_model_page.dart

@@ -90,7 +90,11 @@ class SpaceModelPage extends StatelessWidget {
                             },
                             child: Container(
                               margin: const EdgeInsets.all(8.0),
-                              child: SpaceModelCardWidget(model: model),
+                              child: SpaceModelCardWidget(
+                                model: model,
+                                pageContext: context,
+                                topActionsDisabled: false,
+                              ),
                             ));
                       },
                     ),

lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_event.dart';
@@ -50,7 +52,9 @@ class CreateSpaceModelDialog extends StatelessWidget {
         width: screenWidth * 0.3,
         child: BlocProvider(
           create: (_) {
-            final bloc = CreateSpaceModelBloc(_spaceModelApi);
+            final bloc = CreateSpaceModelBloc(
+              _spaceModelApi,
+            );
             if (spaceModel != null) {
               bloc.add(UpdateSpaceTemplate(spaceModel!, otherSpaceModels));
             } else {
@@ -130,14 +134,14 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     SubspaceModelCreate(
                       subspaces: state.space.subspaceModels ?? [],
                       tags: state.space.tags ?? [],
-                      onSpaceModelUpdate: (updatedSubspaces,updatedTags) {
+                      onSpaceModelUpdate: (updatedSubspaces, updatedTags) {
                         context
                             .read<CreateSpaceModelBloc>()
                             .add(AddSubspacesToSpaceTemplate(updatedSubspaces));
-                        if(updatedTags!=null){
+                        if (updatedTags != null) {
                           context
-                            .read<CreateSpaceModelBloc>()
+                              .read<CreateSpaceModelBloc>()
-                            .add(AddTagsToSpaceTemplate(updatedTags));
+                              .add(AddTagsToSpaceTemplate(updatedTags));
                         }
                       },
                     ),
@@ -194,6 +198,12 @@ class CreateSpaceModelDialog extends StatelessWidget {
                                                         .add(CreateSpaceModel(
                                                             newSpaceModel:
                                                                 newModel));
+                                                    pageContext!
+                                                        .read<
+                                                            SpaceManagementBloc>()
+                                                        .add(
+                                                            UpdateSpaceModelCache(
+                                                                newModel));
                                                   }
                                                   Navigator.of(context)
                                                       .pop(); // Close the dialog
@@ -239,6 +249,11 @@ class CreateSpaceModelDialog extends StatelessWidget {
                                                                   spaceModelUuid:
                                                                       newModel.uuid ??
                                                                           ''));
+                                                          pageContext!
+                                                              .read<
+                                                                  SpaceManagementBloc>()
+                                                              .add(UpdateSpaceModelCache(
+                                                                  newModel));
                                                         }
                                                         Navigator.of(context)
                                                             .pop();