Fixed cursor issue

fix endpoints

android/app/build.gradle

@@ -1,9 +1,5 @@
 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

@@ -1,68 +0,0 @@
-{
-  "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,10 +20,6 @@ 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

@@ -1,6 +0,0 @@
-<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

@@ -1 +0,0 @@
-{"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,7 +15,6 @@
 		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 */
 
@@ -65,7 +64,6 @@
 		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 */
 
@@ -140,7 +138,6 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				1454C118FFCECEEDF59152D2 /* Pods */,
 				20A3C64D2B1CFED5A81C3251 /* Frameworks */,
-				B14AB50E8716720E10D074BD /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -202,7 +199,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				33590C9CD073D3D5EBA02CDE /* [CP] Embed Pods Frameworks */,
-				7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -268,7 +264,6 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-				F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -308,24 +303,6 @@
 			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

@@ -1,32 +0,0 @@
-<?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

@@ -88,34 +88,19 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
                           itemCount: _filteredItems.length,
                           itemBuilder: (context, index) {
                             final item = _filteredItems[index];
-
+                            return ListTile(
-                            return Container(
+                              title: Text(item,
-                              decoration: const BoxDecoration(
+                                  style: Theme.of(context)
-                                border: Border(
+                                      .textTheme
-                                  bottom: BorderSide(
+                                      .bodyMedium
-                                    color: ColorsManager.lightGrayBorderColor,
+                                      ?.copyWith(
-                                    width: 1.0,
+                                          color:
-                                  ),
+                                              ColorsManager.textPrimaryColor)),
-                                ),
+                              onTap: () {
-                              ),
+                                _controller.text = item;
-                              child: ListTile(
+                                widget.onSelected(item);
-                                title: Text(item,
+                                _closeDropdown();
-                                    style: Theme.of(context)
+                              },
-                                        .textTheme
-                                        .bodyMedium
-                                        ?.copyWith(
-                                            color: ColorsManager
-                                                .textPrimaryColor)),
-                                onTap: () {
-                                  _controller.text = item;
-                                  widget.onSelected(item);
-                                  setState(() {
-                                    _filteredItems
-                                        .remove(item); // Remove selected item
-                                  });
-                                  _closeDropdown();
-                                },
-                              ),
                             );
                           },
                         );

lib/common/widgets/custom_expansion_tile.dart

@@ -56,6 +56,24 @@ 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(
@@ -66,9 +84,7 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   });
                 },
                 child: Icon(
-                  _isExpanded
+                  _isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
-                      ? Icons.keyboard_arrow_down
-                      : Icons.keyboard_arrow_right,
                   color: ColorsManager.lightGrayColor,
                   size: 16.0, // Adjusted size for better alignment
                 ),
@@ -85,10 +101,8 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   _capitalizeFirstLetter(widget.title),
                   style: TextStyle(
                     color: widget.isSelected
-                        ? ColorsManager
+                        ? ColorsManager.blackColor // Change color to black when selected
-                            .blackColor // Change color to black when selected
+                        : ColorsManager.lightGrayColor, // Gray when not selected
-                        : ColorsManager
-                            .lightGrayColor, // Gray when not selected
                     fontWeight: FontWeight.w400,
                   ),
                 ),
@@ -97,9 +111,7 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
           ],
         ),
         // The expanded section (children) that shows when the tile is expanded
-        if (_isExpanded &&
+        if (_isExpanded && widget.children != null && widget.children!.isNotEmpty)
-            widget.children != null &&
-            widget.children!.isNotEmpty)
           Padding(
             padding: const EdgeInsets.only(left: 48.0), // Indented children
             child: Column(

lib/firebase_options_dev.dart

@@ -1,93 +0,0 @@
-// 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

@@ -1,77 +0,0 @@
-// 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,11 +1,8 @@
-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';
@@ -21,13 +18,9 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment =
+    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
-        String.fromEnvironment('FLAVOR', defaultValue: 'production');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
-    await Firebase.initializeApp(
-      options: DefaultFirebaseOptionsStaging.currentPlatform,
-    );
     initialSetup();
   } catch (_) {}
   runApp(MyApp());
@@ -56,8 +49,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-          BlocProvider(
+          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-              create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),

lib/main_dev.dart

@@ -1,84 +0,0 @@
-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

@@ -8,6 +8,9 @@ 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';
 import 'package:syncrow_web/utils/constants/app_enum.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/snack_bar.dart';
 
 class AccessBloc extends Bloc<AccessEvent, AccessState> {

lib/pages/access_management/view/access_management.dart

@@ -18,7 +18,6 @@ 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 {
@@ -34,9 +33,11 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
 
     return WebScaffold(
         enableMenuSidebar: false,
-        appBarTitle: Text(
+        appBarTitle: FittedBox(
-          'Access Management',
+          child: Text(
-          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+            'Access Management',
+            style: Theme.of(context).textTheme.headlineLarge,
+          ),
         ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(

lib/pages/auth/bloc/auth_bloc.dart

@@ -10,12 +10,9 @@ 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> {
@@ -35,7 +32,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController = TextEditingController();
+  final TextEditingController forgetPasswordController =
+      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -52,7 +50,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+    add(UpdateTimerEvent(
+        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -89,7 +88,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+        add(UpdateTimerEvent(
+            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -99,7 +99,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
+  Future<void> changePassword(
+      ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -115,7 +116,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
+      String errorMessage =
+          errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -129,7 +131,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
+    emit(TimerState(
+        isButtonEnabled: event.isButtonEnabled,
+        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -179,13 +183,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
+        await storage.write(
+            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'));
@@ -336,12 +342,14 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch =
+      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
-          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
+              StringsManager.firstLaunch) ??
+          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
+      await SharedPreferencesHelper.saveBoolToSP(
+          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -394,7 +402,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
+        hours
+            .toString()
+            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -435,7 +445,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<void> logout(BuildContext context) async {
     final storage = FlutterSecureStorage();
     ProjectManager.clearProjectUUID();
-    context.read<SpaceTreeBloc>().add(ClearAllData());
     storage.deleteAll();
   }
 }

lib/pages/auth/view/forget_password_page.dart

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

lib/pages/auth/view/login_page.dart

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

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

@@ -1,6 +1,5 @@
 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';
@@ -20,7 +19,6 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     on<AcControlEvent>(_onAcControl);
     on<AcBatchControlEvent>(_onAcBatchControl);
     on<AcFactoryResetEvent>(_onFactoryReset);
-    on<AcStatusUpdated>(_onAcStatusUpdated);
   }
 
   FutureOr<void> _onFetchAcStatus(
@@ -30,64 +28,12 @@ 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,5 +1,4 @@
 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 {
@@ -8,7 +7,6 @@ sealed class AcsEvent extends Equatable {
   @override
   List<Object> get props => [];
 }
-class AcUpdated extends AcsEvent {}
 
 class AcFetchDeviceStatusEvent extends AcsEvent {
   final String deviceId;
@@ -18,10 +16,7 @@ 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,8 +24,7 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => AcBloc(deviceId: device.uuid!)
+      create: (context) => AcBloc(deviceId: device.uuid!)..add(AcFetchDeviceStatusEvent(device.uuid!)),
-        ..add(AcFetchDeviceStatusEvent(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           if (state is ACStatusLoaded) {
@@ -99,8 +98,7 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                       ),
                       Text(
                         'h',
-                        style: context.textTheme.bodySmall!
+                        style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
-                            .copyWith(color: ColorsManager.blackColor),
                       ),
                       Text(
                         '30',
@@ -109,9 +107,7 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                           fontWeight: FontWeight.bold,
                         ),
                       ),
-                      Text('m',
+                      Text('m', style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor)),
-                          style: context.textTheme.bodySmall!
-                              .copyWith(color: ColorsManager.blackColor)),
                       IconButton(
                         padding: const EdgeInsets.all(0),
                         onPressed: () {},

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

@@ -10,7 +10,6 @@ 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 {
@@ -26,12 +25,13 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
         ),
       ],
       child: WebScaffold(
-        appBarTitle: Text(
+        appBarTitle: FittedBox(
-          'Device Management',
+          child: Text(
-          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+            'Device Management',
+            style: Theme.of(context).textTheme.headlineLarge,
+          ),
         ),
-        centerBody:
+        centerBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
-            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           return Row(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -48,11 +48,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 child: Text(
                   'Devices',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: !state.routineTab
+                    color: !state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                        ? ColorsManager.whiteColors
+                    fontWeight: !state.routineTab ? FontWeight.w700 : FontWeight.w400,
-                        : ColorsManager.grayColor,
-                    fontWeight:
-                        !state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -61,18 +58,13 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
-                  context
+                  context.read<RoutineBloc>().add(const TriggerSwitchTabsEvent(isRoutineTab: true));
-                      .read<RoutineBloc>()
-                      .add(const TriggerSwitchTabsEvent(isRoutineTab: true));
                 },
                 child: Text(
                   'Routines',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: state.routineTab
+                    color: state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                        ? ColorsManager.whiteColors
+                    fontWeight: state.routineTab ? FontWeight.w700 : FontWeight.w400,
-                        : ColorsManager.grayColor,
-                    fontWeight:
-                        state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -80,8 +72,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           );
         }),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody:
+        scaffoldBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
-            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           if (state.routineTab) {
             return const RoutinesView();
           }
@@ -96,8 +87,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
               } else if (deviceState is DeviceManagementLoaded) {
                 return DeviceManagementBody(devices: deviceState.devices);
               } else if (deviceState is DeviceManagementFiltered) {
-                return DeviceManagementBody(
+                return DeviceManagementBody(devices: deviceState.filteredDevices);
-                    devices: deviceState.filteredDevices);
               } else {
                 return const Center(child: Text('Error fetching Devices'));
               }

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

@@ -8,6 +8,7 @@ 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';
@@ -94,7 +95,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,6 +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/ceiling_sensor/bloc/ceiling_event.dart';
@@ -23,55 +22,42 @@ 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 =
+      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-      _listenToChanges(event.deviceId);
+      // _listenToChanges();
     } catch (e) {
       emit(CeilingFailedState(error: e.toString()));
       return;
     }
   }
 
-  _listenToChanges(deviceId) {
+  // _listenToChanges() {
-    try {
+  //   try {
-      DatabaseReference ref =
+  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+  //     Stream<DatabaseEvent> stream = ref.onValue;
-      Stream<DatabaseEvent> stream = ref.onValue;
 
-      stream.listen((DatabaseEvent event) {
+  //     stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
+  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-            event.snapshot.value as Map<dynamic, dynamic>;
+  //       List<StatusModel> statusList = [];
 
-        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 = CeilingSensorModel.fromJson(statusList);
+  //       deviceStatus = WallSensorModel.fromJson(statusList);
-        if (!isClosed) {
+  //       add(WallSensorUpdatedEvent());
-          add(StatusUpdated(deviceStatus));
+  //     });
-        }
+  //   } catch (_) {}
-      });
+  // }
-    } catch (_) {}
-  }
 
-  void _onStatusUpdated(StatusUpdated event, Emitter<CeilingSensorState> emit) {
+  void _changeValue(CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
-    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;
@@ -136,8 +122,7 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
-              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -158,8 +143,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     });
   }
 
-  FutureOr<void> _getDeviceReports(GetCeilingDeviceReportsEvent event,
+  FutureOr<void> _getDeviceReports(
-      Emitter<CeilingSensorState> emit) async {
+      GetCeilingDeviceReportsEvent event, Emitter<CeilingSensorState> emit) async {
     if (event.code.isEmpty) {
       emit(ShowCeilingDescriptionState(description: reportString));
       return;
@@ -170,8 +155,7 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
 
       try {
         // await DevicesManagementApi.getDeviceReportsByDate(deviceId, event.code, from.toString(), to.toString())
-        await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+        await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
-            .then((value) {
           emit(CeilingReportsState(deviceReport: value));
         });
       } catch (e) {
@@ -181,23 +165,19 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     }
   }
 
-  void _showDescription(
+  void _showDescription(ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
-      ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
     emit(ShowCeilingDescriptionState(description: event.description));
   }
 
-  void _backToGridView(
+  void _backToGridView(BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
-      BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
   }
 
   FutureOr<void> _fetchCeilingSensorBatchControl(
-      CeilingFetchDeviceStatusEvent event,
+      CeilingFetchDeviceStatusEvent event, Emitter<CeilingSensorState> emit) async {
-      Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      var response =
+      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-          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,6 +1,5 @@
 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();
@@ -84,12 +83,3 @@ 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,5 +1,4 @@
 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';
@@ -17,7 +16,6 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<CurtainControl>(_onCurtainControl);
     on<CurtainBatchControl>(_onCurtainBatchControl);
     on<CurtainFactoryReset>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(
@@ -26,7 +24,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));
@@ -35,48 +33,6 @@ 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,7 +60,3 @@ 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,7 +1,6 @@
 // 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';
@@ -19,39 +18,6 @@ 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(
@@ -62,8 +28,6 @@ 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,6 +1,5 @@
 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();
@@ -52,10 +51,3 @@ 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,7 +1,6 @@
 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';
@@ -40,68 +39,31 @@ 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 _onStatusUpdated(StatusUpdated event, Emitter<GarageDoorState> emit) {
+  void _fetchGarageDoorStatus(GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
-    deviceStatus = event.deviceStatus;
-    emit(GarageDoorLoadedState(status: deviceStatus));
-  }
-
-  void _fetchGarageDoorStatus(
-      GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      var response =
+      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          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,
+  Future<void> _onFetchBatchStatus(GarageDoorFetchBatchStatusEvent event, Emitter<GarageDoorState> emit) async {
-      Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final status =
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
-      deviceStatus =
-          GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
       emit(GarageDoorBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(GarageDoorBatchControlError(e.toString()));
     }
   }
 
-  Future<void> _addSchedule(
+  Future<void> _addSchedule(AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
-      AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         category: event.category,
@@ -109,11 +71,9 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success =
+      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
-          await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(
+        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
-            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }
@@ -122,19 +82,16 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _onUpdateCountdownAlarm(
+  void _onUpdateCountdownAlarm(UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
-      UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
-        status:
+        status: currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
-            currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
       ));
     }
   }
 
-  void _onUpdateTrTimeCon(
+  void _onUpdateTrTimeCon(UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
-      UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -143,8 +100,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event,
+  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
-      Emitter<GarageDoorState> emit) async {
     try {
       final updatedSchedules = deviceStatus.schedules?.map((schedule) {
         if (schedule.scheduleId == event.scheduleId) {
@@ -171,15 +127,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event,
+  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
-      Emitter<GarageDoorState> emit) async {
     try {
-      bool success = await DevicesManagementApi()
+      bool success = await DevicesManagementApi().deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
-          .deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
       if (success) {
-        final updatedSchedules = deviceStatus.schedules
+        final updatedSchedules =
-            ?.where((schedule) => schedule.scheduleId != event.scheduleId)
+            deviceStatus.schedules?.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
-            .toList();
         deviceStatus = deviceStatus.copyWith(schedules: updatedSchedules);
         emit(GarageDoorLoadedState(status: deviceStatus));
       } else {
@@ -190,12 +143,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event,
+  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event, Emitter<GarageDoorState> emit) async {
-      Emitter<GarageDoorState> emit) async {
     emit(ScheduleGarageLoadingState());
     try {
-      List<ScheduleModel> schedules = await DevicesManagementApi()
+      List<ScheduleModel> schedules =
-          .getDeviceSchedules(deviceStatus.uuid, event.category);
+          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
       deviceStatus = deviceStatus.copyWith(schedules: schedules);
       emit(
         GarageDoorLoadedState(
@@ -213,37 +165,30 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSelectedTime(
+  Future<void> _updateSelectedTime(UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
-      UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(selectedTime: event.selectedTime));
     }
   }
 
-  Future<void> _updateSelectedDay(
+  Future<void> _updateSelectedDay(UpdateSelectedDayEvent event, Emitter<GarageDoorState> emit) async {
-      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(
+      emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
-          selectedDays: updatedDays, selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _updateFunctionOn(
+  Future<void> _updateFunctionOn(UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
-      UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
-      emit(currentState.copyWith(
+      emit(currentState.copyWith(functionOn: event.functionOn, selectedTime: currentState.selectedTime));
-          functionOn: event.functionOn,
-          selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _initializeAddSchedule(
+  Future<void> _initializeAddSchedule(InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
-      InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -255,25 +200,20 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchRecords(
+  Future<void> _fetchRecords(FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
-      FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorReportsLoadingState());
     try {
-      final from = DateTime.now()
+      final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
-          .subtract(const Duration(days: 30))
-          .millisecondsSinceEpoch;
       final to = DateTime.now().millisecondsSinceEpoch;
       final DeviceReport records =
-          await DevicesManagementApi.getDeviceReportsByDate(
+          await DevicesManagementApi.getDeviceReportsByDate(event.deviceId, 'switch_1', from.toString(), to.toString());
-              event.deviceId, 'switch_1', from.toString(), to.toString());
       emit(GarageDoorReportsState(deviceReport: records));
     } catch (e) {
       emit(GarageDoorReportsFailedState(error: e.toString()));
     }
   }
 
-  Future<void> _onBatchControl(
+  Future<void> _onBatchControl(GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
-      GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
     final oldValue = event.code == 'switch_1' ? deviceStatus.switch1 : false;
 
     _updateLocalValue(event.code, event.value);
@@ -293,13 +233,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _backToGridView(
+  void _backToGridView(BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
-      BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
-  void _handleUpdate(
+  void _handleUpdate(GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
-      GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
@@ -315,11 +253,9 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       late bool status;
       await Future.delayed(const Duration(milliseconds: 500));
       if (isBatch) {
-        status = await DevicesManagementApi()
+        status = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
-            .deviceBatchControl(deviceId, code, value);
       } else {
-        status = await DevicesManagementApi()
+        status = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
-            .deviceControl(deviceId, Status(code: code, value: value));
       }
 
       if (!status) {
@@ -334,12 +270,10 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _onFactoryReset(
+  Future<void> _onFactoryReset(GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
-      GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final response = await DevicesManagementApi()
+      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
-          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(const GarageDoorErrorState(message: 'Failed to reset device'));
       } else {
@@ -350,47 +284,34 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _increaseDelay(
+  void _increaseDelay(IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
-      IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
-      deviceStatus = deviceStatus.copyWith(
+      deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay + Duration(minutes: 10));
-          delay: deviceStatus.delay + Duration(minutes: 10));
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(
+      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
-          deviceId: event.deviceId,
-          value: deviceStatus.delay.inSeconds,
-          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     // }
   }
 
-  void _decreaseDelay(
+  void _decreaseDelay(DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
-      DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
       if (deviceStatus.delay.inMinutes > 10) {
-        deviceStatus = deviceStatus.copyWith(
+        deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay - Duration(minutes: 10));
-            delay: deviceStatus.delay - Duration(minutes: 10));
       }
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(
+      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
-          deviceId: event.deviceId,
-          value: deviceStatus.delay.inSeconds,
-          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     //}
   }
 
-  void _garageDoorControlEvent(
+  void _garageDoorControlEvent(GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
-      GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
+    final oldValue = event.code == 'countdown_1' ? deviceStatus.countdown1 : deviceStatus.switch1;
-    final oldValue = event.code == 'countdown_1'
-        ? deviceStatus.countdown1
-        : deviceStatus.switch1;
     _updateLocalValue(event.code, event.value);
     emit(GarageDoorLoadedState(status: deviceStatus));
     final success = await _runDeBouncer(
@@ -406,8 +327,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _revertValue(
+  void _revertValue(String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
-      String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
     switch (code) {
       case 'switch_1':
         if (oldValue is bool) {
@@ -416,8 +336,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (oldValue is int) {
-          deviceStatus = deviceStatus.copyWith(
+          deviceStatus = deviceStatus.copyWith(countdown1: oldValue, delay: Duration(seconds: oldValue));
-              countdown1: oldValue, delay: Duration(seconds: oldValue));
         }
         break;
       // Add other cases if needed
@@ -439,8 +358,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (value is int) {
-          deviceStatus = deviceStatus.copyWith(
+          deviceStatus = deviceStatus.copyWith(countdown1: value, delay: Duration(seconds: value));
-              countdown1: value, delay: Duration(seconds: value));
         }
         break;
       case 'countdown_alarm':
@@ -483,8 +401,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     return super.close();
   }
 
-  FutureOr<void> _onEditSchedule(
+  FutureOr<void> _onEditSchedule(EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
-      EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         scheduleId: event.scheduleId,
@@ -493,11 +410,9 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success = await DevicesManagementApi()
+      bool success = await DevicesManagementApi().editScheduleRecord(deviceId, newSchedule);
-          .editScheduleRecord(deviceId, newSchedule);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(
+        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
-            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }

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

@@ -3,7 +3,6 @@
 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();
@@ -26,8 +25,7 @@ class GarageDoorControlEvent extends GarageDoorEvent {
   final dynamic value;
   final String code;
 
-  const GarageDoorControlEvent(
+  const GarageDoorControlEvent({required this.deviceId, required this.value, required this.code});
-      {required this.deviceId, required this.value, required this.code});
 
   @override
   List<Object?> get props => [deviceId, value];
@@ -123,8 +121,7 @@ class FetchGarageDoorRecordsEvent extends GarageDoorEvent {
   final String deviceId;
   final String code;
 
-  const FetchGarageDoorRecordsEvent(
+  const FetchGarageDoorRecordsEvent({required this.deviceId, required this.code});
-      {required this.deviceId, required this.code});
 
   @override
   List<Object?> get props => [deviceId, code];
@@ -235,10 +232,3 @@ 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,6 +1,5 @@
 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';
@@ -17,7 +16,6 @@ class MainDoorSensorBloc
     on<MainDoorSensorFetchBatchEvent>(_onFetchBatchStatus);
     on<MainDoorSensorReportsEvent>(_fetchReports);
     on<MainDoorSensorFactoryReset>(_factoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late MainDoorSensorStatusModel deviceStatus;
@@ -30,7 +28,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) {
@@ -158,35 +156,4 @@ 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,5 +1,4 @@
 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';
 
@@ -72,10 +71,3 @@ 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,7 +1,6 @@
 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';
@@ -11,71 +10,33 @@ 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
+class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
-    extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
   OneGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
   OneGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = OneGangGlassStatusModel(
+      : deviceStatus = OneGangGlassStatusModel(uuid: deviceId, switch1: false, countDown: 0),
-            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(OneGangGlassSwitchFetchDeviceEvent event,
+  Future<void> _onFetchDeviceStatus(
-      Emitter<OneGangGlassSwitchState> emit) async {
+      OneGangGlassSwitchFetchDeviceEvent event, Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status =
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
-      _listenToChanges(event.deviceId);
-      deviceStatus =
-          OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  _listenToChanges(deviceId) {
+  Future<void> _onControl(OneGangGlassSwitchControl event, Emitter<OneGangGlassSwitchState> emit) async {
-    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);
@@ -91,12 +52,10 @@ class OneGangGlassSwitchBloc
     );
   }
 
-  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event,
+  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event, Emitter<OneGangGlassSwitchState> emit) async {
-      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi()
+      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
-          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(OneGangGlassSwitchError('Failed to reset device'));
       } else {
@@ -107,8 +66,7 @@ class OneGangGlassSwitchBloc
     }
   }
 
-  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event,
+  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event, Emitter<OneGangGlassSwitchState> emit) async {
-      Emitter<OneGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -125,14 +83,11 @@ class OneGangGlassSwitchBloc
   }
 
   Future<void> _onFetchBatchStatus(
-      OneGangGlassSwitchFetchBatchStatusEvent event,
+      OneGangGlassSwitchFetchBatchStatusEvent event, Emitter<OneGangGlassSwitchState> emit) async {
-      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status =
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
-      deviceStatus = OneGangGlassStatusModel.fromJson(
-          event.deviceIds.first, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
@@ -162,11 +117,9 @@ class OneGangGlassSwitchBloc
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
-              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
-              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -178,8 +131,7 @@ class OneGangGlassSwitchBloc
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<OneGangGlassSwitchState> emit) {
-      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,11 +39,6 @@ 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,6 +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/one_gang_switch/bloc/wall_light_switch_event.dart';
@@ -17,7 +16,6 @@ class WallLightSwitchBloc
     on<WallLightSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<WallLightSwitchBatchControl>(_onBatchControl);
     on<WallLightFactoryReset>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WallLightStatusModel deviceStatus;
@@ -33,44 +31,12 @@ 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,6 +1,5 @@
 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
@@ -58,10 +57,3 @@ 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,7 +1,6 @@
 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';
@@ -11,8 +10,7 @@ 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
+class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
-    extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
   ThreeGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
@@ -31,57 +29,21 @@ class ThreeGangGlassSwitchBloc
     on<ThreeGangGlassSwitchBatchControl>(_onBatchControl);
     on<ThreeGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<ThreeGangGlassFactoryReset>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(ThreeGangGlassSwitchFetchDeviceEvent event,
+  Future<void> _onFetchDeviceStatus(
-      Emitter<ThreeGangGlassSwitchState> emit) async {
+      ThreeGangGlassSwitchFetchDeviceEvent event, Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status =
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
-      deviceStatus =
-          ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
-      _listenToChanges(event.deviceId);
       emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  _listenToChanges(deviceId) {
+  Future<void> _onControl(ThreeGangGlassSwitchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
-    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);
@@ -97,8 +59,7 @@ class ThreeGangGlassSwitchBloc
     );
   }
 
-  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event,
+  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
-      Emitter<ThreeGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -115,26 +76,21 @@ class ThreeGangGlassSwitchBloc
   }
 
   Future<void> _onFetchBatchStatus(
-      ThreeGangGlassSwitchFetchBatchStatusEvent event,
+      ThreeGangGlassSwitchFetchBatchStatusEvent event, Emitter<ThreeGangGlassSwitchState> emit) async {
-      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status =
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(
-          event.deviceIds.first, status.status);
       emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event,
+  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event, Emitter<ThreeGangGlassSwitchState> emit) async {
-      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi()
+      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
-          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(ThreeGangGlassSwitchError('Failed'));
       } else {
@@ -168,11 +124,9 @@ class ThreeGangGlassSwitchBloc
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
-              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
-              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -184,8 +138,7 @@ class ThreeGangGlassSwitchBloc
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<ThreeGangGlassSwitchState> emit) {
-      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,10 +49,3 @@ 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,7 +3,6 @@
 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';
@@ -23,7 +22,6 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
     on<LivingRoomBatchControl>(_livingRoomBatchControl);
     on<LivingRoomFetchBatchEvent>(_livingRoomFetchBatchControl);
     on<LivingRoomFactoryResetEvent>(_livingRoomFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(LivingRoomFetchDeviceStatusEvent event,
@@ -34,7 +32,6 @@ 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()));
@@ -147,9 +144,6 @@ 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()));
@@ -191,34 +185,4 @@ 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,10 +58,3 @@ 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,11 +1,12 @@
 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';
 
@@ -13,6 +14,7 @@ class TwoGangGlassSwitchBloc
     extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
   TwoGangGlassStatusModel deviceStatus;
   Timer? _timer;
+
   TwoGangGlassSwitchBloc({required String deviceId})
       : deviceStatus = TwoGangGlassStatusModel(
             uuid: deviceId,
@@ -26,7 +28,6 @@ class TwoGangGlassSwitchBloc
     on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
     on<TwoGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<TwoGangGlassFactoryReset>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchDeviceStatus(TwoGangGlassSwitchFetchDeviceEvent event,
@@ -37,44 +38,12 @@ 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);
@@ -209,37 +178,4 @@ 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,11 +48,3 @@ 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,8 +6,7 @@ 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
+class TwoGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const TwoGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -15,25 +14,25 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceId)
+      create: (context) =>
-          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
+          TwoGangGlassSwitchBloc(deviceId: 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 Center(child: Text(state.message));
+            return const Center(child: Text('Error fetching status'));
-            } else {
+          } else {
-              return const Center(child: CircularProgressIndicator());
+            return const Center(child: CircularProgressIndicator());
-            }
+          }
-          },
+        },
-        ));
+      ),
+    );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, TwoGangGlassStatusModel status) {
-      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,6 +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/two_gang_switch/bloc/two_gang_switch_event.dart';
@@ -15,7 +14,6 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     on<TwoGangSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<TwoGangSwitchBatchControl>(_onBatchControl);
     on<TwoGangFactoryReset>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late TwoGangStatusModel deviceStatus;
@@ -28,8 +26,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()));
@@ -176,34 +174,4 @@ 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,6 +1,5 @@
 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
@@ -58,10 +57,3 @@ 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,5 +1,4 @@
 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';
@@ -30,7 +29,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      _listenToChanges(emit);
+      // _listenToChanges();
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -39,12 +38,10 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
 
   // Fetch batch status
   FutureOr<void> _fetchWallSensorBatchControl(
-      WallSensorFetchBatchStatusEvent event,
+      WallSensorFetchBatchStatusEvent event, Emitter<WallSensorState> emit) async {
-      Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingInitialState());
     try {
-      var response =
+      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
-          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
     } catch (e) {
@@ -52,30 +49,26 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit) {
+  // _listenToChanges() {
-    try {
+  //   try {
-      DatabaseReference ref =
+  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
+  //     Stream<DatabaseEvent> stream = ref.onValue;
-      Stream<DatabaseEvent> stream = ref.onValue;
 
-      stream.listen((DatabaseEvent event) {
+  //     stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
+  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-            event.snapshot.value as Map<dynamic, dynamic>;
+  //       List<StatusModel> statusList = [];
-        List<Status> statusList = [];
 
-        usersMap['status'].forEach((element) {
+  //       usersMap['status'].forEach((element) {
-          statusList
+  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-              .add(Status(code: element['code'], value: element['value']));
+  //       });
-        });
 
-        deviceStatus = WallSensorModel.fromJson(statusList);
+  //       deviceStatus = WallSensorModel.fromJson(statusList);
-        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
+  //       add(WallSensorUpdatedEvent());
-      });
+  //     });
-    } catch (_) {}
+  //   } catch (_) {}
-  }
+  // }
 
-  void _changeValue(
+  void _changeValue(WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
-      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
     if (event.code == 'far_detection') {
       deviceStatus.farDetection = event.value;
@@ -132,8 +125,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi()
+          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
-              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -158,8 +150,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     try {
       // await DevicesManagementApi.getDeviceReportsByDate(
       //         deviceId, event.code, from.toString(), to.toString())
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
-          .then((value) {
         emit(DeviceReportsState(deviceReport: value, code: event.code));
       });
     } catch (e) {
@@ -168,13 +159,11 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  void _showDescription(
+  void _showDescription(ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
-      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorShowDescriptionState(description: event.description));
   }
 
-  void _backToGridView(
+  void _backToGridView(BackToGridViewEvent event, Emitter<WallSensorState> emit) {
-      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
   }
 

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

@@ -4,7 +4,6 @@ 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';
@@ -35,7 +34,6 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<EditWaterHeaterScheduleEvent>(_onEditSchedule);
     on<DeleteScheduleEvent>(_onDeleteSchedule);
     on<UpdateScheduleEntryEvent>(_onUpdateSchedule);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WaterHeaterStatusModel deviceStatus;
@@ -80,8 +78,7 @@ 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(
+    emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
-        selectedDays: updatedDays, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateFunctionOn(
@@ -89,8 +86,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     Emitter<WaterHeaterState> emit,
   ) {
     final currentState = state as WaterHeaterDeviceStatusLoaded;
-    emit(currentState.copyWith(
+    emit(currentState.copyWith(functionOn: event.isOn, selectedTime: currentState.selectedTime));
-        functionOn: event.isOn, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateScheduleEvent(
@@ -105,8 +101,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         ));
       }
       if (event.scheduleMode == ScheduleModes.countdown) {
-        final countdownRemaining =
+        final countdownRemaining = Duration(hours: event.hours, minutes: event.minutes);
-            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.countdown,
@@ -116,13 +111,11 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           countdownRemaining: countdownRemaining,
         ));
 
-        if (!currentState.isCountdownActive! &&
+        if (!currentState.isCountdownActive! && countdownRemaining > Duration.zero) {
-            countdownRemaining > Duration.zero) {
           _startCountdownTimer(emit, countdownRemaining);
         }
       } else if (event.scheduleMode == ScheduleModes.inching) {
-        final inchingDuration =
+        final inchingDuration = Duration(hours: event.hours, minutes: event.minutes);
-            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.inching,
@@ -224,8 +217,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
       try {
         final status = await DevicesManagementApi().deviceControl(
           event.deviceId,
-          Status(
+          Status(code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
-              code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
         );
         if (!status) {
           emit(const WaterHeaterFailedState(error: 'Failed to stop schedule.'));
@@ -243,10 +235,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status =
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus = WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
-      deviceStatus =
-          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
 
       if (deviceStatus.scheduleMode == ScheduleModes.countdown) {
         final countdownRemaining = Duration(
@@ -310,42 +300,11 @@ 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,
@@ -375,10 +334,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
-      if (currentState.countdownRemaining != null &&
+      if (currentState.countdownRemaining != null && currentState.countdownRemaining! > Duration.zero) {
-          currentState.countdownRemaining! > Duration.zero) {
+        final newRemaining = currentState.countdownRemaining! - const Duration(minutes: 1);
-        final newRemaining =
-            currentState.countdownRemaining! - const Duration(minutes: 1);
 
         if (newRemaining <= Duration.zero) {
           _countdownTimer?.cancel();
@@ -473,8 +430,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _revertValue(String code, dynamic oldValue,
+  void _revertValue(String code, dynamic oldValue, void Function(WaterHeaterState state) emit) {
-      void Function(WaterHeaterState state) emit) {
     _updateLocalValue(code, oldValue);
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
@@ -521,13 +477,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     return super.close();
   }
 
-  FutureOr<void> _getSchedule(
+  FutureOr<void> _getSchedule(GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
-      GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
     emit(ScheduleLoadingState());
 
     try {
-      List<ScheduleModel> schedules = await DevicesManagementApi()
+      List<ScheduleModel> schedules =
-          .getDeviceSchedules(deviceStatus.uuid, event.category);
+          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
 
       emit(WaterHeaterDeviceStatusLoaded(
         deviceStatus,
@@ -559,8 +514,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi()
+      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, currentState.status.uuid);
-          .addScheduleRecord(newSchedule, currentState.status.uuid);
 
       if (success) {
         add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid));
@@ -571,8 +525,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event,
+  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event, Emitter<WaterHeaterState> emit) async {
-      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
@@ -641,13 +594,11 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi()
+      bool success = await DevicesManagementApi().deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
-          .deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
 
       if (success) {
-        final updatedSchedules = currentState.schedules
+        final updatedSchedules =
-            .where((schedule) => schedule.scheduleId != event.scheduleId)
+            currentState.schedules.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
-            .toList();
 
         emit(currentState.copyWith(schedules: updatedSchedules));
       } else {
@@ -657,15 +608,12 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event,
+  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event, Emitter<WaterHeaterState> emit) async {
-      Emitter<WaterHeaterState> emit) async {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status =
+      final status = await DevicesManagementApi().getBatchStatus(event.devicesUuid);
-          await DevicesManagementApi().getBatchStatus(event.devicesUuid);
+      deviceStatus = WaterHeaterStatusModel.fromJson(event.devicesUuid.first, status.status);
-      deviceStatus = WaterHeaterStatusModel.fromJson(
-          event.devicesUuid.first, status.status);
 
       emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -673,8 +621,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event,
+  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event, Emitter<WaterHeaterState> emit) async {
-      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,15 +54,6 @@ 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,5 +1,4 @@
 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';
@@ -22,7 +21,6 @@ class WaterLeakBloc extends Bloc<WaterLeakEvent, WaterLeakState> {
     on<FetchWaterLeakBatchStatusEvent>(_onFetchBatchStatus);
     on<FetchWaterLeakReportsEvent>(_onFetchWaterLeakReports);
     on<WaterLeakFactoryResetEvent>(_onFactoryReset);
-    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchWaterLeakStatus(
@@ -32,43 +30,12 @@ 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,6 +1,5 @@
 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();
@@ -18,13 +17,6 @@ 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

@@ -2,19 +2,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:shared_preferences/shared_preferences.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';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -51,12 +52,12 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid =
+          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());
@@ -72,6 +73,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
       emit(HomeInitial());
+
+      // emit(PolicyAgreement());
     } catch (e) {
       return;
     }
@@ -81,6 +84,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
+      debugPrint("Fetched policy: $policy");
+      // Emit a state to trigger the UI update
       emit(HomeInitial());
     } catch (e) {
       debugPrint("Error fetching policy: $e");
@@ -88,10 +93,12 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _confirmUserAgreement(ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
+  Future _confirmUserAgreement(
+      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid =
+          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
     } catch (e) {
@@ -111,11 +118,10 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   List<HomeItemModel> homeItems = [
     HomeItemModel(
-      title: 'Access Management',
+      title: 'Access',
       icon: Assets.accessIcon,
       active: true,
       onPress: (context) {
-        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.accessManagementPage);
       },
       color: null,
@@ -125,24 +131,21 @@ 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 Management',
+      title: 'Devices',
       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/roles_and_permission/model/edit_user_model.dart

@@ -219,9 +219,6 @@ class UserSpaceModel {
   final double x;
   final double y;
   final String icon;
-  final String communityUuid;
-
-  //communityUuid
 
   UserSpaceModel({
     required this.uuid,
@@ -234,23 +231,22 @@ 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
@@ -266,7 +262,6 @@ 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,6 +1,5 @@
 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';
@@ -9,14 +8,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';
+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';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
   UsersBloc() : super(UsersInitial()) {
@@ -66,10 +65,8 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   void isCompleteSpacesFun(
       CheckSpacesStepStatus event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-    var spaceBloc =
+    List<String> selectedIds = getSelectedIds(updatedCommunities);
-        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+    isCompleteSpaces = selectedIds.isNotEmpty;
-
-    isCompleteSpaces = spaceBloc.state.selectedCommunities.isNotEmpty;
     emit(ChangeStatusSteps());
   }
 
@@ -343,11 +340,9 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       emit(UsersLoadingState());
-      // List<String> selectedIds =
+      List<String> selectedIds = getSelectedIds(updatedCommunities)
-      //     getSelectedIds(updatedCommunities).where((id) => !communityIds.contains(id)).toList();
+          .where((id) => !communityIds.contains(id))
-
+          .toList();
-      List<String> selectedSpacesId = getSelectedSpacesIds();
-      // List<String> selectedIds = getSelectedIds(updatedCommunities);
 
       bool res = await UserPermissionApi().sendInviteUser(
           email: emailController.text,
@@ -356,7 +351,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: selectedSpacesId,
+          spaceUuids: selectedIds,
           projectUuid: projectUuid);
 
       if (res) {
@@ -386,20 +381,12 @@ 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)
+          .where((id) => !communityIds.contains(id))
+          .toList();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       bool res = await UserPermissionApi().editInviteUser(
@@ -409,7 +396,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
-          spaceUuids: getSelectedSpacesIds(),
+          spaceUuids: selectedIds,
           projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
@@ -515,8 +502,6 @@ 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) {
@@ -531,20 +516,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneController.text = res.phoneNumber ?? '';
           jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
-          res.spaces.map((space) {
+          if (updatedCommunities.isNotEmpty) {
-            selectedIds.add(space.uuid);
+            // Create a list of UUIDs to mark
-            CommunityModel community = spaceBloc.state.communityList
+            final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
-                .firstWhere((item) => item.uuid == space.communityUuid);
+            // Print all IDs and mark nodes in updatedCommunities
-            spaceBloc.add(OnSpaceSelected(community, space.uuid, []));
+            debugPrint('Printing and marking nodes in updatedCommunities:');
-          }).toList();
+            _printAndMarkNodes(updatedCommunities, uuidsToMark);
-
+          }
-          // 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 ==
@@ -637,16 +615,4 @@ 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

@@ -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';
@@ -24,7 +25,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) {},

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

@@ -26,12 +26,13 @@ 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).add(GetUserByIdEvent(uuid: widget.userId));
+            BlocProvider.of<UsersBloc>(context)
+                .add(GetUserByIdEvent(uuid: widget.userId));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -39,7 +40,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
           return Dialog(
               child: Container(
             decoration: const BoxDecoration(
-                color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
+                color: Colors.white,
+                borderRadius: BorderRadius.all(Radius.circular(20))),
             width: 900,
             child: Column(
               children: [
@@ -68,7 +70,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
+                              _buildStep3Indicator(
+                                  3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -116,13 +119,15 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole.add(CheckStepStatus(isEditUser: true));
+                                _blocRole
+                                    .add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole
+                              _blocRole.add(EditInviteUsers(
-                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
+                                  context: context,
+                                   userId: widget.userId!));
                             }
                           });
                         },
@@ -131,7 +136,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions == false) &&
+                                          _blocRole.isCompleteRolePermissions ==
+                                              false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -204,8 +210,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -263,8 +273,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -321,8 +335,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    color: currentStep == step
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                        ? ColorsManager.blackColor
+                        : 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,9 +1,14 @@
 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/space_tree/view/space_tree_view.dart';
+import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/view/build_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;
@@ -22,8 +27,10 @@ class SpacesAccessView extends StatelessWidget {
             children: [
               Text(
                 'Spaces access',
-                style: context.textTheme.bodyLarge
+                style: context.textTheme.bodyLarge?.copyWith(
-                    ?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, color: Colors.black),
+                    fontWeight: FontWeight.w700,
+                    fontSize: 20,
+                    color: Colors.black),
               ),
               const SizedBox(
                 height: 35,
@@ -35,78 +42,77 @@ class SpacesAccessView extends StatelessWidget {
               const SizedBox(
                 height: 25,
               ),
-              Expanded(child: SpaceTreeView(onSelect: () {}))
+              Expanded(
-              // Expanded(
+                child: SizedBox(
-              //   child: SizedBox(
+                  child: Column(
-              //     child: Column(
+                    children: [
-              //       children: [
+                      Expanded(
-              //         Expanded(
+                        flex: 2,
-              //           flex: 2,
+                        child: Container(
-              //           child: Container(
+                          decoration: const BoxDecoration(
-              //             decoration: const BoxDecoration(
+                            color: ColorsManager.circleRolesBackground,
-              //               color: ColorsManager.circleRolesBackground,
+                            borderRadius: BorderRadius.only(
-              //               borderRadius: BorderRadius.only(
+                                topRight: Radius.circular(20),
-              //                   topRight: Radius.circular(20),
+                                topLeft: Radius.circular(20)),
-              //                   topLeft: Radius.circular(20)),
+                          ),
-              //             ),
+                          child: Padding(
-              //             child: Padding(
+                            padding: const EdgeInsets.all(8.0),
-              //               padding: const EdgeInsets.all(8.0),
+                            child: Row(
-              //               child: Row(
+                              children: [
-              //                 children: [
+                                Expanded(
-              //                   Expanded(
+                                  child: Container(
-              //                     child: Container(
+                                    decoration: BoxDecoration(
-              //                       decoration: BoxDecoration(
+                                        borderRadius: const BorderRadius.all(
-              //                           borderRadius: const BorderRadius.all(
+                                            Radius.circular(20)),
-              //                               Radius.circular(20)),
+                                        border: Border.all(
-              //                           border: Border.all(
+                                            color: ColorsManager.grayBorder)),
-              //                               color: ColorsManager.grayBorder)),
+                                    child: TextFormField(
-              //                       child: TextFormField(
+                                      style:
-              //                         style:
+                                          const TextStyle(color: Colors.black),
-              //                             const TextStyle(color: Colors.black),
+                                      // controller: _blocRole.firstNameController,
-              //                         // controller: _blocRole.firstNameController,
+                                      onChanged: (value) {
-              //                         onChanged: (value) {
+                                        _blocRole.add(SearchAnode(
-              //                           _blocRole.add(SearchAnode(
+                                            nodes: _blocRole.updatedCommunities,
-              //                               nodes: _blocRole.updatedCommunities,
+                                            searchTerm: value));
-              //                               searchTerm: value));
+                                      },
-              //                         },
+                                      decoration: textBoxDecoration(radios: 20)!
-              //                         decoration: textBoxDecoration(radios: 20)!
+                                          .copyWith(
-              //                             .copyWith(
+                                        fillColor: Colors.white,
-              //                           fillColor: Colors.white,
+                                        suffixIcon: Padding(
-              //                           suffixIcon: Padding(
+                                          padding:
-              //                             padding:
+                                              const EdgeInsets.only(right: 16),
-              //                                 const EdgeInsets.only(right: 16),
+                                          child: SvgPicture.asset(
-              //                             child: SvgPicture.asset(
+                                            Assets.textFieldSearch,
-              //                               Assets.textFieldSearch,
+                                            width: 24,
-              //                               width: 24,
+                                            height: 24,
-              //                               height: 24,
+                                          ),
-              //                             ),
+                                        ),
-              //                           ),
+                                        hintStyle: context.textTheme.bodyMedium
-              //                           hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
-              //                               ?.copyWith(
+                                                fontWeight: FontWeight.w400,
-              //                                   fontWeight: FontWeight.w400,
+                                                fontSize: 12,
-              //                                   fontSize: 12,
+                                                color: ColorsManager.textGray),
-              //                                   color: ColorsManager.textGray),
+                                      ),
-              //                         ),
+                                    ),
-              //                       ),
+                                  ),
-              //                     ),
+                                ),
-              //                   ),
+                              ],
-              //                 ],
+                            ),
-              //               ),
+                          ),
-              //             ),
+                        ),
-              //           ),
+                      ),
-              //         ),
+                      Expanded(
-              //         Expanded(
+                          flex: 7,
-              //             flex: 7,
+                          child: Container(
-              //             child: Container(
+                              color: ColorsManager.circleRolesBackground,
-              //                 color: ColorsManager.circleRolesBackground,
+                              padding: const EdgeInsets.all(8.0),
-              //                 padding: const EdgeInsets.all(8.0),
+                              child: Container(
-              //                 child: Container(
+                                  color: ColorsManager.whiteColors,
-              //                     color: ColorsManager.whiteColors,
+                                  child: TreeView(userId: userId))))
-              //                     child: TreeView(userId: userId))))
+                    ],
-              //       ],
+                  ),
-              //     ),
+                ),
-              //   ),
+              ),
-              // ),
             ],
           ),
         ),

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

@@ -13,13 +13,10 @@ 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';
 import 'package:syncrow_web/utils/style.dart';
-
 class UsersPage extends StatelessWidget {
   UsersPage({super.key});
 
@@ -27,7 +24,8 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton({bool isActive = false, required String title, Function()? onTap}) {
+    Widget actionButton(
+        {bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -60,7 +58,8 @@ class UsersPage extends StatelessWidget {
                     : ColorsManager.disabledPink.withOpacity(0.5),
           ),
           child: Padding(
-            padding: const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
+            padding:
+                const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -84,12 +83,15 @@ class UsersPage extends StatelessWidget {
     }
 
     Widget changeIconStatus(
-        {required String userId, required String status, required Function()? onTap}) {
+        {required String userId,
+        required String status,
+        required Function()? onTap}) {
       return Center(
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
+            padding:
+                const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
             child: SvgPicture.asset(
               status == "invited"
                   ? Assets.invitedIcon
@@ -157,7 +159,6 @@ class UsersPage extends StatelessWidget {
                       const SizedBox(width: 20),
                       InkWell(
                         onTap: () {
-                          context.read<SpaceTreeBloc>().add(ClearCachedData());
                           showDialog(
                             context: context,
                             barrierDismissible: false,
@@ -196,10 +197,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const SortUsersByNameAsc());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const SortUsersByNameAsc());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const SortUsersByNameDesc());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const SortUsersByNameDesc());
                           },
                         );
                       }
@@ -208,8 +213,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.jobTitle)
                             item: _blocRole.selectedJobTitles.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
@@ -249,8 +255,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.roleTypes)
                             item: _blocRole.selectedRoles.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 4,
@@ -270,9 +277,10 @@ class UsersPage extends StatelessWidget {
                                 .map((entry) => entry.key)
                                 .toList();
                             Navigator.of(context).pop();
-                            context.read<UserTableBloc>().add(FilterUsersByRoleEvent(
+                            context.read<UserTableBloc>().add(
-                                selectedRoles: selectedItems,
+                                FilterUsersByRoleEvent(
-                                sortOrder: _blocRole.currentSortRole));
+                                    selectedRoles: selectedItems,
+                                    sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
                             _blocRole.currentSortRole = v;
@@ -287,10 +295,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -299,8 +311,9 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.createdBy)
                             item: _blocRole.selectedCreatedBy.contains(item),
                         };
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 1,
@@ -338,8 +351,9 @@ class UsersPage extends StatelessWidget {
                             item: _blocRole.selectedStatuses.contains(item),
                         };
 
-                        final RenderBox overlay =
+                        final RenderBox overlay = Overlay.of(context)
-                            Overlay.of(context).context.findRenderObject() as RenderBox;
+                            .context
+                            .findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
@@ -376,10 +390,14 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrderDate,
                           aToZTap: () {
-                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
+                            context
+                                .read<UserTableBloc>()
+                                .add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -406,17 +424,23 @@ class UsersPage extends StatelessWidget {
                         Text(user.createdTime ?? ''),
                         Text(user.invitedBy),
                         status(
-                          status: user.isEnabled == false ? 'disabled' : user.status,
+                          status: user.isEnabled == false
+                              ? 'disabled'
+                              : user.status,
                         ),
                         changeIconStatus(
-                          status: user.isEnabled == false ? 'disabled' : user.status,
+                          status: user.isEnabled == false
+                              ? 'disabled'
+                              : user.status,
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  context.read<UserTableBloc>().add(ChangeUserStatus(
+                                  context.read<UserTableBloc>().add(
-                                      userId: user.uuid,
+                                      ChangeUserStatus(
-                                      newStatus:
+                                          userId: user.uuid,
-                                          user.isEnabled == false ? 'disabled' : user.status));
+                                          newStatus: user.isEnabled == false
+                                              ? 'disabled'
+                                              : user.status));
                                 }
                               : null,
                         ),
@@ -427,12 +451,12 @@ class UsersPage extends StatelessWidget {
                                     isActive: true,
                                     title: "Edit",
                                     onTap: () {
-                                      context.read<SpaceTreeBloc>().add(ClearCachedData());
                                       showDialog(
                                         context: context,
                                         barrierDismissible: false,
                                         builder: (BuildContext context) {
-                                          return EditUserDialog(userId: user.uuid);
+                                          return EditUserDialog(
+                                              userId: user.uuid);
                                         },
                                       ).then((v) {
                                         if (v != null) {
@@ -453,10 +477,13 @@ class UsersPage extends StatelessWidget {
                                   context: context,
                                   barrierDismissible: false,
                                   builder: (BuildContext context) {
-                                    return DeleteUserDialog(onTapDelete: () async {
+                                    return DeleteUserDialog(
+                                        onTapDelete: () async {
                                       try {
-                                        _blocRole.add(DeleteUserEvent(user.uuid, context));
+                                        _blocRole.add(DeleteUserEvent(
-                                        await Future.delayed(const Duration(seconds: 2));
+                                            user.uuid, context));
+                                        await Future.delayed(
+                                            const Duration(seconds: 2));
                                         return true;
                                       } catch (e) {
                                         return false;
@@ -486,14 +513,20 @@ class UsersPage extends StatelessWidget {
                             visiblePagesCount: 4,
                             buttonRadius: 10,
                             selectedButtonColor: ColorsManager.secondaryColor,
-                            buttonUnSelectedBorderColor: ColorsManager.grayBorder,
+                            buttonUnSelectedBorderColor:
-                            lastPageIcon: const Icon(Icons.keyboard_double_arrow_right),
+                                ColorsManager.grayBorder,
-                            firstPageIcon: const Icon(Icons.keyboard_double_arrow_left),
+                            lastPageIcon:
-                            totalPages:
+                                const Icon(Icons.keyboard_double_arrow_right),
-                                (_blocRole.totalUsersCount.length / _blocRole.itemsPerPage).ceil(),
+                            firstPageIcon:
+                                const Icon(Icons.keyboard_double_arrow_left),
+                            totalPages: (_blocRole.totalUsersCount.length /
+                                    _blocRole.itemsPerPage)
+                                .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              context.read<UserTableBloc>().add(ChangePage(pageNumber));
+                              context
+                                  .read<UserTableBloc>()
+                                  .add(ChangePage(pageNumber));
                             },
                           ),
                         ),

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -9,7 +9,6 @@ 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 {
@@ -28,10 +27,11 @@ class RolesAndPermissionPage extends StatelessWidget {
               ? const Center(child: CircularProgressIndicator())
               : WebScaffold(
                   enableMenuSidebar: false,
-                  appBarTitle: Text(
+                  appBarTitle: FittedBox(
-                    'Roles & Permissions',
+                    child: Text(
-                    style:
+                      'Roles & Permissions',
-                        ResponsiveTextTheme.of(context).deviceManagementTitle,
+                      style: Theme.of(context).textTheme.headlineLarge,
+                    ),
                   ),
                   rightBody: const NavigateHomeGridView(),
                   centerBody: Row(

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

@@ -61,8 +61,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
-        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -88,8 +87,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 = updatedIfItems.indexWhere(
+    int index =
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -98,21 +97,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
-      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 = currentItems.indexWhere(
+    int index =
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -123,26 +119,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
-          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(
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
-                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 ==
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
-                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -152,15 +144,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
-              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
-            List.from(currentFunctions)..addAll(selectedFunction);
+          ..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
-            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -169,8 +159,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
-      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
@@ -179,11 +168,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          scenes.addAll(
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
-              await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
       }
 
@@ -201,8 +188,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
-      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
 
@@ -210,8 +196,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
           automations.addAll(await SceneApi.getAutomation(spaceId));
         }
@@ -230,16 +215,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
-      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(
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -253,8 +236,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -267,8 +249,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -344,8 +325,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -366,8 +346,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -479,21 +458,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
-      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -504,8 +479,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -517,23 +491,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
-      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (
+  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
-    List<Map<String, dynamic>>,
+      _createCardData(
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -566,8 +535,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath':
+                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
-                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -603,11 +571,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
+        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -650,8 +615,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -699,12 +663,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
-            'uniqueCustomId':
+                ? const Uuid().v4()
-                action.type == 'automation' || action.actionExecutor == 'delay'
+                : action.entityId,
-                    ? const Uuid().v4()
-                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -739,8 +701,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
-            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -812,8 +773,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
-      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -837,20 +797,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
-      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) {
         await SceneApi.deleteScene(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
-            sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
-            automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes());
@@ -879,8 +836,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -890,11 +846,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          devices.addAll(await DevicesManagementApi()
+          devices
-              .fetchDevices(communityId, spaceId, projectUuid));
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
         }
       }
 
@@ -904,8 +859,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
-      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -919,8 +873,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
+          errorMessage: 'A delay condition cannot be the only or the last action',
-              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -973,8 +926,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -993,8 +945,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1105,8 +1056,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateAutomation(
+      final result =
-          createAutomationModel, state.automationId ?? '');
+          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
@@ -1139,8 +1090,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails =
+      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
-          await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1208,15 +1158,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = action.actionExecutor == 'delay'
+        final deviceId =
-            ? '${action.entityId}_delay'
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
-            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1247,8 +1195,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null &&
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
-            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1290,14 +1237,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
-          .where((card) => card['type'] == 'condition')
-          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' ||
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(

lib/pages/routines/view/routines_view.dart

@@ -7,6 +7,7 @@ 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});

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,3 +1,4 @@
+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/space_tree/bloc/space_tree_event.dart';
@@ -5,8 +6,18 @@ 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';
 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/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+  final TextEditingController textController = TextEditingController();
+
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
@@ -14,35 +25,6 @@ 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 {
@@ -55,8 +37,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       List<CommunityModel> updatedCommunities = await Future.wait(
         communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
+          List<SpaceModel> spaces =
-              .getSpaceHierarchy(community.uuid, projectUuid);
+              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
           return CommunityModel(
             uuid: community.uuid,
@@ -71,27 +53,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       );
 
       emit(state.copyWith(
-          communitiesList: updatedCommunities,
+          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
-          expandedCommunity: [],
-          expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  void _onCommunityAdded(
+  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
-      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<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
-          List.from(state.expandedCommunities);
 
       if (updatedExpandedCommunityList.contains(event.communityId)) {
         updatedExpandedCommunityList.remove(event.communityId);
@@ -123,19 +93,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _onCommunitySelected(
+  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
-      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-          List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-      List<String> updatedSoldChecks =
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
-          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);
 
@@ -143,16 +107,14 @@ 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] = selectedSpacesInCommunity;
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
@@ -168,15 +130,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
-          List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
-      List<String> updatedSoldChecks =
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
-          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;
@@ -191,19 +147,14 @@ 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.communityModel.uuid);
+        updatedSelectedCommunities.add(event.communityId);
-        selectedSpacesInCommunity.add(event.spaceId);
-
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
-          selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces =
+        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
-            _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
-              !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -211,45 +162,28 @@ 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 =
+        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
-            _getThePathToChild(event.communityModel.uuid, event.spaceId)
+        if (!_parentSelected(parents, updatedSelectedSpaces)) {
-                .toSet()
-                .toList();
-
-        if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
-          updatedSelectedCommunities.remove(event.communityModel.uuid);
+        }
-        } else {
+        if (!_anySpacesSelectedInCommunity(
-          // Check if any parent has selected children
+            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
-          for (String space in parents) {
+          updatedSelectedCommunities.remove(event.communityId);
-            if (!_noChildrenSelected(
-                event.communityModel, space, updatedSelectedSpaces, parents)) {
-              updatedSoldChecks.remove(space);
-            }
-          }
-
-          if (!_anySpacesSelectedInCommunity(
-              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
-            updatedSelectedCommunities.remove(event.communityModel.uuid);
-          }
         }
       }
 
-      communityAndSpaces[event.communityModel.uuid] = selectedSpacesInCommunity;
+      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities.toSet().toList(),
@@ -262,24 +196,12 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _noChildrenSelected(CommunityModel community, String spaceId,
+  _parentSelected(List<String> parents, List<String> selectedSpaces) {
-      List<String> selectedSpaces, List<String> parents) {
+    for (String space in parents) {
-    if (selectedSpaces.contains(spaceId)) {
+      if (selectedSpaces.contains(space)) {
-      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;
   }
 
@@ -290,11 +212,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
+        final containsQueryInCommunity =
-            .toLowerCase()
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
-            .contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
-        final containsQueryInSpaces = community.spaces.any(
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
@@ -308,47 +229,11 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _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'));
-    }
-  }
-
   // 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 = space.children.any((child) =>
+    final matchesChildren =
-        _containsQuery(child, query)); // Recursive check for children
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -359,26 +244,21 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids.toSet().toList();
+    return ids;
   }
 
-  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
+  bool _anySpacesSelectedInCommunity(
-    List<SpaceModel> children = [];
+      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
-    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;
-    List<String> ids = _getAllChildIds(community.spaces);
+    for (var community in state.communityList) {
-    for (var id in ids) {
+      if (community.uuid == communityId) {
-      result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+        List<String> ids = _getAllChildIds(community.spaces);
-      if (result) {
+        for (var id in ids) {
-        return result;
+          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+          if (result) {
+            return result;
+          }
+        }
       }
     }
     return result;
@@ -401,8 +281,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
-      SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');
@@ -426,6 +305,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   @override
   Future<void> close() async {
+    textController.dispose();
     super.close();
   }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,5 +1,4 @@
 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 {
@@ -50,14 +49,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.communityModel, this.spaceId, this.children);
+  const OnSpaceSelected(this.communityId, this.spaceId, this.children);
 
   @override
-  List<Object> get props => [communityModel, spaceId, children];
+  List<Object> get props => [communityId, spaceId, children];
 }
 
 class SearchQueryEvent extends SpaceTreeEvent {
@@ -68,24 +67,3 @@ 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/view/space_tree_view.dart

@@ -100,8 +100,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                       state.expandedSpaces.contains(space.uuid),
                                                   onItemSelected: () {
                                                     context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community, space.uuid ?? '',
+                                                        OnSpaceSelected(community.uuid,
-                                                            space.children));
+                                                            space.uuid ?? '', space.children));
                                                     widget.onSelect();
                                                   },
                                                   onExpansionChanged: () {
@@ -114,7 +114,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                           state.soldCheck.contains(space.uuid),
                                                   isSoldCheck: state.soldCheck.contains(space.uuid),
                                                   children: _buildNestedSpaces(
-                                                      context, state, space, community),
+                                                      context, state, space, community.uuid),
                                                 );
                                               }).toList(),
                                             ),
@@ -197,7 +197,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
+      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
         isSelected:
@@ -208,13 +208,13 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
+              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
         },
-        children: _buildNestedSpaces(context, state, child, community),
+        children: _buildNestedSpaces(context, state, child, communityId),
       );
     }).toList();
   }

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

@@ -1,8 +1,8 @@
-import 'dart:async';
+import 'dart:developer';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:shared_preferences/shared_preferences.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';
@@ -17,7 +17,10 @@ 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' as custom_action;
+import 'package:syncrow_web/utils/constants/action_enum.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';
 
 class SpaceManagementBloc
     extends Bloc<SpaceManagementEvent, SpaceManagementState> {
@@ -26,16 +29,11 @@ class SpaceManagementBloc
   final SpaceModelManagementApi _spaceModelApi;
 
   List<ProductModel>? _cachedProducts;
-  List<SpaceTemplateModel>? _cachedSpaceModels;
-  final SpaceTreeBloc _spaceTreeBloc;
 
-  SpaceManagementBloc(
+  SpaceManagementBloc(this._api, this._productApi, this._spaceModelApi)
-    this._api,
+      : super(SpaceManagementInitial()) {
-    this._productApi,
-    this._spaceModelApi,
-    this._spaceTreeBloc,
-  ) : super(SpaceManagementInitial()) {
     on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
+    on<UpdateSpacePositionEvent>(_onUpdateSpacePosition);
     on<CreateCommunityEvent>(_onCreateCommunity);
     on<SelectCommunityEvent>(_onSelectCommunity);
     on<DeleteCommunityEvent>(_onCommunityDelete);
@@ -46,94 +44,18 @@ class SpaceManagementBloc
     on<NewCommunityEvent>(_onNewCommunity);
     on<BlankStateEvent>(_onBlankState);
     on<SpaceModelLoadEvent>(_onLoadSpaceModel);
-    on<UpdateSpaceModelCache>(_updateSpaceModelCache);
-    on<DeleteSpaceModelFromCache>(_deleteSpaceModelFromCache);
   }
 
-  Future<void> _updateSpaceModelCache(
+  void _logEvent(String eventName) {
-      UpdateSpaceModelCache event, Emitter<SpaceManagementState> emit) async {
+    log('Event Triggered: $eventName');
-    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(
     UpdateCommunityEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    _logEvent('UpdateCommunityEvent');
+
     final previousState = state;
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -148,13 +70,11 @@ 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();
+          var prevSpaceModels = await fetchSpaceModels(previousState);
 
           emit(SpaceManagementLoaded(
             communities: updatedCommunities,
@@ -171,6 +91,46 @@ class SpaceManagementBloc
     }
   }
 
+  Future<List<SpaceTemplateModel>> fetchSpaceModels(
+      SpaceManagementState previousState) async {
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      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, projectId: projectUuid);
+          if (spaces.isNotEmpty) {
+            allSpaces.addAll(spaces);
+            page++;
+          } else {
+            hasNext = false;
+          }
+        }
+        prevSpaceModels = await _spaceModelApi.listSpaceModels(
+            page: 1, projectId: projectUuid);
+      }
+
+      return allSpaces;
+    } catch (e) {
+      return [];
+    }
+  }
+
   void _onloadProducts() async {
     if (_cachedProducts == null) {
       final products = await _productApi.fetchProducts();
@@ -208,7 +168,7 @@ class SpaceManagementBloc
         return;
       }
 
-      var prevSpaceModels = await fetchSpaceModels();
+      var prevSpaceModels = await fetchSpaceModels(previousState);
 
       emit(BlankState(
         communities: event.communities,
@@ -225,10 +185,8 @@ class SpaceManagementBloc
     try {
       final previousState = state;
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      var spaceBloc = event.context.read<SpaceTreeBloc>();
-      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
 
-      var prevSpaceModels = await fetchSpaceModels();
+      var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (previousState is SpaceManagementLoaded ||
           previousState is BlankState) {
@@ -241,31 +199,25 @@ class SpaceManagementBloc
         return;
       }
 
-      if (communities.isEmpty) {
+      final communities = await _api.fetchCommunities(projectUuid);
-        communities = await _api.fetchCommunities(projectUuid);
+      final updatedCommunities =
+          await Future.wait(communities.map((community) async {
+        final spaces = await _fetchSpacesForCommunity(community.uuid);
 
-        List<CommunityModel> updatedCommunities = await Future.wait(
+        return CommunityModel(
-          communities.map((community) async {
+          uuid: community.uuid,
-            List<SpaceModel> spaces =
+          createdAt: community.createdAt,
-                await _fetchSpacesForCommunity(community.uuid);
+          updatedAt: community.updatedAt,
-            return CommunityModel(
+          name: community.name,
-              uuid: community.uuid,
+          description: community.description,
-              createdAt: community.createdAt,
+          spaces: spaces,
-              updatedAt: community.updatedAt,
+          region: community.region,
-              name: community.name,
-              description: community.description,
-              spaces: spaces,
-              region: community.region,
-            );
-          }).toList(),
         );
-
+      }));
-        communities = updatedCommunities;
-      }
 
       emit(BlankState(
         spaceModels: prevSpaceModels,
-        communities: communities,
+        communities: updatedCommunities,
         products: _cachedProducts ?? [],
       ));
     } catch (error) {
@@ -277,39 +229,41 @@ class SpaceManagementBloc
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var spaceBloc = event.context.read<SpaceTreeBloc>();
+    _logEvent('LoadCommunityAndSpacesEvent');
-    _onloadProducts();
 
-    // Wait until `communityList` is loaded
+    var prevState = state;
-    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+    emit(SpaceManagementLoading());
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-    // Fetch space models after communities are available
+      _onloadProducts();
-    final prevSpaceModels = await fetchSpaceModels();
+      List<CommunityModel> communities =
-    emit(SpaceManagementLoaded(
+          await _api.fetchCommunities(projectUuid);
-      communities: communities,
-      products: _cachedProducts ?? [],
-      spaceModels: prevSpaceModels,
-    ));
-  }
 
-  Future<List<CommunityModel>> _waitForCommunityList(
+      List<CommunityModel> updatedCommunities = await Future.wait(
-      SpaceTreeBloc spaceBloc) async {
+        communities.map((community) async {
-    // Check if communityList is already populated
+          List<SpaceModel> spaces =
-    if (spaceBloc.state.communityList.isNotEmpty) {
+              await _fetchSpacesForCommunity(community.uuid);
-      return spaceBloc.state.communityList;
+          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);
+      emit(SpaceManagementLoaded(
+          communities: updatedCommunities,
+          products: _cachedProducts ?? [],
+          spaceModels: prevSpaceModels));
+    } catch (e) {
+      emit(SpaceManagementError('Error loading communities and spaces: $e'));
     }
-
-    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(
@@ -323,7 +277,7 @@ class SpaceManagementBloc
       final success =
           await _api.deleteCommunity(event.communityUuid, projectUuid);
       if (success) {
-        //  add(LoadCommunityAndSpacesEvent());
+        add(LoadCommunityAndSpacesEvent());
       } else {
         emit(const SpaceManagementError('Failed to delete the community.'));
       }
@@ -333,6 +287,11 @@ class SpaceManagementBloc
     }
   }
 
+  void _onUpdateSpacePosition(
+    UpdateSpacePositionEvent event,
+    Emitter<SpaceManagementState> emit,
+  ) {}
+
   void _onCreateCommunity(
     CreateCommunityEvent event,
     Emitter<SpaceManagementState> emit,
@@ -345,7 +304,7 @@ class SpaceManagementBloc
 
       CommunityModel? newCommunity = await _api.createCommunity(
           event.name, event.description, projectUuid);
-      var prevSpaceModels = await fetchSpaceModels();
+      var prevSpaceModels = await fetchSpaceModels(previousState);
 
       if (newCommunity != null) {
         if (previousState is SpaceManagementLoaded ||
@@ -354,8 +313,6 @@ class SpaceManagementBloc
             (previousState as dynamic).communities,
           );
           final updatedCommunities = prevCommunities..add(newCommunity);
-          _spaceTreeBloc.add(OnCommunityAdded(newCommunity));
-
           emit(SpaceManagementLoaded(
               spaceModels: prevSpaceModels,
               communities: updatedCommunities,
@@ -450,6 +407,8 @@ class SpaceManagementBloc
           event.communityUuid,
           emit,
         );
+      } else {
+        add(LoadCommunityAndSpacesEvent());
       }
     } catch (e) {
       emit(SpaceManagementError('Error saving spaces: $e'));
@@ -466,15 +425,13 @@ class SpaceManagementBloc
     String communityUuid,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevSpaceModels = await fetchSpaceModels();
+    var prevSpaceModels = await fetchSpaceModels(previousState);
 
     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 ?? [],
@@ -526,15 +483,13 @@ class SpaceManagementBloc
                     .any((subspace) => subspace.uuid == prevSubspace.uuid);
                 if (!existsInNew) {
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: custom_action.Action.delete,
+                      action: Action.delete, uuid: prevSubspace.uuid));
-                      uuid: prevSubspace.uuid));
                 }
               }
             } else if (prevSubspaces != null && newSubspaces == null) {
               for (var prevSubspace in prevSubspaces) {
                 subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                    action: custom_action.Action.delete,
+                    action: Action.delete, uuid: prevSubspace.uuid));
-                    uuid: prevSubspace.uuid));
               }
             }
 
@@ -547,14 +502,14 @@ class SpaceManagementBloc
                   if (newSubspace.tags != null) {
                     for (var tag in newSubspace.tags!) {
                       tagUpdates.add(TagModelUpdate(
-                          action: custom_action.Action.add,
+                          action: Action.add,
                           uuid: tag.uuid == '' ? null : tag.uuid,
                           tag: tag.tag,
                           productUuid: tag.product?.uuid));
                     }
                   }
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: custom_action.Action.add,
+                      action: Action.add,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagUpdates));
                 }
@@ -573,7 +528,7 @@ class SpaceManagementBloc
                   final List<TagModelUpdate> tagSubspaceUpdates =
                       processTagUpdates(prevSubspace.tags, newSubspace.tags);
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: custom_action.Action.update,
+                      action: Action.update,
                       uuid: newSubspace.uuid,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagSubspaceUpdates));
@@ -660,42 +615,35 @@ 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;
 
-      var prevSpaceModels = await fetchSpaceModels();
+      List<CommunityModel> communities =
+          await _api.fetchCommunities(projectUuid);
 
-      if (communities.isEmpty) {
+      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities = await _api.fetchCommunities(projectUuid);
+        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, // New spaces list
+            region: community.region,
+          );
+        }).toList(),
+      );
 
-        List<CommunityModel> updatedCommunities = await Future.wait(
+      var prevSpaceModels = await fetchSpaceModels(prevState);
-          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: communities,
+          communities: updatedCommunities,
-        products: _cachedProducts ?? [],
+          products: _cachedProducts ?? [],
-        spaceModels: prevSpaceModels,
+          spaceModels: prevSpaceModels));
-      ));
     } catch (e) {
       emit(SpaceManagementError('Error loading communities and spaces: $e'));
     }
@@ -711,7 +659,7 @@ class SpaceManagementBloc
     if (prevTags == null && newTags != null) {
       for (var newTag in newTags) {
         tagUpdates.add(TagModelUpdate(
-          action: custom_action.Action.add,
+          action: Action.add,
           tag: newTag.tag,
           uuid: newTag.uuid,
           productUuid: newTag.product?.uuid,
@@ -727,14 +675,14 @@ class SpaceManagementBloc
           final existsInNew =
               newTags.any((newTag) => newTag.uuid == prevTag.uuid);
           if (!existsInNew) {
-            tagUpdates.add(TagModelUpdate(
+            tagUpdates
-                action: custom_action.Action.delete, uuid: prevTag.uuid));
+                .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
           }
         }
       } else if (prevTags != null && newTags == null) {
         for (var prevTag in prevTags) {
-          tagUpdates.add(TagModelUpdate(
+          tagUpdates
-              action: custom_action.Action.delete, uuid: prevTag.uuid));
+              .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
         }
       }
 
@@ -747,7 +695,7 @@ class SpaceManagementBloc
           if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
               !processedTags.contains(newTag.tag)) {
             tagUpdates.add(TagModelUpdate(
-                action: custom_action.Action.add,
+                action: Action.add,
                 tag: newTag.tag,
                 uuid: newTag.uuid == '' ? null : newTag.uuid,
                 productUuid: newTag.product?.uuid));
@@ -764,7 +712,7 @@ class SpaceManagementBloc
           final newTag = newTagMap[prevTag.uuid];
           if (newTag != null) {
             tagUpdates.add(TagModelUpdate(
-              action: custom_action.Action.update,
+              action: Action.update,
               uuid: newTag.uuid,
               tag: newTag.tag,
             ));

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

@@ -1,23 +1,16 @@
 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 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; // Import for Offset
-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;
@@ -81,12 +74,14 @@ class UpdateSpacePositionEvent extends SpaceManagementEvent {
 class CreateCommunityEvent extends SpaceManagementEvent {
   final String name;
   final String description;
-  final BuildContext context;
 
-  const CreateCommunityEvent(this.name, this.description, this.context);
+  const CreateCommunityEvent({
+    required this.name,
+    required this.description,
+  });
 
   @override
-  List<Object?> get props => [name, description, context];
+  List<Object> get props => [name, description];
 }
 
 class UpdateCommunityEvent extends SpaceManagementEvent {
@@ -146,28 +141,7 @@ class LoadSpaceHierarchyEvent extends SpaceManagementEvent {
   List<Object> get props => [communityId];
 }
 
-class BlankStateEvent extends SpaceManagementEvent {
-  final BuildContext context;
 
-  const BlankStateEvent(this.context);
+class BlankStateEvent extends SpaceManagementEvent {}
-  @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,6 +30,10 @@ class SpaceManagementLoaded extends SpaceManagementState {
       this.spaceModels});
 }
 
+class SpaceModelManagenetLoaded extends SpaceManagementState {
+  SpaceModelManagenetLoaded();
+}
+
 class BlankState extends SpaceManagementState {
   final List<CommunityModel> communities;
   final List<ProductModel> products;
@@ -71,4 +75,3 @@ class SpaceModelLoaded extends SpaceManagementState {
   @override
   List<Object> get props => [communities, products, spaceModels];
 }
-

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

@@ -1,9 +1,6 @@
-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';
@@ -13,7 +10,6 @@ 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 {
@@ -32,22 +28,19 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => SpaceManagementBloc(
+          create: (_) => SpaceManagementBloc(
             _api,
             _productApi,
             _spaceModelApi,
-            BlocProvider.of<SpaceTreeBloc>(context),
+          )..add(LoadCommunityAndSpacesEvent()),
-          )..add(LoadCommunityAndSpacesEvent(this.context)),
         ),
         BlocProvider(
-          create: (context) => CenterBodyBloc(),
+          create: (_) => CenterBodyBloc(),
         ),
       ],
       child: WebScaffold(
-        appBarTitle: Text(
+        appBarTitle: Text('Space Management',
-          'Space Management',
+            style: Theme.of(context).textTheme.headlineLarge),
-          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
-        ),
         enableMenuSidebar: false,
         centerBody: CenterBodyWidget(),
         rightBody: const NavigateHomeGridView(),
@@ -64,7 +57,6 @@ 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,14 +73,17 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
       context: parentContext,
       builder: (context) => CreateCommunityDialog(
         isEditMode: false,
-        existingCommunityNames:
+        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
-            widget.communities.map((community) => community.name).toList(),
         onCreateCommunity: (String communityName, String description) {
           parentContext.read<SpaceManagementBloc>().add(
-                CreateCommunityEvent(communityName, description, context),
+                CreateCommunityEvent(
+                  name: communityName,
+                  description: description,
+                ),
               );
         },
       ),
     );
   }
+
 }

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

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

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

@@ -40,7 +40,6 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void initState() {
     super.initState();
-
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
@@ -48,7 +47,6 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
     super.didUpdateWidget(oldWidget);
-
     if (widget.spaceModels != oldWidget.spaceModels) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted) {
@@ -78,33 +76,29 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
       clipBehavior: Clip.none,
       children: [
         widget.shouldNavigateToSpaceModelPage
-            ? _spaceModels.isNotEmpty
+            ? Row(
-                ? Row(
+                children: [
-                    children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
-                      SizedBox(
+                  Expanded(
-                          width: 300, child: SpaceTreeView(onSelect: () {})),
+                    child: BlocProvider(
-                      Expanded(
+                      create: (context) => SpaceModelBloc(
-                        child: BlocProvider(
+                        api: SpaceModelManagementApi(),
-                          create: (context) => SpaceModelBloc(
+                        initialSpaceModels: _spaceModels,
-                            api: SpaceModelManagementApi(),
-                            initialSpaceModels: _spaceModels,
-                          ),
-                          child: SpaceModelPage(
-                            products: widget.products,
-                            onSpaceModelsUpdated: _onSpaceModelsUpdated,
-                          ),
-                        ),
                       ),
-                    ],
+                      child: SpaceModelPage(
-                  )
+                        products: widget.products,
-                : const Center(child: CircularProgressIndicator())
+                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
+                      ),
+                    ),
+                  ),
+                ],
+              )
             : Row(
                 children: [
                   SidebarWidget(
                     communities: widget.communities,
-                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                    selectedSpaceUuid:
-                        widget.selectedCommunity?.uuid ??
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
-                        '',
                   ),
                   CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,

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

@@ -9,6 +9,9 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.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/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class CreateSpaceModelBloc
     extends Bloc<CreateSpaceModelEvent, CreateSpaceModelState> {

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

@@ -1,11 +1,12 @@
-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';
 import 'package:syncrow_web/services/space_model_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';
 
 class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
   final SpaceModelManagementApi api;
@@ -14,11 +15,8 @@ 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(
@@ -52,7 +50,7 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
         final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
         final newSpaceModel =
-            await api.getSpaceModel(event.spaceModelUuid, projectUuid);
+            await api.getSpaceModel(event.spaceModelUuid ?? '', projectUuid);
         if (newSpaceModel != null) {
           final updatedSpaceModels = currentState.spaceModels.map((model) {
             return model.uuid == event.spaceModelUuid ? newSpaceModel : model;
@@ -64,28 +62,4 @@ 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,12 +34,3 @@ 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,11 +90,7 @@ class SpaceModelPage extends StatelessWidget {
                             },
                             child: Container(
                               margin: const EdgeInsets.all(8.0),
-                              child: SpaceModelCardWidget(
+                              child: SpaceModelCardWidget(model: model),
-                                model: model,
-                                pageContext: context,
-                                topActionsDisabled: false,
-                              ),
                             ));
                       },
                     ),

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

@@ -2,8 +2,6 @@ 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';
@@ -198,12 +196,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
                                                         .add(CreateSpaceModel(
                                                             newSpaceModel:
                                                                 newModel));
-                                                    pageContext!
-                                                        .read<
-                                                            SpaceManagementBloc>()
-                                                        .add(
-                                                            UpdateSpaceModelCache(
-                                                                newModel));
                                                   }
                                                   Navigator.of(context)
                                                       .pop(); // Close the dialog
@@ -249,11 +241,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
                                                                   spaceModelUuid:
                                                                       newModel.uuid ??
                                                                           ''));
-                                                          pageContext!
-                                                              .read<
-                                                                  SpaceManagementBloc>()
-                                                              .add(UpdateSpaceModelCache(
-                                                                  newModel));
                                                         }
                                                         Navigator.of(context)
                                                             .pop();

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

@@ -1,85 +0,0 @@
-import 'package:flutter/material.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/utils/color_manager.dart';
-
-class DeleteSpaceModelDialog extends StatelessWidget {
-  final VoidCallback onConfirmDelete;
-
-  const DeleteSpaceModelDialog({Key? key, required this.onConfirmDelete})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-
-    return AlertDialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      backgroundColor: ColorsManager.whiteColors,
-      title: Center(
-        child: Text(
-          "Delete Space Model",
-          textAlign: TextAlign.center,
-          style: Theme.of(context)
-              .textTheme
-              .headlineLarge
-              ?.copyWith(color: ColorsManager.blackColor),
-        ),
-      ),
-      content: SizedBox(
-        width: screenWidth * 0.4,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              "Are you sure you want to delete?",
-              textAlign: TextAlign.center,
-              style: Theme.of(context).textTheme.headlineSmall,
-            ),
-            const SizedBox(height: 15),
-            Text(
-              "The existing sub-spaces, devices, and routines will remain associated with the spaces, but the connection will be removed.",
-              textAlign: TextAlign.center,
-              style: Theme.of(context)
-                  .textTheme
-                  .bodyMedium
-                  ?.copyWith(color: ColorsManager.lightGrayColor),
-            ),
-          ],
-        ),
-      ),
-      actions: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            SizedBox(
-              width: 200,
-              child: CancelButton(
-                onPressed: () {
-                  Navigator.of(context).pop(); // Close dialog
-                },
-                label: "Cancel",
-              ),
-            ),
-            const SizedBox(width: 10),
-            SizedBox(
-              width: 200,
-              child: DefaultButton(
-                onPressed: () {
-                  Navigator.of(context).pop(); // Close dialog
-                  onConfirmDelete(); // Execute delete action
-                },
-                backgroundColor: ColorsManager.semiTransparentRed,
-                borderRadius: 10,
-                foregroundColor: ColorsManager.whiteColors,
-                child: const Text('Delete'),
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-}

lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart

@@ -1,30 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import 'package:flutter_svg/svg.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/space_model/bloc/space_model_bloc.dart';
-
-import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dialog/delete_space_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dynamic_product_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dynamic_room_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 
 class SpaceModelCardWidget extends StatelessWidget {
   final SpaceTemplateModel model;
-  final BuildContext? pageContext;
-  final bool topActionsDisabled;
 
-  const SpaceModelCardWidget({
+  const SpaceModelCardWidget({Key? key, required this.model}) : super(key: key);
-    Key? key,
-    required this.model,
-    this.pageContext,
-    this.topActionsDisabled = true,
-  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -51,7 +34,7 @@ class SpaceModelCardWidget extends StatelessWidget {
     return LayoutBuilder(
       builder: (context, constraints) {
         bool showOnlyName = constraints.maxWidth < 250;
-        return Container(
+       return Container(
           padding: const EdgeInsets.all(16.0),
           decoration: BoxDecoration(
             color: Colors.white,
@@ -68,50 +51,14 @@ class SpaceModelCardWidget extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Row(
+              Text(
-                children: [
+                model.modelName,
-                  Expanded(
+                style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                    child: Text(
+                      color: Colors.black,
-                      model.modelName,
+                      fontWeight: FontWeight.bold,
-                      style:
-                          Theme.of(context).textTheme.headlineMedium?.copyWith(
-                                color: Colors.black,
-                                fontWeight: FontWeight.bold,
-                              ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
                     ),
-                  ),
+                maxLines: 1,
-                  if (!topActionsDisabled)
+                overflow: TextOverflow.ellipsis,
-                    GestureDetector(
-                      onTap: () => _showDeleteDialog(context),
-                      child: Container(
-                        width: 36, // Adjust size as needed
-                        height: 36,
-                        decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color: Colors.white,
-                          boxShadow: [
-                            BoxShadow(
-                              color: Colors.black.withOpacity(0.1),
-                              spreadRadius: 2,
-                              blurRadius: 5,
-                              offset: const Offset(0, 2),
-                            ),
-                          ],
-                        ),
-                        child: Center(
-                          child: SvgPicture.asset(
-                            Assets.deleteSpaceModel, // Your actual SVG path
-                            width: 20,
-                            height: 20,
-                            colorFilter: const ColorFilter.mode(
-                                Colors.grey, BlendMode.srcIn),
-                          ),
-                        ),
-                      ),
-                    ),
-                ],
               ),
               if (!showOnlyName) ...[
                 const SizedBox(height: 10),
@@ -170,26 +117,4 @@ class SpaceModelCardWidget extends StatelessWidget {
       },
     );
   }
-
-  void _showDeleteDialog(BuildContext context) {
-    showDialog(
-      context: context,
-      barrierDismissible: true,
-      builder: (BuildContext dialogContext) {
-        return DeleteSpaceModelDialog(
-          onConfirmDelete: () {
-            if (pageContext != null) {
-              pageContext!.read<SpaceModelBloc>().add(
-                    DeleteSpaceModel(spaceModelUuid: model.uuid ?? ''),
-                  );
-
-              pageContext!.read<SpaceManagementBloc>().add(
-                    DeleteSpaceModelFromCache(model.uuid ?? ''),
-                  );
-            }
-          },
-        );
-      },
-    );
-  }
 }

lib/pages/spaces_management/structure_selector/view/center_body_widget.dart

@@ -15,11 +15,11 @@ class CenterBodyWidget extends StatelessWidget {
           context.read<CenterBodyBloc>().add(CommunityStructureSelectedEvent());
         }
          if (state is CommunityStructureState) {
-          context.read<SpaceManagementBloc>().add(BlankStateEvent(context));
+          context.read<SpaceManagementBloc>().add(BlankStateEvent());
         }
 
          if (state is SpaceModelState) {
-          context.read<SpaceManagementBloc>().add(SpaceModelLoadEvent(context));
+          context.read<SpaceManagementBloc>().add(SpaceModelLoadEvent());
         }
 
         return Container(

lib/services/space_model_mang_api.dart

@@ -60,17 +60,4 @@ class SpaceModelManagementApi {
     );
     return response;
   }
-
-  Future<bool> deleteSpaceModel(String spaceModelUuid, String projectId) async {
-    final response = await HTTPService().delete(
-      path: ApiEndpoints.getSpaceModel
-          .replaceAll('{projectId}', projectId)
-          .replaceAll('{spaceModelUuid}', spaceModelUuid),
-      showServerMessage: true,
-      expectedResponseModel: (json) {
-        return json['success'] ?? false;
-      },
-    );
-    return response;
-  }
 }

lib/services/user_permission.dart

@@ -34,9 +34,8 @@ class UserPermissionApi {
       path: ApiEndpoints.roleTypes,
       showServerMessage: true,
       expectedResponseModel: (json) {
-        final List<RoleTypeModel> fetchedRoles = (json['data'] as List)
+        final List<RoleTypeModel> fetchedRoles =
-            .map((item) => RoleTypeModel.fromJson(item))
+            (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList();
-            .toList();
         return fetchedRoles;
       },
     );
@@ -48,9 +47,7 @@ class UserPermissionApi {
       path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {
-        return (json as List)
+        return (json as List).map((data) => PermissionOption.fromJson(data)).toList();
-            .map((data) => PermissionOption.fromJson(data))
-            .toList();
       },
     );
     return response ?? [];
@@ -195,14 +192,10 @@ class UserPermissionApi {
 
   Future<bool> changeUserStatusById(userUuid, status, String projectUuid) async {
     try {
-      Map<String, dynamic> bodya = {
+      Map<String, dynamic> bodya = {"disable": status, "projectUuid": projectUuid};
-        "disable": status,
-        "projectUuid": projectUuid
-      };
 
       final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
-            .replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
           return json['success'];

lib/utils/color_manager.dart

@@ -71,5 +71,4 @@ abstract class ColorsManager {
   static const Color lightGrayBorderColor = Color(0xB2D5D5D5);
   //background: #F8F8F8;
   static const Color vividBlue = Color(0xFF023DFE);
-  static const Color semiTransparentRed = Color(0x99FF0000);
 }

lib/utils/constants/api_const.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 abstract class ApiEndpoints {
-  static const String projectUuid = "0e62577c-06fa-41b9-8a92-99a21fbaf51c";
+  static const String projectUuid = "bcda711e-9fc2-4168-a05e-171b4026d1ff";
   static String baseUrl = dotenv.env['BASE_URL'] ?? '';
   static const String signUp = '/authentication/user/signup';
   static const String login = '/authentication/user/login';
@@ -25,7 +25,7 @@ abstract class ApiEndpoints {
 
   ////// Devices Management ////////////////
 
-  static const String getAllDevices = '/projects/{projectId}/devices';
+  static const String getAllDevices = '/projects/{projectId}/device';
   static const String getSpaceDevices =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
   static const String getDeviceStatus = '/device/{uuid}/functions/status';

lib/utils/constants/assets.dart

@@ -258,7 +258,6 @@ class Assets {
   static const String doorSensor = 'assets/icons/door_sensor.svg';
 
   static const String delete = 'assets/icons/delete.svg';
-  static const String deleteSpaceModel = 'assets/icons/delete_space_model.svg';
   static const String edit = 'assets/icons/edit.svg';
   static const String editSpace = 'assets/icons/edit_space.svg';
   //assets/icons/routine/tab_to_run.svg

lib/utils/constants/temp_const.dart

@@ -1,3 +1,3 @@
 class TempConst {
-  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+  static const projectId = 'bcda711e-9fc2-4168-a05e-171b4026d1ff';
 }

lib/utils/responsive_layout.dart

@@ -1,37 +1,18 @@
 import 'package:flutter/material.dart';
 
 class ResponsiveLayout extends StatelessWidget {
-  final Widget mobileBody;
-  final Widget? tablet;
   final Widget desktopBody;
-
+  final Widget mobileBody;
-  const ResponsiveLayout({
+  const ResponsiveLayout(
-    super.key,
+      {super.key, required this.desktopBody, required this.mobileBody});
-    required this.mobileBody,
-    this.tablet,
-    required this.desktopBody,
-  });
-
-  static bool isMobile(BuildContext context) =>
-      MediaQuery.of(context).size.width < 650;
-
-  static bool isTablet(BuildContext context) =>
-      MediaQuery.of(context).size.width < 1100 &&
-      MediaQuery.of(context).size.width >= 650;
-
-  static bool isDesktop(BuildContext context) =>
-      MediaQuery.of(context).size.width >= 1100;
-
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        if (constraints.maxWidth >= 1100) {
+        if (constraints.maxWidth < 600) {
-          return desktopBody;
-        } else if (constraints.maxWidth >= 650) {
-          return tablet!;
-        } else {
           return mobileBody;
+        } else {
+          return desktopBody;
         }
       },
     );

lib/utils/theme/responsive_text_theme.dart

@@ -1,30 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/responsive_layout.dart';
-
-class ResponsiveTextTheme extends ThemeExtension<ResponsiveTextTheme> {
-  final TextStyle deviceManagementTitle;
-
-  ResponsiveTextTheme({
-    required this.deviceManagementTitle,
-  });
-
-  @override
-  ThemeExtension<ResponsiveTextTheme> copyWith() => this;
-
-  @override
-  ThemeExtension<ResponsiveTextTheme> lerp(
-          ThemeExtension<ResponsiveTextTheme>? other, double t) =>
-      this;
-
-  static ResponsiveTextTheme of(BuildContext context) {
-    final isMobile = ResponsiveLayout.isMobile(context);
-    return Theme.of(context).extension<ResponsiveTextTheme>() ??
-        ResponsiveTextTheme(
-          deviceManagementTitle: TextStyle(
-              fontSize: isMobile ? 20 : 30,
-              fontWeight: FontWeight.w700,
-              color: ColorsManager.whiteColors),
-        );
-  }
-}

lib/web_layout/web_app_bar.dart

@@ -5,10 +5,10 @@ import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/responsive_layout.dart';
+import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/user_drop_down_menu.dart';
 
-class WebAppBar extends StatelessWidget {
+class WebAppBar extends StatefulWidget {
   final Widget? title;
   final Widget? centerBody;
   final Widget? rightBody;
@@ -16,234 +16,178 @@ class WebAppBar extends StatelessWidget {
   const WebAppBar({super.key, this.title, this.centerBody, this.rightBody});
 
   @override
-  Widget build(BuildContext context) {
+  State<WebAppBar> createState() => _WebAppBarState();
-    return BlocBuilder<HomeBloc, HomeState>(
-      builder: (context, state) {
-        final user = context.read<HomeBloc>().user;
-        return ResponsiveLayout(
-          mobileBody: MobileAppBar(
-            title: title,
-            centerBody: centerBody,
-            rightBody: rightBody,
-            user: user,
-          ),
-          tablet: TabletAppBar(
-            title: title,
-            centerBody: centerBody,
-            rightBody: rightBody,
-            user: user,
-          ),
-          desktopBody: DesktopAppBar(
-            title: title,
-            centerBody: centerBody,
-            rightBody: rightBody,
-            user: user,
-          ),
-        );
-      },
-    );
-  }
 }
 
-class DesktopAppBar extends StatelessWidget {
+class _WebAppBarState extends State<WebAppBar> with HelperResponsiveLayout {
-  final Widget? title;
+  @override
-  final Widget? centerBody;
+  void initState() {
-  final Widget? rightBody;
+    super.initState();
-  final dynamic user;
+  }
-
-  const DesktopAppBar({
-    super.key,
-    this.title,
-    this.centerBody,
-    this.rightBody,
-    required this.user,
-  });
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    bool isSmallScreen = isSmallScreenSize(context);
-      height: 100,
+    bool isHalfMediumScreen = isHafMediumScreenSize(context);
-      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
+    return BlocBuilder<HomeBloc, HomeState>(builder: (context, state) {
-      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+      final user = context.read<HomeBloc>().user;
-      child: Row(
+      return Container(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        height: (isSmallScreen || isHalfMediumScreen) ? 130 : 100,
-        children: [
+        decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
-          Expanded(
+        padding: const EdgeInsets.all(10),
-            child: Row(
+        child: isSmallScreen || isHalfMediumScreen
-              children: [
+            ? Column(
-                if (title != null) title!,
+                crossAxisAlignment: CrossAxisAlignment.start,
-                if (centerBody != null)
+                children: [
-                  Padding(
+                  if (widget.title != null)
-                    padding: const EdgeInsets.only(left: 80),
+                    Align(
-                    child: centerBody!,
+                      alignment: Alignment.centerLeft,
+                      child: widget.title!,
+                    ),
+                  if (widget.centerBody != null)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: widget.centerBody,
+                    ),
+                  if (widget.rightBody != null || user != null)
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        if (widget.rightBody != null) widget.rightBody!,
+                        Row(
+                          children: [
+                            SizedBox.square(
+                              dimension: 40,
+                              child: CircleAvatar(
+                                backgroundColor: ColorsManager.whiteColors,
+                                child: SizedBox.square(
+                                  dimension: 35,
+                                  child: SvgPicture.asset(
+                                    Assets.logoGrey,
+                                    fit: BoxFit.cover,
+                                  ),
+                                ),
+                              ),
+                            ),
+                            const SizedBox(
+                              width: 10,
+                            ),
+                            if (user != null)
+                              Text(
+                                '${user.firstName} ${user.lastName}',
+                                style: Theme.of(context).textTheme.bodyLarge,
+                              ),
+                          ],
+                        ),
+                      ],
+                    ),
+                ],
+              )
+            : Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Expanded(
+                    child: Row(
+                      children: [
+                        widget.title!,
+                        if (widget.centerBody != null)
+                          Padding(
+                            padding: const EdgeInsets.only(left: 80),
+                            child: widget.centerBody!,
+                          ),
+                      ],
+                    ),
                   ),
-              ],
+                  Row(
-            ),
+                    mainAxisSize: MainAxisSize.min,
-          ),
+                    children: [
-          _buildUserSection(context),
+                      if (widget.rightBody != null)
-        ],
+                        Align(
-      ),
+                          alignment: Alignment.centerRight,
-    );
+                          child: widget.rightBody,
-  }
+                        ),
-
+                      const SizedBox(
-  Widget _buildUserSection(BuildContext context) {
+                        width: 10,
-    return Row(
+                      ),
-      children: [
+                      SizedBox.square(
-        if (rightBody != null) rightBody!,
+                        dimension: 40,
-        const SizedBox(width: 24),
+                        child: CircleAvatar(
-        _UserAvatar(),
+                          backgroundColor: ColorsManager.whiteColors,
-        const SizedBox(width: 12),
+                          child: SizedBox.square(
-        if (user != null)
+                            dimension: 35,
-          Text(
+                            child: SvgPicture.asset(
-            '${user.firstName} ${user.lastName}',
+                              Assets.logoGrey,
-            style: Theme.of(context).textTheme.bodyLarge,
+                              fit: BoxFit.cover,
-          ),
+                            ),
-        const SizedBox(width: 12),
+                          ),
-        UserDropdownMenu(user: user),
+                        ),
-      ],
+                      ),
-    );
+                      const SizedBox(
-  }
+                        width: 10,
-}
+                      ),
-
+                      if (user != null)
-class TabletAppBar extends StatelessWidget {
+                        Text(
-  final Widget? title;
+                          '${user.firstName} ${user.lastName}',
-  final Widget? centerBody;
+                          style: Theme.of(context).textTheme.bodyLarge,
-  final Widget? rightBody;
+                        ),
-  final dynamic user;
+                      const SizedBox(
-
+                        width: 10,
-  const TabletAppBar({
+                      ),
-    super.key,
+                      UserDropdownMenu(user: user),
-    this.title,
+                      // GestureDetector(
-    this.centerBody,
+                      //   onTap: () {
-    this.rightBody,
+                      //     showCustomDialog(
-    required this.user,
+                      //       context: context,
-  });
+                      //       barrierDismissible: true,
-
+                      //       title: 'Logout',
-  @override
+                      //       message: 'Are you sure you want to logout?',
-  Widget build(BuildContext context) {
+                      //       actions: [
-    return Container(
+                      //         GestureDetector(
-      height: 100,
+                      //           onTap: () {
-      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
+                      //             AuthBloc.logout();
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+                      //             context.go(RoutesConst.auth);
-      child: Column(
+                      //           },
-        children: [
+                      //           child: DefaultButton(
-          Row(
+                      //             child: Text(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      //               'Ok',
-            children: [
+                      //               style: Theme.of(context)
-              if (title != null) Expanded(child: title!),
+                      //                   .textTheme
-              _buildUserSection(context),
+                      //                   .bodyMedium!
-            ],
+                      //                   .copyWith(fontSize: 12, color: Colors.white),
-          ),
+                      //             ),
-          if (centerBody != null) Expanded(child: centerBody!),
+                      //           ),
-        ],
+                      //         ),
-      ),
+                      //         const SizedBox(
-    );
+                      //           height: 10,
-  }
+                      //         ),
-
+                      //         GestureDetector(
-  Widget _buildUserSection(BuildContext context) {
+                      //           onTap: () {
-    return Row(
+                      //             context.pop();
-      children: [
+                      //           },
-        if (rightBody != null) rightBody!,
+                      //           child: DefaultButton(
-        const SizedBox(width: 16),
+                      //             child: Text(
-        _UserAvatar(),
+                      //               'Cancel',
-        if (user != null) ...[
+                      //               style: Theme.of(context)
-          const SizedBox(width: 8),
+                      //                   .textTheme
-          Text(
+                      //                   .bodyMedium!
-            '${user.firstName} ${user.lastName}',
+                      //                   .copyWith(fontSize: 12, color: Colors.white),
-            style:
+                      //             ),
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
+                      //           ),
-          ),
+                      //         ),
-        ],
+                      //       ],
-        UserDropdownMenu(user: user),
+                      //     );
-      ],
+                      //   },
-    );
+                      //   child: const Icon(
-  }
+                      //     Icons.logout,
-}
+                      //     color: ColorsManager.whiteColors,
-
+                      //   ),
-class MobileAppBar extends StatelessWidget {
+                      // )
-  final Widget? title;
+                    ],
-  final Widget? centerBody;
+                  ),
-  final Widget? rightBody;
+                ],
-  final dynamic user;
+              ),
-
+      );
-  const MobileAppBar({
+    });
-    super.key,
-    this.title,
-    this.centerBody,
-    this.rightBody,
-    required this.user,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 135,
-      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
-      padding: const EdgeInsets.all(12),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              if (title != null) title!,
-              _buildUserSection(context),
-            ],
-          ),
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              if (centerBody != null)
-                Padding(
-                  padding: const EdgeInsets.only(top: 8),
-                  child: centerBody!,
-                ),
-              if (rightBody != null)
-                Padding(
-                  padding: const EdgeInsets.only(top: 8),
-                  child: rightBody!,
-                ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildUserSection(BuildContext context) {
-    return Row(
-      children: [
-        _UserAvatar(),
-        if (user != null) ...[
-          const SizedBox(width: 8),
-          Text(
-            '${user.firstName} ${user.lastName}',
-            style:
-                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
-          ),
-        ],
-        UserDropdownMenu(user: user),
-      ],
-    );
-  }
-}
-
-class _UserAvatar extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox.square(
-      dimension: 40,
-      child: CircleAvatar(
-        backgroundColor: ColorsManager.whiteColors,
-        child: SizedBox.square(
-          dimension: 35,
-          child: SvgPicture.asset(
-            Assets.logoGrey,
-            fit: BoxFit.cover,
-          ),
-        ),
-      ),
-    );
   }
 }

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,20 +5,12 @@
 import FlutterMacOS
 import Foundation
 
-import firebase_analytics
-import firebase_core
-import firebase_crashlytics
-import firebase_database
 import flutter_secure_storage_macos
 import path_provider_foundation
 import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
-  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
-  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
-  FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

macos/Runner.xcodeproj/project.pbxproj

@@ -22,7 +22,6 @@
 
 /* Begin PBXBuildFile section */
 		108157F896CD9F637B06D7C0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DAF1C60594A51D692304366 /* Pods_Runner.framework */; };
-		2901225E5FAB0C696EE79F77 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */; };
 		2D0F1F294F673EF0DB5E4CA1 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E148CBDFFE42BF88E8C34DE0 /* Pods_RunnerTests.framework */; };
 		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
@@ -85,7 +84,6 @@
 		81F2F315AC5109F6F5D27BE6 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		96C46007EE0A4E9E1D6D74CE /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		A604E311B663FBF4B7C54DC5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		AB949539E0D0A8E2BDAB9ADF /* 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>"; };
 		E148CBDFFE42BF88E8C34DE0 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -140,7 +138,6 @@
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
 				75DCDFECC7757C5159E8F0C5 /* Pods */,
-				996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -244,7 +241,6 @@
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
 				92D754792F50A5D35F6D5AEE /* [CP] Embed Pods Frameworks */,
-				7E188D2155D07A3E9E027C0F /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -321,7 +317,6 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
-				2901225E5FAB0C696EE79F77 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -366,24 +361,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		7E188D2155D07A3E9E027C0F /* 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=macos --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";
-		};
 		8ECFD939A4D371A145DBA191 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

macos/Runner/GoogleService-Info.plist

@@ -1,32 +0,0 @@
-<?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>

pubspec.lock

@@ -1,14 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      sha256: e051259913915ea5bc8fe18664596bea08592fd123930605d562969cd7315fcd
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.51"
   args:
     dependency: transitive
     description:
@@ -161,94 +153,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
-  firebase_analytics:
-    dependency: "direct main"
-    description:
-      name: firebase_analytics
-      sha256: "47428047a0778f72af53a3c7cb5d556e1cb25e2327cc8aa40d544971dc6245b2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.4.2"
-  firebase_analytics_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_analytics_platform_interface
-      sha256: "1076f4b041f76143e14878c70f0758f17fe5910c0cd992db9e93bd3c3584512b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.2"
-  firebase_analytics_web:
-    dependency: transitive
-    description:
-      name: firebase_analytics_web
-      sha256: "8f6dd64ea6d28b7f5b9e739d183a9e1c7f17027794a3e9aba1879621d42426ef"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.10+8"
-  firebase_core:
-    dependency: "direct main"
-    description:
-      name: firebase_core
-      sha256: "93dc4dd12f9b02c5767f235307f609e61ed9211047132d07f9e02c668f0bfc33"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.11.0"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.4.0"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      sha256: "0e13c80f0de8acaa5d0519cbe23c8b4cc138a2d5d508b5755c861bdfc9762678"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.20.0"
-  firebase_crashlytics:
-    dependency: "direct main"
-    description:
-      name: firebase_crashlytics
-      sha256: "6273ed71bcd8a6fb4d0ca13d3abddbb3301796807efaad8782b5f90156f26f03"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.2"
-  firebase_crashlytics_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_crashlytics_platform_interface
-      sha256: "94f3986e1a10e5a883f2ad5e3d719aef98a8a0f9a49357f6e45b7d3696ea6a97"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.8.2"
-  firebase_database:
-    dependency: "direct main"
-    description:
-      name: firebase_database
-      sha256: cd2354dfef68e52c0713b5efbb7f4e10dfc2aff2f945c7bc8db34d1934170627
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.3.2"
-  firebase_database_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_database_platform_interface
-      sha256: d430983f4d877c9f72f88b3d715cca9a50021dd7ccd8e3ae6fb79603853317de
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.6+2"
-  firebase_database_web:
-    dependency: transitive
-    description:
-      name: firebase_database_web
-      sha256: f64edae62c5beaa08e9e611a0736d64ab11a812983a0aa132695d2d191311ea7
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.6+8"
   fixnum:
     dependency: transitive
     description:
@@ -668,10 +572,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
+      sha256: "3a293170d4d9403c3254ee05b84e62e8a9b3c5808ebd17de6a33fe9ea6457936"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.0"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -873,10 +777,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "0.5.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -56,11 +56,6 @@ dependencies:
   number_pagination: ^1.1.6
   url_launcher: ^6.2.5
   flutter_html: ^3.0.0-beta.2
-  firebase_analytics: ^11.4.0
-  firebase_core: ^3.11.0
-  firebase_crashlytics: ^4.3.2
-  firebase_database: ^11.3.2
-
 
 dev_dependencies:
   flutter_test:

web/index.html

@@ -40,8 +40,6 @@
   <script src="flutter.js" defer></script>
 </head>
 <body>
-  <script src="https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js"></script>
-
   <script>
     window.addEventListener('load', function(ev) {
       // Download main.dart.js
@@ -56,20 +54,6 @@
         }
       });
     });
-
-
-var firebaseConfig = {
-  apiKey: "AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0",
-  authDomain: "test2-8a3d2.firebaseapp.com",
-  databaseURL: "https://test2-8a3d2-default-rtdb.firebaseio.com",
-  projectId: "test2-8a3d2",
-  storageBucket: "test2-8a3d2.firebasestorage.app",
-  messagingSenderId: "427332280600",
-  appId: "1:427332280600:web:ad50516a87a35a1a0c7e6d",
-  measurementId: "G-Z1RTTTV5H9"
-};
-firebase.initializeApp(firebaseConfig);
-
   </script>
 </body>
 </html>

windows/flutter/generated_plugin_registrant.cc

@@ -6,13 +6,10 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <firebase_core/firebase_core_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  FirebaseCorePluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  firebase_core
   flutter_secure_storage_windows
   url_launcher_windows
 )