Merge branch 'dev' of https://github.com/SyncrowIOT/web into hotfix/communities_loading

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->



## Description

<!--- Describe your changes in detail -->
fix energy dialog and fix reset value in text form and fix create dialog
routine

## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore

.github/.github/dependabot.yaml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"

lib/main.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.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';
@@ -21,8 +20,10 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment =
-        String.fromEnvironment('FLAVOR', defaultValue: 'production');
+    const environment = String.fromEnvironment(
+      'FLAVOR',
+      defaultValue: 'production',
+    );
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -40,7 +41,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -58,8 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(
-              create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -67,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/main_dev.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.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';
@@ -21,7 +20,10 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment = String.fromEnvironment(
+      'FLAVOR',
+      defaultValue: 'development',
+    );
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -39,7 +41,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -57,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -65,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/main_staging.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.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';
@@ -39,7 +38,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -57,7 +56,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -65,7 +64,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -31,6 +31,8 @@ import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_o
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+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/api/http_service.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
@@ -130,9 +132,19 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
   }
 }
 
-class AnalyticsPageForm extends StatelessWidget {
+class AnalyticsPageForm extends StatefulWidget {
   const AnalyticsPageForm({super.key});
 
+  @override
+  State<AnalyticsPageForm> createState() => _AnalyticsPageFormState();
+}
+
+class _AnalyticsPageFormState extends State<AnalyticsPageForm> {
+  @override
+  void initState() {
+    context.read<SpaceTreeBloc>().add(InitialEvent());
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return WebScaffold(

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

@@ -8,15 +8,28 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/view/routines_view.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/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 {
+class DeviceManagementPage extends StatefulWidget with HelperResponsiveLayout {
   const DeviceManagementPage({super.key});
 
+  @override
+  State<DeviceManagementPage> createState() => _DeviceManagementPageState();
+}
+
+class _DeviceManagementPageState extends State<DeviceManagementPage> {
+
+@override
+  void initState() {
+    context.read<SpaceTreeBloc>().add(InitialEvent());
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(

lib/pages/home/bloc/home_bloc.dart

@@ -13,30 +13,32 @@ 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/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   UserModel? user;
   String terms = '';
   String policy = '';
 
-  HomeBloc() : super((HomeInitial())) {
-    // on<CreateNewNode>(_createNode);
+  HomeBloc() : super(HomeInitial()) {
     on<FetchUserInfo>(_fetchUserInfo);
     on<FetchTermEvent>(_fetchTerms);
     on<FetchPolicyEvent>(_fetchPolicy);
     on<ConfirmUserAgreementEvent>(_confirmUserAgreement);
   }
 
-  Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
+  Future<void> _fetchUserInfo(
+    FetchUserInfo event,
+    Emitter<HomeState> emit,
+  ) async {
     try {
-      var uuid =
+      final uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
-      user = await HomeApi().fetchUserInfo(uuid);
+      if (uuid != null) {
+        user = await HomeApi().fetchUserInfo(uuid);
+      }
 
-      if (user != null && user!.project != null) {
+      if (user != null && user?.project != null) {
         await ProjectManager.setProjectUUID(user!.project!.uuid);
-
       }
       add(FetchTermEvent());
       add(FetchPolicyEvent());
@@ -47,7 +49,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _fetchTerms(FetchTermEvent event, Emitter<HomeState> emit) async {
+  Future<void> _fetchTerms(FetchTermEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
@@ -57,22 +59,22 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _fetchPolicy(FetchPolicyEvent event, Emitter<HomeState> emit) async {
+  Future<void> _fetchPolicy(FetchPolicyEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
       emit(HomeInitial());
     } catch (e) {
-      debugPrint("Error fetching policy: $e");
+      debugPrint('Error fetching policy: $e');
       return;
     }
   }
 
-  Future _confirmUserAgreement(
+  Future<void> _confirmUserAgreement(
       ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid =
+      final uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
@@ -81,7 +83,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  List<HomeItemModel> homeItems = [
+  final List<HomeItemModel> homeItems = [
     HomeItemModel(
       title: 'Access Management',
       icon: Assets.accessIcon,
@@ -126,41 +128,5 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       },
       color: const Color(0xFF023DFE),
     ),
-
-    // HomeItemModel(
-    //   title: 'Move in',
-    //   icon: Assets.moveinIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Construction',
-    //   icon: Assets.constructionIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Energy',
-    //   icon: Assets.energyIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Integrations',
-    //   icon: Assets.integrationsIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Asset',
-    //   icon: Assets.assetIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
   ];
 }

lib/pages/home/view/home_page.dart

@@ -1,17 +1,37 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_bloc/flutter_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/home/view/home_page_mobile.dart';
 import 'package:syncrow_web/pages/home/view/home_page_web.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class HomePage extends StatelessWidget with HelperResponsiveLayout {
+class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> with HelperResponsiveLayout {
+  @override
+  void initState() {
+    _fetchUserInfo();
+
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
-    final isSmallScreen = isSmallScreenSize(context);
-    final isMediumScreen = isMediumScreenSize(context);
-    return isSmallScreen || isMediumScreen
-        ? HomeMobilePage()
-        : const HomeWebPage();
+    if (isSmallScreenSize(context) || isMediumScreenSize(context)) {
+      return HomeMobilePage();
+    }
+
+    return const HomeWebPage();
+  }
+
+  void _fetchUserInfo() {
+    final bloc = context.read<HomeBloc>();
+    if (bloc.user == null) bloc.add(const FetchUserInfo());
   }
 }

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

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

lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart

@@ -13,6 +13,35 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     on<AddFunction>(_onAddFunction);
     on<SelectFunction>(_onSelectFunction);
   }
+  // void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
+  //   final functions = List<DeviceFunctionData>.from(state.addedFunctions);
+  //   final existingIndex = functions.indexWhere(
+  //     (f) => f.functionCode == event.functionData.functionCode,
+  //   );
+
+  //   if (existingIndex != -1) {
+  //     final existingData = functions[existingIndex];
+  //     functions[existingIndex] = DeviceFunctionData(
+  //       entityId: event.functionData.entityId,
+  //       functionCode: event.functionData.functionCode,
+  //       operationName: event.functionData.operationName,
+  //       value: event.functionData.value ?? existingData.value,
+  //       valueDescription: event.functionData.valueDescription ??
+  //           existingData.valueDescription,
+  //       condition: event.functionData.condition ?? existingData.condition,
+  //       step: event.functionData.step ?? existingData.step,
+  //     );
+  //   } else {
+  //     functions.clear();
+  //     functions.add(event.functionData);
+  //   }
+
+  //   emit(state.copyWith(
+  //     addedFunctions: functions,
+  //     selectedFunction: event.functionData.functionCode,
+  //   ));
+  // }
+
   void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
     final functions = List<DeviceFunctionData>.from(state.addedFunctions);
     final existingIndex = functions.indexWhere(
@@ -20,19 +49,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     );
 
     if (existingIndex != -1) {
-      final existingData = functions[existingIndex];
-      functions[existingIndex] = DeviceFunctionData(
-        entityId: event.functionData.entityId,
-        functionCode: event.functionData.functionCode,
-        operationName: event.functionData.operationName,
-        value: event.functionData.value ?? existingData.value,
-        valueDescription: event.functionData.valueDescription ??
-            existingData.valueDescription,
-        condition: event.functionData.condition ?? existingData.condition,
-        step: event.functionData.step ?? existingData.step,
-      );
+      // Update the function value
+      functions[existingIndex] = event.functionData;
     } else {
-      functions.clear();
+      // Add new function value
       functions.add(event.functionData);
     }
 

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

@@ -4,8 +4,8 @@ import 'package:bloc/bloc.dart';
 import 'package:dio/dio.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
@@ -27,9 +27,6 @@ import 'package:uuid/uuid.dart';
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
     on<AddToIfContainer>(_onAddToIfContainer);
@@ -173,45 +170,45 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
-    emit(state.copyWith(isLoading: true, errorMessage: null));
-    List<ScenesModel> scenes = [];
-    try {
-      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var createRoutineBloc = context.read<CreateRoutineBloc>();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
-        var spaceBloc = context.read<SpaceTreeBloc>();
-        for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-          for (var spaceId in spacesList) {
-            scenes.addAll(
-                await SceneApi.getScenes(spaceId, communityId, projectUuid));
-          }
+Future<void> _onLoadScenes(
+    LoadScenes event, Emitter<RoutineState> emit) async {
+  emit(state.copyWith(isLoading: true, errorMessage: null));
+  List<ScenesModel> scenes = [];
+  try {
+    BuildContext context = NavigationService.navigatorKey.currentContext!;
+    var createRoutineBloc = context.read<CreateRoutineBloc>();
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+    if (createRoutineBloc.selectedSpaceId == '' &&
+        createRoutineBloc.selectedCommunityId == '') {
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
-      } else {
-        scenes.addAll(await SceneApi.getScenes(
-            createRoutineBloc.selectedSpaceId,
-            createRoutineBloc.selectedCommunityId,
-            projectUuid));
       }
-
-      emit(state.copyWith(
-        scenes: scenes,
-        isLoading: false,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-          isLoading: false,
-          loadScenesErrorMessage: 'Failed to load scenes',
-          errorMessage: '',
-          loadAutomationErrorMessage: '',
-          scenes: scenes));
+    } else {
+      scenes.addAll(await SceneApi.getScenes(
+          createRoutineBloc.selectedSpaceId,
+          createRoutineBloc.selectedCommunityId,
+          projectUuid));
     }
+
+    emit(state.copyWith(
+      scenes: scenes,
+      isLoading: false,
+    ));
+  } catch (e) {
+    emit(state.copyWith(
+        isLoading: false,
+        loadScenesErrorMessage: 'Failed to load scenes',
+        errorMessage: '',
+        loadAutomationErrorMessage: '',
+        scenes: scenes));
   }
+} 
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -1163,8 +1160,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation());
-        add(LoadScenes());
+        add(const LoadAutomation());
+        add(const LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1422,15 +1419,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           event.automationId, event.automationStatusUpdate, projectId);
 
       if (success) {
-        final updatedAutomations = await SceneApi.getAutomationByUnitId(
-            event.automationStatusUpdate.spaceUuid,
-            event.communityId,
-            projectId);
+        // await SceneApi.getAutomationByUnitId(
+        //     event.automationStatusUpdate.spaceUuid,
+        //     event.communityId,
+        //     projectId);
 
         // Remove from loading set safely
+
         final updatedLoadingIds = {...state.loadingAutomationIds!}
           ..remove(event.automationId);
-
+        final updatedAutomations = changeItemStateOnToggelingSceen(
+            state.automations, event.automationId);
         emit(state.copyWith(
           automations: updatedAutomations,
           loadingAutomationIds: updatedLoadingIds,
@@ -1452,4 +1451,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
+
+  List<ScenesModel> changeItemStateOnToggelingSceen(
+      List<ScenesModel> oldSceen, String automationId) {
+    return oldSceen.map((scene) {
+      if (scene.id == automationId) {
+        return ScenesModel(
+          id: scene.id,
+          sceneTuyaId: scene.sceneTuyaId,
+          name: scene.name,
+          status: scene.status == 'enable' ? 'disable' : 'enable',
+          type: scene.type,
+          spaceName: scene.spaceName,
+          spaceId: scene.spaceId,
+          communityId: scene.communityId,
+          icon: scene.icon,
+        );
+      }
+      return scene;
+    }).toList();
+  }
 }

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -117,7 +117,7 @@ class _DropdownContentState extends State<_DropdownContent> {
     final selectedCommunity = _findCommunity(state, state.selectedSpaceId);
 
     return Container(
-      height: 46,
+      height: 40,
       decoration: BoxDecoration(
         border: Border.all(color: Colors.grey.shade300),
         borderRadius: BorderRadius.circular(12),
@@ -149,7 +149,7 @@ class _DropdownContentState extends State<_DropdownContent> {
               ),
             ),
             height: 45,
-            width: 33,
+            width: 44,
             child: const Icon(
               Icons.keyboard_arrow_down,
               color: ColorsManager.textGray,

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -44,144 +44,156 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
               _selectedSpace = null;
               _selectedCommunity = _selectedId;
             }
-            return AlertDialog(
+            return Dialog(
               backgroundColor: Colors.white,
-              insetPadding: EdgeInsets.zero,
-              contentPadding: EdgeInsets.zero,
+              insetPadding: const EdgeInsets.symmetric(
+                horizontal: 20,
+              ),
               shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(12)),
-              title: Text(
-                'Create New Routines',
-                textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                      color: ColorsManager.spaceColor,
-                      fontSize: 20,
-                      fontWeight: FontWeight.w700,
-                    ),
-              ),
-              content: Stack(
-                children: [
-                  Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      const Divider(),
-                      const SizedBox(height: 20),
-                      Column(
-                        children: [
-                          Padding(
-                              padding:
-                                  const EdgeInsets.only(left: 13, right: 8),
-                              child: Column(
-                                children: [
-                                  SpaceTreeDropdown(
-                                    selectedSpaceId: _selectedId,
+              child: Container(
+                width: 450,
+                child: Stack(
+                  children: [
+                    Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const SizedBox(height: 20),
+                        Text(
+                          'Create New Routines',
+                          textAlign: TextAlign.center,
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    color: ColorsManager.spaceColor,
+                                    fontSize: 20,
+                                    fontWeight: FontWeight.w700,
+                                  ),
+                        ),
+                        const Divider(),
+                        const SizedBox(height: 20),
+                        Column(
+                          children: [
+                            Column(
+                              children: [
+                                Padding(
+                                    padding: const EdgeInsets.only(
+                                        left: 13, right: 10),
+                                    child: Column(
+                                      children: [
+                                        SpaceTreeDropdown(
+                                          selectedSpaceId: _selectedId,
+                                          onChanged: (String? newValue) {
+                                            setState(
+                                                () => _selectedId = newValue!);
+                                            if (_selectedId != null) {
+                                              _bloc.add(
+                                                  SpaceOnlyWithDevicesEvent(
+                                                      _selectedId!));
+                                            }
+                                          },
+                                        ),
+                                      ],
+                                    )),
+                                const SizedBox(height: 21),
+                                Padding(
+                                  padding: const EdgeInsets.only(
+                                      left: 15, right: 20),
+                                  child: SpaceDropdown(
+                                    hintMessage: spaceHint,
+                                    spaces: spaces,
+                                    selectedValue: _selectedSpace,
                                     onChanged: (String? newValue) {
-                                      setState(() => _selectedId = newValue!);
-                                      if (_selectedId != null) {
-                                        _bloc.add(SpaceOnlyWithDevicesEvent(
-                                            _selectedId!));
-                                      }
+                                      setState(() {
+                                        _selectedSpace = newValue;
+                                      });
                                     },
                                   ),
-                                ],
-                              )),
-                          const SizedBox(height: 5),
-                          const SizedBox(height: 8),
-                          Padding(
-                            padding: const EdgeInsets.only(left: 15, right: 15),
-                            child: SpaceDropdown(
-                              hintMessage: spaceHint,
-                              spaces: spaces,
-                              selectedValue: _selectedSpace,
-                              onChanged: (String? newValue) {
-                                setState(() {
-                                  _selectedSpace = newValue;
-                                });
-                              },
+                                ),
+                              ],
                             ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 20),
-                      const Divider(),
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceAround,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.only(
-                              left: 20,
-                              right: 20,
-                            ),
-                            child: TextButton(
-                              onPressed: () {
-                                Navigator.of(context).pop();
-                              },
-                              child: Text(
-                                'Cancel',
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium!
-                                    .copyWith(
-                                      fontWeight: FontWeight.w400,
-                                      fontSize: 14,
-                                      color: ColorsManager.blackColor,
-                                    ),
+                          ],
+                        ),
+                        const SizedBox(height: 20),
+                        const Divider(),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceAround,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.only(
+                                left: 20,
+                                right: 20,
+                              ),
+                              child: TextButton(
+                                onPressed: () {
+                                  Navigator.of(context).pop();
+                                },
+                                child: Text(
+                                  'Cancel',
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodyMedium!
+                                      .copyWith(
+                                        fontWeight: FontWeight.w400,
+                                        fontSize: 14,
+                                        color: ColorsManager.blackColor,
+                                      ),
+                                ),
                               ),
                             ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.only(
-                              left: 20,
-                              right: 20,
-                            ),
-                            child: TextButton(
-                              onPressed: _selectedCommunity != null &&
-                                      _selectedSpace != null
-                                  ? () {
-                                      Navigator.of(context).pop({
-                                        'community': _selectedCommunity,
-                                        'space': _selectedSpace,
-                                      });
-                                    }
-                                  : null,
-                              child: Text(
-                                'Next',
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium!
-                                    .copyWith(
-                                      fontWeight: FontWeight.w400,
-                                      fontSize: 14,
-                                      color: _selectedCommunity != null &&
-                                              _selectedSpace != null
-                                          ? ColorsManager.blueColor
-                                          : Colors.blue.shade100,
-                                    ),
+                            Padding(
+                              padding: const EdgeInsets.only(
+                                left: 20,
+                                right: 20,
+                              ),
+                              child: TextButton(
+                                onPressed: _selectedCommunity != null &&
+                                        _selectedSpace != null
+                                    ? () {
+                                        Navigator.of(context).pop({
+                                          'community': _selectedCommunity,
+                                          'space': _selectedSpace,
+                                        });
+                                      }
+                                    : null,
+                                child: Text(
+                                  'Next',
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodyMedium!
+                                      .copyWith(
+                                        fontWeight: FontWeight.w400,
+                                        fontSize: 14,
+                                        color: _selectedCommunity != null &&
+                                                _selectedSpace != null
+                                            ? ColorsManager.blueColor
+                                            : Colors.blue.shade100,
+                                      ),
+                                ),
                               ),
                             ),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 10),
-                    ],
-                  ),
-                  if (isLoadingCommunities)
-                    const SizedBox(
-                      height: 200,
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Center(
-                            child: CircularProgressIndicator(
-                              color: ColorsManager.primaryColor,
-                            ),
-                          ),
-                        ],
-                      ),
+                          ],
+                        ),
+                        const SizedBox(height: 10),
+                      ],
                     ),
-                ],
+                    if (isLoadingCommunities)
+                      const SizedBox(
+                        height: 200,
+                        child: Column(
+                          mainAxisSize: MainAxisSize.min,
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          children: [
+                            Center(
+                              child: CircularProgressIndicator(
+                                color: ColorsManager.primaryColor,
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                  ],
+                ),
               ),
             );
           },

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -34,7 +34,9 @@ class SpaceDropdown extends StatelessWidget {
           ),
           SizedBox(
             child: Container(
+              height: 40,
               decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(10),
               ),
               child: DropdownButton2<String>(
@@ -45,7 +47,7 @@ class SpaceDropdown extends StatelessWidget {
                     value: space.uuid,
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         Text(
                           '   ${space.name}',
@@ -88,7 +90,7 @@ class SpaceDropdown extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Expanded(
-                        flex: 6,
+                        flex: 8,
                         child: Padding(
                           padding: const EdgeInsets.only(left: 10),
                           child: Text(
@@ -129,6 +131,7 @@ class SpaceDropdown extends StatelessWidget {
                 dropdownStyleData: DropdownStyleData(
                   maxHeight: MediaQuery.of(context).size.height * 0.4,
                   decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
                     borderRadius: BorderRadius.circular(10),
                   ),
                 ),

lib/pages/routines/helper/save_routine_helper.dart

@@ -17,9 +17,10 @@ class SaveRoutineHelper {
       builder: (context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
-            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
-                ? 'All Conditions are met'
-                : 'Any Condition is met';
+            final selectedConditionLabel =
+                state.selectedAutomationOperator == 'and'
+                    ? 'All Conditions are met'
+                    : 'Any Condition is met';
 
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
@@ -37,10 +38,11 @@ class SaveRoutineHelper {
                     Text(
                       'Create a scene: ${state.routineName ?? ""}',
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
-                            color: ColorsManager.primaryColorWithOpacity,
-                            fontWeight: FontWeight.bold,
-                          ),
+                      style:
+                          Theme.of(context).textTheme.headlineMedium!.copyWith(
+                                color: ColorsManager.primaryColorWithOpacity,
+                                fontWeight: FontWeight.bold,
+                              ),
                     ),
                     const SizedBox(height: 18),
                     _buildDivider(),
@@ -58,7 +60,8 @@ class SaveRoutineHelper {
                             _buildIfConditions(state, context),
                             Container(
                               width: 1,
-                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
+                              color: ColorsManager.greyColor
+                                  .withValues(alpha: 0.8),
                             ),
                             _buildThenActions(state, context),
                           ],
@@ -97,7 +100,8 @@ class SaveRoutineHelper {
       child: Row(
         spacing: 16,
         children: [
-          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
+          Expanded(
+              child: Text('IF: $selectedConditionLabel', style: textStyle)),
           const Expanded(child: Text('THEN:', style: textStyle)),
         ],
       ),
@@ -109,7 +113,7 @@ class SaveRoutineHelper {
       spacing: 16,
       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
       children: [
- DialogFooterButton(
+        DialogFooterButton(
           text: 'Back',
           onTap: () => Navigator.pop(context),
         ),
@@ -143,7 +147,8 @@ class SaveRoutineHelper {
       child: ListView(
         // shrinkWrap: true,
         children: state.thenItems.map((item) {
-          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
+          final functions =
+              state.selectedFunctions[item['uniqueCustomId']] ?? [];
           return functionRow(item, context, functions);
         }).toList(),
       ),
@@ -203,19 +208,20 @@ class SaveRoutineHelper {
                     ),
                   ),
                   child: Center(
-                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                        ? Image.memory(
-                            base64Decode(item['icon']),
-                            width: 12,
-                            height: 22,
-                            fit: BoxFit.scaleDown,
-                          )
-                        : SvgPicture.asset(
-                            item['imagePath'],
-                            width: 12,
-                            height: 12,
-                            fit: BoxFit.scaleDown,
-                          ),
+                    child:
+                        item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                            ? Image.memory(
+                                base64Decode(item['icon']),
+                                width: 12,
+                                height: 22,
+                                fit: BoxFit.scaleDown,
+                              )
+                            : SvgPicture.asset(
+                                item['imagePath'],
+                                width: 12,
+                                height: 12,
+                                fit: BoxFit.scaleDown,
+                              ),
                   ),
                 ),
                 Flexible(

lib/pages/routines/models/pc/energy_clamp_functions.dart

@@ -405,8 +405,8 @@ class PowerFactorCStatusFunction extends EnergyClampFunctions {
           code: 'PowerFactorC',
           operationName: 'Power Factor C',
           icon: Assets.speedoMeter,
-          min: 0.00,
-          max: 1.00,
+          min: 0.0,
+          max: 1.0,
           step: 0.1,
           unit: "",
         );

lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart

@@ -117,10 +117,22 @@ class ACHelper {
                         },
                         onConfirm: state.addedFunctions.isNotEmpty
                             ? () {
+                                final selectedFunctionData =
+                                    state.addedFunctions.firstWhere(
+                                  (f) =>
+                                      f.functionCode == state.selectedFunction,
+                                  orElse: () => DeviceFunctionData(
+                                    entityId: '',
+                                    functionCode: state.selectedFunction ?? '',
+                                    operationName: '',
+                                    value: null,
+                                  ),
+                                );
+
                                 /// add the functions to the routine bloc
                                 context.read<RoutineBloc>().add(
                                       AddFunctionToRoutine(
-                                        state.addedFunctions,
+                                        [selectedFunctionData],
                                         uniqueCustomId,
                                       ),
                                     );

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart

@@ -78,12 +78,22 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
                   onCancel: () => Navigator.pop(context),
                   onConfirm: state.addedFunctions.isNotEmpty
                       ? () {
+                          final selectedFunctionData =
+                              state.addedFunctions.firstWhere(
+                            (f) => f.functionCode == state.selectedFunction,
+                            orElse: () => DeviceFunctionData(
+                              entityId: '',
+                              functionCode: state.selectedFunction ?? '',
+                              operationName: '',
+                              value: null,
+                            ),
+                          );
                           final functions = _updateValuesForAddedFunctions(
                             state.addedFunctions,
                           );
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                  functions,
+                                  [selectedFunctionData],
                                   '${widget.uniqueCustomId}',
                                 ),
                               );

lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart

@@ -192,9 +192,18 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart

@@ -115,9 +115,18 @@ class _GatewayDialogState extends State<GatewayDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId ?? '-1',
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart

@@ -147,7 +147,7 @@ class OneGangSwitchHelper {
                                   // }
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          state.addedFunctions,
+                                          [selectedFunctionData],
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart

@@ -250,9 +250,18 @@ class _EnergyClampDialogState extends State<EnergyClampDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_value_selector_widget.dart

@@ -27,17 +27,16 @@ class EnergyValueSelectorWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final selectedFn =
-        functions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = functions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
-    final step = selectedFn.step ?? 1.0; 
+    final step = selectedFn.step;
     final _unit = selectedFn.unit ?? '';
     final (double, double) sliderRange =
         (selectedFn.min ?? 0.0, selectedFn.max ?? 100.0);
 
     if (_isSliderFunction(selectedFunction)) {
       return CustomRoutinesTextbox(
-        withSpecialChar: false,
+        withSpecialChar: true,
         currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
@@ -60,14 +59,14 @@ class EnergyValueSelectorWidget extends StatelessWidget {
                   entityId: device?.uuid ?? '',
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
-                  value: value.toInt(),
+                  value: value,
                   condition: functionData.condition,
                 ),
               ),
             ),
         unit: _unit,
         dividendOfRange: 1,
-        stepIncreaseAmount: step,
+        stepIncreaseAmount: step!,
       );
     }
 

lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart

@@ -145,9 +145,22 @@ class TwoGangSwitchHelper {
                                   //         ),
                                   //       );
                                   // }
+                                  final selectedFunctionData =
+                                      state.addedFunctions.firstWhere(
+                                    (f) =>
+                                        f.functionCode ==
+                                        state.selectedFunction,
+                                    orElse: () => DeviceFunctionData(
+                                      entityId: '',
+                                      functionCode:
+                                          state.selectedFunction ?? '',
+                                      operationName: '',
+                                      value: null,
+                                    ),
+                                  );
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          state.addedFunctions,
+                                          [selectedFunctionData],
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -210,9 +210,18 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart

@@ -188,9 +188,18 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.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/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';
@@ -25,6 +26,12 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
   final CommunitySpaceManagementApi _api = CommunitySpaceManagementApi();
   final ProductApi _productApi = ProductApi();
   final SpaceModelManagementApi _spaceModelApi = SpaceModelManagementApi();
+
+  @override
+  void initState() {
+    context.read<SpaceTreeBloc>().add(InitialEvent());
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(

lib/services/home_api.dart

@@ -3,14 +3,20 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class HomeApi {
-  Future fetchUserInfo(userId) async {
-    final response = await HTTPService().get(
-        path: ApiEndpoints.getUser.replaceAll('{userUuid}', userId!),
+  Future<UserModel?> fetchUserInfo(String userId) async {
+    try {
+      final response = await HTTPService().get(
+        path: ApiEndpoints.getUser.replaceAll('{userUuid}', userId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return UserModel.fromJson(json);
-        });
-    return response;
+          final user = UserModel.fromJson(json as Map<String, dynamic>);
+          return user;
+        },
+      );
+      return response;
+    } catch (e) {
+      return null;
+    }
   }
 
   Future fetchTerms() async {

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)
-            .map((item) => RoleTypeModel.fromJson(item))
-            .toList();
+        final List<RoleTypeModel> fetchedRoles =
+            (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList();
         return fetchedRoles;
       },
     );
@@ -48,9 +47,7 @@ class UserPermissionApi {
       path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {
-        return (json as List)
-            .map((data) => PermissionOption.fromJson(data))
-            .toList();
+        return (json as List).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 = {
-        "disable": status,
-        "projectUuid": projectUuid
-      };
+      Map<String, dynamic> bodya = {"disable": status, "projectUuid": projectUuid};
 
       final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
-            .replaceAll("{invitedUserUuid}", userUuid),
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
           return json['success'];

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';

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';
 }