Merge 3f7f7ce49f into 9098276223

fixes bugs and add project id staging

.env.dev

@@ -1,2 +1,3 @@
 ENV_NAME=development
-BASE_URL=https://syncrow-dev.azurewebsites.net
+BASE_URL=https://syncrow-dev.azurewebsites.net
+PROJECT_ID=0e62577c-06fa-41b9-8a92-99a21fbaf51c

.env.prod

@@ -1,2 +1,3 @@
 ENV_NAME=production
-BASE_URL=https://syncrow-staging.azurewebsites.net
+BASE_URL=https://syncrow-staging.azurewebsites.net
+PROJECT_ID=bcda711e-9fc2-4168-a05e-171b4026d1ff

.env.staging

@@ -1,2 +1,3 @@
 ENV_NAME=staging
-BASE_URL=https://syncrow-staging.azurewebsites.net
+BASE_URL=https://syncrow-staging.azurewebsites.net
+PROJECT_ID=bcda711e-9fc2-4168-a05e-171b4026d1ff

lib/features/app_layout/bloc/home_cubit.dart

@@ -10,6 +10,7 @@ import 'package:share_plus/share_plus.dart';
 import 'package:syncrow_app/features/app_layout/model/permission_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/app_layout/view/widgets/app_bar_home_dropdown.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/user_model.dart';
 import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
@@ -28,6 +29,7 @@ import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/profile_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 part 'home_state.dart';
@@ -67,6 +69,8 @@ class HomeCubit extends Cubit<HomeState> {
       var uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await ProfileApi().fetchUserInfo(uuid);
+      project = user?.project;
+
       emit(HomeUserInfoLoaded(user!));
     } catch (e) {
       return;
@@ -175,6 +179,8 @@ class HomeCubit extends Cubit<HomeState> {
 
   SubSpaceModel? selectedRoom;
 
+  Project? project;
+
   PageController devicesPageController = PageController();
 
   PageController roomsPageController = PageController();
@@ -324,8 +330,8 @@ class HomeCubit extends Cubit<HomeState> {
 //////////////////////////////////////// API ////////////////////////////////////////
   generateInvitation(SpaceModel unit) async {
     try {
-      final invitationCode =
-          await SpacesAPI.generateInvitationCode(unit.id, unit.community.uuid);
+      final invitationCode = await SpacesAPI.generateInvitationCode(unit.id,
+          unit.community.uuid, project?.uuid ?? TempConst.projectIdDev);
       if (invitationCode.isNotEmpty) {
         Share.share('The invitation code is $invitationCode');
         CustomSnackBar.displaySnackBar(
@@ -380,8 +386,10 @@ class HomeCubit extends Cubit<HomeState> {
   fetchRoomsByUnitId(SpaceModel space) async {
     emitSafe(GetSpaceRoomsLoading());
     try {
-      space.subspaces =
-          await SpacesAPI.getSubSpaceBySpaceId(space.community.uuid, space.id);
+      space.subspaces = await SpacesAPI.getSubSpaceBySpaceId(
+          space.community.uuid,
+          space.id,
+          project?.uuid ?? TempConst.projectIdDev);
     } catch (failure) {
       emitSafe(GetSpaceRoomsError(failure.toString()));
       return;
@@ -414,7 +422,6 @@ class HomeCubit extends Cubit<HomeState> {
       emitSafe(ActivationError(errMessage: errorMsg));
       return false;
     }
-
   }
 
   /////////////////////////////////////// Nav ///////////////////////////////////////

lib/features/auth/model/project_model.dart

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

lib/features/auth/model/user_model.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:flutter/foundation.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/token.dart';
 
 class UserModel {
@@ -20,6 +21,7 @@ class UserModel {
   final bool? hasAcceptedAppAgreement;
   final DateTime? appAgreementAcceptedAt;
   final Role? role;
+  final Project? project;
 
   UserModel({
     required this.uuid,
@@ -38,6 +40,7 @@ class UserModel {
     required this.hasAcceptedAppAgreement,
     required this.appAgreementAcceptedAt,
     required this.role,
+    required this.project,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
@@ -62,33 +65,35 @@ class UserModel {
           ? DateTime.parse(json['appAgreementAcceptedAt'])
           : null,
       role: json['role'] != null ? Role.fromJson(json['role']) : null,
+      project:
+          json['project'] != null ? Project.fromJson(json['project']) : null,
     );
   }
 
   factory UserModel.fromToken(Token token) {
     Map<String, dynamic> tempJson = Token.decodeToken(token.accessToken);
     return UserModel(
-      uuid: tempJson['uuid'].toString(),
-      email: tempJson['email'],
-      lastName: tempJson['lastName'],
-      firstName: tempJson['firstName'],
-      profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
-      phoneNumber: null,
-      isEmailVerified: null,
-      isAgreementAccepted: null,
-      regionUuid: null,
-      regionName: tempJson['region']?['regionName'],
-      timeZone: tempJson['timezone']?['timeZoneOffset'],
-      hasAcceptedWebAgreement: tempJson['hasAcceptedWebAgreement'],
-      webAgreementAcceptedAt: tempJson['webAgreementAcceptedAt'] != null
-          ? DateTime.parse(tempJson['webAgreementAcceptedAt'])
-          : null,
-      hasAcceptedAppAgreement: tempJson['hasAcceptedAppAgreement'],
-      appAgreementAcceptedAt: tempJson['appAgreementAcceptedAt'] != null
-          ? DateTime.parse(tempJson['appAgreementAcceptedAt'])
-          : null,
-      role: tempJson['role'] != null ? Role.fromJson(tempJson['role']) : null,
-    );
+        uuid: tempJson['uuid'].toString(),
+        email: tempJson['email'],
+        lastName: tempJson['lastName'],
+        firstName: tempJson['firstName'],
+        profilePicture: UserModel.decodeBase64Image(tempJson['profilePicture']),
+        phoneNumber: null,
+        isEmailVerified: null,
+        isAgreementAccepted: null,
+        regionUuid: null,
+        regionName: tempJson['region']?['regionName'],
+        timeZone: tempJson['timezone']?['timeZoneOffset'],
+        hasAcceptedWebAgreement: tempJson['hasAcceptedWebAgreement'],
+        webAgreementAcceptedAt: tempJson['webAgreementAcceptedAt'] != null
+            ? DateTime.parse(tempJson['webAgreementAcceptedAt'])
+            : null,
+        hasAcceptedAppAgreement: tempJson['hasAcceptedAppAgreement'],
+        appAgreementAcceptedAt: tempJson['appAgreementAcceptedAt'] != null
+            ? DateTime.parse(tempJson['appAgreementAcceptedAt'])
+            : null,
+        role: tempJson['role'] != null ? Role.fromJson(tempJson['role']) : null,
+        project: null);
   }
 
   static Uint8List? decodeBase64Image(String? base64String) {
@@ -137,8 +142,10 @@ class Role {
   factory Role.fromJson(Map<String, dynamic> json) {
     return Role(
       uuid: json['uuid'],
-      createdAt: json['createdAt'] != null ? DateTime.parse(json['createdAt']) : null,
-      updatedAt: json['updatedAt'] != null ? DateTime.parse(json['updatedAt']) : null,
+      createdAt:
+          json['createdAt'] != null ? DateTime.parse(json['createdAt']) : null,
+      updatedAt:
+          json['updatedAt'] != null ? DateTime.parse(json['updatedAt']) : null,
       type: json['type'],
     );
   }

lib/features/common/bloc/project_cubit.dart

@@ -0,0 +1,19 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+class ProjectCubit extends Cubit<String?> {
+  final FlutterSecureStorage storage;
+  static const String projectKey = "selected_project_uuid";
+
+  ProjectCubit(this.storage) : super(null);
+
+  Future<void> setProjectUUID(String newUUID) async {
+    await storage.write(key: projectKey, value: newUUID);
+    emit(newUUID);
+  }
+
+  Future<void> clearProjectUUID() async {
+    await storage.delete(key: projectKey);
+    emit(null);
+  }
+}

lib/features/devices/bloc/6_scene_switch_bloc/6_scene_bloc.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_event.dart';
 import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@@ -16,6 +17,7 @@ import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/scene_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 
 class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
@@ -112,8 +114,9 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
       FetchRoomsEvent event, Emitter<SixSceneState> emit) async {
     try {
       emit(SixSceneLoadingState());
+      Project? project = HomeCubit.getInstance().project;
       roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid, event.unit.id, project?.uuid ?? TempConst.projectIdDev);
       emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
     } catch (e) {
       emit(SixSceneFailedState(errorMessage: e.toString()));
@@ -125,12 +128,14 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
     try {
       emit(SixSceneLoadingState());
       if (_hasSelectionChanged) {
+        Project? project = HomeCubit.getInstance().project;
         await HomeManagementAPI.assignDeviceToRoom(
-            event.unit.community.uuid, event.unit.id, event.roomId, sixSceneId);
+            event.unit.community.uuid, event.unit.id, event.roomId, sixSceneId, project?.uuid ?? TempConst.projectIdDev);
         final devicesList = await DevicesAPI.getDevicesByRoomId(
             communityUuid: event.unit.community.uuid,
             spaceUuid: event.unit.id,
-            roomId: event.roomId);
+            roomId: event.roomId,
+            projectId: project?.uuid ?? TempConst.projectIdDev);
         List<String> allDevicesIds = [];
         allDevices.forEach((element) {
           allDevicesIds.add(element.uuid!);
@@ -341,8 +346,10 @@ class SixSceneBloc extends Bloc<SixSceneEvent, SixSceneState> {
     emit(SixSceneLoadingState());
 
     try {
+            Project? project = HomeCubit.getInstance().project;
+
       allScenes = await SceneApi.getScenesByUnitId(
-          event.unitId, event.unit.community.uuid,
+          event.unitId, event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
           showInDevice: event.showInDevice);
 
       filteredScenes = allScenes;

lib/features/devices/bloc/acs_bloc/acs_bloc.dart

@@ -136,7 +136,6 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
           ac.acSwitch = acSwitchValue;
         }
       }
-  
 
       _setAllAcsTempsAndSwitches();
       _emitAcsStatus(emit);
@@ -458,24 +457,27 @@ class ACsBloc extends Bloc<AcsEvent, AcsState> {
   }
 
   void _getCounterValue(GetCounterEvent event, Emitter<AcsState> emit) async {
-    try {
-      emit(AcsLoadingState());
-      var response = await DevicesAPI.getDeviceStatus(acId);
-      List<StatusModel> statusModelList = [];
-      for (var status in response['status']) {
-        statusModelList.add(StatusModel.fromJson(status));
-      }
-      deviceStatus =
-          AcStatusModel.fromJson(response['productUuid'], statusModelList);
-
-      if (event.deviceCode == 'countdown_time') {
-        deviceStatus.countdown1 > 0
-            ? _onStartTimer(deviceStatus.countdown1)
-            : emit(UpdateTimerState(seconds: deviceStatus.countdown1));
-      }
-    } catch (e) {
-      emit(AcsFailedState(errorMessage: e.toString()));
-      return;
+    emit(AcsLoadingState());
+    var response = await DevicesAPI.getDeviceStatus(acId);
+    List<StatusModel> statusModelList = [];
+    for (var status in response['status']) {
+      statusModelList.add(StatusModel.fromJson(status));
+    }
+    deviceStatus =
+        AcStatusModel.fromJson(response['productUuid'], statusModelList);
+    deviceStatus.countdown1;
+    var duration;
+    if (deviceStatus.countdown1 == 5) {
+      duration = const Duration(minutes: 30);
+      var countNum = duration.inSeconds;
+      _onStartTimer(countNum);
+    } else if (deviceStatus.countdown1 > 5) {
+      duration = Duration(minutes: deviceStatus.countdown1 * 6);
+      var countNum = duration.inSeconds;
+      _onStartTimer(countNum);
+    } else {
+      _timer?.cancel();
+      emit(TimerRunComplete());
     }
   }
 

lib/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_event.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_state.dart';
@@ -10,6 +12,7 @@ import 'package:syncrow_app/features/devices/model/device_model.dart';
 
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 
 class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
@@ -27,11 +30,16 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
 
   static List<DevicesCategoryModel>? allCategories;
 
-  Future<void> _onFetchAllDevices(FetchAllDevices event, Emitter<DeviceManagerState> emit) async {
+  Future<void> _onFetchAllDevices(
+      FetchAllDevices event, Emitter<DeviceManagerState> emit) async {
     emit(state.copyWith(loading: true));
     try {
-      final allDevices = await HomeManagementAPI.fetchDevicesByUnitId();
-      emit(state.copyWith(devices: _getOnlyImplementedDevices(allDevices), loading: false));
+      Project? project = HomeCubit.getInstance().project;
+
+      final allDevices = await HomeManagementAPI.fetchDevicesByUnitId(
+          project?.uuid ?? TempConst.projectIdDev);
+      emit(state.copyWith(
+          devices: _getOnlyImplementedDevices(allDevices), loading: false));
     } catch (e) {
       emit(state.copyWith(error: e.toString(), loading: false));
     }
@@ -41,26 +49,31 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
       FetchDevicesByRoomId event, Emitter<DeviceManagerState> emit) async {
     emit(state.copyWith(loading: true));
     try {
-      final devices = await DevicesAPI.getDevicesByRoomId(
-        communityUuid: event.unit.community.uuid,
-        spaceUuid: event.unit.id,
-        roomId: event.roomId,
-      );
+      Project? project = HomeCubit.getInstance().project;
 
-      emit(state.copyWith(devices: _getOnlyImplementedDevices(devices), loading: false));
+      final devices = await DevicesAPI.getDevicesByRoomId(
+          communityUuid: event.unit.community.uuid,
+          spaceUuid: event.unit.id,
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
+
+      emit(state.copyWith(
+          devices: _getOnlyImplementedDevices(devices), loading: false));
     } catch (e) {
       emit(state.copyWith(error: e.toString(), loading: false));
     }
   }
 
-  void _onSelectCategory(SelectCategory event, Emitter<DeviceManagerState> emit) {
+  void _onSelectCategory(
+      SelectCategory event, Emitter<DeviceManagerState> emit) {
     for (var i = 0; i < allCategories!.length; i++) {
       allCategories![i].isSelected = i == event.index;
     }
     emit(state.copyWith(categoryChanged: true));
   }
 
-  void _onUnselectAllCategories(UnselectAllCategories event, Emitter<DeviceManagerState> emit) {
+  void _onUnselectAllCategories(
+      UnselectAllCategories event, Emitter<DeviceManagerState> emit) {
     for (var category in allCategories!) {
       category.isSelected = false;
     }
@@ -104,7 +117,8 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
     _updateDevicesStatus(category, emit);
   }
 
-  void _onTurnOnOffDevice(TurnOnOffDevice event, Emitter<DeviceManagerState> emit) {
+  void _onTurnOnOffDevice(
+      TurnOnOffDevice event, Emitter<DeviceManagerState> emit) {
     var device = event.device;
     device.isOnline = !device.isOnline!;
     DevicesCategoryModel category = allCategories!.firstWhere((category) {
@@ -127,7 +141,8 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
     emit(state.copyWith(categoryChanged: true)); // Set category changed state
   }
 
-  void _updateDevicesStatus(DevicesCategoryModel category, Emitter<DeviceManagerState> emit) {
+  void _updateDevicesStatus(
+      DevicesCategoryModel category, Emitter<DeviceManagerState> emit) {
     if (category.devices != null && category.devices!.isNotEmpty) {
       bool? tempStatus = category.devices![0].isOnline;
       for (var device in category.devices!) {
@@ -147,7 +162,8 @@ class DeviceManagerBloc extends Bloc<DeviceManagerEvent, DeviceManagerState> {
     try {
       final deviceFunctions = await DevicesAPI.deviceFunctions(event.deviceId);
 
-      emit(state.copyWith(functionsLoading: false, deviceFunctions: deviceFunctions));
+      emit(state.copyWith(
+          functionsLoading: false, deviceFunctions: deviceFunctions));
     } catch (e) {
       emit(state.copyWith(functionsLoading: false, error: e.toString()));
     }

lib/features/devices/bloc/device_settings_bloc/device_scene_bloc.dart

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

lib/features/devices/bloc/devices_cubit.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/model/device_category_model.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
@@ -19,6 +20,7 @@ import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/network_exception.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/resource_manager/constants.dart';
 part 'devices_state.dart';
 
@@ -48,7 +50,6 @@ class DevicesCubit extends Cubit<DevicesState> {
     return _instance ??= DevicesCubit._();
   }
 
-
   @override
   Future<void> close() {
     _instance = null;
@@ -310,11 +311,14 @@ class DevicesCubit extends Cubit<DevicesState> {
         .subspaces
         .indexWhere((element) => element.id == roomId);
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       HomeCubit.getInstance().selectedSpace!.subspaces[roomIndex].devices =
           await DevicesAPI.getDevicesByRoomId(
               communityUuid: unit!.community.uuid,
               spaceUuid: unit.id,
-              roomId: roomId);
+              roomId: roomId,
+              projectId: project?.uuid ?? TempConst.projectIdDev);
     } catch (e) {
       emitSafe(GetDevicesError(e.toString()));
       return;
@@ -411,10 +415,12 @@ class DevicesCubit extends Cubit<DevicesState> {
   Future<void> fetchAllDevices(SpaceModel? unit) async {
     emitSafe(GetDevicesLoading());
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       final devices = await DevicesAPI.getAllDevices(
-        communityUuid: unit!.community.uuid,
-        spaceUuid: unit.id,
-      );
+          communityUuid: unit!.community.uuid,
+          spaceUuid: unit.id,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
       allDevices = devices;
       emitSafe(GetDevicesSuccess(allDevices));
     } catch (e) {
@@ -478,8 +484,7 @@ class DevicesCubit extends Cubit<DevicesState> {
         final statusIndex =
             device.status.indexWhere((s) => s.code == switchCode);
         if (statusIndex != -1) {
-          final currentValue = device.status[statusIndex].value ?? false;
-          final toggledValue = !currentValue;
+          final toggledValue = control.value;
           final controlRequest = DeviceControlModel(
               code: switchCode, value: toggledValue, deviceId: deviceUuid);
           final response =
@@ -518,8 +523,7 @@ class DevicesCubit extends Cubit<DevicesState> {
         final statusIndex =
             device.status.indexWhere((s) => s.code == switchCode);
         if (statusIndex != -1) {
-          final currentValue = device.status[statusIndex].value ?? false;
-          final toggledValue = !currentValue;
+          final toggledValue = control.value;
           final controlRequest = DeviceControlModel(
               code: switchCode, value: toggledValue, deviceId: deviceUuid);
           final response =
@@ -556,8 +560,7 @@ class DevicesCubit extends Cubit<DevicesState> {
         final statusIndex =
             device.status.indexWhere((s) => s.code == switchCode);
         if (statusIndex != -1) {
-          final currentValue = device.status[statusIndex].value ?? false;
-          final toggledValue = !currentValue;
+          final toggledValue = control.value;
           final controlRequest = DeviceControlModel(
               code: switchCode, value: toggledValue, deviceId: deviceUuid);
           final response =
@@ -589,8 +592,7 @@ class DevicesCubit extends Cubit<DevicesState> {
 
       final statusIndex = device.status.indexWhere((s) => s.code == 'switch_1');
       if (statusIndex != -1) {
-        final currentValue = device.status[statusIndex].value ?? false;
-        final toggledValue = !currentValue;
+        final toggledValue = control.value;
         final controlRequest = DeviceControlModel(
             code: 'switch_1', value: toggledValue, deviceId: deviceUuid);
         final response =

lib/features/devices/bloc/four_scene_bloc/four_scene_bloc.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_event.dart';
 import 'package:syncrow_app/features/devices/bloc/four_scene_bloc/four_scene_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@@ -14,6 +16,7 @@ import 'package:syncrow_app/features/devices/model/subspace_model.dart';
 import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/scene_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 
 class FourSceneBloc extends Bloc<FourSceneEvent, FourSceneState> {
@@ -299,9 +302,11 @@ class FourSceneBloc extends Bloc<FourSceneEvent, FourSceneState> {
       LoadScenes event, Emitter<FourSceneState> emit) async {
     emit(FourSceneLoadingState());
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.unitId.isNotEmpty) {
         allScenes = await SceneApi.getScenesByUnitId(
-            event.unitId, event.unit.community.uuid,
+            event.unitId, event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
             showInDevice: event.showInDevice);
 
         filteredScenes = allScenes;

lib/features/devices/bloc/sos_bloc/sos_bloc.dart

@@ -5,6 +5,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
 import 'package:syncrow_app/features/app_layout/model/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_event.dart';
 import 'package:syncrow_app/features/devices/bloc/sos_bloc/sos_state.dart';
 import 'package:syncrow_app/features/devices/model/device_control_model.dart';
@@ -19,6 +20,7 @@ import 'package:syncrow_app/navigation/routing_constants.dart';
 import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 
 class SosBloc extends Bloc<SosEvent, SosState> {
@@ -184,8 +186,12 @@ class SosBloc extends Bloc<SosEvent, SosState> {
       FetchRoomsEvent event, Emitter<SosState> emit) async {
     try {
       emit(SosLoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
       roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid,
+          event.unit.id,
+          project?.uuid ?? TempConst.projectIdDev);
       emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
     } catch (e) {
       emit(const SosFailedState(errorMessage: 'Something went wrong'));
@@ -223,13 +229,19 @@ class SosBloc extends Bloc<SosEvent, SosState> {
   void _assignDevice(AssignRoomEvent event, Emitter<SosState> emit) async {
     try {
       emit(SosLoadingState());
+      Project? project = HomeCubit.getInstance().project;
 
       await HomeManagementAPI.assignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, sosId);
+          event.unit.community.uuid,
+          event.unit.id,
+          event.roomId,
+          sosId,
+          project?.uuid ?? TempConst.projectIdDev);
       final devicesList = await DevicesAPI.getDevicesByRoomId(
           communityUuid: event.unit.community.uuid,
           spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
 
       List<String> allDevicesIds = [];
 
@@ -249,13 +261,16 @@ class SosBloc extends Bloc<SosEvent, SosState> {
   void _unassignDevice(UnassignRoomEvent event, Emitter<SosState> emit) async {
     try {
       Map<String, bool> roomDevicesId = {};
+      Project? project = HomeCubit.getInstance().project;
+
       emit(SosLoadingState());
       await HomeManagementAPI.unAssignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, sosId);
+          event.unit.community.uuid, event.unit.id, event.roomId, sosId, project?.uuid ?? TempConst.projectIdDev);
       final devicesList = await DevicesAPI.getDevicesByRoomId(
           communityUuid: event.unit.community.uuid,
           spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
 
       List<String> allDevicesIds = [];
 

lib/features/devices/view/widgets/ACs/ac_interface_controls.dart

@@ -43,6 +43,7 @@ class AcInterfaceControls extends StatelessWidget {
                           PageRouteBuilder(
                               pageBuilder: (context, animation1, animation2) =>
                                   AcTimerPage(
+                                    deviceStatus: deviceStatus,
                                     device: deviceModel,
                                     deviceCode: deviceModel.type!,
                                     switchCode: '',

lib/features/devices/view/widgets/ACs/ac_timer_page.dart

@@ -7,7 +7,7 @@ import 'package:syncrow_app/features/devices/bloc/6_scene_switch_bloc/6_scene_st
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_event.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
-
+import 'package:syncrow_app/features/devices/model/ac_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/custom_halfhour_timer_picker.dart';
 import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
@@ -20,10 +20,13 @@ class AcTimerPage extends StatelessWidget {
   final DeviceModel device;
   final String deviceCode;
   final String switchCode;
+  final AcStatusModel deviceStatus;
+
   const AcTimerPage(
       {required this.device,
       required this.deviceCode,
       required this.switchCode,
+      required this.deviceStatus,
       super.key});
 
   @override
@@ -37,27 +40,24 @@ class AcTimerPage extends StatelessWidget {
         create: (context) => ACsBloc(acId: device.uuid ?? ''),
         child: BlocBuilder<ACsBloc, AcsState>(
           builder: (context, state) {
-            final oneGangBloc = BlocProvider.of<ACsBloc>(context);
+            final acBloc = BlocProvider.of<ACsBloc>(context);
             Duration duration = Duration.zero;
             int selectedValue = 0;
-
             int countNum = 0;
-            if (state is UpdateTimerState) {
+            if (state is AcsInitialState) {
+              acBloc.add(GetCounterEvent(deviceCode: deviceCode));
+            } else if (state is UpdateTimerState) {
               countNum = state.seconds;
             } else if (state is TimerRunInProgress) {
               countNum = state.remainingTime;
             } else if (state is TimerRunComplete) {
               countNum = 0;
             }
-            // else if (state is LoadingNewSate) {
-            //   countNum = 0;
-            // }
-
             return PopScope(
                 canPop: false,
                 onPopInvoked: (didPop) {
                   if (!didPop) {
-                    oneGangBloc.add(OnClose());
+                    acBloc.add(OnClose());
                     Navigator.pop(context);
                   }
                 },
@@ -90,7 +90,7 @@ class AcTimerPage extends StatelessWidget {
                                   ),
                                 ),
                                 Center(
-                                  child: Container(
+                                  child: SizedBox(
                                     child: Column(
                                       mainAxisAlignment:
                                           MainAxisAlignment.center,
@@ -102,7 +102,7 @@ class AcTimerPage extends StatelessWidget {
                                                     .slidingBlueColor,
                                                 fontSize: 40,
                                               )
-                                            : Container(
+                                            : SizedBox(
                                                 child: CustomHalfHourPicker(
                                                   onValueChanged: (value) {
                                                     selectedValue =
@@ -120,8 +120,6 @@ class AcTimerPage extends StatelessWidget {
                                                       countNum =
                                                           duration.inSeconds;
                                                     }
-                                                    print(
-                                                        "Selected Value: $selectedValue, Duration: $duration");
                                                   },
                                                 ),
                                               ),
@@ -131,12 +129,14 @@ class AcTimerPage extends StatelessWidget {
                                                 return;
                                               }
                                               if (countNum > 0) {
-                                                oneGangBloc.add(SetCounterValue(
+                                                acBloc.add(SetCounterValue(
                                                     seconds: countNum,
-                                                    deviceCode:'countdown_time',
+                                                    deviceCode:
+                                                        'countdown_time',
                                                     duration: selectedValue));
-                                              } else if (duration != Duration.zero) {
-                                                oneGangBloc.add(SetCounterValue(
+                                              } else if (duration !=
+                                                  Duration.zero) {
+                                                acBloc.add(SetCounterValue(
                                                     seconds: 0,
                                                     deviceCode:
                                                         'countdown_time',

lib/features/devices/view/widgets/ACs/acs_view.dart

@@ -4,7 +4,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_event.dart';
 import 'package:syncrow_app/features/devices/bloc/acs_bloc/acs_state.dart';
-import 'package:syncrow_app/features/devices/model/ac_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/ac_interface.dart';
 import 'package:syncrow_app/features/devices/view/widgets/ACs/acs_list.dart';
@@ -23,8 +22,6 @@ class ACsView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    print("ACsView deviceModel UUID: ${deviceModel?.uuid}");
-
     return BlocProvider(
       create: (context) => ACsBloc(acId: deviceModel?.uuid ?? '')
         ..add(AcsInitial(allAcs: deviceModel != null ? false : true)),
@@ -41,7 +38,6 @@ class ACsView extends StatelessWidget {
                 extendBody: true,
                 appBar: deviceModel != null
                     ? DeviceAppbar(
-                      //BlocProvider.of<ACsBloc>(context).deviceStatus.acSwitch.toString()
                         value: true,
                         deviceName: deviceModel!.name!,
                         deviceUuid: deviceModel!.uuid!,

lib/features/devices/view/widgets/ceiling_sensor/ceiling_sensor_interface.dart

@@ -306,7 +306,7 @@ class CeilingSensorInterface extends StatelessWidget {
                 .toString()
                 .toLowerCase()
                 .replaceAll('sec', 's')
-                .replaceAll('1hr', '1hour'), // Replacing "sec" with "s"
+                .replaceAll('1hr', '1hour'),
             code: 'nobody_time'));
       }
     } else if (title == 'Maximum Distance') {
@@ -344,7 +344,7 @@ class CeilingSensorInterface extends StatelessWidget {
         context,
         MaterialPageRoute(builder: (context) => const CeilingHelpDescription()),
       );
-    } else if (title == 'Induction History') {
+    } else if (title == 'Presence Record') {
       Navigator.push(
         context,
         MaterialPageRoute(
@@ -393,7 +393,7 @@ class CeilingSensorInterface extends StatelessWidget {
         'val': nobodyTimeVal,
       },
       {
-        'title': 'Induction History',
+        'title': 'Presence Record',
         'icon': Assets.assetsIconsPresenceSensorAssetsInductionRecording,
         'page': null,
         'withArrow': false,

lib/features/devices/view/widgets/ceiling_sensor/max_distance_control.dart

@@ -31,12 +31,12 @@ class MaxDistanceControl extends StatefulWidget {
 }
 
 int _parseValue(String value) {
-  if (value.endsWith('sec')) {
-    return int.parse(value.replaceAll('sec', '').trim());
+  if (value.endsWith('s')) {
+    return int.parse(value.replaceAll('s', '').trim());
   } else if (value.endsWith('min')) {
     return int.parse(value.replaceAll('min', '').trim()) * 60;
-  } else if (value.endsWith('hr')) {
-    return int.parse(value.replaceAll('hr', '').trim()) * 3600;
+  } else if (value.endsWith('hour')) {
+    return int.parse(value.replaceAll('hour', '').trim()) * 3600;
   }
   return 0; // Default to 0 if the format is unrecognized
 }
@@ -58,7 +58,7 @@ class MaxDistanceControlState extends State<MaxDistanceControl> {
 
   String _formatLabel(double seconds) {
     if (seconds == 0) return 'None';
-    if (seconds < 60) return '${seconds.toInt()}sec';
+    if (seconds < 60) return '${seconds.toInt()}s';
     if (seconds < 3600) {
       final minutes = (seconds / 60).round();
       return '${minutes}min';
@@ -90,7 +90,6 @@ class MaxDistanceControlState extends State<MaxDistanceControl> {
   @override
   Widget build(BuildContext context) {
     final double currentSeconds = _stepValues[_currentIndex];
-
     return Dialog(
       child: Container(
         decoration: BoxDecoration(
@@ -128,7 +127,9 @@ class MaxDistanceControlState extends State<MaxDistanceControl> {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   TitleMedium(
-                    text: _formatLabel(currentSeconds),
+                    text: _formatLabel(currentSeconds)
+                        .replaceAll('1hr', '1hour')
+                        .replaceAllMapped(RegExp(r's$'), (match) => 'sec'),
                     style: context.titleMedium.copyWith(
                       color: Colors.black,
                       fontWeight: FontsManager.bold,

lib/features/devices/view/widgets/devices_view_body.dart

@@ -21,32 +21,28 @@ class DevicesViewBody extends StatelessWidget {
     return BlocBuilder<HomeCubit, HomeState>(
       builder: (context, homeState) {
         final homeCubit = HomeCubit.getInstance();
-
         // Handle state priority: Errors first
         if (homeState is ActivationError) {
           return const CreateUnitWidget();
         }
-
         // Handle loading states
         if (homeState is GetSpacesLoading || homeState is HomeLoading) {
           return const Center(child: CircularProgressIndicator());
         }
-
         // Handle error states
         if (homeState is GetSpacesError) {
           return const CreateUnitWidget();
         }
-
         // Handle success states
         if (homeState is GetSpacesSuccess ||
             homeState is RoomUnSelected ||
             homeState is RoomSelected ||
-            homeState is NavChangePage) {
+            homeState is NavChangePage ||
+            homeState is GetSpaceRoomsSuccess) {
           // Show empty state if no spaces
           if (homeCubit.spaces.isEmpty) {
             return const CreateUnitWidget();
           }
-
           return BlocBuilder<DevicesCubit, DevicesState>(
             builder: (context, devicesState) {
               // Devices loading states
@@ -55,7 +51,6 @@ class DevicesViewBody extends StatelessWidget {
                   devicesState is GetDevicesLoading) {
                 return const Center(child: CircularProgressIndicator());
               }
-
               // Devices error state
               if (devicesState is GetDevicesError) {
                 return Center(child: BodyLarge(text: devicesState.errorMsg));
@@ -65,7 +60,6 @@ class DevicesViewBody extends StatelessWidget {
             },
           );
         }
-
         // Fallback for unknown states
         return const Center(child: BodyLarge(text: ''));
       },
@@ -74,7 +68,6 @@ class DevicesViewBody extends StatelessWidget {
 
   Widget _buildMainContent(BuildContext context, HomeCubit homeCubit) {
     final devicesCubit = context.read<DevicesCubit>();
-
     return Column(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       crossAxisAlignment: CrossAxisAlignment.center,

lib/features/menu/bloc/create_unit_bloc/create_unit_bloc.dart

@@ -1,10 +1,12 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/auth/model/user_model.dart';
 import 'package:syncrow_app/features/menu/bloc/create_unit_bloc/create_unit_event.dart';
 import 'package:syncrow_app/features/menu/bloc/create_unit_bloc/create_unit_state.dart';
 import 'package:syncrow_app/services/api/home_creation_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 import 'package:syncrow_app/utils/helpers/snack_bar.dart';
 
 class CreateUnitBloc extends Bloc<CreateUnitEvent, CreateUnitState> {
@@ -239,8 +241,13 @@ Future<String> _createNewRoom(
     required String communityId}) async {
   try {
     Map<String, String> body = {'subspaceName': roomName};
+    Project? project = HomeCubit.getInstance().project;
+
     final response = await HomeCreation.createRoom(
-        communityId: communityId, spaceId: unitId, body: body);
+        communityId: communityId,
+        spaceId: unitId,
+        body: body,
+        projectId: project?.uuid ?? TempConst.projectIdDev);
     // if (response['data']['uuid'] != '') {
     //   final result = await _assignToRoom(roomId: response['data']['uuid'], userId: userId);
 

lib/features/menu/bloc/manage_unit_bloc/manage_unit_bloc.dart

@@ -1,5 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/devices/model/device_model.dart';
 import 'package:syncrow_app/features/menu/bloc/manage_unit_bloc/manage_unit_event.dart';
 import 'package:syncrow_app/features/menu/bloc/manage_unit_bloc/manage_unit_state.dart';
@@ -7,6 +8,7 @@ import 'package:syncrow_app/services/api/devices_api.dart';
 import 'package:syncrow_app/services/api/home_creation_api.dart';
 import 'package:syncrow_app/services/api/home_management_api.dart';
 import 'package:syncrow_app/services/api/spaces_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 
 class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
   List<DeviceModel> allDevices = [];
@@ -24,8 +26,12 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
       FetchRoomsEvent event, Emitter<ManageUnitState> emit) async {
     try {
       emit(LoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
       final roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-          event.unit.community.uuid, event.unit.id);
+          event.unit.community.uuid,
+          event.unit.id,
+          project?.uuid ?? TempConst.projectIdDev);
       emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
     } catch (e) {
       emit(const ErrorState(message: 'Something went wrong'));
@@ -37,11 +43,14 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
       FetchDevicesByRoomIdEvent event, Emitter<ManageUnitState> emit) async {
     try {
       Map<String, bool> roomDevicesId = {};
+      Project? project = HomeCubit.getInstance().project;
+
       emit(LoadingState());
       final devicesList = await DevicesAPI.getDevicesByRoomId(
           communityUuid: event.unit.community.uuid,
           spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
       allDevices = await HomeManagementAPI.fetchDevicesByUserId();
 
       List<String> allDevicesIds = [];
@@ -72,14 +81,21 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
       AssignRoomEvent event, Emitter<ManageUnitState> emit) async {
     try {
       Map<String, bool> roomDevicesId = {};
+      Project? project = HomeCubit.getInstance().project;
+
       emit(LoadingState());
-     
+
       await HomeManagementAPI.assignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, event.deviceId);
+          event.unit.community.uuid,
+          event.unit.id,
+          event.roomId,
+          event.deviceId,
+          project?.uuid ?? TempConst.projectIdDev);
       final devicesList = await DevicesAPI.getDevicesByRoomId(
           communityUuid: event.unit.community.uuid,
           spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
 
       List<String> allDevicesIds = [];
 
@@ -105,19 +121,25 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
     }
   }
 
-
   void _unassignDevice(
       UnassignRoomEvent event, Emitter<ManageUnitState> emit) async {
     try {
       Map<String, bool> roomDevicesId = {};
+      Project? project = HomeCubit.getInstance().project;
+
       emit(LoadingState());
-     
+
       await HomeManagementAPI.unAssignDeviceToRoom(
-          event.unit.community.uuid, event.unit.id, event.roomId, event.deviceId);
+          event.unit.community.uuid,
+          event.unit.id,
+          event.roomId,
+          event.deviceId,
+          project?.uuid ?? TempConst.projectIdDev);
       final devicesList = await DevicesAPI.getDevicesByRoomId(
           communityUuid: event.unit.community.uuid,
           spaceUuid: event.unit.id,
-          roomId: event.roomId);
+          roomId: event.roomId,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
 
       List<String> allDevicesIds = [];
 
@@ -143,18 +165,22 @@ class ManageUnitBloc extends Bloc<ManageUnitEvent, ManageUnitState> {
     }
   }
 
-
   _addNewRoom(AddNewRoom event, Emitter<ManageUnitState> emit) async {
     Map<String, String> body = {'subspaceName': event.roomName};
     try {
       emit(LoadingState());
+      Project? project = HomeCubit.getInstance().project;
+
       final response = await HomeCreation.createRoom(
           communityId: event.unit.community.uuid,
           spaceId: event.unit.id,
-          body: body);
+          body: body,
+          projectId: project?.uuid ?? TempConst.projectIdDev);
       if (response['data']['uuid'] != '') {
         final roomsList = await SpacesAPI.getSubSpaceBySpaceId(
-            event.unit.community.uuid, event.unit.id);
+            event.unit.community.uuid,
+            event.unit.id,
+            project?.uuid ?? TempConst.projectIdDev);
         allDevices = await HomeManagementAPI.fetchDevicesByUserId();
         emit(FetchRoomsState(devicesList: allDevices, roomsList: roomsList));
         await HomeCubit.getInstance().fetchUnitsByUserId();

lib/features/menu/bloc/menu_cubit.dart

@@ -154,11 +154,11 @@ class MenuCubit extends Cubit<MenuState> {
       'title': 'Legal Information',
       'color': const Color(0xFF001B72),
       'buttons': [
-        {
-          'title': 'About',
-          'Icon': Assets.assetsIconsMenuIconsLeagalInfoIconsAbout,
-          'page': null
-        },
+        // {
+        //   'title': 'About',
+        //   'Icon': Assets.assetsIconsMenuIconsLeagalInfoIconsAbout,
+        //   'page': null
+        // },
         {
           'title': 'Privacy Policy',
           'Icon': Assets.assetsIconsMenuIconsLeagalInfoIconsPrivacyPolicy,
@@ -176,7 +176,7 @@ class MenuCubit extends Cubit<MenuState> {
   Future<void> fetchMenuSections() async {
     emit(MenuLoading());
     try {
-      emit(MenuItemsLoaded(menuSections)); 
+      emit(MenuItemsLoaded(menuSections));
     } catch (e) {
       emit(MenuError(e.toString()));
     }

lib/features/menu/bloc/profile_bloc/profile_bloc.dart

@@ -23,8 +23,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
   String timeZoneSelected = '';
   String regionSelected = '';
   final TextEditingController searchController = TextEditingController();
-  final TextEditingController nameController =
-      TextEditingController(text: '${HomeCubit.user!.firstName} ${HomeCubit.user!.lastName}');
+  final TextEditingController nameController = TextEditingController(
+      text: '${HomeCubit.user!.firstName} ${HomeCubit.user!.lastName}');
 
   List<RegionModel> allRegions = [];
   List<TimeZone> allTimeZone = [];
@@ -77,10 +77,13 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     emit(NameEditingState(editName: editName));
   }
 
-  void _fetchUserInfo(InitialProfileEvent event, Emitter<ProfileState> emit) async {
+  void _fetchUserInfo(
+      InitialProfileEvent event, Emitter<ProfileState> emit) async {
     try {
       emit(LoadingInitialState());
       HomeCubit.user = await ProfileApi().fetchUserInfo(HomeCubit.user!.uuid);
+      HomeCubit.getInstance().project = HomeCubit.user?.project;
+
       emit(SaveState());
     } catch (e) {
       emit(FailedState(errorMessage: e.toString()));
@@ -88,7 +91,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future _fetchTimeZone(TimeZoneInitialEvent event, Emitter<ProfileState> emit) async {
+  Future _fetchTimeZone(
+      TimeZoneInitialEvent event, Emitter<ProfileState> emit) async {
     emit(LoadingInitialState());
     try {
       allTimeZone = await ProfileApi.fetchTimeZone();
@@ -100,7 +104,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future selectTimeZone(SelectTimeZoneEvent event, Emitter<ProfileState> emit) async {
+  Future selectTimeZone(
+      SelectTimeZoneEvent event, Emitter<ProfileState> emit) async {
     try {
       emit(LoadingInitialState());
       timeZoneSelected = event.val;
@@ -112,7 +117,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future selectRegion(SelectRegionEvent event, Emitter<ProfileState> emit) async {
+  Future selectRegion(
+      SelectRegionEvent event, Emitter<ProfileState> emit) async {
     try {
       emit(LoadingInitialState());
       await ProfileApi.saveRegion(regionUuid: event.val);
@@ -124,7 +130,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future<void> searchRegion(SearchRegionEvent event, Emitter<ProfileState> emit) async {
+  Future<void> searchRegion(
+      SearchRegionEvent event, Emitter<ProfileState> emit) async {
     emit(LoadingInitialState());
     final query = event.query.toLowerCase();
     if (allRegions.isEmpty) {
@@ -140,7 +147,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future<void> searchTimeZone(SearchTimeZoneEvent event, Emitter<ProfileState> emit) async {
+  Future<void> searchTimeZone(
+      SearchTimeZoneEvent event, Emitter<ProfileState> emit) async {
     emit(LoadingInitialState());
     final query = event.query.toLowerCase();
     if (allTimeZone.isEmpty) {
@@ -156,7 +164,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  void _fetchRegion(RegionInitialEvent event, Emitter<ProfileState> emit) async {
+  void _fetchRegion(
+      RegionInitialEvent event, Emitter<ProfileState> emit) async {
     try {
       emit(LoadingInitialState());
       allRegions = await ProfileApi.fetchRegion();
@@ -166,7 +175,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     }
   }
 
-  Future<void> _selectImage(SelectImageEvent event, Emitter<ProfileState> emit) async {
+  Future<void> _selectImage(
+      SelectImageEvent event, Emitter<ProfileState> emit) async {
     try {
       if (await _requestPermission()) {
         emit(ChangeImageState());
@@ -283,7 +293,8 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
       }
       return false;
     } else {
-      SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
+      SharedPreferences sharedPreferences =
+          await SharedPreferences.getInstance();
       bool firstClick = sharedPreferences.getBool('firstPermission') ?? true;
       await sharedPreferences.setBool('firstPermission', false);
       if (firstClick == false) {

lib/features/scene/bloc/scene_bloc/scene_bloc.dart

@@ -2,9 +2,12 @@ import 'dart:async';
 
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/auth/model/project_model.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/model/scenes_model.dart';
 import 'package:syncrow_app/services/api/scene_api.dart';
+import 'package:syncrow_app/utils/constants/temp_const.dart';
 
 part 'scene_state.dart';
 
@@ -23,9 +26,11 @@ class SceneBloc extends Bloc<SceneEvent, SceneState> {
     emit(SceneLoading());
 
     try {
+      Project? project = HomeCubit.getInstance().project;
+
       if (event.unitId.isNotEmpty) {
-        scenes = await SceneApi.getScenesByUnitId(
-            event.unitId, event.unit.community.uuid,
+        scenes = await SceneApi.getScenesByUnitId(event.unitId,
+            event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
             showInDevice: event.showInDevice);
         emit(SceneLoaded(scenes, automationList));
       } else {

lib/services/api/devices_api.dart

@@ -51,14 +51,11 @@ class DevicesAPI {
   static Future<Map<String, dynamic>> controlDevice(
       DeviceControlModel controlModel, String deviceId) async {
     try {
-      print('object-*/-*/-*/${controlModel.toJson()}');
       final response = await _httpService.post(
         path: ApiEndpoints.controlDevice.replaceAll('{deviceUuid}', deviceId),
         body: controlModel.toJson(),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          print('object-*/-*/-*/${json}');
-
           return json;
         },
       );
@@ -191,7 +188,6 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          print('object-*-*-*${json}');
           return json;
         });
     return response;
@@ -223,13 +219,14 @@ class DevicesAPI {
     required String communityUuid,
     required String spaceUuid,
     required String roomId,
+    required String projectId,
   }) async {
     try {
       final String path = ApiEndpoints.deviceByRoom
           .replaceAll('{communityUuid}', communityUuid)
           .replaceAll('{spaceUuid}', spaceUuid)
           .replaceAll('{subSpaceUuid}', roomId)
-          .replaceAll('{projectUuid}', TempConst.projectId);
+          .replaceAll('{projectUuid}', projectId);
 
       final response = await _httpService.get(
         path: path,
@@ -568,22 +565,18 @@ class DevicesAPI {
   static Future<List<DeviceModel>> getAllDevices({
     required String communityUuid,
     required String spaceUuid,
+    required String projectId,
   }) async {
-    print('communityUuid=$communityUuid');
-    print('spaceUuid=$spaceUuid');
-    print('projectUuid=${TempConst.projectId}');
-
     try {
       final String path = ApiEndpoints.getAllDevices
           .replaceAll('{communityUuid}', communityUuid)
           .replaceAll('{spaceUuid}', spaceUuid)
-          .replaceAll('{projectUuid}', TempConst.projectId);
+          .replaceAll('{projectUuid}', projectId);
 
       final response = await _httpService.get(
         path: path,
         showServerMessage: false,
         expectedResponseModel: (json) {
-          print('response-*/-*/$json');
           final data = json['data'];
 
           if (data == null || data.isEmpty) {

lib/services/api/home_creation_api.dart

@@ -145,12 +145,13 @@ class HomeCreation {
     required String communityId,
     required String spaceId,
     required Map<String, String> body,
+    required String projectId
   }) async {
     try {
       final fullPath = ApiEndpoints.addSubSpace
           .replaceAll('{communityUuid}', communityId)
           .replaceAll('{spaceUuid}', spaceId)
-          .replaceAll('{projectUuid}', TempConst.projectId);
+          .replaceAll('{projectUuid}', projectId);
       final response = await _httpService.post(
         path: fullPath,
         body: body,

lib/services/api/home_management_api.dart

@@ -27,7 +27,7 @@ class HomeManagementAPI {
     return list;
   }
 
-  static Future<List<DeviceModel>> fetchDevicesByUnitId() async {
+  static Future<List<DeviceModel>> fetchDevicesByUnitId(String projectUuid) async {
     List<DeviceModel> list = [];
 
     try {
@@ -40,7 +40,7 @@ class HomeManagementAPI {
       final path = ApiEndpoints.spaceDevices
           .replaceAll('{communityUuid}', communityUuid)
           .replaceAll('{spaceUuid}', spaceUuid)
-          .replaceAll('{projectUuid}', TempConst.projectId);
+          .replaceAll('{projectUuid}', projectUuid);
 
       await _httpService.get(
         path: path,
@@ -63,10 +63,11 @@ class HomeManagementAPI {
   }
 
   static Future<Map<String, dynamic>> assignDeviceToRoom(String communityId,
-      String spaceId, String subSpaceId, String deviceId) async {
+      String spaceId, String subSpaceId, String deviceId, String projectId) async {
     try {
       final response = await _httpService.post(
         path: ApiEndpoints.assignDeviceToRoom
+            .replaceAll('{projectUuid}', projectId)
             .replaceAll('{communityUuid}', communityId)
             .replaceAll('{spaceUuid}', spaceId)
             .replaceAll('{subSpaceUuid}', subSpaceId)
@@ -82,7 +83,7 @@ class HomeManagementAPI {
   }
 
   static Future<Map<String, dynamic>> unAssignDeviceToRoom(String communityId,
-      String spaceId, String subSpaceId, String deviceId) async {
+      String spaceId, String subSpaceId, String deviceId, String projectId) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.assignDeviceToRoom
@@ -90,7 +91,7 @@ class HomeManagementAPI {
             .replaceAll('{spaceUuid}', spaceId)
             .replaceAll('{subSpaceUuid}', subSpaceId)
             .replaceAll('{deviceUuid}', deviceId)
-            .replaceAll('{projectUuid}', TempConst.projectId),
+            .replaceAll('{projectUuid}', projectId),
         expectedResponseModel: (json) {
           return json;
         },

lib/services/api/scene_api.dart

@@ -50,14 +50,14 @@ class SceneApi {
   //get scene by unit id
 
   static Future<List<ScenesModel>> getScenesByUnitId(
-      String unitId, String communityId,
+      String unitId, String communityId, String projectId,
       {showInDevice = false}) async {
     try {
       final response = await _httpService.get(
         path: ApiEndpoints.getUnitScenes
             .replaceAll('{spaceUuid}', unitId)
             .replaceAll('{communityUuid}', communityId)
-            .replaceAll('{projectUuid}', TempConst.projectId),
+            .replaceAll('{projectUuid}', projectId),
         queryParameters: {'showInHomePage': showInDevice},
         showServerMessage: false,
         expectedResponseModel: (json) {

lib/services/api/spaces_api.dart

@@ -32,13 +32,13 @@ class SpacesAPI {
   }
 
   static Future<List<SubSpaceModel>> getSubSpaceBySpaceId(
-      String communityId, String spaceId) async {
+      String communityId, String spaceId, String projectId) async {
     try {
       // Construct the API path
       final path = ApiEndpoints.listSubspace
           .replaceFirst('{communityUuid}', communityId)
           .replaceFirst('{spaceUuid}', spaceId)
-          .replaceAll('{projectUuid}', TempConst.projectId);
+          .replaceAll('{projectUuid}', projectId);
 
       final response = await _httpService.get(
         path: path,
@@ -66,12 +66,12 @@ class SpacesAPI {
   //factory/reset/{deviceUuid}
 
   static Future<String> generateInvitationCode(
-      String unitId, String communityId) async {
+      String unitId, String communityId, String projectId) async {
     final response = await _httpService.post(
       path: ApiEndpoints.invitationCode
           .replaceAll('{unitUuid}', unitId)
           .replaceAll('{communityUuid}', communityId)
-          .replaceAll('{projectUuid}', TempConst.projectId),
+          .replaceAll('{projectUuid}', projectId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         if (json != null && json['data'] != null) {

lib/utils/constants/temp_const.dart

@@ -1,3 +1,5 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
 class TempConst {
-  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+  static String projectIdDev = dotenv.env['PROJECT_ID'] ?? '';
 }