Merge remote-tracking branch 'upstream/main'

lib/core/widgets/custom_drop_down.dart

@@ -64,11 +64,6 @@ class CustomDropDown extends StatelessWidget {
       value: value,
       isDense: true,
       isExpanded: true,
-      style: TextStyle(
-        fontSize: 16,
-        color: Colors.black,
-        fontWeight: FontWeight.w400,
-      ),
       items: items?.map((SelectionPopupModel item) {
         return DropdownMenuItem<SelectionPopupModel>(
           value: item,

lib/core/widgets/custom_text_form_field.dart

@@ -38,10 +38,12 @@ class CustomTextFormField extends StatelessWidget {
     this.expands = false,
     this.textAlignVertical,
     this.counter = const SizedBox.shrink(),
+    this.enabled = true,
     super.key,
     this.hasError = false,
     this.readOnly = false,
   });
+
   final Widget? counter;
   final Alignment? alignment;
   final double? width;
@@ -77,12 +79,15 @@ class CustomTextFormField extends StatelessWidget {
   final bool expands;
   final TextAlignVertical? textAlignVertical;
   final bool hasError;
+  final bool enabled;
+
   final bool readOnly;
   @override
   Widget build(BuildContext context) {
     return Align(
       alignment: alignment ?? Alignment.center,
       child: TextFormField(      
+        enabled: enabled,
         readOnly: readOnly,
         textAlignVertical: textAlignVertical,
         expands: expands,
@@ -114,6 +119,7 @@ class CustomTextFormField extends StatelessWidget {
           prefixIcon: prefix,
           prefixIconConstraints: prefixConstraints,
           suffixIcon: suffix,
+          floatingLabelBehavior: FloatingLabelBehavior.always,
           suffixStyle: TextStyle(
             fontSize: 16,
             fontWeight: FontWeight.w500,