diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index 3c411429..e3c82850 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -448,7 +448,7 @@ class _VerificationMethodsScreenState extends State { if (isActive) { await authenticationViewModel.showIOSAuthMessages(); if (!mounted) return; - if (authenticationViewModel.user != null && + if (authenticationViewModel.user != null && authenticationViewModel.user!.logInTypeID !=null && (SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user!.logInTypeID!) == AuthMethodTypes.Fingerprint || SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user!.logInTypeID!) == AuthMethodTypes.FaceID)) { this.sendActivationCode(authMethodTypes); diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 90fef80f..463a971c 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -182,7 +182,7 @@ class _LabsHomePageState extends State { ), ), ), - if (model.patientLabOrdersList.isEmpty && patient!.patientStatusType! != 43) + if (model.patientLabOrdersList.isEmpty && (patient!.patientStatusType != 43 && patient!.patientStatusType !=null)) Center( child: ErrorMessage( error: TranslationBase.of(context).noDataAvailable,