Setup new firebase project in the web platform.

<!--
  Thanks for contributing!

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

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

## Jira Ticket


## Description

hot fix thermostat as requested by Talal

## Type of Change

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

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

assets/icons/group_icon.svg

@@ -1,15 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_9717_7433)">
-<path d="M17.1131 10.6766H15.5664C15.7241 11.1083 15.8102 11.5741 15.8102 12.0596V17.9053C15.8102 18.1077 15.775 18.302 15.7109 18.4827H18.2679C19.2231 18.4827 20.0002 17.7056 20.0002 16.7505V13.5637C20.0002 11.9718 18.7051 10.6766 17.1131 10.6766Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M4.19005 12.0596C4.19005 11.5741 4.27618 11.1083 4.43384 10.6766H2.88712C1.29516 10.6766 0 11.9718 0 13.5637V16.7505C0 17.7057 0.777072 18.4828 1.73227 18.4828H4.28938C4.22528 18.302 4.19005 18.1077 4.19005 17.9053V12.0596Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M11.7679 9.17249H8.23184C6.63989 9.17249 5.34473 10.4676 5.34473 12.0596V17.9053C5.34473 18.2242 5.60324 18.4827 5.92215 18.4827H14.0776C14.3965 18.4827 14.655 18.2242 14.655 17.9053V12.0596C14.655 10.4676 13.3598 9.17249 11.7679 9.17249Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M9.99995 1.51721C8.08541 1.51721 6.52783 3.07479 6.52783 4.98937C6.52783 6.288 7.24459 7.42218 8.30311 8.01765C8.80518 8.30008 9.38401 8.46148 9.99995 8.46148C10.6159 8.46148 11.1947 8.30008 11.6968 8.01765C12.7553 7.42218 13.4721 6.28796 13.4721 4.98937C13.4721 3.07483 11.9145 1.51721 9.99995 1.51721Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M3.90284 4.75354C2.471 4.75354 1.30615 5.91839 1.30615 7.35022C1.30615 8.78206 2.471 9.94691 3.90284 9.94691C4.26604 9.94691 4.6119 9.87168 4.92608 9.73644C5.46929 9.50257 5.91718 9.08859 6.19433 8.57003C6.38886 8.20609 6.49952 7.79089 6.49952 7.35022C6.49952 5.91843 5.33468 4.75354 3.90284 4.75354Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M16.0972 4.75354C14.6653 4.75354 13.5005 5.91839 13.5005 7.35022C13.5005 7.79093 13.6112 8.20612 13.8057 8.57003C14.0828 9.08863 14.5307 9.50261 15.0739 9.73644C15.3881 9.87168 15.734 9.94691 16.0972 9.94691C17.529 9.94691 18.6939 8.78206 18.6939 7.35022C18.6939 5.91839 17.529 4.75354 16.0972 4.75354Z" fill="#023DFE" fill-opacity="0.7"/>
-</g>
-<defs>
-<clipPath id="clip0_9717_7433">
-<rect width="20" height="20" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/home_icon.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0002 5.97498L3.12109 11.2683V18.3601H8.64871V13.163H11.5852V18.3601H16.8794V11.2683L10.0002 5.97498Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M17.1673 7.15356V3.52759H14.2702V4.92485L10 1.63989L0 9.33274L1.38043 11.1271L10 4.49458L18.6196 11.1272L20 9.33278L17.1673 7.15356Z" fill="#023DFE" fill-opacity="0.7"/>
-</svg>

lib/pages/access_management/booking_system/view/booking_page.dart

@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/view/widgets/icon_text_button.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class BookingPage extends StatelessWidget {
-  const BookingPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      child: Row(
-        children: [
-          Expanded(
-              child: Container(
-            color: Colors.blueGrey[100],
-            child: const Center(
-              child: Text(
-                'Side bar',
-                style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
-              ),
-            ),
-          )),
-          Expanded(
-              flex: 4,
-              child: Padding(
-                padding: const EdgeInsets.all(20.0),
-                child: SizedBox(
-                  child: Column(
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        children: [
-                          SvgTextButton(
-                              svgAsset: Assets.homeIcon,
-                              label: 'Manage Bookable Spaces',
-                              onPressed: () {}),
-                          SizedBox(width: 20),
-                          SvgTextButton(
-                              svgAsset: Assets.groupIcon,
-                              label: 'Manage Users',
-                              onPressed: () {})
-                        ],
-                      )
-                    ],
-                  ),
-                ),
-              ))
-        ],
-      ),
-    );
-  }
-}

lib/pages/access_management/booking_system/view/widgets/icon_text_button.dart

@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class SvgTextButton extends StatelessWidget {
-  final String svgAsset;
-  final String label;
-  final VoidCallback onPressed;
-  final Color backgroundColor;
-  final Color svgColor;
-  final Color labelColor;
-  final double borderRadius;
-  final List<BoxShadow> boxShadow;
-  final double svgSize;
-
-  const SvgTextButton({
-    super.key,
-    required this.svgAsset,
-    required this.label,
-    required this.onPressed,
-    this.backgroundColor = ColorsManager.circleRolesBackground,
-    this.svgColor = const Color(0xFF496EFF),
-    this.labelColor = Colors.black87,
-    this.borderRadius = 10.0,
-    this.boxShadow = const [
-      BoxShadow(
-        color: ColorsManager.textGray,
-        blurRadius: 12,
-        offset: Offset(0, 4),
-      ),
-    ],
-    this.svgSize = 24.0,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: Colors.transparent,
-      child: InkWell(
-        borderRadius: BorderRadius.circular(borderRadius),
-        onTap: onPressed,
-        child: Container(
-          padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-          decoration: BoxDecoration(
-            color: backgroundColor,
-            borderRadius: BorderRadius.circular(borderRadius),
-            boxShadow: boxShadow,
-          ),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              SvgPicture.asset(
-                svgAsset,
-                width: svgSize,
-                height: svgSize,
-                color: svgColor,
-              ),
-              const SizedBox(width: 12),
-              Text(
-                label,
-                style: TextStyle(
-                  color: labelColor,
-                  fontSize: 16,
-                  fontWeight: FontWeight.w500,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/access_management/view/access_management.dart

@@ -2,86 +2,302 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/view/booking_page.dart';
-import 'package:syncrow_web/pages/access_management/view/access_overview_content.dart';
+import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
+import 'package:syncrow_web/pages/common/custom_table.dart';
+import 'package:syncrow_web/pages/common/date_time_widget.dart';
+import 'package:syncrow_web/pages/common/filter/filter_widget.dart';
+import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
+// import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/app_enum.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+import 'package:syncrow_web/utils/style.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class AccessManagementPage extends StatefulWidget {
+class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
   const AccessManagementPage({super.key});
 
-  @override
-  State<AccessManagementPage> createState() => _AccessManagementPageState();
-}
-
-class _AccessManagementPageState extends State<AccessManagementPage>
-    with HelperResponsiveLayout {
-  final PageController _pageController = PageController(initialPage: 0);
-  int _currentPageIndex = 0;
-
-  @override
-  void dispose() {
-    _pageController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
-      child: WebScaffold(
+    final isLargeScreen = isLargeScreenSize(context);
+    final isSmallScreen = isSmallScreenSize(context);
+    final isHalfMediumScreen = isHafMediumScreenSize(context);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+
+    return WebScaffold(
         enableMenuSidebar: false,
         appBarTitle: Text(
           'Access Management',
           style: ResponsiveTextTheme.of(context).deviceManagementTitle,
         ),
-        centerBody: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextButton(
-              onPressed: () => _switchPage(0),
-              child: Text(
-                'Access Overview',
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: _currentPageIndex == 0 ? Colors.white : Colors.grey,
-                  fontWeight: _currentPageIndex == 0
-                      ? FontWeight.w700
-                      : FontWeight.w400,
-                ),
-              ),
-            ),
-            TextButton(
-              onPressed: () => _switchPage(1),
-              child: Text(
-                'Booking System',
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: _currentPageIndex == 1 ? Colors.white : Colors.grey,
-                  fontWeight: _currentPageIndex == 1
-                      ? FontWeight.w700
-                      : FontWeight.w400,
-                ),
-              ),
-            ),
-          ],
-        ),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody: PageView(
-          controller: _pageController,
-          physics: const NeverScrollableScrollPhysics(),
-          children: const [
-            AccessOverviewContent(),
-            BookingPage(),
+        scaffoldBody: BlocProvider(
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
+            child: BlocConsumer<AccessBloc, AccessState>(
+                listener: (context, state) {},
+                builder: (context, state) {
+                  final accessBloc = BlocProvider.of<AccessBloc>(context);
+                  final filteredData = accessBloc.filteredData;
+                  return state is AccessLoaded
+                      ? const Center(child: CircularProgressIndicator())
+                      : Container(
+                          padding: padding,
+                          height: MediaQuery.of(context).size.height,
+                          width: MediaQuery.of(context).size.width,
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              FilterWidget(
+                                size: MediaQuery.of(context).size,
+                                tabs: accessBloc.tabs,
+                                selectedIndex: accessBloc.selectedIndex,
+                                onTabChanged: (index) {
+                                  accessBloc.add(TabChangedEvent(index));
+                                },
+                              ),
+                              const SizedBox(height: 20),
+                              if (isSmallScreen || isHalfMediumScreen)
+                                _buildSmallSearchFilters(context, accessBloc)
+                              else
+                                _buildNormalSearchWidgets(context, accessBloc),
+                              const SizedBox(height: 20),
+                              _buildVisitorAdminPasswords(context, accessBloc),
+                              const SizedBox(height: 20),
+                              Expanded(
+                                  child: DynamicTable(
+                                tableName: 'AccessManagement',
+                                uuidIndex: 1,
+                                withSelectAll: true,
+                                isEmpty: filteredData.isEmpty,
+                                withCheckBox: false,
+                                size: MediaQuery.of(context).size,
+                                cellDecoration: containerDecoration,
+                                headers: const [
+                                  'Name',
+                                  'Access Type',
+                                  'Access Start',
+                                  'Access End',
+                                  'Accessible Device',
+                                  'Authorizer',
+                                  'Authorization Date & Time',
+                                  'Access Status'
+                                ],
+                                data: filteredData.map((item) {
+                                  return [
+                                    item.passwordName,
+                                    item.passwordType.value,
+                                    accessBloc
+                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
+                                    item.deviceName.toString(),
+                                    item.authorizerEmail.toString(),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
+                                    item.passwordStatus.value,
+                                  ];
+                                }).toList(),
+                              )),
                             ],
                           ),
+                        );
+                })));
+  }
+
+  Wrap _buildVisitorAdminPasswords(
+      BuildContext context, AccessBloc accessBloc) {
+    return Wrap(
+      spacing: 10,
+      runSpacing: 10,
+      children: [
+        Container(
+          width: 205,
+          height: 42,
+          decoration: containerDecoration,
+          child: DefaultButton(
+              onPressed: () {
+                showDialog(
+                  context: context,
+                  barrierDismissible: false,
+                  builder: (BuildContext context) {
+                    return const VisitorPasswordDialog();
+                  },
+                ).then((v) {
+                  if (v != null) {
+                    accessBloc.add(FetchTableData());
+                  }
+                });
+              },
+              borderRadius: 8,
+              child: Text(
+                'Create Visitor Password ',
+                style: context.textTheme.titleSmall!
+                    .copyWith(color: Colors.white, fontSize: 12),
+              )),
         ),
+        // Container(
+        //   width: 133,
+        //   height: 42,
+        //   decoration: containerDecoration,
+        //   child: DefaultButton(
+        //       borderRadius: 8,
+        //       backgroundColor: ColorsManager.whiteColors,
+        //       child: Text(
+        //         'Admin Password',
+        //         style: context.textTheme.titleSmall!
+        //             .copyWith(color: Colors.black, fontSize: 12),
+        //       )),
+        // ),
+      ],
     );
   }
 
-  void _switchPage(int index) {
-    setState(() => _currentPageIndex = index);
-    _pageController.jumpToPage(index);
+  Row _buildNormalSearchWidgets(BuildContext context, AccessBloc accessBloc) {
+    // TimeOfDay _selectedTime = TimeOfDay.now();
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.end,
+      textBaseline: TextBaseline.ideographic,
+      children: [
+        SizedBox(
+          width: 250,
+          child: CustomWebTextField(
+            controller: accessBloc.passwordName,
+            height: 43,
+            isRequired: false,
+            textFieldName: 'Name',
+            description: '',
+            onSubmitted: (value) {
+              accessBloc.add(FilterDataEvent(
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  passwordName: accessBloc.passwordName.text.toLowerCase(),
+                  startTime: accessBloc.effectiveTimeTimeStamp,
+                  endTime: accessBloc.expirationTimeTimeStamp));
+            },
+          ),
+        ),
+        const SizedBox(width: 15),
+        SizedBox(
+          width: 250,
+          child: CustomWebTextField(
+            controller: accessBloc.emailAuthorizer,
+            height: 43,
+            isRequired: false,
+            textFieldName: 'Authorizer',
+            description: '',
+            onSubmitted: (value) {
+              accessBloc.add(FilterDataEvent(
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  passwordName: accessBloc.passwordName.text.toLowerCase(),
+                  startTime: accessBloc.effectiveTimeTimeStamp,
+                  endTime: accessBloc.expirationTimeTimeStamp));
+            },
+          ),
+        ),
+        const SizedBox(width: 15),
+        SizedBox(
+          child: DateTimeWebWidget(
+            icon: Assets.calendarIcon,
+            isRequired: false,
+            title: 'Access Time',
+            size: MediaQuery.of(context).size,
+            endTime: () {
+              accessBloc.add(SelectTime(context: context, isStart: false));
+            },
+            startTime: () {
+              accessBloc.add(SelectTime(context: context, isStart: true));
+            },
+            firstString: BlocProvider.of<AccessBloc>(context).startTime,
+            secondString: BlocProvider.of<AccessBloc>(context).endTime,
+          ),
+        ),
+        const SizedBox(width: 15),
+        SearchResetButtons(
+          onSearch: () {
+            accessBloc.add(FilterDataEvent(
+                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
+                passwordName: accessBloc.passwordName.text.toLowerCase(),
+                startTime: accessBloc.effectiveTimeTimeStamp,
+                endTime: accessBloc.expirationTimeTimeStamp));
+          },
+          onReset: () {
+            accessBloc.add(ResetSearch());
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSmallSearchFilters(BuildContext context, AccessBloc accessBloc) {
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: [
+        SizedBox(
+          width: 300,
+          child: CustomWebTextField(
+              controller: accessBloc.passwordName,
+              isRequired: true,
+              height: 40,
+              textFieldName: 'Name',
+              description: '',
+              onSubmitted: (value) {
+                accessBloc.add(FilterDataEvent(
+                    emailAuthorizer:
+                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex:
+                        BlocProvider.of<AccessBloc>(context).selectedIndex,
+                    passwordName: accessBloc.passwordName.text.toLowerCase(),
+                    startTime: accessBloc.effectiveTimeTimeStamp,
+                    endTime: accessBloc.expirationTimeTimeStamp));
+              }),
+        ),
+        DateTimeWebWidget(
+          icon: Assets.calendarIcon,
+          isRequired: false,
+          title: 'Access Time',
+          size: MediaQuery.of(context).size,
+          endTime: () {
+            accessBloc.add(SelectTime(context: context, isStart: false));
+          },
+          startTime: () {
+            accessBloc.add(SelectTime(context: context, isStart: true));
+          },
+          firstString: BlocProvider.of<AccessBloc>(context).startTime,
+          secondString: BlocProvider.of<AccessBloc>(context).endTime,
+        ),
+        SearchResetButtons(
+          onSearch: () {
+            accessBloc.add(FilterDataEvent(
+                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
+                passwordName: accessBloc.passwordName.text.toLowerCase(),
+                startTime: accessBloc.effectiveTimeTimeStamp,
+                endTime: accessBloc.expirationTimeTimeStamp));
+          },
+          onReset: () {
+            accessBloc.add(ResetSearch());
+          },
+        ),
+      ],
+    );
   }
 }

lib/pages/access_management/view/access_overview_content.dart

@@ -1,289 +0,0 @@
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
-import 'package:syncrow_web/pages/common/custom_table.dart';
-import 'package:syncrow_web/pages/common/date_time_widget.dart';
-import 'package:syncrow_web/pages/common/filter/filter_widget.dart';
-import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
-import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
-import 'package:syncrow_web/utils/constants/app_enum.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class AccessOverviewContent extends StatelessWidget
-    with HelperResponsiveLayout {
-  const AccessOverviewContent({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final isLargeScreen = isLargeScreenSize(context);
-    final isSmallScreen = isSmallScreenSize(context);
-    final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding =
-        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
-
-    return BlocProvider(
-        create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
-        child: BlocConsumer<AccessBloc, AccessState>(
-            listener: (context, state) {},
-            builder: (context, state) {
-              final accessBloc = BlocProvider.of<AccessBloc>(context);
-              final filteredData = accessBloc.filteredData;
-              return state is AccessLoaded
-                  ? const Center(child: CircularProgressIndicator())
-                  : Container(
-                      padding: padding,
-                      height: MediaQuery.of(context).size.height,
-                      width: MediaQuery.of(context).size.width,
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          FilterWidget(
-                            size: MediaQuery.of(context).size,
-                            tabs: accessBloc.tabs,
-                            selectedIndex: accessBloc.selectedIndex,
-                            onTabChanged: (index) {
-                              accessBloc.add(TabChangedEvent(index));
-                            },
-                          ),
-                          const SizedBox(height: 20),
-                          if (isSmallScreen || isHalfMediumScreen)
-                            _buildSmallSearchFilters(context, accessBloc)
-                          else
-                            _buildNormalSearchWidgets(context, accessBloc),
-                          const SizedBox(height: 20),
-                          _buildVisitorAdminPasswords(context, accessBloc),
-                          const SizedBox(height: 20),
-                          Expanded(
-                              child: DynamicTable(
-                            tableName: 'AccessManagement',
-                            uuidIndex: 1,
-                            withSelectAll: true,
-                            isEmpty: filteredData.isEmpty,
-                            withCheckBox: false,
-                            size: MediaQuery.of(context).size,
-                            cellDecoration: containerDecoration,
-                            headers: const [
-                              'Name',
-                              'Access Type',
-                              'Access Start',
-                              'Access End',
-                              'Accessible Device',
-                              'Authorizer',
-                              'Authorization Date & Time',
-                              'Access Status'
-                            ],
-                            data: filteredData.map((item) {
-                              return [
-                                item.passwordName,
-                                item.passwordType.value,
-                                accessBloc.timestampToDate(item.effectiveTime),
-                                accessBloc.timestampToDate(item.invalidTime),
-                                item.deviceName.toString(),
-                                item.authorizerEmail.toString(),
-                                accessBloc.timestampToDate(item.invalidTime),
-                                item.passwordStatus.value,
-                              ];
-                            }).toList(),
-                          )),
-                        ],
-                      ),
-                    );
-            }));
-  }
-
-  Wrap _buildVisitorAdminPasswords(
-      BuildContext context, AccessBloc accessBloc) {
-    return Wrap(
-      spacing: 10,
-      runSpacing: 10,
-      children: [
-        Container(
-          width: 205,
-          height: 42,
-          decoration: containerDecoration,
-          child: DefaultButton(
-              onPressed: () {
-                showDialog(
-                  context: context,
-                  barrierDismissible: false,
-                  builder: (BuildContext context) {
-                    return const VisitorPasswordDialog();
-                  },
-                ).then((v) {
-                  if (v != null) {
-                    accessBloc.add(FetchTableData());
-                  }
-                });
-              },
-              borderRadius: 8,
-              child: Text(
-                'Create Visitor Password ',
-                style: context.textTheme.titleSmall!
-                    .copyWith(color: Colors.white, fontSize: 12),
-              )),
-        ),
-        // Container(
-        //   width: 133,
-        //   height: 42,
-        //   decoration: containerDecoration,
-        //   child: DefaultButton(
-        //       borderRadius: 8,
-        //       backgroundColor: ColorsManager.whiteColors,
-        //       child: Text(
-        //         'Admin Password',
-        //         style: context.textTheme.titleSmall!
-        //             .copyWith(color: Colors.black, fontSize: 12),
-        //       )),
-        // ),
-      ],
-    );
-  }
-
-  Row _buildNormalSearchWidgets(BuildContext context, AccessBloc accessBloc) {
-    // TimeOfDay _selectedTime = TimeOfDay.now();
-
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.end,
-      textBaseline: TextBaseline.ideographic,
-      children: [
-        SizedBox(
-          width: 250,
-          child: CustomWebTextField(
-            controller: accessBloc.passwordName,
-            height: 43,
-            isRequired: false,
-            textFieldName: 'Name',
-            description: '',
-            onSubmitted: (value) {
-              accessBloc.add(FilterDataEvent(
-                  emailAuthorizer:
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  passwordName: accessBloc.passwordName.text.toLowerCase(),
-                  startTime: accessBloc.effectiveTimeTimeStamp,
-                  endTime: accessBloc.expirationTimeTimeStamp));
-            },
-          ),
-        ),
-        const SizedBox(width: 15),
-        SizedBox(
-          width: 250,
-          child: CustomWebTextField(
-            controller: accessBloc.emailAuthorizer,
-            height: 43,
-            isRequired: false,
-            textFieldName: 'Authorizer',
-            description: '',
-            onSubmitted: (value) {
-              accessBloc.add(FilterDataEvent(
-                  emailAuthorizer:
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  passwordName: accessBloc.passwordName.text.toLowerCase(),
-                  startTime: accessBloc.effectiveTimeTimeStamp,
-                  endTime: accessBloc.expirationTimeTimeStamp));
-            },
-          ),
-        ),
-        const SizedBox(width: 15),
-        SizedBox(
-          child: DateTimeWebWidget(
-            icon: Assets.calendarIcon,
-            isRequired: false,
-            title: 'Access Time',
-            size: MediaQuery.of(context).size,
-            endTime: () {
-              accessBloc.add(SelectTime(context: context, isStart: false));
-            },
-            startTime: () {
-              accessBloc.add(SelectTime(context: context, isStart: true));
-            },
-            firstString: BlocProvider.of<AccessBloc>(context).startTime,
-            secondString: BlocProvider.of<AccessBloc>(context).endTime,
-          ),
-        ),
-        const SizedBox(width: 15),
-        SearchResetButtons(
-          onSearch: () {
-            accessBloc.add(FilterDataEvent(
-                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex:
-                    BlocProvider.of<AccessBloc>(context).selectedIndex,
-                passwordName: accessBloc.passwordName.text.toLowerCase(),
-                startTime: accessBloc.effectiveTimeTimeStamp,
-                endTime: accessBloc.expirationTimeTimeStamp));
-          },
-          onReset: () {
-            accessBloc.add(ResetSearch());
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget _buildSmallSearchFilters(BuildContext context, AccessBloc accessBloc) {
-    return Wrap(
-      spacing: 20,
-      runSpacing: 10,
-      children: [
-        SizedBox(
-          width: 300,
-          child: CustomWebTextField(
-              controller: accessBloc.passwordName,
-              isRequired: true,
-              height: 40,
-              textFieldName: 'Name',
-              description: '',
-              onSubmitted: (value) {
-                accessBloc.add(FilterDataEvent(
-                    emailAuthorizer:
-                        accessBloc.emailAuthorizer.text.toLowerCase(),
-                    selectedTabIndex:
-                        BlocProvider.of<AccessBloc>(context).selectedIndex,
-                    passwordName: accessBloc.passwordName.text.toLowerCase(),
-                    startTime: accessBloc.effectiveTimeTimeStamp,
-                    endTime: accessBloc.expirationTimeTimeStamp));
-              }),
-        ),
-        DateTimeWebWidget(
-          icon: Assets.calendarIcon,
-          isRequired: false,
-          title: 'Access Time',
-          size: MediaQuery.of(context).size,
-          endTime: () {
-            accessBloc.add(SelectTime(context: context, isStart: false));
-          },
-          startTime: () {
-            accessBloc.add(SelectTime(context: context, isStart: true));
-          },
-          firstString: BlocProvider.of<AccessBloc>(context).startTime,
-          secondString: BlocProvider.of<AccessBloc>(context).endTime,
-        ),
-        SearchResetButtons(
-          onSearch: () {
-            accessBloc.add(FilterDataEvent(
-                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex:
-                    BlocProvider.of<AccessBloc>(context).selectedIndex,
-                passwordName: accessBloc.passwordName.text.toLowerCase(),
-                startTime: accessBloc.effectiveTimeTimeStamp,
-                endTime: accessBloc.expirationTimeTimeStamp));
-          },
-          onReset: () {
-            accessBloc.add(ResetSearch());
-          },
-        ),
-      ],
-    );
-  }
-}

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

@@ -22,7 +22,9 @@ import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_en
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/device_location/device_location_details_service_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/device_location/remote_device_location_service.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_value_divider_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_value_divider_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
@@ -62,19 +64,25 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
         ),
         BlocProvider(
           create: (context) => TotalEnergyConsumptionBloc(
+            DividedTotalEnergyConsumptionDecorator(
               RemoteTotalEnergyConsumptionService(_httpService),
             ),
           ),
+        ),
         BlocProvider(
           create: (context) => EnergyConsumptionByPhasesBloc(
+            EnergyConsumptionByPhasesValueDividerDecorator(
               RemoteEnergyConsumptionByPhasesService(_httpService),
             ),
           ),
+        ),
         BlocProvider(
           create: (context) => EnergyConsumptionPerDeviceBloc(
+            EnergyConsumptionPerDeviceValueDividerDecorator(
               RemoteEnergyConsumptionPerDeviceService(_httpService),
             ),
           ),
+        ),
         BlocProvider(
           create: (context) => PowerClampInfoBloc(
             RemotePowerClampInfoService(_httpService),
@@ -145,6 +153,7 @@ class _AnalyticsPageFormState extends State<AnalyticsPageForm> {
     context.read<SpaceTreeBloc>().add(InitialEvent());
     super.initState();
   }
+
   @override
   Widget build(BuildContext context) {
     return WebScaffold(

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart

@@ -13,15 +13,15 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   });
 
   final List<PhasesEnergyConsumption> energyData;
+  static const _kLeftTitlesInterval = 4.0;
 
   @override
   Widget build(BuildContext context) {
     return BarChart(
       BarChartData(
-
         gridData: EnergyManagementChartsHelper.gridData().copyWith(
           checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 250,
+          horizontalInterval: _kLeftTitlesInterval,
         ),
         borderData: EnergyManagementChartsHelper.borderData(),
         barTouchData: _barTouchData(context),
@@ -100,11 +100,11 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   }) {
     final data = energyData;
 
-    final date = DateFormat('dd/MM/yyyy').format(data[group.x.toInt()].date);
-    final phaseA = data[group.x.toInt()].energyConsumedA;
-    final phaseB = data[group.x.toInt()].energyConsumedB;
-    final phaseC = data[group.x.toInt()].energyConsumedC;
-    final total = data[group.x.toInt()].energyConsumedKw;
+    final date = DateFormat('dd/MM/yyyy').format(data[group.x].date);
+    final phaseA = data[group.x].energyConsumedA;
+    final phaseB = data[group.x].energyConsumedB;
+    final phaseC = data[group.x].energyConsumedC;
+    final total = data[group.x].energyConsumedKw;
 
     return BarTooltipItem(
       '$date\n',
@@ -149,7 +149,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   FlTitlesData _titlesData(BuildContext context) {
     final titlesData = EnergyManagementChartsHelper.titlesData(
       context,
-      leftTitlesInterval: 250,
+      leftTitlesInterval: _kLeftTitlesInterval,
     );
 
     final leftTitles = titlesData.leftTitles.copyWith(

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart.dart

@@ -7,6 +7,7 @@ class EnergyConsumptionPerDeviceChart extends StatelessWidget {
   const EnergyConsumptionPerDeviceChart({super.key, required this.chartData});
 
   final List<DeviceEnergyDataModel> chartData;
+  static const _kLeftTitlesInterval = 2.5;
 
   @override
   Widget build(BuildContext context) {
@@ -15,12 +16,11 @@ class EnergyConsumptionPerDeviceChart extends StatelessWidget {
         clipData: const FlClipData.vertical(),
         titlesData: EnergyManagementChartsHelper.titlesData(
           context,
-          leftTitlesInterval: 250,
+          leftTitlesInterval: _kLeftTitlesInterval,
         ),
-        
         gridData: EnergyManagementChartsHelper.gridData().copyWith(
           checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 250,
+          horizontalInterval: _kLeftTitlesInterval,
         ),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: EnergyManagementChartsHelper.lineTouchData(),

lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart

@@ -9,22 +9,24 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
 
   final List<EnergyDataModel> chartData;
 
+  static const _leftTitlesInterval = 5.0;
   @override
   Widget build(BuildContext context) {
     return Expanded(
       child: LineChart(
         LineChartData(
-          maxY: chartData.isEmpty
-              ? null
-              : chartData.map((e) => e.value).reduce((a, b) => a > b ? a : b) + 250,
+          maxY: chartData.isNotEmpty
+              ? chartData.map((e) => e.value).reduce((a, b) => a > b ? a : b) +
+                  _leftTitlesInterval
+              : null,
           clipData: const FlClipData.vertical(),
           titlesData: EnergyManagementChartsHelper.titlesData(
             context,
-            leftTitlesInterval: 500,
+            leftTitlesInterval: _leftTitlesInterval,
           ),
           gridData: EnergyManagementChartsHelper.gridData().copyWith(
             checkToShowHorizontalLine: (value) => true,
-            horizontalInterval: 500,
+            horizontalInterval: _leftTitlesInterval,
           ),
           borderData: EnergyManagementChartsHelper.borderData(),
           lineTouchData: EnergyManagementChartsHelper.lineTouchData(),

lib/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_value_divider_decorator.dart

@@ -0,0 +1,34 @@
+import 'package:syncrow_web/pages/analytics/models/phases_energy_consumption.dart';
+import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_by_phases_param.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class EnergyConsumptionByPhasesValueDividerDecorator
+    implements EnergyConsumptionByPhasesService {
+  const EnergyConsumptionByPhasesValueDividerDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final EnergyConsumptionByPhasesService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<PhasesEnergyConsumption>> load(
+      GetEnergyConsumptionByPhasesParam param) async {
+    final result = await _decoratee.load(param);
+    return result.map((e) {
+      return PhasesEnergyConsumption(
+        date: e.date,
+        energyConsumedA: SafeDivisionHelper.divide(e.energyConsumedA, divider),
+        energyConsumedB: SafeDivisionHelper.divide(e.energyConsumedB, divider),
+        energyConsumedC: SafeDivisionHelper.divide(e.energyConsumedC, divider),
+        energyConsumedKw: SafeDivisionHelper.divide(e.energyConsumedKw, divider),
+        uuid: e.uuid,
+        createdAt: e.createdAt,
+        updatedAt: e.updatedAt,
+        deviceUuid: e.deviceUuid,
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_value_divider_decorator.dart

@@ -0,0 +1,36 @@
+import 'package:syncrow_web/pages/analytics/models/device_energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/models/energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_per_device_param.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class EnergyConsumptionPerDeviceValueDividerDecorator
+    implements EnergyConsumptionPerDeviceService {
+  const EnergyConsumptionPerDeviceValueDividerDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final EnergyConsumptionPerDeviceService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<DeviceEnergyDataModel>> load(
+    GetEnergyConsumptionPerDeviceParam param,
+  ) async {
+    final result = await _decoratee.load(param);
+    return result.map((device) {
+      return DeviceEnergyDataModel(
+        deviceId: device.deviceId,
+        deviceName: device.deviceName,
+        color: device.color,
+        energy: device.energy.map((e) {
+          return EnergyDataModel(
+            date: e.date,
+            value: SafeDivisionHelper.divide(e.value, divider),
+          );
+        }).toList(),
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/total_energy_consumption/divided_total_energy_consumption_decorator.dart

@@ -0,0 +1,26 @@
+import 'package:syncrow_web/pages/analytics/models/energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/params/get_total_energy_consumption_param.dart';
+import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/total_energy_consumption_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class DividedTotalEnergyConsumptionDecorator
+    implements TotalEnergyConsumptionService {
+  const DividedTotalEnergyConsumptionDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final TotalEnergyConsumptionService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<EnergyDataModel>> load(GetTotalEnergyConsumptionParam param) async {
+    final result = await _decoratee.load(param);
+    return result.map((e) {
+      return EnergyDataModel(
+        date: e.date,
+        value: SafeDivisionHelper.divide(e.value, divider),
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart

@@ -59,3 +59,23 @@ abstract final class _TotalEnergyConsumptionResponseMapper {
     }).toList();
   }
 }
+
+class DividedTotalEnergyConsumptionDecorator
+    implements TotalEnergyConsumptionService {
+  const DividedTotalEnergyConsumptionDecorator(this._decoratee);
+
+  final TotalEnergyConsumptionService _decoratee;
+  @override
+  Future<List<EnergyDataModel>> load(
+    GetTotalEnergyConsumptionParam param,
+  ) async {
+    final result = await _decoratee.load(param);
+    final dividedResult = result.map((e) {
+      return EnergyDataModel(
+        date: e.date,
+        value: e.value / 100,
+      );
+    });
+    return dividedResult.toList();
+  }
+}

lib/pages/common/custom_table.dart

@@ -50,9 +50,6 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
-  static const double _fixedRowHeight = 60;
-  static const double _checkboxColumnWidth = 50;
-  static const double _settingsColumnWidth = 100;
 
   @override
   void initState() {
@@ -70,6 +67,7 @@ class _DynamicTableState extends State<DynamicTable> {
 
   bool _compareListOfLists(
       List<List<dynamic>> oldList, List<List<dynamic>> newList) {
+    // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
     for (int i = 0; i < oldList.length; i++) {
@@ -106,127 +104,69 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
-  double get _totalTableWidth {
-    final hasSettings = widget.headers.contains('Settings');
-    final base = (widget.withCheckBox ? _checkboxColumnWidth : 0) +
-        (hasSettings ? _settingsColumnWidth : 0);
-    final regularCount = widget.headers.length - (hasSettings ? 1 : 0);
-    final regularWidth = (widget.size.width - base) / regularCount;
-    return base + regularCount * regularWidth;
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: widget.size.width,
-      height: widget.size.height,
       decoration: widget.cellDecoration,
-      child: ScrollConfiguration(
-        behavior: const ScrollBehavior().copyWith(scrollbars: false),
       child: Scrollbar(
+        controller: _verticalScrollController,
+        thumbVisibility: true,
+        trackVisibility: true,
+        child: Scrollbar(
+          //fixed the horizontal scrollbar issue
           controller: _horizontalScrollController,
           thumbVisibility: true,
           trackVisibility: true,
-          notificationPredicate: (notif) =>
-              notif.metrics.axis == Axis.horizontal,
+          notificationPredicate: (notif) => notif.depth == 1,
+          child: SingleChildScrollView(
+            controller: _verticalScrollController,
             child: SingleChildScrollView(
               controller: _horizontalScrollController,
               scrollDirection: Axis.horizontal,
               child: SizedBox(
-              width: _totalTableWidth,
+                width: widget.size.width,
                 child: Column(
                   children: [
                     Container(
-                    height: _fixedRowHeight,
                       decoration: widget.headerDecoration ??
-                        const BoxDecoration(color: ColorsManager.boxColor),
+                          const BoxDecoration(
+                            color: ColorsManager.boxColor,
+                          ),
                       child: Row(
                         children: [
-                        if (widget.withCheckBox)
-                          _buildSelectAllCheckbox(_checkboxColumnWidth),
-                        for (var i = 0; i < widget.headers.length; i++)
-                          _buildTableHeaderCell(
-                            widget.headers[i],
-                            widget.headers[i] == 'Settings'
-                                ? _settingsColumnWidth
-                                : (_totalTableWidth -
-                                        (widget.withCheckBox
-                                            ? _checkboxColumnWidth
-                                            : 0) -
-                                        (widget.headers.contains('Settings')
-                                            ? _settingsColumnWidth
-                                            : 0)) /
-                                    (widget.headers.length -
-                                        (widget.headers.contains('Settings')
-                                            ? 1
-                                            : 0)),
-                          ),
+                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
+                          ...List.generate(widget.headers.length, (index) {
+                            return _buildTableHeaderCell(
+                                widget.headers[index], index);
+                          })
+                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
                         ],
                       ),
                     ),
-
-                  Expanded(
+                    SizedBox(
+                      width: widget.size.width,
                       child: widget.isEmpty
                           ? _buildEmptyState()
-                        : Scrollbar(
-                            controller: _verticalScrollController,
-                            thumbVisibility: true,
-                            trackVisibility: true,
-                            notificationPredicate: (notif) =>
-                                notif.metrics.axis == Axis.vertical,
-                            child: ListView.builder(
-                              controller: _verticalScrollController,
-                              itemCount: widget.data.length,
-                              itemBuilder: (_, rowIndex) {
+                          : Column(
+                              children:
+                                  List.generate(widget.data.length, (rowIndex) {
                                 final row = widget.data[rowIndex];
-                                return SizedBox(
-                                  height: _fixedRowHeight,
-                                  child: Row(
+                                return Row(
                                   children: [
                                     if (widget.withCheckBox)
                                       _buildRowCheckbox(
-                                          rowIndex,
-                                          _checkboxColumnWidth,
-                                        ),
-                                      for (var colIndex = 0;
-                                          colIndex < row.length;
-                                          colIndex++)
-                                        widget.headers[colIndex] == 'Settings'
-                                            ? buildSettingsIcon(
-                                                width: _settingsColumnWidth,
-                                                onTap: () => widget
-                                                    .onSettingsPressed
-                                                    ?.call(rowIndex),
-                                              )
-                                            : _buildTableCell(
-                                                row[colIndex].toString(),
-                                                width: widget.headers[
-                                                            colIndex] ==
-                                                        'Settings'
-                                                    ? _settingsColumnWidth
-                                                    : (_totalTableWidth -
-                                                            (widget.withCheckBox
-                                                                ? _checkboxColumnWidth
-                                                                : 0) -
-                                                            (widget.headers
-                                                                    .contains(
-                                                                        'Settings')
-                                                                ? _settingsColumnWidth
-                                                                : 0)) /
-                                                        (widget.headers.length -
-                                                            (widget.headers
-                                                                    .contains(
-                                                                        'Settings')
-                                                                ? 1
-                                                                : 0)),
+                                          rowIndex, widget.size.height * 0.08),
+                                    ...row.asMap().entries.map((entry) {
+                                      return _buildTableCell(
+                                        entry.value.toString(),
+                                        widget.size.height * 0.08,
                                         rowIndex: rowIndex,
-                                                columnIndex: colIndex,
-                                              ),
-                                    ],
-                                  ),
+                                        columnIndex: entry.key,
                                       );
-                              },
-                            ),
+                                    }).toList(),
+                                  ],
+                                );
+                              }),
                             ),
                     ),
                   ],
@@ -235,6 +175,7 @@ class _DynamicTableState extends State<DynamicTable> {
             ),
           ),
         ),
+      ),
     );
   }
 
@@ -269,10 +210,9 @@ class _DynamicTableState extends State<DynamicTable> {
           ],
         ),
       );
-
-  Widget _buildSelectAllCheckbox(double width) {
+  Widget _buildSelectAllCheckbox() {
     return Container(
-      width: width,
+      width: 50,
       decoration: const BoxDecoration(
         border: Border.symmetric(
           vertical: BorderSide(color: ColorsManager.boxDivider),
@@ -287,11 +227,11 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildRowCheckbox(int index, double width) {
+  Widget _buildRowCheckbox(int index, double size) {
     return Container(
-      width: width,
+      width: 50,
       padding: const EdgeInsets.all(8.0),
-      height: _fixedRowHeight,
+      height: size,
       decoration: const BoxDecoration(
         border: Border(
           bottom: BorderSide(
@@ -313,18 +253,20 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableHeaderCell(String title, double width) {
-    return Container(
-      width: width,
+  Widget _buildTableHeaderCell(String title, int index) {
+    return Expanded(
+      child: Container(
         decoration: const BoxDecoration(
           border: Border.symmetric(
             vertical: BorderSide(color: ColorsManager.boxDivider),
           ),
         ),
-      constraints: BoxConstraints(minHeight: 40, maxHeight: _fixedRowHeight),
+        constraints: const BoxConstraints.expand(height: 40),
         alignment: Alignment.centerLeft,
         child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
+          padding: EdgeInsets.symmetric(
+              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
+              vertical: 4),
           child: Text(
             title,
             style: context.textTheme.titleSmall!.copyWith(
@@ -333,27 +275,28 @@ class _DynamicTableState extends State<DynamicTable> {
               fontWeight: FontWeight.w400,
             ),
             maxLines: 2,
-          overflow: TextOverflow.ellipsis,
+          ),
         ),
       ),
     );
   }
 
-  Widget _buildTableCell(String content,
-      {required double width,
-      required int rowIndex,
-      required int columnIndex}) {
+  Widget _buildTableCell(String content, double size,
+      {required int rowIndex, required int columnIndex}) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
     if (isBatteryLevel) {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
-
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
     if (isSettingsColumn) {
       return buildSettingsIcon(
-          width: width, onTap: () => widget.onSettingsPressed?.call(rowIndex));
+        width: 120,
+        height: 60,
+        iconSize: 40,
+        onTap: () => widget.onSettingsPressed?.call(rowIndex),
+      );
     }
 
     Color? statusColor;
@@ -377,10 +320,10 @@ class _DynamicTableState extends State<DynamicTable> {
         statusColor = Colors.black;
     }
 
-    return Container(
-      width: width,
-      height: _fixedRowHeight,
-      padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
+    return Expanded(
+      child: Container(
+        height: size,
+        padding: const EdgeInsets.all(5.0),
         decoration: const BoxDecoration(
           border: Border(
             bottom: BorderSide(
@@ -400,19 +343,23 @@ class _DynamicTableState extends State<DynamicTable> {
                       ? ColorsManager.green
                       : statusColor,
               fontSize: 13,
-          fontWeight: FontWeight.w400,
-        ),
+              fontWeight: FontWeight.w400),
           maxLines: 2,
-        overflow: TextOverflow.ellipsis,
+        ),
       ),
     );
   }
 
-  Widget buildSettingsIcon({required double width, VoidCallback? onTap}) {
-    return Container(
-      width: width,
-      height: _fixedRowHeight,
-      padding: const EdgeInsets.only(left: 15, top: 10, bottom: 10),
+  Widget buildSettingsIcon(
+      {double width = 120,
+      double height = 60,
+      double iconSize = 40,
+      VoidCallback? onTap}) {
+    return Column(
+      children: [
+        Container(
+          padding: const EdgeInsets.only(top: 10, bottom: 15, left: 10),
+          margin: const EdgeInsets.only(right: 15),
           decoration: const BoxDecoration(
             color: ColorsManager.whiteColors,
             border: Border(
@@ -422,13 +369,17 @@ class _DynamicTableState extends State<DynamicTable> {
               ),
             ),
           ),
-      child: Align(
-        alignment: Alignment.centerLeft,
+          width: width,
+          child: Padding(
+            padding: const EdgeInsets.only(
+              right: 16.0,
+              left: 17.0,
+            ),
             child: Container(
               width: 50,
               decoration: BoxDecoration(
                 color: const Color(0xFFF7F8FA),
-            borderRadius: BorderRadius.circular(20),
+                borderRadius: BorderRadius.circular(height / 2),
                 boxShadow: [
                   BoxShadow(
                     color: Colors.black.withOpacity(0.17),
@@ -440,12 +391,12 @@ class _DynamicTableState extends State<DynamicTable> {
               child: InkWell(
                 onTap: onTap,
                 child: Padding(
-              padding: EdgeInsets.all(8.0),
+                  padding: const EdgeInsets.all(8.0),
                   child: Center(
                     child: SvgPicture.asset(
                       Assets.settings,
                       width: 40,
-                  height: 20,
+                      height: 22,
                       color: ColorsManager.primaryColor,
                     ),
                   ),
@@ -453,6 +404,8 @@ class _DynamicTableState extends State<DynamicTable> {
               ),
             ),
           ),
+        ),
+      ],
     );
   }
 }

lib/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart

@@ -17,7 +17,6 @@ class CalibrateCompletedDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         height: 250,

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -32,12 +32,15 @@ class SpaceDropdown extends StatelessWidget {
                   color: ColorsManager.blackColor,
                 ),
           ),
-          DropdownButton2<String>(
-            underline: const SizedBox(),
-            buttonStyleData: ButtonStyleData(
-              decoration:
-                  BoxDecoration(borderRadius: BorderRadius.circular(12)),
+          SizedBox(
+            child: Container(
+              height: 40,
+              decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
+                borderRadius: BorderRadius.circular(10),
               ),
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
                 value: selectedValue,
                 items: spaces.map((space) {
                   return DropdownMenuItem<String>(
@@ -48,21 +51,17 @@ class SpaceDropdown extends StatelessWidget {
                       children: [
                         Text(
                           '   ${space.name}',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                            color: selectedValue == space.uuid
-                                ? ColorsManager.dialogBlueTitle
-                                : ColorsManager.blackColor,
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
                                   ),
                         ),
                         Text(
                           '   ${space.lastThreeParents}',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
                                     fontSize: 12,
-                            color: selectedValue == space.uuid
-                                ? ColorsManager.dialogBlueTitle
-                                : ColorsManager.blackColor,
                                   ),
                         ),
                       ],
@@ -70,10 +69,7 @@ class SpaceDropdown extends StatelessWidget {
                   );
                 }).toList(),
                 onChanged: onChanged,
-            style: TextStyle(
-              color: Colors.black,
-              fontSize: 13,
-            ),
+                style: TextStyle(color: Colors.black),
                 hint: Padding(
                   padding: const EdgeInsets.only(left: 10),
                   child: Text(
@@ -84,9 +80,10 @@ class SpaceDropdown extends StatelessWidget {
                   ),
                 ),
                 customButton: Container(
-              height: 40,
+                  height: 45,
                   decoration: BoxDecoration(
-                border: Border.all(color: ColorsManager.textGray, width: 1.0),
+                    border:
+                        Border.all(color: ColorsManager.textGray, width: 1.0),
                     borderRadius: BorderRadius.circular(10),
                   ),
                   child: Row(
@@ -102,8 +99,8 @@ class SpaceDropdown extends StatelessWidget {
                                     .firstWhere((e) => e.uuid == selectedValue)
                                     .name
                                 : hintMessage,
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                              fontSize: 13,
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
                                       color: selectedValue != null
                                           ? Colors.black
                                           : ColorsManager.textGray,
@@ -142,6 +139,8 @@ class SpaceDropdown extends StatelessWidget {
                   height: 60,
                 ),
               ),
+            ),
+          ),
         ],
       ),
     );

lib/pages/routines/widgets/main_routine_view/routine_view_card.dart

@@ -121,8 +121,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                 child: SizedBox(
                                   width: 16,
                                   height: 16,
-                                  child:
-                                      CircularProgressIndicator(strokeWidth: 2),
+                                  child: CircularProgressIndicator(strokeWidth: 2),
                                 ),
                               ),
                             )
@@ -160,8 +159,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder:
-                                          (context, error, stackTrace) =>
+                                      errorBuilder: (context, error, stackTrace) =>
                                           Image.asset(
                                         Assets.logo,
                                         height: iconSize,
@@ -205,8 +203,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                             maxLines: 1,
                             style: context.textTheme.bodySmall?.copyWith(
                               color: ColorsManager.blackColor,
-                              fontSize:
-                                  widget.isSmallScreenSize(context) ? 10 : 12,
+                              fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
                             ),
                           ),
                           if (widget.spaceName != '')
@@ -225,9 +222,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   maxLines: 1,
                                   style: context.textTheme.bodySmall?.copyWith(
                                     color: ColorsManager.blackColor,
-                                    fontSize: widget.isSmallScreenSize(context)
-                                        ? 10
-                                        : 12,
+                                    fontSize:
+                                        widget.isSmallScreenSize(context) ? 10 : 12,
                                   ),
                                 ),
                               ],

lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart

@@ -1,39 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart';
 
 abstract final class SpaceManagementCommunityDialogHelper {
-  static void showCreateDialog(BuildContext context) => showDialog<void>(
-        context: context,
-        builder: (_) => const CreateCommunityDialog(),
-      );
-
-  static void showEditDialog(
-    BuildContext context,
-    CommunityModel community,
-  ) {
+  static void showCreateDialog(BuildContext context) {
     showDialog<void>(
       context: context,
-      builder: (_) => EditCommunityDialog(
-        community: community,
-        parentContext: context,
+      builder: (_) => CreateCommunityDialog(
+        title: const SelectableText('Community Name'),
+        onCreateCommunity: (community) {
+          context.read<CommunitiesBloc>().add(
+                InsertCommunity(community),
+              );
+          context.read<CommunitiesTreeSelectionBloc>().add(
+                SelectCommunityEvent(community: community),
+              );
+        },
       ),
     );
   }
-
-  static void showLoadingDialog(BuildContext context) => showDialog<void>(
-        context: context,
-        barrierDismissible: false,
-        builder: (context) => const Center(
-          child: CircularProgressIndicator(),
-        ),
-      );
-
-  static void showSuccessSnackBar(BuildContext context, String message) =>
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(message),
-        ),
-      );
 }

lib/pages/space_management_v2/main_module/views/space_management_page.dart

@@ -7,9 +7,6 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/s
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/unique_subspaces_decorator.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
@@ -29,13 +26,6 @@ class SpaceManagementPage extends StatelessWidget {
           )..add(const LoadCommunities(LoadCommunitiesParam())),
         ),
         BlocProvider(create: (context) => CommunitiesTreeSelectionBloc()),
-        BlocProvider(
-          create: (context) => SpaceDetailsBloc(
-            UniqueSubspacesDecorator(
-              RemoteSpaceDetailsService(httpService: HTTPService()),
-            ),
-          ),
-        ),
       ],
       child: WebScaffold(
         appBarTitle: Text(

lib/pages/space_management_v2/main_module/widgets/community_structure_header.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class CommunityStructureHeader extends StatelessWidget {
-  const CommunityStructureHeader({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final screenWidth = MediaQuery.of(context).size.width;
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0),
-      decoration: BoxDecoration(
-        color: ColorsManager.whiteColors,
-        boxShadow: [
-          BoxShadow(
-            color: ColorsManager.shadowBlackColor,
-            blurRadius: 8,
-            offset: const Offset(0, 4),
-          ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Expanded(
-                child: _buildCommunityInfo(context, theme, screenWidth),
-              ),
-              const SizedBox(width: 16),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCommunityInfo(
-      BuildContext context, ThemeData theme, double screenWidth) {
-    final selectedCommunity =
-        context.watch<CommunitiesTreeSelectionBloc>().state.selectedCommunity;
-    final selectedSpace =
-        context.watch<CommunitiesTreeSelectionBloc>().state.selectedSpace;
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Community Structure',
-          style: theme.textTheme.headlineLarge
-              ?.copyWith(color: ColorsManager.blackColor),
-        ),
-        if (selectedCommunity != null)
-          Row(
-            children: [
-              Expanded(
-                child: Row(
-                  children: [
-                    Flexible(
-                      child: SelectableText(
-                        selectedCommunity.name,
-                        style: theme.textTheme.bodyLarge
-                            ?.copyWith(color: ColorsManager.blackColor),
-                        maxLines: 1,
-                      ),
-                    ),
-                    const SizedBox(width: 2),
-                    GestureDetector(
-                      onTap: () {
-                        SpaceManagementCommunityDialogHelper.showEditDialog(
-                          context,
-                          selectedCommunity,
-                        );
-                      },
-                      child: SvgPicture.asset(
-                        Assets.iconEdit,
-                        width: 16,
-                        height: 16,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(width: 8),
-              CommunityStructureHeaderActionButtons(
-                onDelete: (space) {},
-                onDuplicate: (space) {},
-                onEdit: (space) {
-                  SpaceDetailsDialogHelper.showEdit(
-                    context,
-                    spaceModel: selectedSpace!,
-                  );
-                },
-                selectedSpace: selectedSpace,
-              ),
-            ],
-          ),
-      ],
-    );
-  }
-}

lib/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons.dart

@@ -1,46 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_button.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class CommunityStructureHeaderActionButtons extends StatelessWidget {
-  const CommunityStructureHeaderActionButtons({
-    super.key,
-    required this.onDelete,
-    required this.selectedSpace,
-    required this.onDuplicate,
-    required this.onEdit,
-  });
-
-  final void Function(SpaceModel space) onDelete;
-  final void Function(SpaceModel space) onDuplicate;
-  final void Function(SpaceModel space) onEdit;
-  final SpaceModel? selectedSpace;
-
-  @override
-  Widget build(BuildContext context) {
-    return Wrap(
-      alignment: WrapAlignment.end,
-      spacing: 10,
-      children: [
-        if (selectedSpace != null) ...[
-          CommunityStructureHeaderButton(
-            label: 'Edit',
-            svgAsset: Assets.editSpace,
-            onPressed: () => onEdit(selectedSpace!),
-          ),
-          CommunityStructureHeaderButton(
-            label: 'Duplicate',
-            svgAsset: Assets.duplicate,
-            onPressed: () => onDuplicate(selectedSpace!),
-          ),
-          CommunityStructureHeaderButton(
-            label: 'Delete',
-            svgAsset: Assets.spaceDelete,
-            onPressed: () => onDelete(selectedSpace!),
-          ),
-        ],
-      ],
-    );
-  }
-}

lib/pages/space_management_v2/main_module/widgets/community_structure_header_button.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CommunityStructureHeaderButton extends StatelessWidget {
-  const CommunityStructureHeaderButton({
-    super.key,
-    required this.label,
-    required this.onPressed,
-    this.svgAsset,
-  });
-
-  final String label;
-  final VoidCallback onPressed;
-  final String? svgAsset;
-
-  @override
-  Widget build(BuildContext context) {
-    const double buttonHeight = 40;
-    return ConstrainedBox(
-      constraints: const BoxConstraints(
-        maxWidth: 130,
-        minHeight: buttonHeight,
-      ),
-      child: DefaultButton(
-        onPressed: onPressed,
-        borderWidth: 2,
-        backgroundColor: ColorsManager.textFieldGreyColor,
-        foregroundColor: ColorsManager.blackColor,
-        borderRadius: 12.0,
-        padding: 2.0,
-        height: buttonHeight,
-        elevation: 0,
-        borderColor: ColorsManager.lightGrayColor,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (svgAsset != null)
-              SvgPicture.asset(
-                svgAsset!,
-                width: 20,
-                height: 20,
-              ),
-            const SizedBox(width: 10),
-            Flexible(
-              child: Text(
-                label,
-                style: context.textTheme.bodySmall
-                    ?.copyWith(color: ColorsManager.blackColor, fontSize: 14),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/main_module/widgets/space_management_community_structure.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/create_space_button.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 
@@ -19,18 +18,10 @@ class SpaceManagementCommunityStructure extends StatelessWidget {
       replacement: const Row(
         children: [spacer, Expanded(child: CreateSpaceButton()), spacer],
       ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const CommunityStructureHeader(),
-          Expanded(
       child: CommunityStructureCanvas(
         community: selectedCommunity,
         selectedSpace: selectedSpace,
       ),
-          ),
-        ],
-      ),
     );
   }
 }

lib/pages/space_management_v2/modules/communities/domain/models/community_model.dart

@@ -39,26 +39,6 @@ class CommunityModel extends Equatable {
         .toList();
   }
 
-  CommunityModel copyWith({
-    String? uuid,
-    String? name,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? description,
-    String? externalId,
-    List<SpaceModel>? spaces,
-  }) {
-    return CommunityModel(
-      uuid: uuid ?? this.uuid,
-      name: name ?? this.name,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      description: description ?? this.description,
-      externalId: externalId ?? this.externalId,
-      spaces: spaces ?? this.spaces,
-    );
-  }
-
   @override
   List<Object?> get props => [uuid, name, spaces];
 }

lib/pages/space_management_v2/modules/communities/domain/models/space_model.dart

@@ -19,16 +19,6 @@ class SpaceModel extends Equatable {
     required this.parent,
   });
 
-  factory SpaceModel.empty() => const SpaceModel(
-        uuid: '',
-        createdAt: null,
-        updatedAt: null,
-        spaceName: '',
-        icon: '',
-        children: [],
-        parent: null,
-      );
-
   factory SpaceModel.fromJson(Map<String, dynamic> json) {
     return SpaceModel(
       uuid: json['uuid'] as String? ?? '',

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart

@@ -16,7 +16,6 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
     on<LoadCommunities>(_onLoadCommunities);
     on<LoadMoreCommunities>(_onLoadMoreCommunities);
     on<InsertCommunity>(_onInsertCommunity);
-    on<CommunitiesUpdateCommunity>(_onCommunitiesUpdateCommunity);
   }
 
   final CommunitiesService _communitiesService;
@@ -115,18 +114,4 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
   ) {
     emit(state.copyWith(communities: [event.community, ...state.communities]));
   }
-
-  void _onCommunitiesUpdateCommunity(
-    CommunitiesUpdateCommunity event,
-    Emitter<CommunitiesState> emit,
-  ) {
-    final updatedCommunities = state.communities
-        .map((e) => e.uuid == event.community.uuid ? event.community : e)
-        .toList();
-    emit(
-      state.copyWith(
-        communities: updatedCommunities,
-      ),
-    );
-  }
 }

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart

@@ -31,12 +31,3 @@ final class InsertCommunity extends CommunitiesEvent {
   @override
   List<Object?> get props => [community];
 }
-
-final class CommunitiesUpdateCommunity extends CommunitiesEvent {
-  const CommunitiesUpdateCommunity(this.community);
-
-  final CommunityModel community;
-
-  @override
-  List<Object?> get props => [community];
-}

lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart

@@ -1,58 +1,57 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/widgets/community_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/data/services/remote_create_community_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_dialog_widget.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 
 class CreateCommunityDialog extends StatelessWidget {
-  const CreateCommunityDialog({super.key});
+  final void Function(CommunityModel community) onCreateCommunity;
+  final String? initialName;
+  final Widget title;
+
+  const CreateCommunityDialog({
+    super.key,
+    required this.onCreateCommunity,
+    required this.title,
+    this.initialName,
+  });
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (_) => CreateCommunityBloc(
-        RemoteCreateCommunityService(HTTPService()),
-      ),
-      child: BlocConsumer<CreateCommunityBloc, CreateCommunityState>(
+      create: (_) => CreateCommunityBloc(RemoteCreateCommunityService(HTTPService())),
+      child: BlocListener<CreateCommunityBloc, CreateCommunityState>(
         listener: (context, state) {
           switch (state) {
-            case CreateCommunityLoading() || CreateCommunityInitial():
-              SpaceManagementCommunityDialogHelper.showLoadingDialog(context);
+            case CreateCommunityLoading():
+              showDialog<void>(
+                context: context,
+                builder: (context) => const Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
               break;
             case CreateCommunitySuccess(:final community):
               Navigator.of(context).pop();
               Navigator.of(context).pop();
-              SpaceManagementCommunityDialogHelper.showSuccessSnackBar(
-                context,
-                '${community.name} community created successfully',
-              );
-              context.read<CommunitiesBloc>().add(
-                    InsertCommunity(community),
-                  );
-              context.read<CommunitiesTreeSelectionBloc>().add(
-                    SelectCommunityEvent(community: community),
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(content: Text('Community created successfully')),
               );
+              onCreateCommunity.call(community);
               break;
             case CreateCommunityFailure():
               Navigator.of(context).pop();
               break;
+            default:
+              break;
           }
         },
-        builder: (BuildContext context, CreateCommunityState state) {
-          return CommunityDialog(
-            title: const Text('Create Community'),
-            initialName: null,
-            onSubmit: (name) => context.read<CreateCommunityBloc>().add(
-                  CreateCommunity(CreateCommunityParam(name: name)),
+        child: CreateCommunityDialogWidget(
+          title: title,
+          initialName: initialName,
         ),
-            errorMessage: state is CreateCommunityFailure ? state.message : null,
-          );
-        },
       ),
     );
   }

lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog_widget.dart

@@ -1,29 +1,28 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_name_text_field.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CommunityDialog extends StatefulWidget {
+class CreateCommunityDialogWidget extends StatefulWidget {
   final String? initialName;
   final Widget title;
-  final void Function(String name) onSubmit;
-  final String? errorMessage;
 
-  const CommunityDialog({
-    required this.title,
-    required this.onSubmit,
-    this.initialName,
-    this.errorMessage,
+  const CreateCommunityDialogWidget({
     super.key,
+    required this.title,
+    this.initialName,
   });
 
   @override
-  State<CommunityDialog> createState() => _CommunityDialogState();
+  State<CreateCommunityDialogWidget> createState() =>
+      _CreateCommunityDialogWidgetState();
 }
 
-class _CommunityDialogState extends State<CommunityDialog> {
+class _CreateCommunityDialogWidgetState extends State<CreateCommunityDialogWidget> {
   late final TextEditingController _nameController;
 
   @override
@@ -64,7 +63,9 @@ class _CommunityDialogState extends State<CommunityDialog> {
         child: Form(
           key: _formKey,
           child: SingleChildScrollView(
-            child: Column(
+            child: BlocBuilder<CreateCommunityBloc, CreateCommunityState>(
+              builder: (context, state) {
+                return Column(
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
@@ -73,11 +74,24 @@ class _CommunityDialogState extends State<CommunityDialog> {
                       child: widget.title,
                     ),
                     const SizedBox(height: 18),
-                CreateCommunityNameTextField(nameController: _nameController),
-                _buildErrorMessage(),
+                    CreateCommunityNameTextField(
+                      nameController: _nameController,
+                    ),
+                    if (state case CreateCommunityFailure(:final message))
+                      Padding(
+                        padding: const EdgeInsets.only(top: 18),
+                        child: SelectableText(
+                          '* $message',
+                          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                color: Theme.of(context).colorScheme.error,
+                              ),
+                        ),
+                      ),
                     const SizedBox(height: 24),
                     _buildActionButtons(context),
                   ],
+                );
+              },
             ),
           ),
         ),
@@ -118,22 +132,13 @@ class _CommunityDialogState extends State<CommunityDialog> {
 
   void _onSubmit(BuildContext context) {
     if (_formKey.currentState?.validate() ?? false) {
-      widget.onSubmit.call(_nameController.text.trim());
-    }
-  }
-
-  Widget _buildErrorMessage() {
-    return Visibility(
-      visible: widget.errorMessage != null,
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(vertical: 18),
-        child: SelectableText(
-          '* ${widget.errorMessage}',
-          style: context.textTheme.bodyMedium?.copyWith(
-            color: context.theme.colorScheme.error,
-          ),
+      context.read<CreateCommunityBloc>().add(
+            CreateCommunity(
+              CreateCommunityParam(
+                name: _nameController.text.trim(),
               ),
             ),
           );
     }
+  }
 }

lib/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart

@@ -1,7 +1,6 @@
 import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
@@ -16,15 +15,12 @@ class RemoteSpaceDetailsService implements SpaceDetailsService {
   static const _defaultErrorMessage = 'Failed to load space details';
 
   @override
-  Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param) async {
+  Future<SpaceDetailsModel> getSpaceDetails(LoadSpacesParam param) async {
     try {
       final response = await _httpService.get(
-        path: await _makeEndpoint(param),
+        path: 'endpoint',
         expectedResponseModel: (data) {
-          final response = data as Map<String, dynamic>;
-          return SpaceDetailsModel.fromJson(
-            response['data'] as Map<String, dynamic>,
-          );
+          return SpaceDetailsModel.fromJson(data as Map<String, dynamic>);
         },
       );
       return response;
@@ -41,13 +37,4 @@ class RemoteSpaceDetailsService implements SpaceDetailsService {
       throw APIException(formattedErrorMessage);
     }
   }
-
-  Future<String> _makeEndpoint(LoadSpaceDetailsParam param) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    if (projectUuid == null || projectUuid.isEmpty) {
-      throw APIException('Project UUID is not set');
-    }
-
-    return '/projects/$projectUuid/communities/${param.communityUuid}/spaces/${param.spaceUuid}';
-  }
 }

lib/pages/space_management_v2/modules/space_details/data/services/unique_subspaces_decorator.dart

@@ -1,27 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart';
-
-class UniqueSubspacesDecorator implements SpaceDetailsService {
-  final SpaceDetailsService _decoratee;
-
-  const UniqueSubspacesDecorator(this._decoratee);
-
-  @override
-  Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param) async {
-    final response = await _decoratee.getSpaceDetails(param);
-
-    final uniqueSubspaces = <String, Subspace>{};
-
-    for (final subspace in response.subspaces) {
-      final normalizedName = subspace.name.trim().toLowerCase();
-      if (!uniqueSubspaces.containsKey(normalizedName)) {
-        uniqueSubspaces[normalizedName] = subspace;
-      }
-    }
-
-    return response.copyWith(
-      subspaces: uniqueSubspaces.values.toList(),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart

@@ -1,7 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/models/product.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/tags/domain/models/tag.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 
 class SpaceDetailsModel extends Equatable {
   final String uuid;
@@ -18,13 +17,6 @@ class SpaceDetailsModel extends Equatable {
     required this.subspaces,
   });
 
-  factory SpaceDetailsModel.empty() => const SpaceDetailsModel(
-        uuid: '',
-        spaceName: '',
-        icon: Assets.villa,
-        productAllocations: [],
-        subspaces: [],
-      );
   factory SpaceDetailsModel.fromJson(Map<String, dynamic> json) {
     return SpaceDetailsModel(
       uuid: json['uuid'] as String,
@@ -49,22 +41,6 @@ class SpaceDetailsModel extends Equatable {
     };
   }
 
-  SpaceDetailsModel copyWith({
-    String? uuid,
-    String? spaceName,
-    String? icon,
-    List<ProductAllocation>? productAllocations,
-    List<Subspace>? subspaces,
-  }) {
-    return SpaceDetailsModel(
-      uuid: uuid ?? this.uuid,
-      spaceName: spaceName ?? this.spaceName,
-      icon: icon ?? this.icon,
-      productAllocations: productAllocations ?? this.productAllocations,
-      subspaces: subspaces ?? this.subspaces,
-    );
-  }
-
   @override
   List<Object?> get props => [uuid, spaceName, icon, productAllocations, subspaces];
 }
@@ -72,10 +48,12 @@ class SpaceDetailsModel extends Equatable {
 class ProductAllocation extends Equatable {
   final Product product;
   final Tag tag;
+  final String? location;
 
   const ProductAllocation({
     required this.product,
     required this.tag,
+    this.location,
   });
 
   factory ProductAllocation.fromJson(Map<String, dynamic> json) {
@@ -92,16 +70,6 @@ class ProductAllocation extends Equatable {
     };
   }
 
-  ProductAllocation copyWith({
-    Product? product,
-    Tag? tag,
-  }) {
-    return ProductAllocation(
-      product: product ?? this.product,
-      tag: tag ?? this.tag,
-    );
-  }
-
   @override
   List<Object?> get props => [product, tag];
 }
@@ -120,7 +88,7 @@ class Subspace extends Equatable {
   factory Subspace.fromJson(Map<String, dynamic> json) {
     return Subspace(
       uuid: json['uuid'] as String,
-      name: json['subspaceName'] as String,
+      name: json['name'] as String,
       productAllocations: (json['productAllocations'] as List)
           .map((e) => ProductAllocation.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -135,18 +103,6 @@ class Subspace extends Equatable {
     };
   }
 
-  Subspace copyWith({
-    String? uuid,
-    String? name,
-    List<ProductAllocation>? productAllocations,
-  }) {
-    return Subspace(
-      uuid: uuid ?? this.uuid,
-      name: name ?? this.name,
-      productAllocations: productAllocations ?? this.productAllocations,
-    );
-  }
-
   @override
   List<Object?> get props => [uuid, name, productAllocations];
 }

lib/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart

@@ -1,9 +0,0 @@
-class LoadSpaceDetailsParam {
-  const LoadSpaceDetailsParam({
-    required this.spaceUuid,
-    required this.communityUuid,
-  });
-
-  final String spaceUuid;
-  final String communityUuid;
-}

lib/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart

@@ -0,0 +1,3 @@
+class LoadSpacesParam {
+  const LoadSpacesParam();
+}

lib/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart

@@ -1,6 +1,6 @@
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart';
 
 abstract class SpaceDetailsService {
-  Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param);
+  Future<SpaceDetailsModel> getSpaceDetails(LoadSpacesParam param);
 }

lib/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart

@@ -1,7 +1,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 
@@ -9,13 +9,12 @@ part 'space_details_event.dart';
 part 'space_details_state.dart';
 
 class SpaceDetailsBloc extends Bloc<SpaceDetailsEvent, SpaceDetailsState> {
+  final SpaceDetailsService _spaceDetailsService;
+
   SpaceDetailsBloc(this._spaceDetailsService) : super(SpaceDetailsInitial()) {
     on<LoadSpaceDetails>(_onLoadSpaceDetails);
-    on<ClearSpaceDetails>(_onClearSpaceDetails);
   }
 
-  final SpaceDetailsService _spaceDetailsService;
-
   Future<void> _onLoadSpaceDetails(
     LoadSpaceDetails event,
     Emitter<SpaceDetailsState> emit,
@@ -32,11 +31,4 @@ class SpaceDetailsBloc extends Bloc<SpaceDetailsEvent, SpaceDetailsState> {
       emit(SpaceDetailsFailure(e.toString()));
     }
   }
-
-  void _onClearSpaceDetails(
-    ClearSpaceDetails event,
-    Emitter<SpaceDetailsState> emit,
-  ) {
-    emit(SpaceDetailsInitial());
-  }
 }

lib/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_event.dart

@@ -7,18 +7,11 @@ sealed class SpaceDetailsEvent extends Equatable {
   List<Object> get props => [];
 }
 
-final class LoadSpaceDetails extends SpaceDetailsEvent {
+class LoadSpaceDetails extends SpaceDetailsEvent {
   const LoadSpaceDetails(this.param);
 
-  final LoadSpaceDetailsParam param;
+  final LoadSpacesParam param;
 
   @override
   List<Object> get props => [param];
 }
-
-final class ClearSpaceDetails extends SpaceDetailsEvent {
-  const ClearSpaceDetails();
-
-  @override
-  List<Object> get props => [];
-}

lib/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_state.dart

@@ -21,10 +21,10 @@ final class SpaceDetailsLoaded extends SpaceDetailsState {
 }
 
 final class SpaceDetailsFailure extends SpaceDetailsState {
-  final String errorMessage;
+  final String message;
 
-  const SpaceDetailsFailure(this.errorMessage);
+  const SpaceDetailsFailure(this.message);
 
   @override
-  List<Object> get props => [errorMessage];
+  List<Object> get props => [message];
 }

lib/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart

@@ -1,46 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
 
 abstract final class SpaceDetailsDialogHelper {
   static void showCreate(BuildContext context) {
     showDialog<void>(
       context: context,
-      builder: (_) => BlocProvider(
-        create: (context) => SpaceDetailsBloc(
-          RemoteSpaceDetailsService(httpService: HTTPService()),
-        ),
-        child: SpaceDetailsDialog(
-          context: context,
-          title: const SelectableText('Create Space'),
-          spaceModel: SpaceModel.empty(),
-          onSave: print,
-        ),
-      ),
-    );
-  }
-
-  static void showEdit(
-    BuildContext context, {
-    required SpaceModel spaceModel,
-  }) {
-    showDialog<void>(
-      context: context,
-      builder: (_) => BlocProvider(
-        create: (context) => SpaceDetailsBloc(
-          RemoteSpaceDetailsService(httpService: HTTPService()),
-        ),
-        child: SpaceDetailsDialog(
-          context: context,
-          title: const SelectableText('Edit Space'),
-          spaceModel: spaceModel,
-          onSave: (space) {},
-        ),
-      ),
+      builder: (context) => const SpaceDetailsDialog(),
     );
   }
 }

lib/pages/space_management_v2/modules/space_details/presentation/widgets/button_content_widget.dart

@@ -1,60 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class ButtonContentWidget extends StatelessWidget {
-  final String label;
-  final String? svgAssets;
-  final bool disabled;
-
-  const ButtonContentWidget({
-    required this.label,
-    this.svgAssets,
-    this.disabled = false,
-    super.key,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-
-    return Opacity(
-      opacity: disabled ? 0.5 : 1.0,
-      child: Container(
-        width: screenWidth * 0.25,
-        decoration: BoxDecoration(
-          color: ColorsManager.textFieldGreyColor,
-          border: Border.all(
-            color: ColorsManager.neutralGray,
-            width: 3.0,
-          ),
-          borderRadius: BorderRadius.circular(20),
-        ),
-        padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
-        child: Row(
-          children: [
-            if (svgAssets != null)
-              Padding(
-                padding: const EdgeInsets.only(left: 6.0),
-                child: SvgPicture.asset(
-                  svgAssets!,
-                  width: screenWidth * 0.015,
-                  height: screenWidth * 0.015,
-                ),
-              ),
-            const SizedBox(width: 10),
-            Expanded(
-              child: Text(
-                label,
-                style: const TextStyle(
-                  color: ColorsManager.blackColor,
-                  fontSize: 16,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_action_buttons.dart

@@ -1,45 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class SpaceDetailsActionButtons extends StatelessWidget {
-  const SpaceDetailsActionButtons({
-    super.key,
-    required this.onSave,
-    required this.onCancel,
-  });
-
-  final VoidCallback onCancel;
-  final VoidCallback? onSave;
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      spacing: 10,
-      children: [
-        Expanded(child: _buildCancelButton(context)),
-        Expanded(child: _buildSaveButton()),
-      ],
-    );
-  }
-
-  Widget _buildCancelButton(BuildContext context) {
-    return CancelButton(
-      onPressed: onCancel,
-      label: 'Cancel',
-    );
-  }
-
-  Widget _buildSaveButton() {
-    return DefaultButton(
-      onPressed: onSave,
-      borderRadius: 10,
-      backgroundColor: ColorsManager.secondaryColor,
-      foregroundColor: ColorsManager.whiteColors,
-      child: const Text('OK'),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart

@@ -1,92 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/common/edit_chip.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/button_content_widget.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class SpaceDetailsDevicesBox extends StatelessWidget {
-  const SpaceDetailsDevicesBox({
-    required this.space,
-    super.key,
-  });
-
-  final SpaceDetailsModel space;
-
-  @override
-  Widget build(BuildContext context) {
-    final productAllocations = space.productAllocations;
-    final subspaces = space.subspaces;
-    final isAnySubspaceHasProductAllocations =
-        subspaces.any((subspace) => subspace.productAllocations.isNotEmpty);
-    if (productAllocations.isNotEmpty || isAnySubspaceHasProductAllocations) {
-      return Container(
-        width: double.infinity,
-        padding: const EdgeInsets.all(8),
-        decoration: BoxDecoration(
-          color: ColorsManager.textFieldGreyColor,
-          borderRadius: BorderRadius.circular(15),
-          border: Border.all(
-            color: ColorsManager.textFieldGreyColor,
-            width: 3.0,
-          ),
-        ),
-        child: Wrap(
-          spacing: 8.0,
-          runSpacing: 8.0,
-          children: [
-            // Combine tags from spaceModel and subspaces
-            // ...TagHelper.groupTags([
-            //   ...?tags,
-            //   ...?subspaces?.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}',
-            //       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: () {},
-            ),
-          ],
-        ),
-      );
-    } else {
-      return TextButton(
-        onPressed: () {},
-        style: TextButton.styleFrom(
-          padding: EdgeInsets.zero,
-        ),
-        child: const SizedBox(
-          width: double.infinity,
-          child: ButtonContentWidget(
-            svgAssets: Assets.addIcon,
-            label: 'Add Devices',
-            // disabled: isTagsAndSubspaceModelDisabled,
-          ),
-        ),
-      );
-    }
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart

@@ -1,105 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_form.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class SpaceDetailsDialog extends StatefulWidget {
-  const SpaceDetailsDialog({
-    required this.title,
-    required this.spaceModel,
-    required this.onSave,
-    required this.context,
-    super.key,
-  });
-
-  final Widget title;
-  final SpaceModel spaceModel;
-  final void Function(SpaceDetailsModel space) onSave;
-  final BuildContext context;
-
-  @override
-  State<SpaceDetailsDialog> createState() => _SpaceDetailsDialogState();
-}
-
-class _SpaceDetailsDialogState extends State<SpaceDetailsDialog> {
-  @override
-  void initState() {
-    final isCreateMode = widget.spaceModel.uuid.isEmpty;
-
-    if (!isCreateMode) {
-      final param = LoadSpaceDetailsParam(
-        spaceUuid: widget.spaceModel.uuid,
-        communityUuid: widget.context
-            .read<CommunitiesTreeSelectionBloc>()
-            .state
-            .selectedCommunity!
-            .uuid,
-      );
-      widget.context.read<SpaceDetailsBloc>().add(LoadSpaceDetails(param));
-    }
-    super.initState();
-  }
+class SpaceDetailsDialog extends StatelessWidget {
+  const SpaceDetailsDialog({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final isCreateMode = widget.spaceModel.uuid.isEmpty;
-    if (isCreateMode) {
-      return SpaceDetailsForm(
-        title: widget.title,
-        space: SpaceDetailsModel.empty(),
-        onSave: widget.onSave,
-      );
-    }
-
-    return BlocBuilder<SpaceDetailsBloc, SpaceDetailsState>(
-      bloc: widget.context.read<SpaceDetailsBloc>(),
-      builder: (context, state) => switch (state) {
-        SpaceDetailsInitial() => _buildLoadingDialog(),
-        SpaceDetailsLoading() => _buildLoadingDialog(),
-        SpaceDetailsLoaded(:final spaceDetails) => SpaceDetailsForm(
-            title: widget.title,
-            space: spaceDetails,
-            onSave: widget.onSave,
-          ),
-        SpaceDetailsFailure(:final errorMessage) => _buildErrorDialog(
-            errorMessage,
-          ),
-      },
-    );
-  }
-
-  Widget _buildLoadingDialog() {
-    return AlertDialog(
-      title: widget.title,
-      backgroundColor: ColorsManager.whiteColors,
-      content: SizedBox(
-        height: context.screenHeight * 0.3,
-        width: context.screenWidth * 0.5,
-        child: const Center(child: CircularProgressIndicator()),
-      ),
-    );
-  }
-
-  Widget _buildErrorDialog(String errorMessage) {
-    return AlertDialog(
-      title: widget.title,
-      backgroundColor: ColorsManager.whiteColors,
-      content: Center(
-        child: SelectableText(
-          errorMessage,
-          style: context.textTheme.bodyLarge?.copyWith(
-            color: ColorsManager.red,
-            fontWeight: FontWeight.w500,
-            fontSize: 18,
-          ),
-        ),
-      ),
+    return const Dialog(
+      child: Text('Create Space'),
     );
   }
 }

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_form.dart

@@ -1,77 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_action_buttons.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_devices_box.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_icon_picker.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_name_text_field.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_sub_spaces_box.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SpaceDetailsForm extends StatelessWidget {
-  const SpaceDetailsForm({
-    required this.title,
-    required this.space,
-    required this.onSave,
-    super.key,
-  });
-
-  final Widget title;
-  final SpaceDetailsModel space;
-  final void Function(SpaceDetailsModel space) onSave;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => SpaceDetailsModelBloc(initialState: space),
-      child: BlocBuilder<SpaceDetailsModelBloc, SpaceDetailsModel>(
-          buildWhen: (previous, current) => previous != current,
-          builder: (context, space) {
-            return AlertDialog(
-              title: title,
-              backgroundColor: ColorsManager.whiteColors,
-              content: SizedBox(
-                height: context.screenHeight * 0.3,
-                width: context.screenWidth * 0.5,
-                child: Row(
-                  spacing: 20,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Expanded(child: SpaceIconPicker(iconPath: space.icon)),
-                    Expanded(
-                      flex: 2,
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          SpaceNameTextField(
-                            initialValue: space.spaceName,
-                            isNameFieldExist: (value) => space.subspaces.any(
-                              (subspace) => subspace.name == value,
-                            ),
-                          ),
-                          const Spacer(),
-                          SpaceSubSpacesBox(
-                            subspaces: space.subspaces,
-                          ),
-                          const SizedBox(height: 16),
-                          SpaceDetailsDevicesBox(space: space),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              actions: [
-                SpaceDetailsActionButtons(
-                  onSave: () => onSave(space),
-                  onCancel: Navigator.of(context).pop,
-                ),
-              ],
-            );
-          }),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_icon_picker.dart

@@ -1,76 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_icon_selection_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.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 SpaceIconPicker extends StatelessWidget {
-  const SpaceIconPicker({
-    required this.iconPath,
-    super.key,
-  });
-
-  final String iconPath;
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Stack(
-        
-        alignment: Alignment.center,
-        children: [
-          Container(
-            width: context.screenWidth * 0.175,
-            height: context.screenHeight * 0.175,
-            decoration: const BoxDecoration(
-              color: ColorsManager.boxColor,
-              shape: BoxShape.circle,
-            ),
-            padding: const EdgeInsets.all(24),
-            child: SvgPicture.asset(
-              iconPath,
-              width: context.screenWidth * 0.08,
-              height: context.screenHeight * 0.08,
-            ),
-          ),
-          Positioned.directional(
-            top: 12,
-            start: context.screenHeight * 0.06,
-            textDirection: Directionality.of(context),
-            child: InkWell(
-              onTap: () {
-                showDialog<String?>(
-                  context: context,
-                  builder: (context) => SpaceIconSelectionDialog(
-                    selectedIcon: iconPath,
-                  ),
-                ).then((value) {
-                  if (value != null) {
-                    if (context.mounted) {
-                      context.read<SpaceDetailsModelBloc>().add(
-                            UpdateSpaceDetailsIcon(value),
-                          );
-                    }
-                  }
-                });
-              },
-              child: Container(
-                decoration: const BoxDecoration(
-                  shape: BoxShape.circle,
-                ),
-                child: SvgPicture.asset(
-                  Assets.iconEdit,
-                  width: 16,
-                  height: 16,
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_icon_selection_dialog.dart

@@ -1,75 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.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 SpaceIconSelectionDialog extends StatelessWidget {
-  const SpaceIconSelectionDialog({super.key, required this.selectedIcon});
-  final String selectedIcon;
-
-  static const List<String> _icons = [
-    Assets.location,
-    Assets.villa,
-    Assets.gym,
-    Assets.sauna,
-    Assets.bbq,
-    Assets.building,
-    Assets.desk,
-    Assets.door,
-    Assets.parking,
-    Assets.pool,
-    Assets.stair,
-    Assets.steamRoom,
-    Assets.street,
-    Assets.unit,
-  ];
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: SelectableText(
-        'Space Icon',
-        style: context.textTheme.headlineMedium,
-      ),
-      backgroundColor: ColorsManager.whiteColors,
-      content: Container(
-        width: context.screenWidth * 0.45,
-        height: context.screenHeight * 0.275,
-        padding: const EdgeInsets.all(12),
-        decoration: BoxDecoration(
-          color: ColorsManager.boxColor,
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: GridView.builder(
-          gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-            crossAxisCount: 7,
-            crossAxisSpacing: 8,
-            mainAxisSpacing: 16,
-          ),
-          itemCount: _icons.length,
-          itemBuilder: (context, index) {
-            final isSelected = selectedIcon == _icons[index];
-            return Container(
-              padding: const EdgeInsetsDirectional.all(2),
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                border: isSelected
-                    ? Border.all(color: ColorsManager.vividBlue, width: 2)
-                    : null,
-              ),
-              child: IconButton(
-                onPressed: () => Navigator.of(context).pop(_icons[index]),
-                icon: SvgPicture.asset(
-                  _icons[index],
-                  width: context.screenWidth * 0.03,
-                  height: context.screenHeight * 0.08,
-                ),
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_name_text_field.dart

@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SpaceNameTextField extends StatefulWidget {
-  const SpaceNameTextField({
-    required this.initialValue,
-    required this.isNameFieldExist,
-    super.key,
-  });
-
-  final String? initialValue;
-  final bool Function(String value) isNameFieldExist;
-
-  @override
-  State<SpaceNameTextField> createState() => _SpaceNameTextFieldState();
-}
-
-class _SpaceNameTextFieldState extends State<SpaceNameTextField> {
-  late final TextEditingController _controller;
-
-  @override
-  void initState() {
-    _controller = TextEditingController(text: widget.initialValue);
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  final _formKey = GlobalKey<FormState>();
-
-  String? _validateName(String? value) {
-    if (value == null || value.isEmpty) {
-      return '*Space name should not be empty.';
-    }
-    if (widget.isNameFieldExist(value)) {
-      return '*Name already exists';
-    }
-    return null;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: _formKey,
-      autovalidateMode: AutovalidateMode.onUserInteraction,
-      child: TextFormField(
-        controller: _controller,
-        onChanged: (value) => context.read<SpaceDetailsModelBloc>().add(
-              UpdateSpaceDetailsName(value),
-            ),
-        validator: _validateName,
-        style: context.textTheme.bodyMedium,
-        decoration: InputDecoration(
-          hintText: 'Please enter the name',
-          hintStyle: context.textTheme.bodyMedium!.copyWith(
-            color: ColorsManager.lightGrayColor,
-          ),
-          filled: true,
-          fillColor: ColorsManager.boxColor,
-          enabledBorder: _buildBorder(context, ColorsManager.vividBlue),
-          focusedBorder: _buildBorder(context, ColorsManager.primaryColor),
-          errorBorder: _buildBorder(context, context.theme.colorScheme.error),
-          focusedErrorBorder: _buildBorder(context, context.theme.colorScheme.error),
-          errorStyle: context.textTheme.bodySmall?.copyWith(
-            color: context.theme.colorScheme.error,
-          ),
-        ),
-      ),
-    );
-  }
-
-  OutlineInputBorder _buildBorder(BuildContext context, [Color? color]) {
-    return OutlineInputBorder(
-      borderRadius: BorderRadius.circular(10),
-      borderSide: BorderSide(width: 1, color: color ?? ColorsManager.boxColor),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_sub_spaces_box.dart

@@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/common/edit_chip.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/button_content_widget.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_sub_spaces_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/subspace_name_display_widget.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class SpaceSubSpacesBox extends StatelessWidget {
-  const SpaceSubSpacesBox({super.key, required this.subspaces});
-
-  final List<Subspace> subspaces;
-
-  @override
-  Widget build(BuildContext context) {
-    if (subspaces.isEmpty) {
-      return TextButton(
-        style: TextButton.styleFrom(
-          padding: EdgeInsets.zero,
-          overlayColor: ColorsManager.transparentColor,
-        ),
-        onPressed: () => _showSubSpacesDialog(context),
-        child: const SizedBox(
-          width: double.infinity,
-          child: ButtonContentWidget(
-            svgAssets: Assets.addIcon,
-            label: 'Create Sub Spaces',
-          ),
-        ),
-      );
-    } else {
-      return Container(
-        padding: const EdgeInsets.all(8.0),
-        width: double.infinity,
-        decoration: BoxDecoration(
-          color: ColorsManager.textFieldGreyColor,
-          borderRadius: BorderRadius.circular(15),
-          border: Border.all(
-            color: ColorsManager.textFieldGreyColor,
-            width: 3.0,
-          ),
-        ),
-        child: Wrap(
-          spacing: 8.0,
-          runSpacing: 8.0,
-          children: [
-            ...subspaces.map((e) => SubspaceNameDisplayWidget(subSpace: e)),
-            EditChip(
-              onTap: () => _showSubSpacesDialog(context),
-            ),
-          ],
-        ),
-      );
-    }
-  }
-
-  void _showSubSpacesDialog(BuildContext context) {
-    showDialog<void>(
-      context: context,
-      barrierDismissible: false,
-      builder: (_) => SpaceSubSpacesDialog(
-        subspaces: subspaces,
-        onSave: (subspaces) {
-          context.read<SpaceDetailsModelBloc>().add(
-                UpdateSpaceDetailsSubspaces(subspaces),
-              );
-        },
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_sub_spaces_dialog.dart

@@ -1,90 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_action_buttons.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/sub_spaces_input.dart';
-import 'package:uuid/uuid.dart';
-
-class SpaceSubSpacesDialog extends StatefulWidget {
-  const SpaceSubSpacesDialog({
-    required this.subspaces,
-    required this.onSave,
-    super.key,
-  });
-
-  final List<Subspace> subspaces;
-  final void Function(List<Subspace> subspaces) onSave;
-
-  @override
-  State<SpaceSubSpacesDialog> createState() => _SpaceSubSpacesDialogState();
-}
-
-class _SpaceSubSpacesDialogState extends State<SpaceSubSpacesDialog> {
-  late List<Subspace> _subspaces;
-
-  bool get _hasDuplicateNames =>
-      _subspaces.map((subspace) => subspace.name.toLowerCase()).toSet().length !=
-      _subspaces.length;
-
-  @override
-  void initState() {
-    super.initState();
-    _subspaces = List.from(widget.subspaces);
-  }
-
-  void _handleSubspaceAdded(String name) {
-    setState(() {
-      _subspaces = [
-        ..._subspaces,
-        Subspace(
-          name: name,
-          uuid: const Uuid().v4(),
-          productAllocations: const [],
-        ),
-      ];
-    });
-  }
-
-  void _handleSubspaceDeleted(String uuid) => setState(
-        () => _subspaces = _subspaces.where((s) => s.uuid != uuid).toList(),
-      );
-
-  void _handleSave() {
-    widget.onSave(_subspaces);
-    Navigator.of(context).pop();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const SelectableText('Create Sub Spaces'),
-      content: Column(
-        spacing: 12,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          SubSpacesInput(
-            subSpaces: _subspaces,
-            onSubspaceAdded: _handleSubspaceAdded,
-            onSubspaceDeleted: _handleSubspaceDeleted,
-          ),
-          AnimatedSwitcher(
-            duration: const Duration(milliseconds: 100),
-            child: Visibility(
-              key: ValueKey(_hasDuplicateNames),
-              visible: _hasDuplicateNames,
-              child: const SelectableText(
-                'Error: Duplicate subspace names are not allowed.',
-                style: TextStyle(color: Colors.red),
-              ),
-            ),
-          ),
-        ],
-      ),
-      actions: [
-        SpaceDetailsActionButtons(
-          onSave: _hasDuplicateNames ? null : _handleSave,
-          onCancel: Navigator.of(context).pop,
-        )
-      ],
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/sub_spaces_input.dart

@@ -1,107 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/subspace_chip.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SubSpacesInput extends StatefulWidget {
-  const SubSpacesInput({
-    super.key,
-    required this.subSpaces,
-    required this.onSubspaceAdded,
-    required this.onSubspaceDeleted,
-  });
-
-  final List<Subspace> subSpaces;
-  final void Function(String name) onSubspaceAdded;
-  final void Function(String uuid) onSubspaceDeleted;
-
-  @override
-  State<SubSpacesInput> createState() => _SubSpacesInputState();
-}
-
-class _SubSpacesInputState extends State<SubSpacesInput> {
-  late final TextEditingController _subspaceNameController;
-  late final FocusNode _focusNode;
-  @override
-  void initState() {
-    super.initState();
-    _subspaceNameController = TextEditingController();
-    _focusNode = FocusNode();
-  }
-
-  @override
-  void dispose() {
-    _subspaceNameController.dispose();
-    _focusNode.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: context.screenWidth * 0.35,
-      padding: const EdgeInsets.symmetric(
-        vertical: 10,
-        horizontal: 16,
-      ),
-      decoration: BoxDecoration(
-        color: ColorsManager.boxColor,
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Wrap(
-        spacing: 8,
-        runSpacing: 8,
-        alignment: WrapAlignment.start,
-        crossAxisAlignment: WrapCrossAlignment.center,
-        children: [
-          ...widget.subSpaces.asMap().entries.map(
-            (entry) {
-              final index = entry.key;
-              final subSpace = entry.value;
-
-              final lowerName = subSpace.name.toLowerCase();
-
-              final duplicateIndices = widget.subSpaces
-                  .asMap()
-                  .entries
-                  .where((e) => e.value.name.toLowerCase() == lowerName)
-                  .map((e) => e.key)
-                  .toList();
-              final isDuplicate = duplicateIndices.length > 1 &&
-                  duplicateIndices.indexOf(index) != 0;
-              return SubspaceChip(
-                subSpace: subSpace,
-                isDuplicate: isDuplicate,
-                onDeleted: () => widget.onSubspaceDeleted(subSpace.uuid),
-              );
-            },
-          ),
-          SizedBox(
-            width: 200,
-            child: TextField(
-              focusNode: _focusNode,
-              controller: _subspaceNameController,
-              decoration: InputDecoration(
-                border: InputBorder.none,
-                hintText: widget.subSpaces.isEmpty ? 'Please enter the name' : null,
-                hintStyle: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.lightGrayColor,
-                ),
-              ),
-              onSubmitted: (value) {
-                final trimmedValue = value.trim();
-                if (trimmedValue.isNotEmpty) {
-                  widget.onSubspaceAdded(trimmedValue);
-                  _subspaceNameController.clear();
-                  _focusNode.requestFocus();
-                }
-              },
-              style: context.textTheme.bodyMedium,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/subspace_chip.dart

@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SubspaceChip extends StatelessWidget {
-  const SubspaceChip({
-    required this.subSpace,
-    required this.isDuplicate,
-    required this.onDeleted,
-    super.key,
-  });
-
-  final Subspace subSpace;
-  final bool isDuplicate;
-  final void Function() onDeleted;
-
-  @override
-  Widget build(BuildContext context) {
-    return Chip(
-      label: Text(
-        subSpace.name,
-        style: context.textTheme.bodySmall?.copyWith(
-          color: isDuplicate ? ColorsManager.red : ColorsManager.spaceColor,
-        ),
-      ),
-      backgroundColor: ColorsManager.whiteColors,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(10),
-        side: BorderSide(
-          color: isDuplicate ? ColorsManager.red : ColorsManager.transparentColor,
-          width: 0,
-        ),
-      ),
-      deleteIcon: Container(
-        padding: const EdgeInsetsDirectional.all(1),
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          border: Border.all(
-            color: ColorsManager.lightGrayColor,
-            width: 1.5,
-          ),
-        ),
-        child: const FittedBox(
-          fit: BoxFit.scaleDown,
-          child: Icon(
-            Icons.close,
-            color: ColorsManager.lightGrayColor,
-          ),
-        ),
-      ),
-      onDeleted: onDeleted,
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/presentation/widgets/subspace_name_display_widget.dart

@@ -1,171 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class SubspaceNameDisplayWidget extends StatefulWidget {
-  const SubspaceNameDisplayWidget({super.key, required this.subSpace});
-
-  final Subspace subSpace;
-
-  @override
-  State<SubspaceNameDisplayWidget> createState() =>
-      _SubspaceNameDisplayWidgetState();
-}
-
-class _SubspaceNameDisplayWidgetState extends State<SubspaceNameDisplayWidget> {
-  late final TextEditingController _controller;
-  late final FocusNode _focusNode;
-  bool _isEditing = false;
-  bool _hasDuplicateName = false;
-
-  @override
-  void initState() {
-    _controller = TextEditingController(text: widget.subSpace.name);
-    _focusNode = FocusNode();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    _focusNode.dispose();
-    super.dispose();
-  }
-
-  bool _checkForDuplicateName(String name) {
-    final bloc = context.read<SpaceDetailsModelBloc>();
-    return bloc.state.subspaces
-        .where((s) => s.uuid != widget.subSpace.uuid)
-        .any((s) => s.name.toLowerCase() == name.toLowerCase());
-  }
-
-  void _handleNameChange(String value) {
-    setState(() {
-      _hasDuplicateName = _checkForDuplicateName(value);
-    });
-  }
-
-  void _tryToFinishEditing() {
-    if (!_hasDuplicateName) {
-      _onFinishEditing();
-    }
-  }
-
-  void _tryToSubmit(String value) {
-    if (_hasDuplicateName) return;
-
-    final bloc = context.read<SpaceDetailsModelBloc>();
-    bloc.add(
-      UpdateSpaceDetailsSubspaces(
-        bloc.state.subspaces
-            .map(
-              (e) => e.uuid == widget.subSpace.uuid ? e.copyWith(name: value) : e,
-            )
-            .toList(),
-      ),
-    );
-    _onFinishEditing();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final textStyle = context.textTheme.bodySmall?.copyWith(
-      color: ColorsManager.spaceColor,
-    );
-    return InkWell(
-      onTap: () {
-        setState(() => _isEditing = true);
-        _focusNode.requestFocus();
-      },
-      child: Chip(
-        backgroundColor: ColorsManager.whiteColors,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
-          side: const BorderSide(color: ColorsManager.transparentColor),
-        ),
-        onDeleted: () {
-          final bloc = context.read<SpaceDetailsModelBloc>();
-          bloc.add(
-            UpdateSpaceDetailsSubspaces(
-              bloc.state.subspaces
-                  .where((s) => s.uuid != widget.subSpace.uuid)
-                  .toList(),
-            ),
-          );
-        },
-        deleteIcon: Container(
-          padding: const EdgeInsetsDirectional.all(1),
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            border: Border.all(
-              color: ColorsManager.lightGrayColor,
-              width: 1.5,
-            ),
-          ),
-          child: const FittedBox(
-            child: Icon(
-              Icons.close,
-              color: ColorsManager.lightGrayColor,
-            ),
-          ),
-        ),
-        label: Visibility(
-          visible: _isEditing,
-          replacement: Text(
-            widget.subSpace.name,
-            style: textStyle,
-          ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              SizedBox(
-                width: context.screenWidth * 0.065,
-                height: context.screenHeight * 0.025,
-                child: TextField(
-                  focusNode: _focusNode,
-                  controller: _controller,
-                  style: textStyle?.copyWith(
-                    color: _hasDuplicateName ? Colors.red : null,
-                  ),
-                  decoration: const InputDecoration.collapsed(
-                    hintText: '',
-                  ),
-                  onChanged: _handleNameChange,
-                  onTapOutside: (_) => _tryToFinishEditing(),
-                  onSubmitted: _tryToSubmit,
-                ),
-              ),
-              if (_hasDuplicateName)
-                AnimatedSwitcher(
-                  duration: const Duration(milliseconds: 250),
-                  child: Visibility(
-                    key: ValueKey(_hasDuplicateName),
-                    visible: _hasDuplicateName,
-                    child: Text(
-                      'Name already exists',
-                      style: textStyle?.copyWith(
-                        color: Colors.red,
-                        fontSize: 8,
-                      ),
-                    ),
-                  ),
-                ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  void _onFinishEditing() {
-    setState(() {
-      _isEditing = false;
-      _hasDuplicateName = false;
-    });
-    _focusNode.unfocus();
-  }
-}

lib/pages/space_management_v2/modules/update_community/data/services/remote_update_community_service.dart

@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/update_community/domain/params/update_community_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_community/domain/services/update_community_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
@@ -13,15 +13,15 @@ class RemoteUpdateCommunityService implements UpdateCommunityService {
   static const _defaultErrorMessage = 'Failed to update community';
 
   @override
-  Future<CommunityModel> updateCommunity(CommunityModel param) async {
-    final endpoint = await _makeUrl(param.uuid);
+  Future<CommunityModel> updateCommunity(UpdateCommunityParam param) async {
     try {
-      await _httpService.put(
-        path: endpoint,
-        body: {'name': param.name},
-        expectedResponseModel: (data) => null,
+      final response = await _httpService.put(
+        path: 'endpoint',
+        expectedResponseModel: (data) => CommunityModel.fromJson(
+          data as Map<String, dynamic>,
+        ),
       );
-      return param;
+      return response;
     } on DioException catch (e) {
       final message = e.response?.data as Map<String, dynamic>?;
       final error = message?['error'] as Map<String, dynamic>?;
@@ -36,12 +36,4 @@ class RemoteUpdateCommunityService implements UpdateCommunityService {
       throw APIException(formattedErrorMessage);
     }
   }
-
-  Future<String> _makeUrl(String communityUuid) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    if (projectUuid == null) {
-      throw APIException('Project UUID is not set');
-    }
-    return '/projects/$projectUuid/communities/$communityUuid';
-  }
 }

lib/pages/space_management_v2/modules/update_community/domain/params/update_community_param.dart

@@ -0,0 +1,10 @@
+import 'package:equatable/equatable.dart';
+
+class UpdateCommunityParam extends Equatable {
+  const UpdateCommunityParam({required this.name});
+
+  final String name;
+
+  @override
+  List<Object> get props => [name];
+}

lib/pages/space_management_v2/modules/update_community/domain/services/update_community_service.dart

@@ -1,5 +1,6 @@
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/update_community/domain/params/update_community_param.dart';
 
 abstract class UpdateCommunityService {
-  Future<CommunityModel> updateCommunity(CommunityModel community);
+  Future<CommunityModel> updateCommunity(UpdateCommunityParam param);
 }

lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_bloc.dart

@@ -1,6 +1,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/update_community/domain/params/update_community_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_community/domain/services/update_community_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 
@@ -23,7 +24,7 @@ class UpdateCommunityBloc extends Bloc<UpdateCommunityEvent, UpdateCommunityStat
     emit(UpdateCommunityLoading());
     try {
       final updatedCommunity = await _updateCommunityService.updateCommunity(
-        event.communityModel,
+        event.param,
       );
       emit(UpdateCommunitySuccess(updatedCommunity));
     } on APIException catch (e) {

lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_event.dart

@@ -8,10 +8,10 @@ sealed class UpdateCommunityEvent extends Equatable {
 }
 
 final class UpdateCommunity extends UpdateCommunityEvent {
-  const UpdateCommunity(this.communityModel);
+  const UpdateCommunity(this.param);
 
-  final CommunityModel communityModel ;
+  final UpdateCommunityParam param;
 
   @override
-  List<Object> get props => [communityModel];
+  List<Object> get props => [param];
 }

lib/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_state.dart

@@ -21,10 +21,10 @@ final class UpdateCommunitySuccess extends UpdateCommunityState {
 }
 
 final class UpdateCommunityFailure extends UpdateCommunityState {
-  final String errorMessage;
+  final String message;
 
-  const UpdateCommunityFailure(this.errorMessage);
+  const UpdateCommunityFailure(this.message);
 
   @override
-  List<Object> get props => [errorMessage];
+  List<Object> get props => [message];
 }

lib/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart

@@ -1,71 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/shared/widgets/community_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_community/data/services/remote_update_community_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_community/presentation/bloc/update_community_bloc.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-
-class EditCommunityDialog extends StatelessWidget {
-  const EditCommunityDialog({
-    required this.community,
-    required this.parentContext,
-    super.key,
-  });
-
-  final CommunityModel community;
-  final BuildContext parentContext;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => UpdateCommunityBloc(
-        RemoteUpdateCommunityService(HTTPService()),
-      ),
-      child: BlocConsumer<UpdateCommunityBloc, UpdateCommunityState>(
-        listener: (context, state) {
-          switch (state) {
-            case UpdateCommunityInitial() || UpdateCommunityLoading():
-              SpaceManagementCommunityDialogHelper.showLoadingDialog(context);
-              break;
-            case UpdateCommunitySuccess(:final community):
-              _onUpdateCommunitySuccess(context, community);
-              break;
-            case UpdateCommunityFailure():
-              Navigator.of(context).pop();
-              break;
-          }
-        },
-        builder: (context, state) => CommunityDialog(
-          title: const Text('Edit Community'),
-          initialName: community.name,
-          errorMessage: state is UpdateCommunityFailure ? state.errorMessage : null,
-          onSubmit: (name) => context.read<UpdateCommunityBloc>().add(
-                UpdateCommunity(community.copyWith(name: name)),
-              ),
-        ),
-      ),
-    );
-  }
-
-  void _onUpdateCommunitySuccess(
-    BuildContext context,
-    CommunityModel community,
-  ) {
-    Navigator.of(context).pop();
-    Navigator.of(context).pop();
-    SpaceManagementCommunityDialogHelper.showSuccessSnackBar(
-      context,
-      '${community.name} community updated successfully',
-    );
-    parentContext.read<CommunitiesBloc>().add(
-          CommunitiesUpdateCommunity(community),
-        );
-    parentContext.read<CommunitiesTreeSelectionBloc>().add(
-          SelectCommunityEvent(community: community),
-        );
-  }
-}

lib/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_bloc.dart

@@ -1,45 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-
-part 'space_details_model_event.dart';
-
-class SpaceDetailsModelBloc extends Bloc<SpaceDetailsModelEvent, SpaceDetailsModel> {
-  SpaceDetailsModelBloc({
-    required SpaceDetailsModel initialState,
-  }) : super(initialState) {
-    on<UpdateSpaceDetailsIcon>(_onUpdateSpaceDetailsIcon);
-    on<UpdateSpaceDetailsName>(_onUpdateSpaceDetailsName);
-    on<UpdateSpaceDetailsSubspaces>(_onUpdateSpaceDetailsSubspaces);
-    on<UpdateSpaceDetailsProductAllocations>(
-        _onUpdateSpaceDetailsProductAllocations);
-  }
-
-  void _onUpdateSpaceDetailsIcon(
-    UpdateSpaceDetailsIcon event,
-    Emitter<SpaceDetailsModel> emit,
-  ) {
-    emit(state.copyWith(icon: event.icon));
-  }
-
-  void _onUpdateSpaceDetailsName(
-    UpdateSpaceDetailsName event,
-    Emitter<SpaceDetailsModel> emit,
-  ) {
-    emit(state.copyWith(spaceName: event.name));
-  }
-
-  void _onUpdateSpaceDetailsSubspaces(
-    UpdateSpaceDetailsSubspaces event,
-    Emitter<SpaceDetailsModel> emit,
-  ) {
-    emit(state.copyWith(subspaces: event.subspaces));
-  }
-
-  void _onUpdateSpaceDetailsProductAllocations(
-    UpdateSpaceDetailsProductAllocations event,
-    Emitter<SpaceDetailsModel> emit,
-  ) {
-    emit(state.copyWith(productAllocations: event.productAllocations));
-  }
-}

lib/pages/space_management_v2/modules/update_space/presentation/bloc/space_details_model_bloc/space_details_model_event.dart

@@ -1,44 +0,0 @@
-part of 'space_details_model_bloc.dart';
-
-sealed class SpaceDetailsModelEvent extends Equatable {
-  const SpaceDetailsModelEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class UpdateSpaceDetailsIcon extends SpaceDetailsModelEvent {
-  const UpdateSpaceDetailsIcon(this.icon);
-
-  final String icon;
-
-  @override
-  List<Object> get props => [icon];
-}
-
-final class UpdateSpaceDetailsName extends SpaceDetailsModelEvent {
-  const UpdateSpaceDetailsName(this.name);
-
-  final String name;
-
-  @override
-  List<Object> get props => [name];
-}
-
-final class UpdateSpaceDetailsSubspaces extends SpaceDetailsModelEvent {
-  const UpdateSpaceDetailsSubspaces(this.subspaces);
-
-  final List<Subspace> subspaces;
-
-  @override
-  List<Object> get props => [subspaces];
-}
-
-final class UpdateSpaceDetailsProductAllocations extends SpaceDetailsModelEvent {
-  const UpdateSpaceDetailsProductAllocations(this.productAllocations);
-
-  final List<ProductAllocation> productAllocations;
-
-  @override
-  List<Object> get props => [productAllocations];
-}

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -21,6 +21,7 @@ import 'package:syncrow_web/utils/snack_bar.dart';
 
 class VisitorPasswordBloc
     extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
+
   VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
     on<SelectUsageFrequency>(selectUsageFrequency);
     on<FetchDevice>(_onFetchDevice);
@@ -86,9 +87,6 @@ class VisitorPasswordBloc
     SelectTimeVisitorPassword event,
     Emitter<VisitorPasswordState> emit,
   ) async {
-    // Ensure expirationTimeTimeStamp has a value
-    effectiveTimeTimeStamp ??= DateTime.now().millisecondsSinceEpoch ~/ 1000;
-
     final DateTime? picked = await showDatePicker(
       context: event.context,
       initialDate: DateTime.now(),
@@ -96,8 +94,7 @@ class VisitorPasswordBloc
       lastDate: DateTime.now().add(const Duration(days: 5095)),
     );
 
-    if (picked == null) return;
-
+    if (picked != null) {
       final TimeOfDay? timePicked = await showTimePicker(
         context: event.context,
         initialTime: TimeOfDay.now(),
@@ -108,14 +105,18 @@ class VisitorPasswordBloc
                 primary: ColorsManager.primaryColor,
                 onSurface: Colors.black,
               ),
+              buttonTheme: const ButtonThemeData(
+                colorScheme: ColorScheme.light(
+                  primary: Colors.green,
+                ),
+              ),
             ),
             child: child!,
           );
         },
       );
 
-    if (timePicked == null) return;
-
+      if (timePicked != null) {
         final selectedDateTime = DateTime(
           picked.year,
           picked.month,
@@ -123,98 +124,57 @@ class VisitorPasswordBloc
           timePicked.hour,
           timePicked.minute,
         );
-    final selectedTimestamp = selectedDateTime.millisecondsSinceEpoch ~/ 1000;
-    final currentTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+
+        final selectedTimestamp =
+            selectedDateTime.millisecondsSinceEpoch ~/ 1000;
 
         if (event.isStart) {
-      // START TIME VALIDATION
           if (expirationTimeTimeStamp != null &&
               selectedTimestamp > expirationTimeTimeStamp!) {
-        await showDialog<void>(
-          context: event.context,
-          builder: (context) => AlertDialog(
-            title: const Text(
+            CustomSnackBar.displaySnackBar(
               'Effective Time cannot be later than Expiration Time.',
-            ),
-            actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
-              onPressed: () {
-                Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: true,
-                  isRepeat: false,
-                ));
-              },
-              child: const Text('OK'),
-            ),
-          ),
             );
             return;
           }
-
-      if (selectedTimestamp < currentTimestamp) {
+          if(selectedTimestamp < DateTime.now().millisecondsSinceEpoch ~/ 1000) {
+            if(selectedTimestamp < DateTime.now().millisecondsSinceEpoch ~/ 1000) {
               await showDialog<void>(
                 context: event.context,
                 builder: (context) => AlertDialog(
-            title: const Text(
-              'Effective Time cannot be earlier than current time.',
-            ),
+                  title: const Text('Effective Time cannot be earlier than current time.'),
                   actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
+                  content: 
+                    FilledButton(
                       onPressed: () {
                         Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: true,
-                  isRepeat: false,
-                ));
+                        add(SelectTimeVisitorPassword(context: event.context, isStart: true, isRepeat: false));
                       },
                       child: const Text('OK'),
                     ),
+                  
                 ),
               );
+            }
             return;
           }
-
-      // Save effective time
           effectiveTimeTimeStamp = selectedTimestamp;
           startTimeAccess = selectedDateTime.toString().split('.').first;
         } else {
-      // END TIME VALIDATION
           if (effectiveTimeTimeStamp != null &&
               selectedTimestamp < effectiveTimeTimeStamp!) {
-        await showDialog<void>(
-          context: event.context,
-          builder: (context) => AlertDialog(
-            title: const Text(
+            CustomSnackBar.displaySnackBar(
               'Expiration Time cannot be earlier than Effective Time.',
-            ),
-            actionsAlignment: MainAxisAlignment.center,
-            content: FilledButton(
-              onPressed: () {
-                Navigator.of(event.context).pop();
-                add(SelectTimeVisitorPassword(
-                  context: event.context,
-                  isStart: false,
-                  isRepeat: false,
-                ));
-              },
-              child: const Text('OK'),
-            ),
-          ),
             );
             return;
           }
-
-      // Save expiration time
           expirationTimeTimeStamp = selectedTimestamp;
           endTimeAccess = selectedDateTime.toString().split('.').first;
         }
-
         emit(ChangeTimeState());
         emit(VisitorPasswordInitial());
       }
+    }
+  }
 
   bool toggleRepeat(
       ToggleRepeatEvent event, Emitter<VisitorPasswordState> emit) {

lib/utils/constants/assets.dart

@@ -14,8 +14,7 @@ class Assets {
   static const String rightLine = 'assets/images/right_line.png';
   static const String google = 'assets/images/google.svg';
   static const String facebook = 'assets/images/facebook.svg';
-  static const String invisiblePassword =
-      'assets/images/Password_invisible.svg';
+  static const String invisiblePassword = 'assets/images/Password_invisible.svg';
   static const String visiblePassword = 'assets/images/password_visible.svg';
   static const String accessIcon = 'assets/images/access_icon.svg';
   static const String spaseManagementIcon =
@@ -34,8 +33,7 @@ class Assets {
   static const String emptyTable = 'assets/images/empty_table.svg';
 
   // General assets
-  static const String motionlessDetection =
-      'assets/icons/motionless_detection.svg';
+  static const String motionlessDetection = 'assets/icons/motionless_detection.svg';
   static const String acHeating = 'assets/icons/ac_heating.svg';
   static const String acPowerOff = 'assets/icons/ac_power_off.svg';
   static const String acFanMiddle = 'assets/icons/ac_fan_middle.svg';
@@ -72,22 +70,19 @@ class Assets {
       'assets/icons/automation_functions/temp_password_unlock.svg';
   static const String doorlockNormalOpen =
       'assets/icons/automation_functions/doorlock_normal_open.svg';
-  static const String doorbell =
-      'assets/icons/automation_functions/doorbell.svg';
+  static const String doorbell = 'assets/icons/automation_functions/doorbell.svg';
   static const String remoteUnlockViaApp =
       'assets/icons/automation_functions/remote_unlock_via_app.svg';
   static const String doubleLock =
       'assets/icons/automation_functions/double_lock.svg';
   static const String selfTestResult =
       'assets/icons/automation_functions/self_test_result.svg';
-  static const String lockAlarm =
-      'assets/icons/automation_functions/lock_alarm.svg';
+  static const String lockAlarm = 'assets/icons/automation_functions/lock_alarm.svg';
   static const String presenceState =
       'assets/icons/automation_functions/presence_state.svg';
   static const String currentTemp =
       'assets/icons/automation_functions/current_temp.svg';
-  static const String presence =
-      'assets/icons/automation_functions/presence.svg';
+  static const String presence = 'assets/icons/automation_functions/presence.svg';
   static const String residualElectricity =
       'assets/icons/automation_functions/residual_electricity.svg';
   static const String hijackAlarm =
@@ -104,15 +99,12 @@ class Assets {
 
   // Presence Sensor Assets
   static const String sensorMotionIcon = 'assets/icons/sensor_motion_ic.svg';
-  static const String sensorPresenceIcon =
-      'assets/icons/sensor_presence_ic.svg';
+  static const String sensorPresenceIcon = 'assets/icons/sensor_presence_ic.svg';
   static const String sensorVacantIcon = 'assets/icons/sensor_vacant_ic.svg';
   static const String illuminanceRecordIcon =
       'assets/icons/illuminance_record_ic.svg';
-  static const String presenceRecordIcon =
-      'assets/icons/presence_record_ic.svg';
-  static const String helpDescriptionIcon =
-      'assets/icons/help_description_ic.svg';
+  static const String presenceRecordIcon = 'assets/icons/presence_record_ic.svg';
+  static const String helpDescriptionIcon = 'assets/icons/help_description_ic.svg';
 
   static const String lightPulp = 'assets/icons/light_pulb.svg';
   static const String acDevice = 'assets/icons/ac_device.svg';
@@ -166,12 +158,10 @@ class Assets {
   static const String unit = 'assets/icons/unit_icon.svg';
   static const String villa = 'assets/icons/villa_icon.svg';
   static const String iconEdit = 'assets/icons/icon_edit_icon.svg';
-  static const String textFieldSearch =
-      'assets/icons/textfield_search_icon.svg';
+  static const String textFieldSearch = 'assets/icons/textfield_search_icon.svg';
   static const String roundedAddIcon = 'assets/icons/rounded_add_icon.svg';
   static const String addIcon = 'assets/icons/add_icon.svg';
-  static const String smartThermostatIcon =
-      'assets/icons/smart_thermostat_icon.svg';
+  static const String smartThermostatIcon = 'assets/icons/smart_thermostat_icon.svg';
   static const String smartLightIcon = 'assets/icons/smart_light_icon.svg';
   static const String presenceSensor = 'assets/icons/presence_sensor.svg';
   static const String Gang3SwitchIcon = 'assets/icons/3_Gang_switch_icon.svg';
@@ -219,8 +209,7 @@ class Assets {
   //assets/icons/water_leak_normal.svg
   static const String waterLeakNormal = 'assets/icons/water_leak_normal.svg';
   //assets/icons/water_leak_detected.svg
-  static const String waterLeakDetected =
-      'assets/icons/water_leak_detected.svg';
+  static const String waterLeakDetected = 'assets/icons/water_leak_detected.svg';
 
   //assets/icons/automation_records.svg
   static const String automationRecords = 'assets/icons/automation_records.svg';
@@ -291,16 +280,13 @@ class Assets {
       'assets/icons/functions_icons/sensitivity.svg';
   static const String assetsSensitivityOperationIcon =
       'assets/icons/functions_icons/sesitivity_operation_icon.svg';
-  static const String assetsAcPower =
-      'assets/icons/functions_icons/ac_power.svg';
+  static const String assetsAcPower = 'assets/icons/functions_icons/ac_power.svg';
   static const String assetsAcPowerOFF =
       'assets/icons/functions_icons/ac_power_off.svg';
   static const String assetsChildLock =
       'assets/icons/functions_icons/child_lock.svg';
-  static const String assetsFreezing =
-      'assets/icons/functions_icons/freezing.svg';
-  static const String assetsFanSpeed =
-      'assets/icons/functions_icons/fan_speed.svg';
+  static const String assetsFreezing = 'assets/icons/functions_icons/freezing.svg';
+  static const String assetsFanSpeed = 'assets/icons/functions_icons/fan_speed.svg';
   static const String assetsAcCooling =
       'assets/icons/functions_icons/ac_cooling.svg';
   static const String assetsAcHeating =
@@ -309,8 +295,7 @@ class Assets {
       'assets/icons/functions_icons/celsius_degrees.svg';
   static const String assetsTempreture =
       'assets/icons/functions_icons/tempreture.svg';
-  static const String assetsAcFanLow =
-      'assets/icons/functions_icons/ac_fan_low.svg';
+  static const String assetsAcFanLow = 'assets/icons/functions_icons/ac_fan_low.svg';
   static const String assetsAcFanMiddle =
       'assets/icons/functions_icons/ac_fan_middle.svg';
   static const String assetsAcFanHigh =
@@ -329,8 +314,7 @@ class Assets {
       'assets/icons/functions_icons/far_detection.svg';
   static const String assetsFarDetectionFunction =
       'assets/icons/functions_icons/far_detection_function.svg';
-  static const String assetsIndicator =
-      'assets/icons/functions_icons/indicator.svg';
+  static const String assetsIndicator = 'assets/icons/functions_icons/indicator.svg';
   static const String assetsMotionDetection =
       'assets/icons/functions_icons/motion_detection.svg';
   static const String assetsMotionlessDetection =
@@ -343,8 +327,7 @@ class Assets {
       'assets/icons/functions_icons/master_state.svg';
   static const String assetsSwitchAlarmSound =
       'assets/icons/functions_icons/switch_alarm_sound.svg';
-  static const String assetsResetOff =
-      'assets/icons/functions_icons/reset_off.svg';
+  static const String assetsResetOff = 'assets/icons/functions_icons/reset_off.svg';
 
 // Assets for automation_functions
   static const String assetsCardUnlock =
@@ -388,15 +371,13 @@ class Assets {
   static const String activeUser = 'assets/icons/active_user.svg';
   static const String deActiveUser = 'assets/icons/deactive_user.svg';
   static const String invitedIcon = 'assets/icons/invited_icon.svg';
-  static const String rectangleCheckBox =
-      'assets/icons/rectangle_check_box.png';
+  static const String rectangleCheckBox = 'assets/icons/rectangle_check_box.png';
   static const String CheckBoxChecked = 'assets/icons/box_checked.png';
   static const String emptyBox = 'assets/icons/empty_box.png';
   static const String completeProcessIcon =
       'assets/icons/compleate_process_icon.svg';
   static const String completedDoneIcon = 'assets/images/completed_done.svg';
-  static const String currentProcessIcon =
-      'assets/icons/current_process_icon.svg';
+  static const String currentProcessIcon = 'assets/icons/current_process_icon.svg';
   static const String uncomplete_ProcessIcon =
       'assets/icons/uncompleate_process_icon.svg';
   static const String wrongProcessIcon = 'assets/icons/wrong_process_icon.svg';
@@ -417,11 +398,9 @@ class Assets {
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
-  static const String scenesPlayIconCheck =
-      'assets/icons/scenesPlayIconCheck.png';
+  static const String scenesPlayIconCheck = 'assets/icons/scenesPlayIconCheck.png';
   static const String presenceStateIcon = 'assets/icons/presence_state.svg';
-  static const String currentDistanceIcon =
-      'assets/icons/current_distance_icon.svg';
+  static const String currentDistanceIcon = 'assets/icons/current_distance_icon.svg';
 
   static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg';
   static const String motionDetectionSensitivityIcon =
@@ -444,44 +423,29 @@ class Assets {
   static const String cpsMode4 = 'assets/icons/cps_mode4.svg';
   static const String closeToMotion = 'assets/icons/close_to_motion.svg';
   static const String farAwayMotion = 'assets/icons/far_away_motion.svg';
-  static const String communicationFault =
-      'assets/icons/communication_fault.svg';
+  static const String communicationFault = 'assets/icons/communication_fault.svg';
   static const String radarFault = 'assets/icons/radar_fault.svg';
-  static const String selfTestingSuccess =
-      'assets/icons/self_testing_success.svg';
-  static const String selfTestingFailure =
-      'assets/icons/self_testing_failure.svg';
-  static const String selfTestingTimeout =
-      'assets/icons/self_testing_timeout.svg';
+  static const String selfTestingSuccess = 'assets/icons/self_testing_success.svg';
+  static const String selfTestingFailure = 'assets/icons/self_testing_failure.svg';
+  static const String selfTestingTimeout = 'assets/icons/self_testing_timeout.svg';
   static const String movingSpeed = 'assets/icons/moving_speed.svg';
   static const String boundary = 'assets/icons/boundary.svg';
   static const String motionMeter = 'assets/icons/motion_meter.svg';
-  static const String spatialStaticValue =
-      'assets/icons/spatial_static_value.svg';
-  static const String spatialMotionValue =
-      'assets/icons/spatial_motion_value.svg';
+  static const String spatialStaticValue = 'assets/icons/spatial_static_value.svg';
+  static const String spatialMotionValue = 'assets/icons/spatial_motion_value.svg';
   static const String presenceJudgementThrshold =
       'assets/icons/presence_judgement_threshold.svg';
   static const String spaceType = 'assets/icons/space_type.svg';
   static const String sportsPara = 'assets/icons/sports_para.svg';
-  static const String sensitivityFeature1 =
-      'assets/icons/sensitivity_feature_1.svg';
-  static const String sensitivityFeature2 =
-      'assets/icons/sensitivity_feature_2.svg';
-  static const String sensitivityFeature3 =
-      'assets/icons/sensitivity_feature_3.svg';
-  static const String sensitivityFeature4 =
-      'assets/icons/sensitivity_feature_4.svg';
-  static const String sensitivityFeature5 =
-      'assets/icons/sensitivity_feature_5.svg';
-  static const String sensitivityFeature6 =
-      'assets/icons/sensitivity_feature_6.svg';
-  static const String sensitivityFeature7 =
-      'assets/icons/sensitivity_feature_7.svg';
-  static const String sensitivityFeature8 =
-      'assets/icons/sensitivity_feature_8.svg';
-  static const String sensitivityFeature9 =
-      'assets/icons/sensitivity_feature_9.svg';
+  static const String sensitivityFeature1 = 'assets/icons/sensitivity_feature_1.svg';
+  static const String sensitivityFeature2 = 'assets/icons/sensitivity_feature_2.svg';
+  static const String sensitivityFeature3 = 'assets/icons/sensitivity_feature_3.svg';
+  static const String sensitivityFeature4 = 'assets/icons/sensitivity_feature_4.svg';
+  static const String sensitivityFeature5 = 'assets/icons/sensitivity_feature_5.svg';
+  static const String sensitivityFeature6 = 'assets/icons/sensitivity_feature_6.svg';
+  static const String sensitivityFeature7 = 'assets/icons/sensitivity_feature_7.svg';
+  static const String sensitivityFeature8 = 'assets/icons/sensitivity_feature_8.svg';
+  static const String sensitivityFeature9 = 'assets/icons/sensitivity_feature_9.svg';
   static const String deviceTagIcon = 'assets/icons/device_tag_ic.svg';
   static const String targetConfirmTimeIcon =
       'assets/icons/target_confirm_time_icon.svg';
@@ -489,13 +453,10 @@ class Assets {
   static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg';
   static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg';
   static const String blankCalendar = 'assets/icons/blank_calendar.svg';
-  static const String refreshStatusIcon =
-      'assets/icons/refresh_status_icon.svg';
-  static const String energyConsumedIcon =
-      'assets/icons/energy_consumed_icon.svg';
+  static const String refreshStatusIcon = 'assets/icons/refresh_status_icon.svg';
+  static const String energyConsumedIcon = 'assets/icons/energy_consumed_icon.svg';
 
-  static const String closeSettingsIcon =
-      'assets/icons/close_settings_icon.svg';
+  static const String closeSettingsIcon = 'assets/icons/close_settings_icon.svg';
 
   static const String editNameIconSettings =
       'assets/icons/edit_name_icon_settings.svg';
@@ -515,6 +476,4 @@ class Assets {
       'assets/icons/empty_energy_management_per_device.svg';
   static const String emptyHeatmap = 'assets/icons/empty_heatmap.svg';
   static const String emptyRangeOfAqi = 'assets/icons/empty_range_of_aqi.svg';
-  static const String homeIcon = 'assets/icons/home_icon.svg';
-  static const String groupIcon = 'assets/icons/group_icon.svg';
 }

lib/utils/helpers/safe_division_helper.dart

@@ -0,0 +1,8 @@
+abstract final class SafeDivisionHelper {
+  const SafeDivisionHelper._();
+
+  static double divide(num value, num divider) {
+    if (divider == 0) return 0;
+    return value / divider;
+  }
+}

lib/utils/theme/theme.dart

@@ -52,7 +52,4 @@ final myTheme = ThemeData(
       borderRadius: BorderRadius.circular(4),
     ),
   ),
-  dialogTheme: const DialogThemeData(
-    backgroundColor: ColorsManager.whiteColors,
-  ),
 );