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/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart
+++ b/modules/auth/lib/src/features/recover_password/presentation/new_password/new_password_screen.dart
@@ -165,7 +165,7 @@ class NewPasswordScreen extends ConsumerWidget {
                  ),
                  Expanded(child: CustomTextField(
                    hint: context.translate(I18n.phoneNumber),
-                    numeric: true,
+                    keyboardType: TextInputType.number,
                    controller: viewModel.newPhoneNumberController,
                  ))
                ]
--- a/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart
+++ b/modules/auth/lib/src/features/recover_password/presentation/request_recovery/request_recovery_screen.dart
@@ -69,7 +69,7 @@ class RequestRecoveryScreen extends ConsumerWidget {
                  Expanded(
                    child: CustomTextField(
                      hint: context.translate(I18n.phoneNumber),
-                      numeric: true,
+                      keyboardType: TextInputType.number,
                      controller: viewModel.phoneNumberController,
                    ),
                  ),