From 6631661852ff0d17436479565aac351051c38706 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Sun, 27 Mar 2022 12:44:39 +0300 Subject: [PATCH] fixed issues --- lib/pages/user/forget_password_page.dart | 4 ++-- lib/pages/user/login_with_password_page.dart | 16 +++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/pages/user/forget_password_page.dart b/lib/pages/user/forget_password_page.dart index 129e582..1b83423 100644 --- a/lib/pages/user/forget_password_page.dart +++ b/lib/pages/user/forget_password_page.dart @@ -101,9 +101,9 @@ class _ForgetPasswordPageState extends State { title: "Continue", width: double.infinity, onPressed: () { - if(userName.isNum()) { + 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 da7f423..dd7b671 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 { 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 { }, ), ], - ): _email ? - TxtField( - hint: "Enter Email", - value: password, - isPasswordEnabled: true, - maxLines: 1, - onChanged: (v) { - password = v; - }, - ) - :Container(), + ), 10.height, Row( mainAxisAlignment: MainAxisAlignment.end,