refactor: extract device fetching logic into a separate method for improved readability

added client token login

.env.dev

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

.gitignore

@@ -42,3 +42,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/app/.cxx/

lib/features/auth/bloc/auth_cubit.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:syncrow_app/features/auth/model/login_with_email_model.dart';
 import 'package:syncrow_app/features/auth/model/signup_model.dart';
@@ -217,9 +218,22 @@ class AuthCubit extends Cubit<AuthState> {
   signUp() async {
     emit(AuthLoginLoading());
     final response;
+
+    final clientId = dotenv.env['CLIENT_ID'] ?? '';
+    final clientSecret = dotenv.env['CLIENT_SECRET'] ?? '';
+
     try {
       List<String> userFullName = fullName.split(' ');
+
+      final clientToken = await AuthenticationAPI.fetchClientToken(
+        clientId: clientId,
+        clientSecret: clientSecret,
+      );
+
+      final accessToken = clientToken['accessToken'];
+
       response = await AuthenticationAPI.signUp(
+        accessToken: accessToken,
         model: SignUpModel(
             hasAcceptedAppAgreement: true,
             email: email.toLowerCase(),

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

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
-import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
+import 'package:syncrow_app/features/devices/bloc/devices_cubit.dart';
 import 'package:syncrow_app/features/devices/view/widgets/all_devices.dart';
 import 'package:syncrow_app/features/devices/view/widgets/room_page.dart';
 import 'package:syncrow_app/features/devices/view/widgets/rooms_slider.dart';
@@ -15,7 +15,7 @@ import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/strings_manager.dart';
 
 class DevicesViewBody extends StatelessWidget {
-  const DevicesViewBody({Key? key}) : super(key: key);
+  const DevicesViewBody({super.key});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<HomeCubit, HomeState>(
@@ -80,10 +80,7 @@ class DevicesViewBody extends StatelessWidget {
             ),
           ],
         ),
-        SizedBox(
-          height: MediaQuery.of(context).size.height * 0.1,
-          child: const SceneView(pageType: true),
-        ),
+        const SceneView(pageType: true),
         const SizedBox(height: 20),
         const RoomsSlider(),
         const SizedBox(height: 10),

lib/features/devices/view/widgets/garage_door/garage_list.dart

@@ -8,8 +8,7 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class GarageList extends StatelessWidget {
-  const GarageList(
-      {super.key, required this.garageList, required this.allSwitches});
+  const GarageList({super.key, required this.garageList, required this.allSwitches});
 
   final List<GroupGarageModel> garageList;
   final bool allSwitches;
@@ -23,43 +22,42 @@ class GarageList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Garages'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
-                off: 'OFF',
-                on: 'ON',
+                off: 'Close',
+                on: 'Open',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<GarageDoorBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOnEvent(),
+                ),
+                secondAction: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                  GroupAllOffEvent(),
+                ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: garageList.length,
                 itemBuilder: (context, index) {
+                  final garageDoor = garageList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: garageList[index].deviceName),
+                      BodySmall(text: garageDoor.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
-                        off: 'OFF',
-                        on: 'ON',
-                        switchValue: garageList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<GarageDoorBloc>(context).add(
-                              ChangeFirstWizardSwitchStatusEvent(
-                                  value: garageList[index].firstSwitch,
-                                  deviceId: garageList[index].deviceId));
-                        },
+                        off: 'Close',
+                        on: 'Open',
+                        switchValue: garageDoor.firstSwitch,
+                        action: () => BlocProvider.of<GarageDoorBloc>(context).add(
+                          ChangeFirstWizardSwitchStatusEvent(
+                            value: garageDoor.firstSwitch,
+                            deviceId: garageDoor.deviceId,
+                          ),
+                        ),
                       ),
                     ],
                   );

lib/features/devices/view/widgets/water_heater/wh_list.dart

@@ -8,7 +8,11 @@ import 'package:syncrow_app/features/shared_widgets/devices_default_switch.dart'
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_small.dart';
 
 class WHList extends StatelessWidget {
-  const WHList({super.key, required this.whList, required this.allSwitches});
+  const WHList({
+    required this.whList,
+    required this.allSwitches,
+    super.key,
+  });
 
   final List<GroupWHModel> whList;
   final bool allSwitches;
@@ -22,43 +26,42 @@ class WHList extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
               const SizedBox(height: 10),
-              const BodySmall(text: 'All Lights'),
+              const BodySmall(text: 'All Water Heaters'),
               const SizedBox(height: 5),
               DevicesDefaultSwitch(
                 off: 'OFF',
                 on: 'ON',
                 switchValue: allSwitches,
-                action: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOnEvent());
-                },
-                secondAction: () {
-                  BlocProvider.of<WaterHeaterBloc>(context)
-                      .add(GroupAllOffEvent());
-                },
+                action: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOnEvent(),
+                    ),
+                secondAction: () => context.read<WaterHeaterBloc>().add(
+                      GroupAllOffEvent(),
+                    ),
               ),
               ListView.builder(
                 shrinkWrap: true,
                 physics: const NeverScrollableScrollPhysics(),
-                padding: const EdgeInsets.all(0),
+                padding: EdgeInsetsDirectional.zero,
                 itemCount: whList.length,
                 itemBuilder: (context, index) {
+                  final waterHeater = whList[index];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       const SizedBox(height: 10),
-                      BodySmall(text: whList[index].deviceName),
+                      BodySmall(text: waterHeater.deviceName),
                       const SizedBox(height: 5),
                       DevicesDefaultSwitch(
                         off: 'OFF',
                         on: 'ON',
-                        switchValue: whList[index].firstSwitch,
-                        action: () {
-                          BlocProvider.of<WaterHeaterBloc>(context).add(
+                        switchValue: waterHeater.firstSwitch,
+                        action: () => context.read<WaterHeaterBloc>().add(
                               ChangeFirstWizardSwitchStatusEvent(
-                                  value: whList[index].firstSwitch,
-                                  deviceId: whList[index].deviceId));
-                        },
+                                value: waterHeater.firstSwitch,
+                                deviceId: waterHeater.deviceId,
+                              ),
+                            ),
                       ),
                     ],
                   );

lib/features/scene/bloc/tab_change/tab_change_bloc.dart

@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_event.dart';
@@ -7,19 +5,31 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 
 class TabBarBloc extends Bloc<TabBarEvent, TabBarState> {
-  final DeviceManagerBloc deviceManagerBloc;
-  TabBarBloc(this.deviceManagerBloc) : super(const Initial()) {
-    on<TabChanged>(_handleTabChanged);
+  TabBarBloc(this.deviceManagerBloc) : super(const TabBarInitialState()) {
+    on<TabBarTabChangedEvent>(_onTabBarTabChangedEvent);
   }
 
-  FutureOr<void> _handleTabChanged(
-      TabChanged event, Emitter<TabBarState> emit) {
+  final DeviceManagerBloc deviceManagerBloc;
+
+  void _onTabBarTabChangedEvent(
+    TabBarTabChangedEvent event,
+    Emitter<TabBarState> emit,
+  ) {
+    _getDevices(event);
+
+    emit(
+      TabBarTabSelectedState(
+        roomId: event.roomId,
+        selectedTabIndex: event.selectedIndex,
+      ),
+    );
+  }
+
+  void _getDevices(TabBarTabChangedEvent event) {
     if (event.roomId == "-1") {
       deviceManagerBloc.add(FetchAllDevices());
     } else {
-      deviceManagerBloc.add(FetchDevicesByRoomId(event.roomId,event.unit));
+      deviceManagerBloc.add(FetchDevicesByRoomId(event.roomId, event.unit));
     }
-    emit(TabSelected(
-        roomId: event.roomId, selectedTabIndex: event.selectedIndex));
   }
 }

lib/features/scene/bloc/tab_change/tab_change_event.dart

@@ -4,10 +4,14 @@ abstract class TabBarEvent {
   const TabBarEvent();
 }
 
-class TabChanged extends TabBarEvent {
+class TabBarTabChangedEvent extends TabBarEvent {
+  const TabBarTabChangedEvent({
+    required this.selectedIndex,
+    required this.roomId,
+    required this.unit,
+  });
+
   final int selectedIndex;
   final String roomId;
   final SpaceModel unit;
-  const TabChanged(
-      {required this.selectedIndex, required this.roomId, required this.unit});
 }

lib/features/scene/bloc/tab_change/tab_change_state.dart

@@ -2,12 +2,16 @@ abstract class TabBarState {
   const TabBarState();
 }
 
-class Initial extends TabBarState {
-  const Initial();
+class TabBarInitialState extends TabBarState {
+  const TabBarInitialState();
 }
 
-class TabSelected extends TabBarState {
+class TabBarTabSelectedState extends TabBarState {
+  const TabBarTabSelectedState({
+    required this.roomId,
+    required this.selectedTabIndex,
+  });
+
   final int selectedTabIndex;
   final String roomId;
-  const TabSelected({required this.roomId, required this.selectedTabIndex});
 }

lib/features/scene/helper/scene_bloc_factory.dart

@@ -0,0 +1,48 @@
+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/scene/bloc/scene_bloc/scene_bloc.dart';
+import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
+
+abstract final class SceneBlocFactory {
+  static SceneBloc create({
+    required bool pageType,
+    required HomeCubit homeCubit,
+  }) {
+    final selectedSpace = homeCubit.selectedSpace;
+    final defaultSpace = SpaceModel(
+      id: '-1',
+      name: '',
+      community: Community(
+        uuid: '-1',
+        name: '',
+      ),
+    );
+
+    final spaceId = selectedSpace?.id ?? defaultSpace.id;
+    final space = selectedSpace ?? defaultSpace;
+    final communityUuid =
+        selectedSpace?.community.uuid ?? defaultSpace.community.uuid;
+
+    final sceneBloc = SceneBloc();
+
+    sceneBloc.add(
+      LoadScenes(
+        spaceId,
+        space,
+        showInDevice: pageType,
+      ),
+    );
+
+    if (!pageType) {
+      sceneBloc.add(
+        LoadAutomation(
+          spaceId,
+          communityUuid,
+        ),
+      );
+    }
+
+    return sceneBloc;
+  }
+}

lib/features/scene/view/scene_rooms_tabbar.dart

@@ -20,82 +20,69 @@ class SceneRoomsTabBarDevicesView extends StatefulWidget {
       _SceneRoomsTabBarDevicesViewState();
 }
 
-class _SceneRoomsTabBarDevicesViewState
-    extends State<SceneRoomsTabBarDevicesView>
+class _SceneRoomsTabBarDevicesViewState extends State<SceneRoomsTabBarDevicesView>
     with SingleTickerProviderStateMixin {
   late final TabController _tabController;
-  List<SubSpaceModel>? rooms = [];
   late final SpaceModel selectedSpace;
+  var rooms = <SubSpaceModel>[];
 
   @override
   void initState() {
     super.initState();
 
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      selectedSpace = HomeCubit.getInstance().selectedSpace!;
+    selectedSpace = HomeCubit.getInstance().selectedSpace!;
 
-      rooms = List.from(selectedSpace.subspaces ?? []);
+    rooms = List.from(selectedSpace.subspaces);
+    final defaultSubSpaceModel = SubSpaceModel(
+      name: 'All Devices',
+      devices: context.read<DevicesCubit>().allDevices,
+      id: '-1',
+    );
 
-      if (rooms != null && rooms!.isNotEmpty) {
-        if (rooms![0].id != '-1') {
-          rooms?.insert(
-            0,
-            SubSpaceModel(
-              name: 'All Devices',
-              devices: context.read<DevicesCubit>().allDevices,
-              id: '-1',
-            ),
-          );
-        }
-      } else {
-        rooms = [
-          SubSpaceModel(
-            name: 'All Devices',
-            devices: context.read<DevicesCubit>().allDevices,
-            id: '-1',
-          )
-        ];
+    if (rooms.isNotEmpty) {
+      final isFirstRoomIdValid = rooms[0].id != '-1';
+      if (isFirstRoomIdValid) {
+        rooms.insert(0, defaultSubSpaceModel);
       }
-
-      _tabController = TabController(length: rooms!.length, vsync: this);
-      _tabController.addListener(_handleTabSwitched);
-      setState(() {});
-    });
-  }
-
-  void _handleTabSwitched() {
-    if (_tabController.indexIsChanging) {
-      final value = _tabController.index;
-
-      /// select tab
-      context.read<TabBarBloc>().add(TabChanged(
-          selectedIndex: value,
-          roomId: rooms?[value].id ?? '',
-          unit: selectedSpace));
-      return;
+    } else {
+      rooms = [defaultSubSpaceModel];
     }
+
+    _tabController = TabController(length: rooms.length, vsync: this);
+    _tabController.addListener(_handleTabSwitched);
   }
 
   @override
   void dispose() {
     super.dispose();
-    _tabController.dispose();
     _tabController.removeListener(() {});
+    _tabController.dispose();
+  }
+
+  void _handleTabSwitched() {
+    if (_tabController.indexIsChanging) {
+      final index = _tabController.index;
+
+      context.read<TabBarBloc>().add(
+            TabBarTabChangedEvent(
+              selectedIndex: index,
+              roomId: rooms[index].id ?? '',
+              unit: selectedSpace,
+            ),
+          );
+      return;
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return DefaultScaffold(
-      title: StringsManager.createScene,
-      padding: EdgeInsets.zero,
+      padding: EdgeInsetsDirectional.zero,
       leading: IconButton(
-        onPressed: () {
-          navigateToRoute(context, Routes.sceneTasksRoute);
-        },
-        icon: const Icon(
-          Icons.arrow_back_ios,
-        ),
+        onPressed: () => navigateToRoute(context, Routes.sceneTasksRoute),
+        icon: const Icon(Icons.arrow_back_ios),
       ),
+      title: StringsManager.createScene,
       child: SceneDevicesBody(tabController: _tabController, rooms: rooms),
     );
   }

lib/features/scene/view/scene_view.dart

@@ -1,108 +1,70 @@
 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/community_model.dart';
 import 'package:syncrow_app/features/app_layout/model/space_model.dart';
 import 'package:syncrow_app/features/devices/view/widgets/scene_listview.dart';
 import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
 import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
 import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart';
+import 'package:syncrow_app/features/scene/helper/scene_bloc_factory.dart';
+import 'package:syncrow_app/features/scene/widgets/empty_devices_widget.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_grid_view.dart';
 import 'package:syncrow_app/features/scene/widgets/scene_view_widget/scene_header.dart';
-import 'package:syncrow_app/features/shared_widgets/create_unit.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
 import 'package:syncrow_app/utils/context_extension.dart';
 import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
 
 class SceneView extends StatelessWidget {
+  const SceneView({
+    this.pageType = false,
+    super.key,
+  });
+
   final bool pageType;
-  const SceneView({super.key, this.pageType = false});
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (BuildContext context) {
-        if (pageType) {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType));
-        } else {
-          return SceneBloc()
-            ..add(LoadScenes(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace ??
-                    SpaceModel(
-                        id: '-1',
-                        name: '',
-                        community: Community(
-                          uuid: '-1',
-                          name: '',
-                        )),
-                showInDevice: pageType))
-            ..add(LoadAutomation(
-                HomeCubit.getInstance().selectedSpace?.id ?? '',
-                HomeCubit.getInstance().selectedSpace?.community.uuid ?? ''));
-        }
-      },
+      create: (context) => SceneBlocFactory.create(
+        pageType: pageType,
+        homeCubit: HomeCubit.getInstance(),
+      ),
       child: BlocBuilder<CreateSceneBloc, CreateSceneState>(
         builder: (context, state) {
+          final selectedSpace = HomeCubit.getInstance().selectedSpace;
           if (state is DeleteSceneSuccess) {
-            if (state.success) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!.community.uuid));
-            }
+            if (state.success) _loadScenesAndAutomations(context, selectedSpace);
           }
           if (state is CreateSceneWithTasks) {
-            if (state.success == true) {
-              BlocProvider.of<SceneBloc>(context).add(LoadScenes(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!,
-                  showInDevice: pageType));
-              BlocProvider.of<SceneBloc>(context).add(LoadAutomation(
-                  HomeCubit.getInstance().selectedSpace!.id,
-                  HomeCubit.getInstance().selectedSpace!.community.uuid));
-              context
-                  .read<SmartSceneSelectBloc>()
-                  .add(const SmartSceneClearEvent());
+            if (state.success) {
+              _loadScenesAndAutomations(context, selectedSpace);
+              context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent());
             }
           }
           return BlocListener<SceneBloc, SceneState>(
             listener: (context, state) {
               if (state is SceneTriggerSuccess) {
                 context.showCustomSnackbar(
-                    message:
-                        'Scene ${state.sceneName} triggered successfully!');
+                  message: 'Scene ${state.sceneName} triggered successfully!',
+                );
               }
             },
-            child: HomeCubit.getInstance().spaces.isEmpty 
-                ? const CreateUnitWidget()
+            child: HomeCubit.getInstance().spaces.isEmpty
+                ? const EmptyDevicesWidget()
                 : Column(
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      if (pageType == false) const SceneHeader(),
-                      if (pageType == false) const SizedBox(height: 8),
+                      if (!pageType) ...[
+                        const SceneHeader(),
+                        const SizedBox(height: 8),
+                      ],
                       BlocBuilder<SceneBloc, SceneState>(
                         builder: (context, state) {
                           if (state is SceneLoading) {
-                            return const Center(
-                              child: CircularProgressIndicator(),
-                            );
+                            return const AppLoadingIndicator();
                           }
                           if (state is SceneError) {
                             return Center(
@@ -112,90 +74,83 @@ class SceneView extends StatelessWidget {
                           if (state is SceneLoaded) {
                             final scenes = state.scenes;
                             final automationList = state.automationList;
+                            if (scenes.isEmpty) return const EmptyDevicesWidget();
 
-                            return pageType
-                                ? Expanded(
-                                    child: SceneListview(
-                                    scenes: scenes,
-                                    loadingSceneId: state.loadingSceneId,
-                                  ))
-                                : Expanded(
-                                    child: ListView(
+                            if (pageType) {
+                              return SizedBox(
+                                height: context.height * 0.1,
+                                child: SceneListview(
+                                  scenes: scenes,
+                                  loadingSceneId: state.loadingSceneId,
+                                ),
+                              );
+                            }
+
+                            return Theme(
+                              data: Theme.of(context).copyWith(
+                                dividerColor: Colors.transparent,
+                              ),
+                              child: Expanded(
+                                child: ListView(
+                                  children: [
+                                    ExpansionTile(
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      title: const BodyMedium(
+                                        text: 'Tap to run routines',
+                                      ),
                                       children: [
-                                        Theme(
-                                          data: ThemeData().copyWith(
-                                              dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            tilePadding:
-                                                const EdgeInsets.symmetric(
-                                                    horizontal: 6),
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            title: const BodyMedium(
-                                                text: 'Tap to run routines'),
-                                            children: [
-                                              scenes.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: scenes,
-                                                      loadingSceneId:
-                                                          state.loadingSceneId,
-                                                      disablePlayButton: false,
-                                                      loadingStates: state
-                                                          .loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text:
-                                                            'No scenes have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
-                                            ],
+                                        if (scenes.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: scenes,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: false,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text: 'No scenes have been added yet',
+                                            ),
                                           ),
-                                        ),
-                                        Theme(
-                                          data: ThemeData().copyWith(
-                                              dividerColor: Colors.transparent),
-                                          child: ExpansionTile(
-                                            initiallyExpanded: true,
-                                            iconColor: ColorsManager.grayColor,
-                                            tilePadding:
-                                                const EdgeInsets.symmetric(
-                                                    horizontal: 6),
-                                            title: const BodyMedium(
-                                                text: 'Automation'),
-                                            children: [
-                                              automationList.isNotEmpty
-                                                  ? SceneGrid(
-                                                      scenes: automationList,
-                                                      loadingSceneId:
-                                                          state.loadingSceneId,
-                                                      disablePlayButton: true,
-                                                      loadingStates: state
-                                                          .loadingStates, // Add this line
-                                                    )
-                                                  : const Center(
-                                                      child: BodyMedium(
-                                                        text:
-                                                            'No automations have been added yet',
-                                                      ),
-                                                    ),
-                                              const SizedBox(
-                                                height: 10,
-                                              ),
-                                            ],
-                                          ),
-                                        ),
-                                        const SizedBox(
-                                          height: 15,
-                                        ),
+                                        const SizedBox(height: 10),
                                       ],
                                     ),
-                                  );
+                                    ExpansionTile(
+                                      initiallyExpanded: true,
+                                      iconColor: ColorsManager.grayColor,
+                                      tilePadding: const EdgeInsets.symmetric(
+                                        horizontal: 6,
+                                      ),
+                                      title: const BodyMedium(text: 'Automation'),
+                                      children: [
+                                        if (automationList.isNotEmpty)
+                                          SceneGrid(
+                                            scenes: automationList,
+                                            loadingSceneId: state.loadingSceneId,
+                                            disablePlayButton: true,
+                                            loadingStates: state.loadingStates,
+                                          )
+                                        else
+                                          const Center(
+                                            child: BodyMedium(
+                                              text:
+                                                  'No automations have been added yet',
+                                            ),
+                                          ),
+                                        const SizedBox(height: 10),
+                                      ],
+                                    ),
+                                    const SizedBox(height: 15),
+                                  ],
+                                ),
+                              ),
+                            );
                           }
-                          return const SizedBox();
+                          return const SizedBox.shrink();
                         },
                       ),
                     ],
@@ -205,4 +160,21 @@ class SceneView extends StatelessWidget {
       ),
     );
   }
+
+  void _loadScenesAndAutomations(BuildContext context, SpaceModel? selectedSpace) {
+    BlocProvider.of<SceneBloc>(context)
+      ..add(
+        LoadScenes(
+          selectedSpace!.id,
+          selectedSpace,
+          showInDevice: pageType,
+        ),
+      )
+      ..add(
+        LoadAutomation(
+          selectedSpace.id,
+          selectedSpace.community.uuid,
+        ),
+      );
+  }
 }

lib/features/scene/widgets/empty_devices_widget.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class EmptyDevicesWidget extends StatelessWidget {
+  const EmptyDevicesWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 48),
+      child: Text(
+        "No routines.\nEnable 'Show on Home Screen' to add routines",
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          color: ColorsManager.grayColor,
+          fontWeight: FontWeight.w400,
+          fontSize: 12,
+        ),
+      ),
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_body.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_state.dart';
 import 'package:syncrow_app/features/devices/model/subspace_model.dart';
@@ -8,60 +7,44 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_state.dart';
 import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
 import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
-import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
-import 'package:syncrow_app/features/shared_widgets/default_container.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
-import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
-import 'package:syncrow_app/navigation/routing_constants.dart';
-import 'package:syncrow_app/utils/context_extension.dart';
-import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_devices/scene_devices_list.dart';
+import 'package:syncrow_app/features/shared_widgets/app_loading_indicator.dart';
 
 class SceneDevicesBody extends StatelessWidget {
   const SceneDevicesBody({
-    super.key,
-    required TabController tabController,
+    required this.tabController,
     required this.rooms,
-  }) : _tabController = tabController;
+    super.key,
+  });
 
-  final TabController _tabController;
-  final List<SubSpaceModel>? rooms;
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
 
   @override
   Widget build(BuildContext context) {
-    final isAutomationDeviceStatus =
-        ((ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?)?.sceneType ==
-            CreateSceneEnum.deviceStatusChanges.name);
     return BlocBuilder<TabBarBloc, TabBarState>(
-      builder: (context, tabState) {
+      builder: (context, state) {
         return Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            TabBar(
-              controller: _tabController,
-              dividerColor: Colors.transparent,
-              indicatorColor: Colors.transparent,
-              tabs: [
-                ...rooms!.map((e) => Tab(
-                      child: BodyLarge(
-                        text: e.name ?? '',
-                        textAlign: TextAlign.start,
-                        style: context.bodyLarge.copyWith(
-                          color: (tabState is TabSelected) && tabState.roomId == e.id
-                              ? ColorsManager.textPrimaryColor
-                              : ColorsManager.textPrimaryColor.withOpacity(0.2),
-                        ),
-                      ),
-                    )),
-              ],
-              isScrollable: true,
-              tabAlignment: TabAlignment.start,
+            SceneDevicesBodyTabBar(
+              tabController: tabController,
+              rooms: rooms,
+              selectedRoomId: state is TabBarTabSelectedState ? state.roomId : '-1',
             ),
             Expanded(
               child: TabBarView(
-                controller: _tabController,
                 physics: const NeverScrollableScrollPhysics(),
-                children:
-                    rooms!.map((e) => _buildRoomTab(e, context, isAutomationDeviceStatus)).toList(),
+                controller: tabController,
+                children: rooms
+                    .map(
+                      (room) => _buildRoomTab(
+                        room,
+                        _isAutomationDeviceStatus(context),
+                      ),
+                    )
+                    .toList(),
               ),
             ),
           ],
@@ -70,52 +53,46 @@ class SceneDevicesBody extends StatelessWidget {
     );
   }
 
-  Widget _buildRoomTab(SubSpaceModel room, BuildContext context, bool isAutomationDeviceStatus) {
+  bool _isAutomationDeviceStatus(BuildContext context) {
+    final routeArguments =
+        ModalRoute.of(context)?.settings.arguments as SceneSettingsRouteArguments?;
+    final deviceStatusChangesScene = CreateSceneEnum.deviceStatusChanges.name;
+    final sceneType = routeArguments?.sceneType;
+
+    return sceneType == deviceStatusChangesScene;
+  }
+
+  Widget _buildRoomTab(
+    SubSpaceModel room,
+    bool isAutomationDeviceStatus,
+  ) {
     return BlocBuilder<DeviceManagerBloc, DeviceManagerState>(
       builder: (context, state) {
-        if (state.loading && state.devices == null) {
-          return const Center(child: CircularProgressIndicator());
-        } else if (state.devices != null && state.devices!.isNotEmpty) {
-          return ListView.builder(
-            itemCount: state.devices!.length,
-            itemBuilder: (context, index) {
-              final device = state.devices![index];
-              return DefaultContainer(
-                child: SceneListTile(
-                  minLeadingWidth: 40,
-                  leadingWidget: SvgPicture.asset(device.icon ?? ''),
-                  titleWidget: BodyMedium(
-                    text: device.name ?? '',
-                    style: context.titleSmall.copyWith(
-                      color: ColorsManager.secondaryTextColor,
-                      fontWeight: FontWeight.w400,
-                      fontSize: 20,
-                    ),
-                  ),
-                  trailingWidget: const Icon(
-                    Icons.arrow_forward_ios_rounded,
-                    color: ColorsManager.greyColor,
-                    size: 16,
-                  ),
-                  onPressed: () {
-                    Navigator.pushNamed(
-                      context,
-                      Routes.deviceFunctionsRoute,
-                      arguments: {
-                        "device": device,
-                        "isAutomationDeviceStatus": isAutomationDeviceStatus
-                      },
-                    );
-                  },
-                ),
-              );
-            },
-          );
-        } else if (state.error != null) {
-          return const Center(child: Text('Something went wrong'));
-        } else {
-          return const SizedBox();
-        }
+        final isLoading = state.loading && state.devices == null;
+        final hasData =
+            state.devices != null && (state.devices?.isNotEmpty ?? false);
+        final hasError = state.error != null;
+
+        final widgets = <bool, Widget>{
+          isLoading: const AppLoadingIndicator(),
+          hasError: Center(child: Text('${state.error}')),
+          hasData: SceneDevicesList(
+            devices: state.devices ?? [],
+            isAutomationDeviceStatus: isAutomationDeviceStatus,
+          ),
+        };
+
+        final invalidWidgetEntry = MapEntry(
+          true,
+          Center(child: Text('This subspace has no devices')),
+        );
+
+        final validWidgetEntry = widgets.entries.firstWhere(
+          (entry) => entry.key == true,
+          orElse: () => invalidWidgetEntry,
+        );
+
+        return validWidgetEntry.value;
       },
     );
   }

lib/features/scene/widgets/scene_devices/scene_devices_body_tab_bar.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_app/features/devices/model/subspace_model.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_large.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesBodyTabBar extends StatelessWidget {
+  const SceneDevicesBodyTabBar({
+    required this.tabController,
+    required this.rooms,
+    required this.selectedRoomId,
+    super.key,
+  });
+
+  final String selectedRoomId;
+
+  final TabController tabController;
+  final List<SubSpaceModel> rooms;
+
+  @override
+  Widget build(BuildContext context) {
+    return TabBar(
+      controller: tabController,
+      dividerColor: Colors.transparent,
+      indicatorColor: Colors.transparent,
+      isScrollable: true,
+      tabAlignment: TabAlignment.start,
+      tabs: rooms.map((e) {
+        final isSelected = selectedRoomId == e.id;
+        return Tab(
+          child: BodyLarge(
+            text: e.name ?? '',
+            textAlign: TextAlign.start,
+            style: context.bodyLarge.copyWith(
+              color: isSelected
+                  ? ColorsManager.textPrimaryColor
+                  : ColorsManager.textPrimaryColor.withValues(
+                      alpha: 0.2,
+                    ),
+            ),
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/features/scene/widgets/scene_devices/scene_devices_list.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_app/features/devices/model/device_model.dart';
+import 'package:syncrow_app/features/scene/widgets/scene_list_tile.dart';
+import 'package:syncrow_app/features/shared_widgets/default_container.dart';
+import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
+import 'package:syncrow_app/navigation/routing_constants.dart';
+import 'package:syncrow_app/utils/context_extension.dart';
+import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
+
+class SceneDevicesList extends StatelessWidget {
+  const SceneDevicesList({
+    required this.isAutomationDeviceStatus,
+    required this.devices,
+    super.key,
+  });
+  final List<DeviceModel> devices;
+  final bool isAutomationDeviceStatus;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: devices.length,
+      itemBuilder: (context, index) => _buildDeviceTile(context, devices[index]),
+    );
+  }
+
+  Widget _buildDeviceTile(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    return DefaultContainer(
+      child: SceneListTile(
+        minLeadingWidth: 40,
+        leadingWidget: SvgPicture.asset(device.icon ?? ''),
+        titleWidget: BodyMedium(
+          text: device.name ?? '',
+          style: context.titleSmall.copyWith(
+            color: ColorsManager.secondaryTextColor,
+            fontWeight: FontWeight.w400,
+            fontSize: 20,
+          ),
+        ),
+        trailingWidget: const Icon(
+          Icons.arrow_forward_ios_rounded,
+          color: ColorsManager.greyColor,
+          size: 16,
+        ),
+        onPressed: () => _navigateToDeviceFunctions(context, device),
+      ),
+    );
+  }
+
+  void _navigateToDeviceFunctions(
+    BuildContext context,
+    DeviceModel device,
+  ) {
+    Navigator.of(context).pushNamed(
+      Routes.deviceFunctionsRoute,
+      arguments: {
+        "device": device,
+        "isAutomationDeviceStatus": isAutomationDeviceStatus,
+      },
+    );
+  }
+}

lib/features/shared_widgets/app_loading_indicator.dart

@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class AppLoadingIndicator extends StatelessWidget {
+  const AppLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: CircularProgressIndicator.adaptive(),
+    );
+  }
+}

lib/navigation/router.dart

@@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.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/app_layout/view/app_layout.dart';
-import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/login_view.dart';
+import 'package:syncrow_app/features/auth/view/otp_view.dart';
 import 'package:syncrow_app/features/auth/view/sign_up_view.dart';
 import 'package:syncrow_app/features/dashboard/view/dashboard_view.dart';
 import 'package:syncrow_app/features/devices/bloc/device_manager_bloc/device_manager_bloc.dart';
@@ -17,11 +17,12 @@ import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_bloc.dart'
 import 'package:syncrow_app/features/scene/bloc/tab_change/tab_change_event.dart';
 import 'package:syncrow_app/features/scene/view/device_functions_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_auto_settings.dart';
-import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_rooms_tabbar.dart';
+import 'package:syncrow_app/features/scene/view/scene_tasks_view.dart';
 import 'package:syncrow_app/features/scene/view/scene_view.dart';
 import 'package:syncrow_app/features/scene/view/smart_automation_select_route.dart';
 import 'package:syncrow_app/features/splash/view/splash_view.dart';
+
 import 'routing_constants.dart';
 
 class Router {
@@ -88,7 +89,7 @@ class Router {
                     BlocProvider(
                       create: (BuildContext context) =>
                           TabBarBloc(context.read<DeviceManagerBloc>())
-                            ..add(TabChanged(
+                            ..add(TabBarTabChangedEvent(
                                 selectedIndex: 0,
                                 roomId: '-1',
                                 unit: SpaceModel(

lib/services/api/api_links_endpoints.dart

@@ -11,7 +11,7 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String forgetPassword = '/authentication/user/forget-password';
-
+  static const String clientLogin = 'client/token';
 ////////////////////////////////////// Spaces ///////////////////////////////////////
 
   ///Community Module
@@ -111,9 +111,9 @@ abstract class ApiEndpoints {
 //POST
   static const String addDeviceToRoom = '/device/room';
   static const String addDeviceToGroup = '/device/group';
-  static const String controlDevice = '/device/{deviceUuid}/control';
+  static const String controlDevice = '/devices/{deviceUuid}/command';
   static const String firmwareDevice =
-      '/device/{deviceUuid}/firmware/{firmwareVersion}';
+      '/devices/{deviceUuid}/firmware/{firmwareVersion}';
   static const String getDevicesByUserId = '/device/user/{userId}';
   static const String getDevicesByUnitId = '/device/unit/{unitUuid}';
   static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
@@ -121,13 +121,13 @@ abstract class ApiEndpoints {
 //GET
   static const String deviceByRoom =
       '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces/{subSpaceUuid}/devices';
-  static const String deviceByUuid = '/device/{deviceUuid}';
-  static const String deviceFunctions = '/device/{deviceUuid}/functions';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceByUuid = '/devices/{deviceUuid}';
+  static const String deviceFunctions = '/devices/{deviceUuid}/functions';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
   static const String deviceFunctionsStatus =
-      '/device/{deviceUuid}/functions/status';
+      '/devices/{deviceUuid}/functions/status';
   static const String powerClamp =
-      '/device/{powerClampUuid}/power-clamp/status';
+      '/devices/{deviceUuid}/functions/status';
 
   ///Device Permission Module
 //POST
@@ -153,7 +153,8 @@ abstract class ApiEndpoints {
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String getIconScene = '/scene/icon';
 
-  static const String getUnitAutomation = '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
+  static const String getUnitAutomation =
+      '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
 
   static const String getAutomationDetails =
       '/projects/{projectId}/automations/{automationId}';
@@ -161,7 +162,8 @@ abstract class ApiEndpoints {
   /// PUT
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String updateAutomation = '/projects/{projectId}/automations/{automationId}';
+  static const String updateAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   static const String updateAutomationStatus =
       '/projects/{projectId}/automations/{automationId}';
@@ -169,7 +171,8 @@ abstract class ApiEndpoints {
   /// DELETE
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String deleteAutomation = '/projects/{projectId}/automations/{automationId}';
+  static const String deleteAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   //////////////////////Door Lock //////////////////////
   //online
@@ -213,18 +216,18 @@ abstract class ApiEndpoints {
   static const String changeSchedule = '/schedule/enable/{deviceUuid}';
   static const String deleteSchedule = '/schedule/{deviceUuid}/{scheduleId}';
   static const String reportLogs =
-      '/device/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
-  static const String controlBatch = '/device/control/batch';
-  static const String statusBatch = '/device/status/batch';
-  static const String deviceScene = '/device/{deviceUuid}/scenes';
+      '/devices/report-logs/{deviceUuid}?code={code}&startTime={startTime}&endTime={endTime}';
+  static const String controlBatch = '/devices/batch';
+  static const String statusBatch = '/devices/batch';
+  static const String deviceScene = '/devices/{deviceUuid}/scenes';
 
   static const String fourSceneByName =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
 
   static const String resetDevice = '/factory/reset/{deviceUuid}';
   static const String unAssignScenesDevice =
-      '/device/{deviceUuid}/scenes?switchName={switchName}';
-  static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
+      '/devices/{deviceUuid}/scenes?switchName={switchName}';
+  static const String getDeviceLogs = '/devices/report-logs/{uuid}?code={code}';
   static const String terms = '/terms';
   static const String policy = '/policy';
   static const String getPermission = '/permission/{roleUuid}';

lib/services/api/authentication_api.dart

@@ -25,11 +25,15 @@ class AuthenticationAPI {
     return response;
   }
 
-  static Future<bool> signUp({required SignUpModel model}) async {
+  static Future<bool> signUp({
+    required SignUpModel model,
+    required String accessToken,
+  }) async {
     final response = await HTTPService().post(
         path: ApiEndpoints.signUp,
         body: model.toJson(),
         showServerMessage: false,
+        accessToken: accessToken,
         expectedResponseModel: (json) => json['statusCode'] == 201);
     return response;
   }
@@ -63,4 +67,20 @@ class AuthenticationAPI {
         expectedResponseModel: (json) => json['data']);
     return response;
   }
+
+  static Future<Map<String, dynamic>> fetchClientToken({
+    required String clientId,
+    required String clientSecret,
+  }) async {
+    final response = await HTTPService().post(
+      path: ApiEndpoints.clientLogin,
+      body: {
+        'clientId': clientId,
+        'clientSecret': clientSecret,
+      },
+      showServerMessage: false,
+      expectedResponseModel: (json) => json['data'],
+    );
+    return response;
+  }
 }

lib/services/api/devices_api.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:developer';
 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';
@@ -8,7 +7,6 @@ import 'package:syncrow_app/features/devices/model/device_report_model.dart';
 import 'package:syncrow_app/features/devices/model/function_model.dart';
 import 'package:syncrow_app/services/api/api_links_endpoints.dart';
 import 'package:syncrow_app/services/api/http_service.dart';
-import 'package:syncrow_app/utils/constants/temp_const.dart';
 import '../../features/devices/model/create_temporary_password_model.dart';
 
 class DevicesAPI {
@@ -39,7 +37,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         body: {"deviceName": deviceName},
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         },
       );
       return response;
@@ -92,7 +90,7 @@ class DevicesAPI {
           .replaceAll('{deviceUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return json;
+        return json['data'];
       },
     );
     return response;
@@ -101,7 +99,7 @@ class DevicesAPI {
   static Future<Map<String, dynamic>> getPowerClampStatus(
       String deviceId) async {
     final response = await _httpService.get(
-      path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+      path: ApiEndpoints.deviceFunctionsStatus.replaceAll('{powerClampUuid}', deviceId),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return json;
@@ -132,7 +130,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceFunctions.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          final functions = FunctionModel.fromJson(json);
+          final functions = FunctionModel.fromJson(json['data']);
           return functions;
         });
     return response;
@@ -188,7 +186,7 @@ class DevicesAPI {
         path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          return json;
+          return json['data'];
         });
     return response;
   }
@@ -264,7 +262,7 @@ class DevicesAPI {
         if (json == null || json.isEmpty || json == []) {
           return devices;
         }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
           devices.add(DeviceModel.fromJson(device));
         }
         return devices;
@@ -491,7 +489,12 @@ class DevicesAPI {
   }) async {
     final response = await _httpService.post(
       path: ApiEndpoints.controlBatch,
-      body: {"devicesUuid": devicesUuid, "code": code, "value": value},
+      body: {
+        "devicesUuid": devicesUuid,
+        "code": code,
+        "value": value,
+        "operationType": 'COMMAND',
+      },
       showServerMessage: true,
       expectedResponseModel: (json) {
         return json;

lib/services/api/home_management_api.dart

@@ -34,7 +34,7 @@ class HomeManagementAPI {
         path: ApiEndpoints.devices.replaceAll("{projectUuid}", projectUuid),
         showServerMessage: false,
         expectedResponseModel: (json) {
-          json.forEach((value) {
+          json['data'].forEach((value) {
             list.add(DeviceModel.fromJson(value));
           });
         });

lib/services/api/http_service.dart

@@ -48,13 +48,26 @@ class HTTPService {
       Options? options,
       dynamic body,
       bool showServerMessage = true,
+      String? accessToken,
       required T Function(dynamic) expectedResponseModel}) async {
     try {
+      final authOptions = options ??
+          Options(
+            headers: accessToken != null
+                ? {
+                    'Authorization': 'Bearer $accessToken',
+                    'Content-Type': 'application/json',
+                  }
+                : {
+                    'Content-Type': 'application/json',
+                  },
+          );
+
       final response = await client.post(
         path,
         data: body,
         queryParameters: queryParameters,
-        options: options,
+        options: authOptions,
       );
       return expectedResponseModel(response.data);
     } catch (error) {