From 7027299a489ac8666022991b7fd0c90669f50493 Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikander.saleem@cloudsolutions.com.sa>
Date: Sun, 13 Feb 2022 11:57:49 +0300
Subject: [PATCH] merge improvements

---
 lib/ui/login/verify_last_login_screen.dart |  6 +++---
 lib/ui/login/verify_login_screen.dart      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ui/login/verify_last_login_screen.dart b/lib/ui/login/verify_last_login_screen.dart
index 0c8554f..282c7a5 100644
--- a/lib/ui/login/verify_last_login_screen.dart
+++ b/lib/ui/login/verify_last_login_screen.dart
@@ -653,9 +653,9 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
                   }
                 }
                 await LoginApiClient().checkMobileAppVersion();
-                await LoginApiClient().memberLogin(AppState().username!, AppState().password!);
+                await LoginApiClient().memberLogin(AppState().getUserName!, AppState().password!);
                 BasicMemberInformationModel? memberInformationModel = await LoginApiClient()
-                    .mohemmSendActivationCodeByOTPNotificationType(checkBiometricIsAvailable(BiometricType.fingerprint) ? 1 : 0, AppState().memberLoginList?.pMOBILENUMBER, _flag, AppState().username);
+                    .mohemmSendActivationCodeByOTPNotificationType(checkBiometricIsAvailable(BiometricType.fingerprint) ? 1 : 0, AppState().memberLoginList?.pMOBILENUMBER, _flag, AppState().getUserName);
                 Utils.hideLoading(context);
                 OtpDialog(
                   context,
@@ -664,7 +664,7 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
                   (value) async {
                     Utils.showLoading(context);
                     try {
-                      GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(false, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().username);
+                      GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(false, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName);
                       if (genericResponseModel?.errorMessage != null) {
                         Utils.showToast(genericResponseModel?.errorMessage ?? "");
                         //  Navigator.pop(context);
diff --git a/lib/ui/login/verify_login_screen.dart b/lib/ui/login/verify_login_screen.dart
index bf64d8e..8e9255f 100644
--- a/lib/ui/login/verify_login_screen.dart
+++ b/lib/ui/login/verify_login_screen.dart
@@ -655,9 +655,9 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
                     }
                   }
                   await LoginApiClient().checkMobileAppVersion();
-                  await LoginApiClient().memberLogin(AppState().username!, AppState().password!);
+                  await LoginApiClient().memberLogin(AppState().getUserName!, AppState().password!);
                   BasicMemberInformationModel? memberInformationModel = await LoginApiClient().mohemmSendActivationCodeByOTPNotificationType(
-                      checkBiometricIsAvailable(BiometricType.fingerprint) ? 1 : 0, AppState().memberLoginList?.pMOBILENUMBER, _flag, AppState().username);
+                      checkBiometricIsAvailable(BiometricType.fingerprint) ? 1 : 0, AppState().memberLoginList?.pMOBILENUMBER, _flag, AppState().getUserName);
                   Utils.hideLoading(context);
                   OtpDialog(
                     context,
@@ -666,14 +666,14 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
                     (value) async {
                       Utils.showLoading(context);
                       try {
-                        GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(false, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().username);
+                        GenericResponseModel? genericResponseModel = await LoginApiClient().checkActivationCode(false, AppState().memberLoginList?.pMOBILENUMBER, value, AppState().getUserName);
                         GenericResponseModel? genericResponseModel1 = await LoginApiClient().insertMobileLoginInfoNEW(
                             AppState().memberLoginList?.pEMAILADDRESS ?? "",
                             genericResponseModel?.pSESSIONID ?? 0,
                             genericResponseModel?.memberInformationList![0].eMPLOYEENAME ?? "",
                             _flag,
                             AppState().memberLoginList?.pMOBILENUMBER ?? "",
-                            AppState().username!,
+                            AppState().getUserName!,
                             firebaseToken!,
                             Platform.isAndroid ? "android" : "ios");
                         if (genericResponseModel?.errorMessage != null) {
@@ -683,7 +683,7 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
                           AppState().setMemberInformationListModel = genericResponseModel.memberInformationList?.first;
                           MemberInformationListModel.saveToPrefs(genericResponseModel.memberInformationList ?? []);
                           PrivilegeListModel.saveToPrefs(genericResponseModel.privilegeList ?? []);
-                          Utils.saveStringFromPrefs(SharedPrefsConsts.username, AppState().username!);
+                          Utils.saveStringFromPrefs(SharedPrefsConsts.username, AppState().getUserName!);
                           Utils.saveStringFromPrefs(SharedPrefsConsts.password, AppState().password!);
                         }
                         Utils.hideLoading(context);