diff --git a/lib/pages/auth/view/forget_password_web_page.dart b/lib/pages/auth/view/forget_password_web_page.dart index b0e17374..cb137c6b 100644 --- a/lib/pages/auth/view/forget_password_web_page.dart +++ b/lib/pages/auth/view/forget_password_web_page.dart @@ -117,7 +117,7 @@ class ForgetPasswordWebPage extends StatelessWidget { const SizedBox(height: 10), Text( 'Please fill in your account information to\nretrieve your password', - style: Theme.of(context).textTheme.bodySmall, + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 14,fontWeight: FontWeight.w400), ), const SizedBox(height: 10), Column( @@ -126,8 +126,8 @@ class ForgetPasswordWebPage extends StatelessWidget { children: [ Text( "Country/Region", - style: - Theme.of(context).textTheme.bodySmall, + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 14,fontWeight: FontWeight.w400), + ), const SizedBox(height: 10), SizedBox( @@ -140,7 +140,7 @@ class ForgetPasswordWebPage extends StatelessWidget { hintText: null, ), hint: SizedBox( - width: size.width * 0.11, + width: size.width * 0.12, child: const Align( alignment: Alignment.centerLeft, child: Text( @@ -157,7 +157,10 @@ class ForgetPasswordWebPage extends StatelessWidget { .map((RegionModel region) { return DropdownMenuItem( value: region.id, - child: Text(region.name), + child: SizedBox( + width: size.width*0.06, + + child: Text(region.name)), ); }).toList(), onChanged: (String? value) { @@ -176,8 +179,8 @@ class ForgetPasswordWebPage extends StatelessWidget { children: [ Text( "Account", - style: - Theme.of(context).textTheme.bodySmall, + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 14,fontWeight: FontWeight.w400), + ), const SizedBox(height: 10), SizedBox( @@ -200,8 +203,8 @@ class ForgetPasswordWebPage extends StatelessWidget { children: [ Text( "One Time Password", - style: - Theme.of(context).textTheme.bodySmall, + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 14,fontWeight: FontWeight.w400), + ), const SizedBox(height: 10), SizedBox( @@ -247,8 +250,8 @@ class ForgetPasswordWebPage extends StatelessWidget { children: [ Text( "Password", - style: - Theme.of(context).textTheme.bodySmall, + style: Theme.of(context).textTheme.bodySmall!.copyWith(fontSize: 14,fontWeight: FontWeight.w400), + ), const SizedBox(height: 10), SizedBox( @@ -324,7 +327,9 @@ class ForgetPasswordWebPage extends StatelessWidget { ), ], ), - ) + ), + const SizedBox(height: 15.0), + ], ), ), diff --git a/lib/pages/auth/view/login_web_page.dart b/lib/pages/auth/view/login_web_page.dart index 10ed36a6..b819669e 100644 --- a/lib/pages/auth/view/login_web_page.dart +++ b/lib/pages/auth/view/login_web_page.dart @@ -354,7 +354,6 @@ class _LoginWebPageState extends State { ) ), onPressed: () { - if(loginBloc.loginFormKey.currentState!.validate() ){ loginBloc.add(LoginButtonPressed( regionUuid:loginBloc.regionUuid, @@ -364,7 +363,6 @@ class _LoginWebPageState extends State { }else{ loginBloc.add(ChangeValidateEvent()); } - }, ), ),