From 3dc5da827d9001ae6fd745a76d68e0e53f886783 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 7 Apr 2022 13:50:19 +0300 Subject: [PATCH] fix issues --- lib/extensions/string_extensions.dart | 2 +- lib/pages/user/forget_password_page.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index abba253..42a7af4 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -77,7 +77,7 @@ extension EmailValidator on String { } bool isNum() { - return RegExp(r'[0-9]').hasMatch(this); + return RegExp(r'^[0-9]+$').hasMatch(this); } String toFormattedDate() { diff --git a/lib/pages/user/forget_password_page.dart b/lib/pages/user/forget_password_page.dart index 8bac6fa..f0e5bbb 100644 --- a/lib/pages/user/forget_password_page.dart +++ b/lib/pages/user/forget_password_page.dart @@ -97,7 +97,7 @@ class _ForgetPasswordPageState extends State { title: "Continue", width: double.infinity, onPressed: () { - if (userName.isNum()&& !userName.isValidEmail() && type==ClassType.NUMBER) { + if (userName.isNum()&& type==ClassType.NUMBER) { forgetPasswordPhoneOTP(context); } else if (userName.isValidEmail() && type==ClassType.EMAIL) { forgetPasswordEmailOTP(context);