reComite

<!--
  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
[SP-1707](https://syncrow.atlassian.net/browse/SP-1707)

## Description

fix the UI as wanted in Figma 

## 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 


[SP-1707]:
https://syncrow.atlassian.net/browse/SP-1707?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

assets/images/completed_done.svg

@@ -0,0 +1,4 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M37.8033 16.3567C37.2313 15.7848 36.3039 15.7847 35.7318 16.3568L21.5532 30.5353L14.2681 23.2504C13.6962 22.6784 12.7686 22.6783 12.1966 23.2505C11.6246 23.8226 11.6246 24.75 12.1966 25.3221L20.5174 33.6427C20.8034 33.9287 21.1783 34.0717 21.5531 34.0717C21.928 34.0717 22.3029 33.9287 22.5888 33.6426L37.8033 18.4283C38.3754 17.8563 38.3754 16.9288 37.8033 16.3567Z" fill="#023DFE" fill-opacity="0.7"/>
+<path d="M42.6776 7.32236C37.9558 2.60049 31.6776 0 25 0C18.3223 0 12.0442 2.60049 7.32236 7.32236C2.60039 12.0443 0 18.3224 0 25C0 31.6778 2.60039 37.9559 7.32236 42.6777C12.0441 47.3996 18.3223 50 25 50C31.6777 50 37.9558 47.3996 42.6776 42.6777C47.3995 37.9559 50 31.6778 50 25C50 18.3224 47.3995 12.0443 42.6776 7.32236ZM25 47.0703C12.8304 47.0703 2.92969 37.1696 2.92969 25C2.92969 12.8304 12.8304 2.92969 25 2.92969C37.1696 2.92969 47.0703 12.8304 47.0703 25C47.0703 37.1696 37.1696 47.0703 25 47.0703Z" fill="#023DFE" fill-opacity="0.7"/>
+</svg>

lib/pages/device_managment/all_devices/models/device_status.dart

@@ -57,6 +57,16 @@ class Status {
     };
   }
 
+  Status copyWith({
+    String? code,
+    dynamic value,
+  }) {
+    return Status(
+      code: code ?? this.code,
+      value: value ?? this.value,
+    );
+  }
+
   factory Status.fromJson(String source) => Status.fromMap(json.decode(source));
 
   String toJson() => json.encode(toMap());

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

@@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/device_managment/curtain_module/bloc/curtain_m
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 
 class AccurteCalibratingDialog extends StatelessWidget {
   final String deviceId;
@@ -17,14 +18,15 @@ class AccurteCalibratingDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
+      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Calibrating',
         body: const NormalTextBodyForDialog(
           title: '',
           step1:
-              '1. Click Close Button to make the Curtain run to Full Close and Position.',
-          step2: '2. click Next to complete the Calibration.',
+              'Click Close Button to make the Curtain run to Full Close and Position.',
+          step2: 'click Next to complete the Calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_calibrating_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 
 class AccurateCalibrationDialog extends StatelessWidget {
   final String deviceId;
@@ -15,13 +16,14 @@ class AccurateCalibrationDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
+      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Accurate Calibration',
         body: const NormalTextBodyForDialog(
           title: 'Prepare Calibration:',
-          step1: '1. Run The Curtain to the Fully Open Position,and pause.',
-          step2: '2. click Next to Start accurate calibration.',
+          step1: 'Run The Curtain to the Fully Open Position,and pause.',
+          step2: 'click Next to Start accurate calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

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

@@ -17,40 +17,52 @@ class AccurateDialogWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 300,
-      width: 400,
+      height: 250,
+      width: 500,
+      child: Column(
+        children: [
+          Expanded(
+            flex: 3,
             child: Column(
               children: [
                 Padding(
                   padding: const EdgeInsets.all(10),
                   child: Text(
                     title,
-              style: const TextStyle(
+                    style: TextStyle(
                       fontSize: 24,
                       fontWeight: FontWeight.bold,
-                color: ColorsManager.blueColor,
+                      color: ColorsManager.dialogBlueTitle,
                     ),
                   ),
                 ),
-          const SizedBox(height: 5),
                 const Divider(
-            indent: 10,
-            endIndent: 10,
+                  indent: 60,
+                  endIndent: 60,
                 ),
-          Padding(
-            padding: const EdgeInsets.all(10),
+              ],
+            ),
+          ),
+          Expanded(
+            flex: 5,
             child: body,
           ),
-          const SizedBox(height: 20),
-          const Spacer(),
-          const Divider(),
+          Expanded(
+            flex: 2,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: [
+                const Expanded(child: Divider()),
                 Row(
                   children: [
                     Expanded(
                       child: InkWell(
+                        borderRadius: const BorderRadius.only(
+                          bottomLeft: Radius.circular(26),
+                        ),
                         onTap: leftOnTap,
                         child: Container(
-                    height: 60,
+                          height: 40,
                           alignment: Alignment.center,
                           decoration: const BoxDecoration(
                             border: Border(
@@ -58,6 +70,9 @@ class AccurateDialogWidget extends StatelessWidget {
                                 color: ColorsManager.grayBorder,
                               ),
                             ),
+                            borderRadius: BorderRadius.only(
+                              bottomLeft: Radius.circular(26),
+                            ),
                           ),
                           child: const Text(
                             'Cancel',
@@ -68,9 +83,12 @@ class AccurateDialogWidget extends StatelessWidget {
                     ),
                     Expanded(
                       child: InkWell(
+                        borderRadius: const BorderRadius.only(
+                          bottomRight: Radius.circular(26),
+                        ),
                         onTap: rightOnTap,
                         child: Container(
-                    height: 60,
+                          height: 40,
                           alignment: Alignment.center,
                           decoration: const BoxDecoration(
                             border: Border(
@@ -78,6 +96,9 @@ class AccurateDialogWidget extends StatelessWidget {
                                 color: ColorsManager.grayBorder,
                               ),
                             ),
+                            borderRadius: BorderRadius.only(
+                              bottomRight: Radius.circular(26),
+                            ),
                           ),
                           child: const Text(
                             'Next',
@@ -92,6 +113,9 @@ class AccurateDialogWidget extends StatelessWidget {
                 )
               ],
             ),
+          )
+        ],
+      ),
     );
   }
 }

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

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/bloc/curtain_module_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 
 class CalibrateCompletedDialog extends StatelessWidget {
   final BuildContext parentContext;
@@ -21,14 +23,17 @@ class CalibrateCompletedDialog extends StatelessWidget {
         width: 400,
         child: Column(
           children: [
-            const Padding(
-              padding: EdgeInsets.all(10),
+            Expanded(
+              child: Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.all(10),
                     child: Text(
                       'Calibration Completed',
                       style: TextStyle(
                         fontSize: 24,
                         fontWeight: FontWeight.bold,
-                  color: ColorsManager.blueColor,
+                        color: ColorsManager.dialogBlueTitle,
                       ),
                     ),
                   ),
@@ -37,12 +42,16 @@ class CalibrateCompletedDialog extends StatelessWidget {
                     indent: 10,
                     endIndent: 10,
                   ),
-            const Icon(
-              Icons.check_circle,
-              size: 100,
-              color: ColorsManager.blueColor,
+                ],
               ),
-            const Spacer(),
+            ),
+            Expanded(
+              child: SvgPicture.asset(Assets.completedDoneIcon),
+            ),
+            Expanded(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
                   const Divider(
                     indent: 10,
                     endIndent: 10,
@@ -71,6 +80,9 @@ class CalibrateCompletedDialog extends StatelessWidget {
                   )
                 ],
               ),
+            )
+          ],
+        ),
       ),
     );
   }

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

@@ -15,28 +15,72 @@ class NormalTextBodyForDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return Padding(
+      padding: EdgeInsetsGeometry.only(left: 15),
+      child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-        Text(
+          if (title.isEmpty)
+            const SizedBox()
+          else
+            Expanded(
+              child: Text(
                 title,
                 style: const TextStyle(
                   color: ColorsManager.grayColor,
+                  fontSize: 15,
                 ),
               ),
-        Text(
+            ),
+          Expanded(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  width: 10,
+                ),
+                const Text('1. ',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 15,
+                    )),
+                SizedBox(
+                  width: 450,
+                  child: Text(
                     step1,
                     style: const TextStyle(
                       color: ColorsManager.grayColor,
+                      fontSize: 15,
                     ),
                   ),
+                ),
+              ],
+            ),
+          ),
+          Expanded(
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  width: 10,
+                ),
+                const Text('2. ',
+                    style: TextStyle(
+                      color: ColorsManager.grayColor,
+                      fontSize: 15,
+                    )),
                 Text(
                   step2,
                   style: const TextStyle(
                     color: ColorsManager.grayColor,
+                    fontSize: 15,
+                  ),
+                ),
+              ],
             ),
           )
         ],
+      ),
     );
   }
 }

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

@@ -19,7 +19,7 @@ class NumberInputField extends StatelessWidget {
         contentPadding: EdgeInsets.zero,
       ),
       style: const TextStyle(
-        fontSize: 20,
+        fontSize: 15,
         color: ColorsManager.blackColor,
       ),
     );

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

@@ -18,7 +18,7 @@ class PrefReversCardWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return DefaultContainer(
-      padding: const EdgeInsets.all(12),
+      padding: const EdgeInsets.all(18),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisAlignment: MainAxisAlignment.spaceBetween,

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

@@ -23,12 +23,12 @@ class CurtainModulePrefrencesDialog extends StatelessWidget {
   Widget build(_) {
     return AlertDialog(
       backgroundColor: ColorsManager.CircleImageBackground,
-      contentPadding: const EdgeInsets.all(30),
-      title: const Center(
+      contentPadding: const EdgeInsets.all(20),
+      title: Center(
           child: Text(
         'Preferences',
         style: TextStyle(
-          color: ColorsManager.blueColor,
+          color: ColorsManager.dialogBlueTitle,
           fontSize: 24,
           fontWeight: FontWeight.bold,
         ),

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

@@ -63,37 +63,51 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
   @override
   Widget build(_) {
     return AlertDialog(
+      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Calibrating',
         body: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            const Text(
+            const Expanded(
+              child: Align(
+                alignment: Alignment.topCenter,
+                child: Padding(
+                  padding: EdgeInsets.only(right: 75),
+                  child: Text(
                     '1.please Enter the Travel Time:',
-              style: TextStyle(color: ColorsManager.grayBorder),
+                    style: TextStyle(color: ColorsManager.lightGrayColor),
                   ),
-            const SizedBox(height: 10),
-            Container(
-              width: 150,
-              height: 40,
+                ),
+              ),
+            ),
+            Expanded(
+              child: Align(
+                alignment: Alignment.center,
+                child: Container(
+                  width: 130,
                   padding: const EdgeInsets.all(5),
                   decoration: BoxDecoration(
-                color: ColorsManager.whiteColors,
+                    color: ColorsManager.neutralGray.withValues(
+                      alpha: 0.5,
+                    ),
                     borderRadius: BorderRadius.circular(12),
                   ),
                   child: Row(
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
                       Expanded(
-                    child: NumberInputField(controller: _controller),
+                        child: Padding(
+                            padding: const EdgeInsetsGeometry.only(left: 5),
+                            child: NumberInputField(controller: _controller)),
                       ),
-                  const Expanded(
+                      Expanded(
                         child: Text(
                           'seconds',
                           style: TextStyle(
-                        fontSize: 15,
-                        color: ColorsManager.blueColor,
+                            fontSize: 12,
+                            color: ColorsManager.dialogBlueTitle,
                             fontWeight: FontWeight.bold,
                           ),
                         ),
@@ -101,8 +115,11 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
                     ],
                   ),
                 ),
+              ),
+            ),
             if (_errorText != null)
-              Padding(
+              Expanded(
+                child: Padding(
                   padding: const EdgeInsets.only(top: 8.0),
                   child: Text(
                     _errorText!,
@@ -112,6 +129,16 @@ class _QuickCalibratingDialogState extends State<QuickCalibratingDialog> {
                     ),
                   ),
                 ),
+              ),
+            const Expanded(
+              child: Align(
+                alignment: Alignment.bottomCenter,
+                child: Text(
+                  '2.click Next to Complete the calibration',
+                  style: TextStyle(color: ColorsManager.lightGrayColor),
+                ),
+              ),
+            )
           ],
         ),
         leftOnTap: () => Navigator.of(widget.parentContext).pop(),

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/accurate_dialog_widget.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/normal_text_body_for_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/curtain_module/widgets/quick_calibrating_dialog.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 
 class QuickCalibrationDialog extends StatelessWidget {
   final int timControl;
@@ -17,14 +18,15 @@ class QuickCalibrationDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
+      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: AccurateDialogWidget(
         title: 'Quick Calibration',
         body: const NormalTextBodyForDialog(
           title: 'Prepare Calibration:',
           step1:
-              '1. Confirm that the curtain is in the fully closed and suspended state.',
-          step2: '2. click Next to Start calibration.',
+              'Confirm that the curtain is in the fully closed and suspended state.',
+          step2: 'click Next to Start calibration.',
         ),
         leftOnTap: () => Navigator.of(parentContext).pop(),
         rightOnTap: () {

lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart

@@ -286,11 +286,20 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
     try {
       if (state is ScheduleLoaded) {
         final dateTime = DateTime.parse(event.time);
+        Status status = Status(code: '', value: '');
+        if (event.category == 'CUR_2') {
+          status = status.copyWith(
+              code: 'control',
+              value: event.functionOn == true ? 'open' : 'close');
+        } else {
+          status =
+              status.copyWith(code: event.category, value: event.functionOn);
+        }
         final updatedSchedule = ScheduleEntry(
           scheduleId: event.scheduleId,
           category: event.category,
           time: getTimeStampWithoutSeconds(dateTime).toString(),
-          function: Status(code: event.category, value: event.functionOn),
+          function: status,
           days: event.selectedDays,
         );
         final success = await DevicesManagementApi().editScheduleRecord(

lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart

@@ -52,6 +52,9 @@ class BuildScheduleView extends StatelessWidget {
                       children: [
                         const ScheduleHeader(),
                         const SizedBox(height: 20),
+                        if (category == 'CUR_2')
+                          const SizedBox()
+                        else
                           ScheduleModeSelector(
                             currentMode: state.scheduleMode,
                           ),

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart

@@ -212,12 +212,20 @@ class _ScheduleTableView extends StatelessWidget {
                     isEdit: true,
                   ).then((updatedSchedule) {
                     if (updatedSchedule != null) {
+                      bool temp;
+                      if (schedule.category == 'CUR_2') {
+                        updatedSchedule.function.value == 'open'
+                            ? temp = true
+                            : temp = false;
+                      } else {
+                        temp = updatedSchedule.function.value;
+                      }
                       context.read<ScheduleBloc>().add(
                             ScheduleEditEvent(
                                 scheduleId: schedule.scheduleId,
                                 category: schedule.category,
                                 time: updatedSchedule.time,
-                                functionOn: updatedSchedule.function.value,
+                                functionOn: temp,
                                 selectedDays: updatedSchedule.days),
                           );
                     }

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

@@ -34,7 +34,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               return Dialog(
                   child: Container(
                 decoration: const BoxDecoration(
-                    color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
+                    color: Colors.white,
+                    borderRadius: BorderRadius.all(Radius.circular(20))),
                 width: 900,
                 child: Column(
                   children: [
@@ -63,7 +64,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
+                                  _buildStep3Indicator(
+                                      3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -105,18 +107,32 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                           ),
                           InkWell(
                             onTap: () {
+                              final isBasicsStep = currentStep == 1;
+
+                              if (isBasicsStep) {
+                                // Validate the form first
+                                final isValid = _blocRole.formKey.currentState
+                                        ?.validate() ??
+                                    false;
+
+                                if (!isValid)
+                                  return; // Stop if form is not valid
+                              }
                               _blocRole.add(const CheckEmailEvent());
 
                               setState(() {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
+                                    _blocRole.add(const CheckStepStatus(
+                                        isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole.add(const CheckSpacesStepStatus());
+                                    _blocRole
+                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole.add(SendInviteUsers(context: context));
+                                  _blocRole
+                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -124,8 +140,11 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics == false ||
-                                              _blocRole.isCompleteRolePermissions == false) &&
+                                              _blocRole.isCompleteBasics ==
+                                                  false ||
+                                              _blocRole
+                                                      .isCompleteRolePermissions ==
+                                                  false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -143,7 +162,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget _getFormContent() {
     switch (currentStep) {
       case 1:
-        return const BasicsView(
+        return BasicsView(
           userId: '',
         );
       case 2:
@@ -196,8 +215,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -260,8 +283,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -318,8 +345,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -1,9 +1,12 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl_phone_field/countries.dart';
 import 'package:intl_phone_field/country_picker_dialog.dart';
 import 'package:intl_phone_field/intl_phone_field.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
+import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,7 +14,9 @@ import 'package:syncrow_web/utils/style.dart';
 
 class BasicsView extends StatelessWidget {
   final String? userId;
-  const BasicsView({super.key, this.userId = ''});
+  Timer? _debounce;
+
+  BasicsView({super.key, this.userId = ''});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<UsersBloc, UsersState>(builder: (context, state) {
@@ -21,6 +26,7 @@ class BasicsView extends StatelessWidget {
       }
       return Form(
         key: _blocRole.formKey,
+        autovalidateMode: AutovalidateMode.onUserInteraction,
         child: ListView(
           shrinkWrap: true,
           children: [
@@ -208,6 +214,14 @@ class BasicsView extends StatelessWidget {
                           fontSize: 12,
                           color: ColorsManager.textGray),
                     ),
+
+                    onChanged: (value) {
+                      if (_debounce?.isActive ?? false) _debounce!.cancel();
+                      _debounce = Timer(const Duration(milliseconds: 800), () {
+                        _blocRole.add(const CheckEmailEvent());
+                      });
+                    },
+
                     validator: (value) {
                       if (value == null || value.isEmpty) {
                         return 'Enter Email Address';

lib/pages/spaces_management/all_spaces/model/product_model.dart

@@ -58,11 +58,14 @@ class ProductModel {
       '3G': Assets.Gang3SwitchIcon,
       '3GT': Assets.threeTouchSwitch,
       'CUR': Assets.curtain,
+      'CUR_2': Assets.curtain,
       'GD': Assets.garageDoor,
       'GW': Assets.SmartGatewayIcon,
       'DL': Assets.DoorLockIcon,
       'WL': Assets.waterLeakSensor,
       'WH': Assets.waterHeater,
+      'WM': Assets.waterLeakSensor,
+      'SOS': Assets.sos,
       'AC': Assets.ac,
       'CPS': Assets.presenceSensor,
       'PC': Assets.powerClamp,

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -574,8 +574,9 @@ class VisitorPasswordDialog extends StatelessWidget {
             } else {
               return AlertDialog(
                 alignment: Alignment.center,
+                backgroundColor: Colors.white,
                 content: SizedBox(
-                  height: size.height * 0.25,
+                  height: size.height * 0.13,
                   child: Column(
                     children: [
                       Column(
@@ -589,11 +590,16 @@ class VisitorPasswordDialog extends StatelessWidget {
                               width: 35,
                             ),
                           ),
+                          const SizedBox(
+                            height: 20,
+                          ),
                           Text(
                             'Set Password',
-                            style:
-                                Theme.of(context).textTheme.headlineLarge!.copyWith(
-                                      fontSize: 30,
+                            style: Theme.of(context)
+                                .textTheme
+                                .headlineLarge!
+                                .copyWith(
+                                  fontSize: 24,
                                   fontWeight: FontWeight.w400,
                                   color: Colors.black,
                                 ),
@@ -601,15 +607,6 @@ class VisitorPasswordDialog extends StatelessWidget {
                         ],
                       ),
                       const SizedBox(width: 15),
-                      Text(
-                        'This action will update all of the selected\n door locks passwords in the property.\n\nAre you sure you want to continue?',
-                        textAlign: TextAlign.center,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.w400,
-                              fontSize: 18,
-                            ),
-                      ),
                     ],
                   ),
                 ),
@@ -638,6 +635,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                     decoration: containerDecoration,
                     width: size.width * 0.1,
                     child: DefaultButton(
+                      backgroundColor: Color(0xff023DFE),
                       borderRadius: 8,
                       onPressed: () {
                         Navigator.pop(context);
@@ -681,7 +679,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         }
                       },
                       child: Text(
-                        'Ok',
+                        'Confirm',
                         style: Theme.of(context).textTheme.bodySmall!.copyWith(
                               fontWeight: FontWeight.w400,
                               color: ColorsManager.whiteColors,

lib/utils/color_manager.dart

@@ -84,6 +84,4 @@ abstract class ColorsManager {
   static const Color minBlue = Color(0xFF93AAFD);
   static const Color minBlueDot = Color(0xFF023DFE);
   static const Color grey25 = Color(0xFFF9F9F9);
-    
-
 }

lib/utils/constants/assets.dart

@@ -394,6 +394,7 @@ class Assets {
   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 uncomplete_ProcessIcon =
@@ -505,5 +506,6 @@ class Assets {
   static const String aqiAirQuality = 'assets/icons/aqi_air_quality.svg';
   static const String temperatureAqiSidebar = 'assets/icons/thermometer.svg';
   static const String humidityAqiSidebar = 'assets/icons/humidity.svg';
-  static const String autocadOccupancyImage = 'assets/images/autocad_occupancy_image.png';
+  static const String autocadOccupancyImage =
+      'assets/images/autocad_occupancy_image.png';
 }