From 3274875215c5c183b74ef6fa5555b24916f4abac Mon Sep 17 00:00:00 2001
From: Fatimah Alshammari <fatimah.alshammari@cloudsolution-sa.com>
Date: Sun, 27 Mar 2022 12:45:03 +0300
Subject: [PATCH] fixed issues

---
 lib/pages/user/forget_password_page.dart     |  6 ++++--
 lib/pages/user/login_with_password_page.dart | 16 +++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/lib/pages/user/forget_password_page.dart b/lib/pages/user/forget_password_page.dart
index f3198dd..85d0021 100644
--- a/lib/pages/user/forget_password_page.dart
+++ b/lib/pages/user/forget_password_page.dart
@@ -97,9 +97,11 @@ class _ForgetPasswordPageState extends State<ForgetPasswordPage> {
               width: double.infinity,
               txtColor: Colors.white,
               onPressed: () {
-                if(userName.isNum()) {
+                // _mobile ? forgetPasswordPhoneOTP(context)
+                //  : forgetPasswordEmailOTP(context);
+                if(userName.isNum() && _mobile) {
                   forgetPasswordPhoneOTP(context);
-                }else{
+                }else if (!userName.isNum() && _email)  {
                   forgetPasswordEmailOTP(context);
                 }
               },
diff --git a/lib/pages/user/login_with_password_page.dart b/lib/pages/user/login_with_password_page.dart
index c0d036a..34cde9f 100644
--- a/lib/pages/user/login_with_password_page.dart
+++ b/lib/pages/user/login_with_password_page.dart
@@ -79,10 +79,10 @@ class _LoginWithPasswordState extends State<LoginWithPassword> {
             50.height,
             "Enter Mobile or Email".toText24(),
             mFlex(1),
-            _mobile ? Column(
+            Column(
               children: [
                 TxtField(
-                  hint: "Enter phone number",
+                  hint: _mobile ? "Enter phone number" : "Enter Email",
                   value: phoneNum,
                   onChanged: (v) {
                     phoneNum = v;
@@ -99,17 +99,7 @@ class _LoginWithPasswordState extends State<LoginWithPassword> {
                   },
                 ),
               ],
-            ): _email ?
-            TxtField(
-              hint: "Enter Email",
-              value: password,
-              isPasswordEnabled: true,
-              maxLines: 1,
-              onChanged: (v) {
-                password = v;
-              },
-            )
-                :Container(),
+            ),
             10.height,
             Row(
               mainAxisAlignment: MainAxisAlignment.end,