From 3be4fb2986bb9ae436af2731314f351e4bd93db4 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Jul 2021 10:00:19 +0300 Subject: [PATCH] Fix verification methods screen --- lib/config/config.dart | 2 +- lib/screens/auth/verification_methods_screen.dart | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index d6836827..a2fd6875 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -283,7 +283,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 6.1; +const VERSION_ID = 6.2; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index 69d4a47a..c4587014 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -45,7 +45,7 @@ class VerificationMethodsScreen extends StatefulWidget { } class _VerificationMethodsScreenState extends State { - + ProjectViewModel projectsProvider; bool isMoreOption = false; bool onlySMSBox = false; @@ -409,13 +409,6 @@ class _VerificationMethodsScreenState extends State { onTap: () { authenticationViewModel.deleteUser(); authenticationViewModel.setAppStatus(APP_STATUS.UNAUTHENTICATED); - // Navigator.pushAndRemoveUntil( - // AppGlobal.CONTEX, - // FadePage( - // page: RootPage(), - // ), - // (r) => false); - // Navigator.of(context).pushNamed(LOGIN); }, ), @@ -548,13 +541,14 @@ class _VerificationMethodsScreenState extends State { } } - checkActivationCode({value}) async { + checkActivationCode({String value}) async { await authenticationViewModel.checkActivationCodeForDoctorApp(activationCode: value); if (authenticationViewModel.state == ViewState.ErrorLocal) { Navigator.pop(context); Helpers.showErrorToast(authenticationViewModel.error); } else { await authenticationViewModel.onCheckActivationCodeSuccess(); + if(value !=null) Navigator.pop(context); Navigator.pop(context); navigateToLandingPage(); @@ -569,6 +563,4 @@ class _VerificationMethodsScreenState extends State { } } - - }