Merge pull request 'dev_sultan' (#26) from dev_sultan into master

Reviewed-on: #26

lib/features/authentication/authentication_view_model.dart

@@ -191,7 +191,7 @@ class AuthenticationViewModel extends ChangeNotifier {
       (failure) async {
         // LoadingUtils.hideFullScreenLoader();
         // await _errorHandlerService.handleError(failure: failure);
-        LoadingUtils.hideFullScreenLoader();
+        LoaderBottomSheet.hideLoader();
         _navigationService.pushPage(page: LoginScreen());
       },
       (apiResponse) {
@@ -238,6 +238,7 @@ class AuthenticationViewModel extends ChangeNotifier {
           _navigationService.pushPage(page: SavedLogin());
           // _navigationService.pushPage(page: LoginScreen());
         } else {
+          print("print login........");
           LoaderBottomSheet.hideLoader();
           _navigationService.pushPage(page: LoginScreen());
         }
@@ -451,8 +452,9 @@ class AuthenticationViewModel extends ChangeNotifier {
           bool isUserAgreedBefore = await checkIfUserAgreedBefore(request: request);
 
           //updating the last login type in app state to show the fingerprint/face id option on home screen
+          if( _appState.getSelectDeviceByImeiRespModelElement !=null) {
             _appState.getSelectDeviceByImeiRespModelElement!.logInType = loginTypeEnum.toInt;
-
+          }
           LoaderBottomSheet.hideLoader();
           insertPatientIMEIData(loginTypeEnum.toInt);
           clearDefaultInputValues();
@@ -738,6 +740,7 @@ class AuthenticationViewModel extends ChangeNotifier {
       deviceTypeId: _appState.getDeviceTypeID(),
       patientId: _appState.getAuthenticatedUser()!.patientId!,
       patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
+      identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
       firstName: _appState.getAuthenticatedUser()!.firstName!,
       lastName: _appState.getAuthenticatedUser()!.lastName!,
       patientTypeId: _appState.getAuthenticatedUser()!.patientType,