diff --git a/lib/pages/auth/bloc/auth_bloc.dart b/lib/pages/auth/bloc/auth_bloc.dart index e09feea6..0761ae19 100644 --- a/lib/pages/auth/bloc/auth_bloc.dart +++ b/lib/pages/auth/bloc/auth_bloc.dart @@ -58,7 +58,8 @@ class AuthBloc extends Bloc { add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true)); } else { add(UpdateTimerEvent( - remainingTime: _remainingTime, isButtonEnabled: false)); + remainingTime: _remainingTime, + isButtonEnabled: false)); } }); } @@ -185,7 +186,6 @@ class AuthBloc extends Bloc { } String? validateEmail(String? value) { - if (value == null || value.isEmpty) { return 'Email is required'; } else if (!RegExp(r'^[^@]+@[^@]+\.[^@]+').hasMatch(value)) { @@ -373,13 +373,11 @@ class AuthBloc extends Bloc { changeValidate(ChangeValidateEvent event, Emitter emit,){ emit(AuthLoading()); validate=''; - print('validate'); emit(LoginInitial()); } changeForgetValidate(ChangeValidateEvent event, Emitter emit,){ emit(AuthLoading()); forgetValidate=''; - print('validate'); emit(LoginInitial()); } } diff --git a/lib/pages/auth/view/forget_password_web_page.dart b/lib/pages/auth/view/forget_password_web_page.dart index 07b59495..0cb6b0e3 100644 --- a/lib/pages/auth/view/forget_password_web_page.dart +++ b/lib/pages/auth/view/forget_password_web_page.dart @@ -219,10 +219,10 @@ class ForgetPasswordWebPage extends StatelessWidget { child: Center( child: InkWell( onTap: () { - BlocProvider.of(context).add(StartTimerEvent()); + forgetBloc.add(StartTimerEvent()); }, child: Text( - 'Get Code ${state is TimerState && !state.isButtonEnabled ? "(${BlocProvider.of(context).formattedTime(state.remainingTime)}) " : ""}', + 'Get Code ${state is TimerState && !state.isButtonEnabled && state.remainingTime!=1? "(${forgetBloc.formattedTime(state.remainingTime)}) " : ""}', style: TextStyle( color: state is TimerState && !state.isButtonEnabled @@ -325,7 +325,9 @@ class ForgetPasswordWebPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center, children: [ SizedBox(child: Text(forgetBloc.forgetValidate, - style: const TextStyle(fontWeight: FontWeight.w700,color: ColorsManager.red ),),)],) + style: const TextStyle(fontWeight: FontWeight.w700,color: ColorsManager.red ),),) + ], + ) ], ), ),