Fix merge conflicts

2025-12-19 12:43:03 +01:00
parent efbdae81d4
commit 2c56d9fcb2
4 changed files with 33 additions and 55 deletions
--- a/packages/design_system/lib/src/inputs/textfields.dart
+++ b/packages/design_system/lib/src/inputs/textfields.dart
@@ -48,10 +48,10 @@ class CustomTextField extends StatelessWidget {
            ),
          ),
        TextFormField(
-          onFieldSubmitted: widget.onSubmitted,
-          textInputAction: widget.textInputAction,
-          controller: widget.controller,
-          keyboardType: widget.keyboardType,
+          onFieldSubmitted: onSubmitted,
+          textInputAction: textInputAction,
+          controller: controller,
+          keyboardType: keyboardType,
          obscureText: !(showPassword ?? true),
          enableSuggestions: (showPassword ?? true),
          autocorrect: !(showPassword ?? true),