Merge pull request 'haroon_dev' (#39) from haroon_dev into master

Reviewed-on: #39

lib/core/api_consts.dart

@@ -723,7 +723,7 @@ const DEACTIVATE_ACCOUNT = 'Services/Patients.svc/REST/PatientAppleActivation_In
 class ApiConsts {
   static const maxSmallScreen = 660;
 
-  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.prod;
+  static AppEnvironmentTypeEnum appEnvironmentType = AppEnvironmentTypeEnum.uat;
 
   // static String baseUrl = 'https://uat.hmgwebservices.com/'; // HIS API URL UAT
 

lib/features/authentication/authentication_view_model.dart

@@ -48,6 +48,7 @@ class AuthenticationViewModel extends ChangeNotifier {
   final DialogService _dialogService;
   final NavigationService _navigationService;
   final LocalAuthService _localAuthService;
+
   AuthenticationViewModel({
     required AppState appState,
     required AuthenticationRepo authenticationRepo,
@@ -106,7 +107,6 @@ class AuthenticationViewModel extends ChangeNotifier {
   }
 
   Future<void> clearDefaultInputValues() async {
-
     nationalIdController.clear();
     phoneNumberController.clear();
     emailController.clear();
@@ -622,19 +622,20 @@ class AuthenticationViewModel extends ChangeNotifier {
   }
 
   checkLastLoginStatus(Function() onSuccess) async {
-
     Future.delayed(Duration(seconds: 1), () async {
-      if(cacheService.getBool(key: CacheConst.quickLoginEnabled) == null){
+      if (cacheService.getBool(key: CacheConst.quickLoginEnabled) == null) {
         if (_appState.getSelectDeviceByImeiRespModelElement != null &&
             (_appState.getSelectDeviceByImeiRespModelElement!.logInType == 1 || _appState.getSelectDeviceByImeiRespModelElement!.logInType == 4)) {
-          phoneNumberController.text =
+          phoneNumberController.text = (_appState.getAuthenticatedUser()!.mobileNumber!.startsWith("0")
-          (_appState.getAuthenticatedUser()!.mobileNumber!.startsWith("0") ? _appState.getAuthenticatedUser()!.mobileNumber!.replaceFirst("0", "") : _appState.getAuthenticatedUser()!.mobileNumber)!;
+              ? _appState.getAuthenticatedUser()!.mobileNumber!.replaceFirst("0", "")
+              : _appState.getAuthenticatedUser()!.mobileNumber)!;
           nationalIdController.text = _appState.getAuthenticatedUser()!.nationalityId!;
           onSuccess();
         } else if ((loginTypeEnum == LoginTypeEnum.sms || loginTypeEnum == LoginTypeEnum.whatsapp && _appState.getSelectDeviceByImeiRespModelElement == null) &&
             _appState.getAuthenticatedUser() != null) {
-          phoneNumberController.text =
+          phoneNumberController.text = (_appState.getAuthenticatedUser()!.mobileNumber!.startsWith("0")
-          (_appState.getAuthenticatedUser()!.mobileNumber!.startsWith("0") ? _appState.getAuthenticatedUser()!.mobileNumber!.replaceFirst("0", "") : _appState.getAuthenticatedUser()!.mobileNumber)!;
+              ? _appState.getAuthenticatedUser()!.mobileNumber!.replaceFirst("0", "")
+              : _appState.getAuthenticatedUser()!.mobileNumber)!;
           nationalIdController.text = _appState.getAuthenticatedUser()!.nationalityId!;
           onSuccess();
         }

lib/presentation/authentication/register.dart

@@ -296,6 +296,7 @@ class _RegisterNew extends State<RegisterNew> {
                   borderColor: AppColors.borderOnlyColor,
                   textColor: AppColors.textColor,
                   icon: AppAssets.whatsapp,
+                  iconColor: null,
                 ),
               ),
             ],