lib/main.dart

@@ -65,7 +65,7 @@ import 'package:test_sa/modules/site_request_module/providers/site_request_provi
 import 'package:test_sa/modules/site_request_module/screens/site_request_form_screen.dart';
 import 'package:test_sa/modules/site_request_module/screens/site_request_history_screen.dart';
 import 'package:test_sa/modules/applicationDemo/providers/application_demo_request_provider.dart';
-import 'package:test_sa/modules/applicationDemo/screens/application_demo_request_form_screen.dart';
+import 'package:test_sa/modules/applicationDemo/screens/demo_request_form_screen.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/create_gas_refill_request.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/update_gas_refill_request.dart';
 import 'package:test_sa/new_views/app_style/app_themes.dart';

lib/modules/cm_module/views/components/action_button/footer_action_button.dart

@@ -32,12 +32,12 @@ import 'package:test_sa/new_views/swipe_module/dialoge/acknowledge_work_dialog.d
 import 'package:test_sa/providers/service_request_providers/reject_reason_provider.dart';
 
 class FooterActionButton {
-  static Widget footerContainer({required Widget child, required BuildContext context, bool safeAreaTop = true}) {
+  static Widget footerContainer({required Widget child, required BuildContext context}) {
     return Container(
       alignment: Alignment.bottomCenter,
       padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 12),
       color: AppColor.background(context),
-      child: SafeArea(top: safeAreaTop, child: child),
+      child: SafeArea(child: child),
     );
   }
 

lib/modules/signup/screens/signup_screen.dart

@@ -3,7 +3,6 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/validator/validator.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
-import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
@@ -63,9 +62,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
   bool _employeeFetched = false;
   bool _isSubmitting = false;
 
-  // Autovalidate mode - enables validation on user interaction after first submit attempt
-  AutovalidateMode _autovalidateMode = AutovalidateMode.disabled;
-
   @override
   void initState() {
     super.initState();
@@ -104,7 +100,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
             padding: EdgeInsets.all(16.toScreenWidth),
             child: Form(
               key: _formKey,
-              autovalidateMode: _autovalidateMode, // Set autovalidate mode
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -140,7 +135,7 @@ class _SignUpScreenState extends State<SignUpScreen> {
   Widget _buildAssetGroupDropdown() {
     return SingleItemDropDownMenu<AssetGroup, AssetGroupProvider>(
       context: context,
-      title: "Group".addTranslation,
+      title: "Asset Group",
       initialValue: _selectedAssetGroup,
       showAsFullScreenDialog: true,
       showAsBottomSheet: false,
@@ -159,7 +154,7 @@ class _SignUpScreenState extends State<SignUpScreen> {
         }
       },
       validator: (value) {
-        if (value == null) return "Group is required";
+        if (value == null) return "Asset Group is required";
         return null;
       },
     );
@@ -245,8 +240,15 @@ class _SignUpScreenState extends State<SignUpScreen> {
             controller: _employeeIdController,
             labelText: "Employee ID",
             textInputType: TextInputType.number,
+            onChange: (value) {
+              // Clear validation errors on user interaction
+              // if (_formKey.currentState != null) {
+              //   _formKey.currentState!.validate();
+              // }
+            },
             validator: (value) {
               if (_employeeIdController.text.isEmpty) return "Employee ID is required";
+              // if (!Validator.isNumeric(_employeeIdController.text)) return "Employee ID must be numeric";
               return null;
             },
           ),
@@ -485,10 +487,6 @@ class _SignUpScreenState extends State<SignUpScreen> {
   Future<void> _submitForm() async {
     // Validate form fields
     if (!_formKey.currentState!.validate()) {
-      // Enable autovalidation after first submit attempt
-      setState(() {
-        _autovalidateMode = AutovalidateMode.onUserInteraction;
-      });
       Fluttertoast.showToast(msg: "Please fill all required fields");
       return;
     }

lib/modules/site_request_module/providers/site_request_provider.dart

@@ -40,32 +40,19 @@ class SiteRequestProvider extends ChangeNotifier {
 
   // Getters
   bool get loading => _loading;
-
   bool get isLoadingMore => _isLoadingMore;
-
   String? get errorMessage => _errorMessage;
-
   int get currentPage => _currentPage;
-
   bool get hasMoreData => _hasMoreData;
-
   List<RequestTypeModel> get requestTypes => _requestTypes;
-
   List<SiteRequestSiteModel> get userCurrentSites => _userCurrentSites;
-
   List<SiteRequestModel> get requestHistory => _requestHistory;
 
   // User helper methods
-  String getCurrentUserUserId(UserProvider userProvider) => userProvider.user?.userID ?? '';
-
-  String getCurrentUserEmployeeId(UserProvider userProvider) => userProvider.user?.employeeId ?? '';
-
+  String getCurrentUserEmployeeId(UserProvider userProvider) => userProvider.user?.userID ?? '';
   String getCurrentUserFullName(UserProvider userProvider) => userProvider.user?.username ?? '';
-
   String getCurrentUserEmail(UserProvider userProvider) => userProvider.user?.email ?? '';
-
   String getCurrentUserMobile(UserProvider userProvider) => userProvider.user?.phoneNumber ?? '';
-
   String getCurrentUserExtension(UserProvider userProvider) => userProvider.user?.extensionNo ?? '';
 
   String getCurrentUserRole(UserProvider userProvider) {
@@ -76,7 +63,6 @@ class SiteRequestProvider extends ChangeNotifier {
   }
 
   List<String> getCurrentUserAssignedSites(UserProvider userProvider) => [];
-
   bool hasAssignedSites(List<String> assignedSites) => assignedSites.isNotEmpty;
 
   // Setter
@@ -132,7 +118,8 @@ class SiteRequestProvider extends ChangeNotifier {
     notifyListeners();
 
     try {
-      final isChangeSiteRequest = _requestTypes.any((type) => type.identifier == request.requestType && (type.name?.toLowerCase().contains('change') ?? false));
+      final isChangeSiteRequest = _requestTypes.any((type) =>
+          type.identifier == request.requestType && (type.name?.toLowerCase().contains('change') ?? false));
 
       final requestBody = _buildRequestBody(request, userProvider, isChangeSiteRequest);
 
@@ -177,7 +164,7 @@ class SiteRequestProvider extends ChangeNotifier {
         body: {
           "pageSize": size,
           "pageNumber": page,
-          "userId": getCurrentUserUserId(userProvider),
+          "userId": getCurrentUserEmployeeId(userProvider),
         },
       );
 
@@ -258,8 +245,16 @@ class SiteRequestProvider extends ChangeNotifier {
         "id": 0,
         "siteId": int.tryParse(request.siteIds[index]) ?? 0,
         "siteName": request.siteNames[index],
-        "oldSiteId": (isChangeSiteRequest && request.oldSiteIds != null && index < request.oldSiteIds!.length) ? int.tryParse(request.oldSiteIds![index]) ?? 0 : 0,
-        "oldSitName": (isChangeSiteRequest && request.oldSiteNames != null && index < request.oldSiteNames!.length) ? request.oldSiteNames![index] : ""
+        "oldSiteId": (isChangeSiteRequest &&
+            request.oldSiteIds != null &&
+            index < request.oldSiteIds!.length)
+            ? int.tryParse(request.oldSiteIds![index]) ?? 0
+            : 0,
+        "oldSitName": (isChangeSiteRequest &&
+            request.oldSiteNames != null &&
+            index < request.oldSiteNames!.length)
+            ? request.oldSiteNames![index]
+            : ""
       };
     }).toList();
 
@@ -275,7 +270,7 @@ class SiteRequestProvider extends ChangeNotifier {
 
     return {
       "id": 0,
-      "userId": getCurrentUserUserId(userProvider),
+      "userId": getCurrentUserEmployeeId(userProvider),
       "requestTypeId": int.tryParse(request.requestType) ?? 0,
       "siteIds": siteIdsArray,
       "departmentIds": departmentIdsArray,
@@ -327,7 +322,9 @@ class SiteRequestProvider extends ChangeNotifier {
     final data = json.decode(response.body);
 
     if (data['isSuccess'] == true) {
-      final siteRequests = (data['data'] as List?)?.map((item) => SiteRequestModel.fromJson(item)).toList() ?? [];
+      final siteRequests = (data['data'] as List?)
+          ?.map((item) => SiteRequestModel.fromJson(item))
+          .toList() ?? [];
 
       if (loadMore) {
         _requestHistory.addAll(siteRequests);

lib/modules/site_request_module/screens/site_request_form_screen.dart

@@ -1,12 +1,9 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/context_extension.dart';
-import 'package:test_sa/extensions/string_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/new_models/site.dart';
@@ -162,7 +159,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
   Widget _buildRequestTypeDropdown() {
     return SingleItemDropDownMenu<RequestTypeModel, NullableLoadingProvider>(
       context: context,
-      title: "Type of site request".addTranslation,
+      title: "Type of Site Request",
       initialValue: _selectedRequestType,
       staticData: _provider.requestTypes,
       showAsFullScreenDialog: true,
@@ -178,7 +175,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
 
         // Fetch user's current sites if Change Site or Remove Site is selected
         if ((_isChangeSiteRequest() || _isRemoveSiteRequest()) && value != null) {
-          final userId = _provider.getCurrentUserUserId(_userProvider);
+          final userId = _provider.getCurrentUserEmployeeId(_userProvider);
           await _provider.fetchUserCurrentSites(userId);
         }
 
@@ -203,34 +200,28 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
       children: [
         InfoHeader16Widget("Requester Information"),
         // 8.height,
-        // InfoTextWidget(
-        //   label: "Employee ID".addTranslation,
-        //   value: _provider.getCurrentUserEmployeeId(_userProvider),
-        //   showEmptyValue: true,
-        // ),
         InfoTextWidget(
-          label: "Full Name".addTranslation,
+          label: "Full Name",
           value: _provider.getCurrentUserFullName(_userProvider),
           showEmptyValue: true,
         ),
-
         InfoTextWidget(
-          label: "Email Address".addTranslation,
+          label: "Email Address",
           value: _provider.getCurrentUserEmail(_userProvider),
           showEmptyValue: true,
         ),
         InfoTextWidget(
-          label: "Mobile Number".addTranslation,
+          label: "Mobile Number",
           value: _provider.getCurrentUserMobile(_userProvider),
           showEmptyValue: true,
         ),
         InfoTextWidget(
-          label: "Extension Number".addTranslation,
+          label: "Extension Number",
           value: _provider.getCurrentUserExtension(_userProvider),
           showEmptyValue: true,
         ),
         InfoTextWidget(
-          label: "Role".addTranslation,
+          label: "Role",
           value: _provider.getCurrentUserRole(_userProvider),
           showEmptyValue: true,
         ),
@@ -320,7 +311,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
   Widget _buildSiteMultiSelect() {
     return MultipleItemDropDownMenu<Site, SiteProvider>(
       context: context,
-      title: context.translation.site,
+      title: context.translation.bySite,
       initialValue: _selectedSites,
       showAsBottomSheet: true,
       backgroundColor: context.isDark ? AppColor.neutral60 : Colors.white,
@@ -347,7 +338,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
   Widget _buildDepartmentMultiSelect() {
     return MultipleItemDropDownMenu<Department, DepartmentBySitesProvider>(
       context: context,
-      title: "Department".addTranslation,
+      title: "Departments",
       initialValue: _selectedDepartments,
       showAsBottomSheet: true,
       backgroundColor: context.isDark ? AppColor.neutral60 : Colors.white,
@@ -389,12 +380,16 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
         builder: (context, siteProvider, child) {
           // Get ALL user's current site IDs to exclude from new site selection
           final allUserCurrentSiteIds = _provider.userCurrentSites.map((s) => s.identifier ?? '').toSet();
+
           // Filter out already selected new sites and ALL user's current sites
           final alreadySelectedNewSites = _siteReplacements.values.where((r) => r.newSite != null).map((r) => r.newSite!.identifier).toSet();
+
           final filteredSites = siteProvider.items.where((site) {
             final siteId = site.identifier ?? '';
+
             // Exclude ALL user's current sites (not just selected old sites)
             if (allUserCurrentSiteIds.contains(siteId)) return false;
+
             // Exclude already selected new sites (except current one)
             if (replacement?.newSite?.identifier != siteId && alreadySelectedNewSites.contains(siteId)) {
               return false;
@@ -402,6 +397,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
 
             return true;
           }).toList();
+
           return Column(
             mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -506,7 +502,6 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
     // Validation for Change Site request
     if (_isChangeSiteRequest()) {
       if (_selectedOldSites.isEmpty) {
-        "Please select at least one site".showToast;
         return;
       }
 
@@ -560,7 +555,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
 
       final request = SiteRequestModel(
         requestType: _selectedRequestType!.identifier?.toString() ?? '',
-        employeeId: _provider.getCurrentUserUserId(_userProvider),
+        employeeId: _provider.getCurrentUserEmployeeId(_userProvider),
         fullName: _provider.getCurrentUserFullName(_userProvider),
         emailAddress: _provider.getCurrentUserEmail(_userProvider),
         mobileNumber: _provider.getCurrentUserMobile(_userProvider),
@@ -587,12 +582,8 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
       });
 
       // API will handle success/error toast messages
-
       if (success && mounted) {
-        UserProvider userProvider = Provider.of<UserProvider>(context, listen: false);
-        await _provider.fetchSiteRequests(pageNumber: 1, pageSize: 10, userProvider: userProvider);
-        Navigator.pop(context);
-        // Navigator.pushReplacementNamed(context, SiteRequestHistoryScreen.routeName);
+        Navigator.pushReplacementNamed(context, SiteRequestHistoryScreen.routeName);
       }
     } else {
       // For Add Site and Remove Site request types
@@ -614,7 +605,7 @@ class _SiteRequestFormScreenState extends State<SiteRequestFormScreen> {
 
       final request = SiteRequestModel(
         requestType: _selectedRequestType!.identifier?.toString() ?? '',
-        employeeId: _provider.getCurrentUserUserId(_userProvider),
+        employeeId: _provider.getCurrentUserEmployeeId(_userProvider),
         fullName: _provider.getCurrentUserFullName(_userProvider),
         emailAddress: _provider.getCurrentUserEmail(_userProvider),
         mobileNumber: _provider.getCurrentUserMobile(_userProvider),

lib/new_views/common_widgets/app_filled_button.dart

@@ -41,18 +41,13 @@ class AppFilledButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 250),
+    return Container(
       height: height.toScreenHeight,
       width: maxWidth ? double.infinity : width,
       alignment: Alignment.center,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(10),
-        color: disableButton
-            ? context.isDark
-                ? AppColor.neutral20
-                : AppColor.neutral140
-            : (buttonColor ?? AppColor.primary10),
+        color: disableButton ? context.isDark ?AppColor.neutral20 :AppColor.neutral140 : (buttonColor ?? AppColor.primary10),
         border: showBorder ? Border.all(color: textColor ?? AppColor.background(context)) : null,
       ),
       child: loading

lib/new_views/common_widgets/default_app_bar.dart

@@ -12,13 +12,12 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String? title;
   final List<Widget>? actions;
   final Function? onBackPress;
-  final Color? backgroundColor;
   final bool showHomeActionButton;
   final bool showBackButton;
   final VoidCallback? onWillPopScope;
   final TextStyle? titleStyle;
 
-  const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions,this.backgroundColor, this.titleStyle, this.showHomeActionButton = false, this.showBackButton = true, Key? key}) : super(key: key);
+  const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions, this.titleStyle, this.showHomeActionButton = false, this.showBackButton = true, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -42,7 +41,6 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
     return AppBar(
       automaticallyImplyLeading: false,
       titleSpacing: 16,
-      backgroundColor:backgroundColor,
       title: Row(
         children: [
           if (showBackButton)

lib/new_views/forget_password_module/forget_passwod_verify_otp.dart

@@ -9,10 +9,8 @@ import 'package:test_sa/extensions/int_extensions.dart';
 import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/new_models/general_response_model.dart';
-import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
-import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/new_views/forget_password_module/reset_password_view.dart';
 import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
 
@@ -80,18 +78,12 @@ class _ForgetPasswordVerifyOtpViewState extends State<ForgetPasswordVerifyOtpVie
     String otpMethodValue = widget.data['typeSend'] == "SMS" ? widget.data['phoneNumber']["phoneNumber"] : widget.data["phoneNumber"]['email'];
 
     return Scaffold(
-      appBar: const DefaultAppBar(
-        title: '',
-        backgroundColor: Colors.transparent,
-      ),
       body: Column(
         children: [
           SingleChildScrollView(
-            padding: const EdgeInsets.all(16),
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
-              // mainAxisAlignment: MainAxisAlignment.center,
-              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 Text(context.translation.otpVerification, style: AppTextStyles.heading2.copyWith(color: AppColor.headingTextColor(context), fontWeight: FontWeight.w500)),
                 8.height,
@@ -147,17 +139,13 @@ class _ForgetPasswordVerifyOtpViewState extends State<ForgetPasswordVerifyOtpVie
               ],
             ),
           ).center.expanded,
-          FooterActionButton.footerContainer(
-            safeAreaTop: false,
-            context: context,
-            child: AppFilledButton(
+          AppFilledButton(
             label: context.translation.verify,
             maxWidth: true,
             onPressed: verifyOtp,
           ),
-          ),
         ],
-      ),
+      ).paddingOnly(start: 20, end: 20, bottom: 16),
     );
   }
 

lib/new_views/forget_password_module/reset_password_view.dart

@@ -7,11 +7,9 @@ import 'package:test_sa/extensions/text_extensions.dart';
 import 'package:test_sa/extensions/widget_extensions.dart';
 import 'package:test_sa/models/new_models/general_response_model.dart';
 import 'package:test_sa/models/new_models/update_password.dart';
-import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
-import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
 import 'package:test_sa/new_views/pages/login_page.dart';
 import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
 import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
@@ -42,14 +40,9 @@ class _ResetPasswordViewState extends State<ResetPasswordView> {
     return Form(
       key: _formKey,
       child: Scaffold(
-        appBar: const DefaultAppBar(
-          title: '',
-          backgroundColor: Colors.transparent,
-        ),
         body: Column(
           children: [
             SingleChildScrollView(
-              padding: const EdgeInsets.all(16),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -64,10 +57,6 @@ class _ResetPasswordViewState extends State<ResetPasswordView> {
                     validator: (value) => Validator.hasValue(value) ? null : context.translation.requiredField,
                     labelText: context.translation.password,
                     obscureText: !_passwordVisible,
-                    onChange: (value) {
-                      newPassword = value;
-                      setState(() {});
-                    },
                     suffixIcon: Icon(
                             // Based on passwordVisible state choose the icon
                             _passwordVisible ? Icons.visibility : Icons.visibility_off,
@@ -78,10 +67,9 @@ class _ResetPasswordViewState extends State<ResetPasswordView> {
                         _passwordVisible = !_passwordVisible;
                       });
                     }),
-                    // onSaved: (value) {
-                    //
-                    //   newPassword = value;
-                    // },
+                    onSaved: (value) {
+                      newPassword = value;
+                    },
                   ),
                   16.height,
                   AppTextFormField(
@@ -89,99 +77,36 @@ class _ResetPasswordViewState extends State<ResetPasswordView> {
                     labelText: context.translation.confirmPassword,
                     obscureText: !_confirmPasswordVisible,
                     showBorder: true,
-                    onChange: (value) {
+                    validator: (value) => Validator.isValidPassword(value!)
+                        ? null
+                        : value.isEmpty
+                            ? context.translation.requiredField
+                            : context.translation.passwordLengthMessage,
+                    onSaved: (value) {
                       confirmPassword = value;
-                      setState(() {});
                     },
-                    // validator: (value) => Validator.isValidPassword(value!)
-                    //     ? null
-                    //     : value.isEmpty
-                    //         ? context.translation.requiredField
-                    //         : context.translation.passwordLengthMessage,
-                    // onSaved: (value) {
-                    //   confirmPassword = value;
-                    // },
                     suffixIcon: Icon(_confirmPasswordVisible ? Icons.visibility : Icons.visibility_off, color: AppColor.icon2Color(context)).paddingOnly(end: 12).onPress(() {
                       setState(() {
                         _confirmPasswordVisible = !_confirmPasswordVisible;
                       });
                     }),
                   ),
-                  12.height,
-                  passwordConstraintsUI('At least one upper case', checkRegEx(r'[A-Z]')),
-                  8.height,
-                  passwordConstraintsUI('At least one special character', checkRegEx(r'[^\w\s]')),
-                  8.height,
-                  passwordConstraintsUI('At least one numeric', checkRegEx(r'[0-9]')),
-                  8.height,
-                  passwordConstraintsUI('Minimum 8 characters', newPassword.length >= 8),
-                  8.height,
-                  passwordConstraintsUI('Confirm password must match', newPassword.isNotEmpty && newPassword == confirmPassword),
                 ],
               ),
             ).center.expanded,
-            FooterActionButton.footerContainer(
-                safeAreaTop: false,
-                context: context,
-                child: AppFilledButton(label: context.translation.resetPassword, disableButton: !isPasswordCompliant(newPassword, 8), maxWidth: true, onPressed: () => _resetPassword(context))),
+            AppFilledButton(label: context.translation.resetPassword, maxWidth: true, onPressed: () => _resetPassword(context)),
           ],
-        ),
+        ).paddingOnly(start: 16, end: 16, bottom: 24, top: 24),
       ),
     );
   }
 
-  bool checkRegEx(String pattern) {
-    return RegExp(pattern).hasMatch(newPassword);
-  }
-
-  bool isPasswordCompliant(String? password, int minLength) {
-    if (password == null || password.isEmpty) {
-      return false;
-    }
-
-    bool hasUppercase = password.contains(RegExp(r'[A-Z]'));
-    bool hasDigits = password.contains(RegExp(r'[0-9]'));
-    bool hasSpecialCharacter = password.contains(RegExp(r'[^\w\s]'));
-    // bool hasSpecialCharacters = password.contains(RegExp(r'[!@#$%^&*(),.?":{}|<>]'));
-    bool hasMinLength = password.length >= minLength;
-    bool isMatched = password == confirmPassword;
-
-    return hasDigits && hasUppercase && hasMinLength && isMatched && hasSpecialCharacter;
-  }
-
-  Widget passwordConstraintsUI(String description, bool check) {
-    return Row(
-      children: [
-        4.width,
-        SizedBox(
-          width: 12,
-          height: 12,
-          //  activeColor: AppColor.primary10,
-          //             checkColor: AppColor.white10,
-          child: Checkbox(
-            fillColor: MaterialStateProperty.all(AppColor.primary10),
-            side: BorderSide(color: AppColor.icon2Color(context).withValues(alpha: .3), width: 1.0),
-            checkColor: AppColor.white10,
-            value: check,
-            onChanged: null,
-            activeColor: AppColor.blueStatus(context),
-            // side: BorderSide(color: AppColor.loadingColor(context), width: 1.0),
-            visualDensity: const VisualDensity(horizontal: -4.0, vertical: -4.0),
-            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-          ),
-        ),
-        12.width,
-        InfoTextLabelWidget(label: description),
-      ],
-    );
-  }
-
   Future<void> _resetPassword(BuildContext context) async {
-    // if (!_formKey.currentState!.validate()) return;
-    // _formKey.currentState?.save();
-    // if (newPassword != confirmPassword) {
-    //   Fluttertoast.showToast(msg: 'Password not matched try again');
-    // } else {
+    if (!_formKey.currentState!.validate()) return;
+    _formKey.currentState?.save();
+    if (newPassword != confirmPassword) {
+      Fluttertoast.showToast(msg: 'Password not matched try again');
+    } else {
       UserProvider userProvider = Provider.of<UserProvider>(context, listen: false);
       UpdatePasswordModel updatePasswordModel =
           UpdatePasswordModel(password: newPassword, confirmPassword: confirmPassword, userId: userProvider.verifyOtpModel.userId, token: userProvider.verifyOtpModel.token);
@@ -191,6 +116,6 @@ class _ResetPasswordViewState extends State<ResetPasswordView> {
         confirmPassword = '';
         Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
       }
-    // }
+    }
   }
 }

lib/new_views/pages/login_page.dart

@@ -16,7 +16,7 @@ import 'package:test_sa/models/new_models/general_response_model.dart';
 import 'package:test_sa/modules/cx_module/chat/chat_page.dart';
 import 'package:test_sa/modules/cx_module/survey/survey_page.dart';
 import 'package:test_sa/modules/signup/screens/signup_screen.dart';
-import 'package:test_sa/modules/applicationDemo/screens/application_demo_request_form_screen.dart';
+import 'package:test_sa/modules/applicationDemo/screens/demo_request_form_screen.dart';
 import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/forget_password_module/forget_passwod_verify_otp.dart';
 import 'package:test_sa/new_views/pages/land_page/land_page.dart';