Remove unused parameters from CreateSubSpaceDialog constructor

lib/common/widgets/empty_search_result_widget.dart

@@ -1,26 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class EmptySearchResultWidget extends StatelessWidget {
-  const EmptySearchResultWidget({
-    this.message = 'No results found',
-    super.key,
-  });
-
-  final String message;
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Text(
-        message,
-        textAlign: TextAlign.center,
-        style: context.textTheme.bodySmall?.copyWith(
-          color: ColorsManager.lightGreyColor,
-          fontWeight: FontWeight.w400,
-        ),
-      ),
-    );
-  }
-}

lib/common/widgets/sidebar_communities_list.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SidebarCommunitiesList extends StatelessWidget {
-  const SidebarCommunitiesList({
-    required this.communities,
-    required this.itemBuilder,
-    required this.scrollController,
-    required this.onScrollToEnd,
-    super.key,
-  });
-
-  final List<CommunityModel> communities;
-  final Widget Function(BuildContext context, int index) itemBuilder;
-  final ScrollController scrollController;
-  final void Function() onScrollToEnd;
-
-  bool _onNotification(ScrollEndNotification notification) {
-    final hasReachedEnd = notification.metrics.extentAfter == 0;
-    if (hasReachedEnd) {
-      onScrollToEnd.call();
-      return true;
-    }
-
-    return false;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      scrollDirection: Axis.horizontal,
-      child: SizedBox(
-        width: context.screenWidth * 0.5,
-        child: Scrollbar(
-          scrollbarOrientation: ScrollbarOrientation.left,
-          thumbVisibility: true,
-          controller: scrollController,
-          child: NotificationListener<ScrollEndNotification>(
-            onNotification: _onNotification,
-            child: ListView.builder(
-              shrinkWrap: true,
-              padding: const EdgeInsetsDirectional.only(start: 16),
-              itemCount: communities.length,
-              controller: scrollController,
-              itemBuilder: itemBuilder,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/routines/widgets/dragable_card.dart

@@ -225,7 +225,7 @@ class DraggableCard extends StatelessWidget {
     if (function.functionCode == 'temp_set' || function.functionCode == 'temp_current') {
       return '${(function.value / 10).toStringAsFixed(0)}°C';
     } else if (function.functionCode.contains('countdown')) {
-      final seconds = function.value?.toInt() ?? 0;
+      final seconds = function.value.toInt();
       if (seconds >= 3600) {
         final hours = (seconds / 3600).floor();
         final remainingMinutes = ((seconds % 3600) / 60).floor();

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

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
@@ -11,6 +9,8 @@ import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class ACHelper {
   static Future<Map<String, dynamic>?> showACFunctionsDialog({
@@ -74,8 +74,10 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected: (functionCode, operationName) =>
+                                onFunctionSelected:
-                                    context.read<FunctionBloc>().add(SelectFunction(
+                                    (functionCode, operationName) => context
+                                        .read<FunctionBloc>()
+                                        .add(SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
                                         )),
@@ -189,9 +191,8 @@ class ACHelper {
     required String operationName,
     bool? removeComparators,
   }) {
-    final initialVal = selectedFunction == 'temp_set' ? 200 : -100;
     if (selectedFunction == 'temp_set' || selectedFunction == 'temp_current') {
-      final initialValue = selectedFunctionData?.value ?? initialVal;
+      final initialValue = selectedFunctionData?.value ?? 250;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -204,7 +205,8 @@ class ACHelper {
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -285,9 +287,7 @@ class ACHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? selectCode == 'temp_set'
+                  value: selectedFunctionData?.value,
-                      ? 200
-                      : -100,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
@@ -302,7 +302,8 @@ class ACHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -316,7 +317,6 @@ class ACHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
-    final initialVal = selectCode == 'temp_set' ? 200 : -100;
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
       decoration: BoxDecoration(
@@ -324,7 +324,7 @@ class ACHelper {
         borderRadius: BorderRadius.circular(10),
       ),
       child: Text(
-        '${(initialValue ?? initialVal) / 10}°C',
+        '${(initialValue ?? 200) / 10}°C',
         style: context.textTheme.headlineMedium!.copyWith(
           color: ColorsManager.primaryColorWithOpacity,
         ),
@@ -397,7 +397,9 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -413,7 +415,8 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

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

@@ -46,7 +46,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
                 functionCode: selectedFunction,
                 operationName: operationName,
                 condition: condition,
-                value: selectedFunctionData.value ?? 0,
+                value: selectedFunctionData.value,
               ),
             ),
           ),

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

@@ -164,7 +164,7 @@ class OneGangSwitchHelper {
     required bool removeComparetors,
   }) {
     if (selectedFunction == 'countdown_1') {
-      final initialValue = selectedFunctionData?.value ?? 0;
+      final initialValue = selectedFunctionData?.value ?? 200;
       return _buildCountDownSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class OneGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
+                  value: selectedFunctionData?.value,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

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

@@ -170,7 +170,7 @@ class ThreeGangSwitchHelper {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2' ||
         selectedFunction == 'countdown_3') {
-      final initialValue = selectedFunctionData?.value ?? 0;
+      final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -251,7 +251,7 @@ class ThreeGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
+                  value: selectedFunctionData?.value,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

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

@@ -169,7 +169,7 @@ class TwoGangSwitchHelper {
   }) {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2') {
-      final initialValue = selectedFunctionData?.value ?? 0;
+      final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class TwoGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0,
+                  value: selectedFunctionData?.value,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),

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

@@ -36,7 +36,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
         dialogType: dialogType,
         sliderRange: sliderRange,
         displayedValue: getDisplayText,
-        initialValue: functionData.value ?? 0.0,
+        initialValue: functionData.value ?? 250,
         onConditionChanged: (condition) => context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
@@ -44,7 +44,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
                   condition: condition,
-                  value: functionData.value ?? 0,
+                  value: functionData.value,
                 ),
               ),
             ),
@@ -87,7 +87,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
     final intValue = int.tryParse('${functionData.value ?? ''}');
     return switch (functionData.functionCode) {
       'presence_time' => '${intValue ?? '0'}',
-      'dis_current' => '${intValue ?? '0'}',
+      'dis_current' => '${intValue ?? '250'}',
       'illuminance_value' => '${intValue ?? '0'}',
       _ => '$intValue',
     };

lib/pages/space_tree/view/custom_expansion.dart

@@ -8,20 +8,19 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
   final bool isSelected;
   final bool isSoldCheck;
   final bool isExpanded;
-  final void Function()? onExpansionChanged;
+  final Function? onExpansionChanged;
-  final void Function()? onItemSelected;
+  final Function? onItemSelected;
 
-  const CustomExpansionTileSpaceTree({
+  const CustomExpansionTileSpaceTree(
-    required this.isSelected,
+      {super.key,
-    required this.title,
       this.spaceId,
+      required this.title,
       this.children,
+      this.isExpanded = false,
       this.onExpansionChanged,
       this.onItemSelected,
-    this.isExpanded = false,
+      required this.isSelected,
-    this.isSoldCheck = false,
+      this.isSoldCheck = false});
-    super.key,
-  });
 
   @override
   Widget build(BuildContext context) {
@@ -31,30 +30,50 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
           children: [
             Checkbox(
               value: isSoldCheck ? null : isSelected,
-              onChanged: (value) => onItemSelected ?? () {},
+              onChanged: (bool? value) {
+                if (onItemSelected != null) {
+                  onItemSelected!();
+                }
+              },
               tristate: true,
-              side: WidgetStateBorderSide.resolveWith(
+              side: WidgetStateBorderSide.resolveWith((states) {
-                (states) => const BorderSide(color: ColorsManager.grayBorder),
+                return const BorderSide(color: ColorsManager.grayBorder);
-              ),
+              }),
               fillColor: WidgetStateProperty.resolveWith((states) {
                 if (states.contains(WidgetState.selected)) {
                   return ColorsManager.blue1;
-                }
+                } else {
-
                   return ColorsManager.checkBoxFillColor;
+                }
               }),
               checkColor: ColorsManager.whiteColors,
             ),
-            _buildExpansionIcon(),
+            if (children != null && children!.isNotEmpty)
+              InkWell(
+                onTap: () {
+                  if (onExpansionChanged != null) {
+                    onExpansionChanged!();
+                  }
+                },
+                child: Icon(
+                  isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+                  color: ColorsManager.lightGrayColor,
+                  size: 16.0,
+                ),
+              ),
             Expanded(
               child: GestureDetector(
-                onTap: onItemSelected,
+                onTap: () {
+                  if (onItemSelected != null) {
+                    onItemSelected!();
+                  }
+                },
                 child: Text(
                   _capitalizeFirstLetter(title),
                   style: Theme.of(context).textTheme.bodySmall!.copyWith(
                         color: isSelected
-                            ? ColorsManager.blackColor
+                            ? ColorsManager.blackColor // Change color to black when selected
-                            : ColorsManager.lightGrayColor,
+                            : ColorsManager.lightGrayColor, // Gray when not selected
                         fontWeight: FontWeight.w400,
                       ),
                 ),
@@ -73,20 +92,6 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
     );
   }
 
-  Widget _buildExpansionIcon() {
-    return Visibility(
-      visible: children != null && children!.isNotEmpty,
-      child: InkWell(
-        onTap: onExpansionChanged,
-        child: Icon(
-          isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
-          color: ColorsManager.lightGrayColor,
-          size: 16.0,
-        ),
-      ),
-    );
-  }
-
   String _capitalizeFirstLetter(String text) {
     if (text.isEmpty) return text;
     return text[0].toUpperCase() + text.substring(1);

lib/pages/space_tree/view/space_tree_view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
@@ -24,13 +23,7 @@ class SpaceTreeView extends StatefulWidget {
 }
 
 class _SpaceTreeViewState extends State<SpaceTreeView> {
-  late final ScrollController _scrollController;
+  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    _scrollController = ScrollController();
-    super.initState();
-  }
 
   @override
   void dispose() {
@@ -41,27 +34,23 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities = state.searchQuery.isNotEmpty
+      List<CommunityModel> list =
-          ? state.filteredCommunity
+          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
-          : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(
+            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
-                color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
-                  if (widget.isSide == true)
+                  widget.isSide == true
-                    Container(
+                      ? Container(
                           decoration: const BoxDecoration(
                             color: ColorsManager.circleRolesBackground,
                             borderRadius: BorderRadius.only(
-                          topRight: Radius.circular(20),
+                                topRight: Radius.circular(20), topLeft: Radius.circular(20)),
-                          topLeft: Radius.circular(20),
-                        ),
                           ),
                           child: Padding(
                             padding: const EdgeInsets.all(8.0),
@@ -70,23 +59,15 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                 Expanded(
                                   child: Container(
                                     decoration: BoxDecoration(
-                                  borderRadius: const BorderRadius.all(
+                                        borderRadius: const BorderRadius.all(Radius.circular(20)),
-                                    Radius.circular(20),
+                                        border: Border.all(color: ColorsManager.grayBorder)),
-                                  ),
-                                  border: Border.all(
-                                    color: ColorsManager.grayBorder,
-                                  ),
-                                ),
                                     child: TextFormField(
-                                  style: context.textTheme.bodyMedium?.copyWith(
+                                      style: context.textTheme.bodyMedium
-                                    color: ColorsManager.blackColor,
+                                          ?.copyWith(color: ColorsManager.blackColor),
-                                  ),
+                                      onChanged: (value) {
-                                  onChanged: (value) =>
+                                        context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
-                                      context.read<SpaceTreeBloc>().add(
+                                      },
-                                            SearchQueryEvent(value),
+                                      decoration: textBoxDecoration(radios: 20)!.copyWith(
-                                          ),
-                                  decoration:
-                                      textBoxDecoration(radios: 20)?.copyWith(
                                         fillColor: Colors.white,
                                         suffixIcon: Padding(
                                           padding: const EdgeInsets.only(right: 16),
@@ -96,12 +77,10 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                             height: 24,
                                           ),
                                         ),
-                                    hintStyle:
+                                        hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                        context.textTheme.bodyMedium?.copyWith(
                                             fontWeight: FontWeight.w400,
                                             fontSize: 12,
-                                      color: ColorsManager.textGray,
+                                            color: ColorsManager.textGray),
-                                    ),
                                       ),
                                     ),
                                   ),
@@ -110,92 +89,170 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                             ),
                           ),
                         )
-                  else
+                      : CustomSearchBar(
-                    CustomSearchBar(
+                          onSearchChanged: (query) {
-                      onSearchChanged: (query) => context.read<SpaceTreeBloc>().add(
+                            context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-                            SearchQueryEvent(query),
+                          },
-                          ),
                         ),
                   const SizedBox(height: 16),
                   Expanded(
                     child: state.isSearching
                         ? const Center(child: CircularProgressIndicator())
-                        : SidebarCommunitiesList(
+                        : ListView(
-                            onScrollToEnd: () => context.read<SpaceTreeBloc>().add(
+                            shrinkWrap: true,
-                                  PaginationEvent(
+                            scrollDirection: Axis.horizontal,
-                                    state.paginationModel,
+                            children: [
-                                    state.communityList,
+                              Container(
+                                width: MediaQuery.sizeOf(context).width * 0.5,
+                                padding: const EdgeInsets.all(8.0),
+                                child: list.isEmpty
+                                    ? Center(
+                                        child: Text(
+                                          'No results found',
+                                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                color: ColorsManager.lightGrayColor,
+                                                fontWeight: FontWeight.w400,
                                               ),
                                         ),
-                            scrollController: _scrollController,
+                                      )
-                            communities: communities,
+                                    : Scrollbar(
+                                        scrollbarOrientation: ScrollbarOrientation.left,
+                                        thumbVisibility: true,
+                                        controller: _scrollController,
+                                        child: NotificationListener(
+                                          onNotification: (notification) {
+                                            if (notification is ScrollEndNotification &&
+                                                notification.metrics.extentAfter == 0) {
+                                              // If the user has reached the end of the list Load more data
+                                              context.read<SpaceTreeBloc>().add(PaginationEvent(
+                                                  state.paginationModel, state.communityList));
+                                            }
+                                            return false;
+                                          },
+                                          child: Padding(
+                                            padding: const EdgeInsets.only(left: 16),
+                                            child: ListView.builder(
+                                                shrinkWrap: true,
+                                                itemCount: list.length,
+                                                controller: _scrollController,
                                                 itemBuilder: (context, index) {
                                                   return CustomExpansionTileSpaceTree(
-                                title: communities[index].name,
+                                                    title: list[index].name,
                                                     isSelected: state.selectedCommunities
-                                    .contains(communities[index].uuid),
+                                                        .contains(list[index].uuid),
                                                     isSoldCheck: state.selectedCommunities
-                                    .contains(communities[index].uuid),
+                                                        .contains(list[index].uuid),
-                                onExpansionChanged: () =>
+                                                    onExpansionChanged: () {
                                                       context.read<SpaceTreeBloc>().add(
-                                          OnCommunityExpanded(
+                                                          OnCommunityExpanded(list[index].uuid));
-                                            communities[index].uuid,
+                                                    },
-                                          ),
+                                                    isExpanded: state.expandedCommunities
-                                        ),
+                                                        .contains(list[index].uuid),
-                                isExpanded: state.expandedCommunities.contains(
-                                  communities[index].uuid,
-                                ),
                                                     onItemSelected: () {
                                                       context.read<SpaceTreeBloc>().add(
-                                        OnCommunitySelected(
+                                                          OnCommunitySelected(list[index].uuid,
-                                          communities[index].uuid,
+                                                              list[index].spaces));
-                                          communities[index].spaces,
-                                        ),
-                                      );
                                                       widget.onSelect();
                                                     },
-                                children: communities[index].spaces.map(
+                                                    children: list[index].spaces.map((space) {
-                                  (space) {
                                                       return CustomExpansionTileSpaceTree(
                                                         title: space.name,
-                                      isExpanded:
+                                                        isExpanded: state.expandedSpaces
-                                          state.expandedSpaces.contains(space.uuid),
+                                                            .contains(space.uuid),
                                                         onItemSelected: () {
                                                           context.read<SpaceTreeBloc>().add(
                                                               OnSpaceSelected(
-                                                communities[index],
+                                                                  list[index],
                                                                   space.uuid ?? '',
-                                                space.children,
+                                                                  space.children));
-                                              ),
-                                            );
                                                           widget.onSelect();
                                                         },
-                                      onExpansionChanged: () =>
+                                                        onExpansionChanged: () {
                                                           context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(
+                                                              OnSpaceExpanded(list[index].uuid,
-                                                  communities[index].uuid,
+                                                                  space.uuid ?? ''));
-                                                  space.uuid ?? '',
+                                                        },
-                                                ),
-                                              ),
                                                         isSelected: state.selectedSpaces
                                                                 .contains(space.uuid) ||
                                                             state.soldCheck.contains(space.uuid),
                                                         isSoldCheck:
                                                             state.soldCheck.contains(space.uuid),
                                                         children: _buildNestedSpaces(
-                                        context,
+                                                            context, state, space, list[index]),
-                                        state,
+                                                      );
-                                        space,
+                                                    }).toList(),
-                                        communities[index],
+                                                  );
+                                                }),
                                           ),
-                                    );
+                                        ),
-                                  },
+                                      ),
-                                ).toList(),
+                              ),
-                              );
+                            ],
-                            },
                           ),
                   ),
                   if (state.paginationIsLoading) const CircularProgressIndicator(),
+                  // Expanded(
+                  //   child: Padding(
+                  //     padding: const EdgeInsets.all(8.0),
+                  //     child: list.isEmpty
+                  //         ? Center(
+                  //             child: Text(
+                  //               'No results found',
+                  //               style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                  //                     color: ColorsManager.lightGrayColor, // Gray when not selected
+                  //                     fontWeight: FontWeight.w400,
+                  //                   ),
+                  //             ),
+                  //           )
+                  //         : ListView(
+                  //             shrinkWrap: true,
+                  //             children: list
+                  //                 .map(
+                  //                   (community) => CustomExpansionTileSpaceTree(
+                  //                     title: community.name,
+                  //                     isSelected:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     isSoldCheck:
+                  //                         state.selectedCommunities.contains(community.uuid),
+                  //                     onExpansionChanged: () {
+                  //                       context
+                  //                           .read<SpaceTreeBloc>()
+                  //                           .add(OnCommunityExpanded(community.uuid));
+                  //                     },
+                  //                     isExpanded:
+                  //                         state.expandedCommunities.contains(community.uuid),
+                  //                     onItemSelected: () {
+                  //                       context.read<SpaceTreeBloc>().add(
+                  //                           OnCommunitySelected(community.uuid, community.spaces));
+
+                  //                       onSelect();
+                  //                     },
+                  //                     children: community.spaces.map((space) {
+                  //                       return CustomExpansionTileSpaceTree(
+                  //                         title: space.name,
+                  //                         isExpanded: state.expandedSpaces.contains(space.uuid),
+                  //                         onItemSelected: () {
+                  //                           context.read<SpaceTreeBloc>().add(OnSpaceSelected(
+                  //                               community.uuid, space.uuid ?? '', space.children));
+                  //                           onSelect();
+                  //                         },
+                  //                         onExpansionChanged: () {
+                  //                           context.read<SpaceTreeBloc>().add(
+                  //                               OnSpaceExpanded(community.uuid, space.uuid ?? ''));
+                  //                         },
+                  //                         isSelected: state.selectedSpaces.contains(space.uuid) ||
+                  //                             state.soldCheck.contains(space.uuid),
+                  //                         isSoldCheck: state.soldCheck.contains(space.uuid),
+                  //                         children: _buildNestedSpaces(
+                  //                             context, state, space, community.uuid),
+                  //                       );
+                  //                     }).toList(),
+                  //                   ),
+                  //                 )
+                  //                 .toList(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -203,28 +260,22 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-    BuildContext context,
+      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
-    SpaceTreeState state,
-    SpaceModel space,
-    CommunityModel community,
-  ) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
-        isSelected: state.selectedSpaces.contains(child.uuid) ||
+        isSelected:
-            state.soldCheck.contains(child.uuid),
+            state.selectedSpaces.contains(child.uuid) || state.soldCheck.contains(child.uuid),
         isSoldCheck: state.soldCheck.contains(child.uuid),
         title: child.name,
         isExpanded: state.expandedSpaces.contains(child.uuid),
         onItemSelected: () {
-          context.read<SpaceTreeBloc>().add(
+          context
-                OnSpaceSelected(community, child.uuid ?? '', child.children),
+              .read<SpaceTreeBloc>()
-              );
+              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
-                OnSpaceExpanded(community.uuid, child.uuid ?? ''),
-              );
         },
         children: _buildNestedSpaces(context, state, child, community),
       );

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -592,8 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         return CreateSubSpaceDialog(
             spaceName: name,
             dialogTitle: isEdit ? 'Edit Sub-space' : 'Create Sub-space',
-            spaceTags: spaceTags,
-            isEdit: isEdit,
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {

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

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -32,8 +30,6 @@ class SidebarWidget extends StatefulWidget {
 }
 
 class _SidebarWidgetState extends State<SidebarWidget> {
-  late final ScrollController _scrollController;
-
   String _searchQuery = '';
   String? _selectedSpaceUuid;
   String? _selectedId;
@@ -41,16 +37,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void initState() {
     _selectedId = widget.selectedSpaceUuid;
-    _scrollController = ScrollController();
     super.initState();
   }
 
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
@@ -97,14 +86,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     return isSpaceSelected || anySubSpaceIsSelected;
   }
 
-  static const _width = 300.0;
-
   @override
   Widget build(BuildContext context) {
     final filteredCommunities = _filteredCommunities();
 
     return Container(
-      width: _width,
+      width: 300,
       decoration: subSectionContainerDecoration,
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -116,18 +103,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           ),
           const SizedBox(height: 16),
           Expanded(
-            child: Visibility(
+            child: ListView(
-              visible: filteredCommunities.isNotEmpty,
+              children: filteredCommunities
-              replacement: const EmptySearchResultWidget(),
+                  .map((community) => _buildCommunityTile(context, community))
-              child: SidebarCommunitiesList(
+                  .toList(),
-                scrollController: _scrollController,
-                onScrollToEnd: () {},
-                communities: filteredCommunities,
-                itemBuilder: (context, index) => _buildCommunityTile(
-                  context,
-                  filteredCommunities[index],
-                ),
-              ),
             ),
           ),
         ],
@@ -136,17 +115,6 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
-    final spaces = community.spaces
-        .where(
-          (space) =>
-              {
-                SpaceStatus.deleted,
-                SpaceStatus.parentDeleted,
-              }.contains(space.status) ==
-              false,
-        )
-        .map((space) => _buildSpaceTile(space: space, community: community))
-        .toList();
     return CommunityTile(
       title: community.name,
       key: ValueKey(community.uuid),
@@ -165,7 +133,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             );
       },
       onExpansionChanged: (title, expanded) {},
-      children: spaces,
+      children: community.spaces
+          .where((space) {
+            final isDeleted = space.status != SpaceStatus.deleted;
+            final isParentDeleted = space.status != SpaceStatus.parentDeleted;
+            return (isDeleted || isParentDeleted);
+          })
+          .map((space) => _buildSpaceTile(space: space, community: community))
+          .toList(),
     );
   }
 

lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart

@@ -4,169 +4,155 @@ import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_state.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CreateSubSpaceDialog extends StatelessWidget {
+class CreateSubSpaceDialog extends StatefulWidget {
-  final bool isEdit;
   final String dialogTitle;
   final List<SubspaceModel>? existingSubSpaces;
   final String? spaceName;
-  final List<Tag>? spaceTags;
   final List<ProductModel>? products;
-  final Function(List<SubspaceModel>?)? onSave;
+  final void Function(List<SubspaceModel>?)? onSave;
 
-  const CreateSubSpaceDialog(
+  const CreateSubSpaceDialog({
-      {Key? key,
-      required this.isEdit,
     required this.dialogTitle,
-      this.existingSubSpaces,
     required this.spaceName,
-      required this.spaceTags,
     required this.products,
-      required this.onSave})
+    required this.onSave,
-      : super(key: key);
+    this.existingSubSpaces,
+    super.key,
+  });
+
+  @override
+  State<CreateSubSpaceDialog> createState() => _CreateSubSpaceDialogState();
+}
+
+class _CreateSubSpaceDialogState extends State<CreateSubSpaceDialog> {
+  late final TextEditingController _subspaceNameController;
+
+  @override
+  void initState() {
+    _subspaceNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _subspaceNameController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
+    return BlocProvider(
-    final textController = TextEditingController();
-
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: BlocProvider(
       create: (_) {
         final bloc = SubSpaceBloc();
-          if (existingSubSpaces != null) {
+        if (widget.existingSubSpaces != null) {
-            for (var subSpace in existingSubSpaces!) {
+          for (final subSpace in widget.existingSubSpaces ?? []) {
             bloc.add(AddSubSpace(subSpace));
           }
         }
         return bloc;
       },
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
+              width: context.screenWidth * 0.35,
               color: ColorsManager.whiteColors,
-                child: SizedBox(
+              padding: const EdgeInsets.all(16),
-                  width: screenWidth * 0.35,
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                          dialogTitle,
+                    widget.dialogTitle,
-                          style: Theme.of(context)
+                    style: context.textTheme.headlineLarge?.copyWith(
-                              .textTheme
+                      color: ColorsManager.blackColor,
-                              .headlineLarge
+                    ),
-                              ?.copyWith(color: ColorsManager.blackColor),
                   ),
                   const SizedBox(height: 16),
                   Container(
-                          width: screenWidth * 0.35,
+                    width: context.screenWidth * 0.35,
                     padding: const EdgeInsets.symmetric(
-                              vertical: 10.0, horizontal: 16.0),
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
                     decoration: BoxDecoration(
                       color: ColorsManager.boxColor,
                       borderRadius: BorderRadius.circular(10),
                     ),
                     child: Wrap(
-                            spacing: 8.0,
+                      spacing: 8,
-                            runSpacing: 8.0,
+                      runSpacing: 8,
+                      alignment: WrapAlignment.start,
+                      crossAxisAlignment: WrapCrossAlignment.center,
                       children: [
                         ...state.subSpaces.asMap().entries.map(
                           (entry) {
                             final index = entry.key;
                             final subSpace = entry.value;
 
-                                  final lowerName =
+                            final lowerName = subSpace.subspaceName.toLowerCase();
-                                      subSpace.subspaceName.toLowerCase();
 
                             final duplicateIndices = state.subSpaces
                                 .asMap()
                                 .entries
                                 .where((e) =>
-                                          e.value.subspaceName.toLowerCase() ==
+                                    e.value.subspaceName.toLowerCase() == lowerName)
-                                          lowerName)
                                 .map((e) => e.key)
                                 .toList();
-                                  final isDuplicate =
+                            final isDuplicate = duplicateIndices.length > 1 &&
-                                      duplicateIndices.length > 1 &&
                                 duplicateIndices.indexOf(index) != 0;
-
+                            return SubspaceChip(
-                                  return Chip(
+                              subSpace: SubspaceTemplateModel(
-                                    label: Text(subSpace.subspaceName,
+                                subspaceName: entry.value.subspaceName,
-                                        style: Theme.of(context)
+                                disabled: entry.value.disabled,
-                                            .textTheme
-                                            .bodyMedium
-                                            ?.copyWith(
-                                                color:
-                                                    ColorsManager.spaceColor)),
-                                    backgroundColor: ColorsManager.whiteColors,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(10),
-                                      side: BorderSide(
-                                        color: isDuplicate
-                                            ? ColorsManager.red
-                                            : ColorsManager.transparentColor,
-                                        width: 0,
                               ),
+                              isDuplicate: isDuplicate,
+                              onDeleted: () => context.read<SubSpaceBloc>().add(
+                                    RemoveSubSpace(subSpace),
                                   ),
-                                    deleteIcon: Container(
-                                      width: 24,
-                                      height: 24,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1.5,
-                                        ),
-                                      ),
-                                      child: const Icon(
-                                        Icons.close,
-                                        size: 16,
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
-                                    ),
-                                    onDeleted: () => context
-                                        .read<SubSpaceBloc>()
-                                        .add(RemoveSubSpace(subSpace)),
                             );
                           },
                         ),
                         SizedBox(
                           width: 200,
                           child: TextField(
-                                    controller: textController,
+                            controller: _subspaceNameController,
                             decoration: InputDecoration(
                               border: InputBorder.none,
                               hintText: state.subSpaces.isEmpty
                                   ? 'Please enter the name'
                                   : null,
-                                        hintStyle: Theme.of(context)
+                              hintStyle: context.textTheme.bodySmall?.copyWith(
-                                            .textTheme
+                                color: ColorsManager.lightGrayColor,
-                                            .bodySmall
+                              ),
-                                            ?.copyWith(
+                            ),
-                                                color: ColorsManager
-                                                    .lightGrayColor)),
                             onSubmitted: (value) {
-                                      if (value.trim().isNotEmpty) {
+                              final trimmedValue = value.trim();
+                              if (trimmedValue.isNotEmpty) {
                                 context.read<SubSpaceBloc>().add(
-                                            AddSubSpace(SubspaceModel(
+                                      AddSubSpace(
-                                                subspaceName: value.trim(),
+                                        SubspaceModel(
-                                                disabled: false)));
+                                          subspaceName: trimmedValue,
-                                        textController.clear();
+                                          disabled: false,
+                                        ),
+                                      ),
+                                    );
+                                _subspaceNameController.clear();
                               }
                             },
-                                    style:
+                            style: context.textTheme.bodyMedium,
-                                        Theme.of(context).textTheme.bodyMedium),
+                          ),
                         ),
                       ],
                     ),
@@ -174,13 +160,12 @@ class CreateSubSpaceDialog extends StatelessWidget {
                   if (state.errorMessage.isNotEmpty)
                     Padding(
                       padding: const EdgeInsets.only(top: 8.0),
-                            child: Text(state.errorMessage,
+                      child: Text(
-                                style: Theme.of(context)
+                        state.errorMessage,
-                                    .textTheme
+                        style: context.textTheme.bodySmall?.copyWith(
-                                    .bodySmall
-                                    ?.copyWith(
                           color: ColorsManager.warningRed,
-                                    )),
+                        ),
+                      ),
                     ),
                   const SizedBox(height: 16),
                   Row(
@@ -196,16 +181,14 @@ class CreateSubSpaceDialog extends StatelessWidget {
                       const SizedBox(width: 10),
                       Expanded(
                         child: DefaultButton(
-                                onPressed: (state.errorMessage.isNotEmpty)
+                          onPressed: state.errorMessage.isEmpty
-                                    ? null
+                              ? () {
-                                    : () async {
+                                  final subSpacesBloc = context.read<SubSpaceBloc>();
-                                        final subSpaces = context
+                                  final subSpaces = subSpacesBloc.state.subSpaces;
-                                            .read<SubSpaceBloc>()
+                                  widget.onSave?.call(subSpaces);
-                                            .state
-                                            .subSpaces;
-                                        onSave!(subSpaces);
                                   Navigator.of(context).pop();
-                                      },
+                                }
+                              : null,
                           backgroundColor: ColorsManager.secondaryColor,
                           borderRadius: 10,
                           foregroundColor: state.errorMessage.isNotEmpty
@@ -218,8 +201,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                   ),
                 ],
               ),
-                  ),
+            );
-                ));
           },
         ),
       ),

lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart

@@ -1,4 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
@@ -51,6 +54,9 @@ class CreateSubspaceModelChipsBox extends StatelessWidget {
               return SubspaceChip(
                 subSpace: subSpace,
                 isDuplicate: isDuplicate,
+                onDeleted: () => context.read<SubSpaceModelBloc>().add(
+                      RemoveSubSpaceModel(subSpace),
+                    ),
               );
             },
           ),

lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart

@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,10 +8,12 @@ class SubspaceChip extends StatelessWidget {
     required this.subSpace,
     required this.isDuplicate,
     super.key,
+    required this.onDeleted,
   });
 
   final SubspaceTemplateModel subSpace;
   final bool isDuplicate;
+  final void Function() onDeleted;
 
   @override
   Widget build(BuildContext context) {
@@ -50,9 +49,7 @@ class SubspaceChip extends StatelessWidget {
           ),
         ),
       ),
-      onDeleted: () => context.read<SubSpaceModelBloc>().add(
+      onDeleted: onDeleted,
-            RemoveSubSpaceModel(subSpace),
-          ),
     );
   }
 }

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

@@ -145,11 +145,13 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     ),
                     const SizedBox(height: 10),
                     TagChipDisplay(
+                      context,
+                      screenWidth: screenWidth,
                       spaceModel: updatedSpaceModel,
                       products: products,
                       subspaces: subspaces,
                       allTags: allTags,
-                      spaceName: spaceNameController.text,
+                      spaceNameController: spaceNameController,
                       pageContext: pageContext,
                       otherSpaceModels: otherSpaceModels,
                       allSpaceModels: allSpaceModels,

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

@@ -10,77 +10,90 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TagChipDisplay extends StatelessWidget {
-  const TagChipDisplay({
+  final double screenWidth;
-    required this.spaceModel,
-    required this.products,
-    required this.subspaces,
-    required this.allTags,
-    required this.spaceName,
-    required this.projectTags,
-    this.pageContext,
-    this.otherSpaceModels,
-    this.allSpaceModels,
-    super.key,
-  });
-
   final SpaceTemplateModel? spaceModel;
   final List<ProductModel>? products;
   final List<SubspaceTemplateModel>? subspaces;
   final List<String>? allTags;
-  final String spaceName;
+  final TextEditingController spaceNameController;
   final BuildContext? pageContext;
   final List<String>? otherSpaceModels;
   final List<SpaceTemplateModel>? allSpaceModels;
   final List<Tag> projectTags;
 
-  Map<ProductModel, int> get _groupedTags {
+  const TagChipDisplay(BuildContext context,
-    final spaceTags = spaceModel?.tags ?? <Tag>[];
+      {Key? key,
-
+      required this.screenWidth,
-    final subspaces = spaceModel?.subspaceModels ?? [];
+      required this.spaceModel,
-    final subspaceTags = subspaces.expand((e) => e.tags ?? <Tag>[]).toList();
+      required this.products,
-
+      required this.subspaces,
-    return TagHelper.groupTags([...spaceTags, ...subspaceTags]);
+      required this.allTags,
-  }
+      required this.spaceNameController,
+      this.pageContext,
+      this.otherSpaceModels,
+      this.allSpaceModels,
+      required this.projectTags})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final hasTags = spaceModel?.tags?.isNotEmpty ?? false;
+    return (spaceModel?.tags?.isNotEmpty == true ||
-    final hasSubspaceTags =
+            spaceModel?.subspaceModels?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-        spaceModel?.subspaceModels?.any((e) => e.tags?.isNotEmpty ?? false) ?? false;
+                true)
-
+        ? SizedBox(
-    if (hasTags || hasSubspaceTags) {
+            width: screenWidth * 0.25,
-      return Container(
+            child: Container(
-        width: context.screenWidth * 0.25,
+              padding: const EdgeInsets.all(8.0),
-        padding: const EdgeInsets.all(8),
               decoration: BoxDecoration(
                 color: ColorsManager.textFieldGreyColor,
                 borderRadius: BorderRadius.circular(15),
                 border: Border.all(
                   color: ColorsManager.textFieldGreyColor,
-            width: 3,
+                  width: 3.0, // Border width
                 ),
               ),
               child: Wrap(
-          spacing: 8,
+                spacing: 8.0,
-          runSpacing: 8,
+                runSpacing: 8.0,
                 children: [
-            ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
+                  // Combine tags from spaceModel and subspaces
-            _buildEditChip(context),
+                  ...TagHelper.groupTags([
-          ],
+                    ...?spaceModel?.tags,
+                    ...?spaceModel?.subspaceModels?.expand((subspace) => subspace.tags ?? [])
+                  ]).entries.map(
+                        (entry) => Chip(
+                          avatar: SizedBox(
+                            width: 24,
+                            height: 24,
+                            child: SvgPicture.asset(
+                              entry.key.icon ?? 'assets/icons/gateway.svg',
+                              fit: BoxFit.contain,
                             ),
-      );
+                          ),
-    }
+                          label: Text(
+                            'x${entry.value}', // Show count
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodySmall!
+                                .copyWith(color: ColorsManager.spaceColor),
+                          ),
+                          backgroundColor: ColorsManager.whiteColors,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(16),
+                            side: const BorderSide(
+                              color: ColorsManager.spaceColor,
+                            ),
+                          ),
+                        ),
+                      ),
+                  EditChip(onTap: () async {
+                    // Use the Navigator's context for showDialog
+                    Navigator.of(context).pop();
 
-    return _buildAddDevicesButton(context);
+                    await showDialog<bool>(
-  }
+                        barrierDismissible: false,
-
-  Widget _buildEditChip(BuildContext context) {
-    return EditChip(
-      onTap: () => showDialog<void>(
                         context: context,
                         builder: (context) => AssignTagModelsDialog(
                               products: products,
@@ -91,64 +104,38 @@ class TagChipDisplay extends StatelessWidget {
                               spaceModel: spaceModel,
                               otherSpaceModels: otherSpaceModels,
                               initialTags: TagHelper.generateInitialTags(
-            subspaces: subspaces,
+                                  subspaces: subspaces, spaceTagModels: spaceModel?.tags ?? []),
-            spaceTagModels: spaceModel?.tags ?? [],
-          ),
                               title: 'Edit Device',
                               addedProducts: TagHelper.createInitialSelectedProducts(
-            spaceModel?.tags ?? [],
+                                  spaceModel?.tags ?? [], subspaces),
-            subspaces,
-          ),
                               spaceName: spaceModel?.modelName ?? '',
                               projectTags: projectTags,
+                            ));
+                  })
+                ],
               ),
             ),
-    );
+          )
-  }
+        : TextButton(
+            onPressed: () async {
+              Navigator.of(context).pop();
 
-  Widget _buildChip(
+              await showDialog<bool>(
-    BuildContext context,
+                barrierDismissible: false,
-    MapEntry<ProductModel, int> entry,
-  ) {
-    return Chip(
-      backgroundColor: ColorsManager.whiteColors,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-        side: const BorderSide(
-          color: ColorsManager.spaceColor,
-        ),
-      ),
-      avatar: SvgPicture.asset(
-        entry.key.icon ?? Assets.gateway,
-        fit: BoxFit.contain,
-        height: 24,
-        width: 24,
-      ),
-      label: Text(
-        '${entry.value}',
-        style: context.textTheme.bodySmall!.copyWith(
-          color: ColorsManager.spaceColor,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildAddDevicesButton(BuildContext context) {
-    return TextButton(
-      onPressed: () => showDialog<void>(
                 context: context,
                 builder: (context) => AddDeviceTypeModelWidget(
                   products: products,
                   subspaces: subspaces,
                   allTags: allTags,
-          spaceName: spaceName,
+                  spaceName: spaceNameController.text,
                   pageContext: pageContext,
                   isCreate: true,
                   spaceModel: spaceModel,
                   otherSpaceModels: otherSpaceModels,
                   projectTags: projectTags,
                 ),
-      ),
+              );
+            },
             style: TextButton.styleFrom(
               padding: EdgeInsets.zero,
             ),