assets/langs/ar-SA.json

@@ -885,6 +885,5 @@
   "typeAMessage": "اكتب رسالة...",
   "initializingChatPleaseWait": "يرجى الانتظار، جاري تهيئة المحادثة...",
   "am": "ص",
-  "pm": "م",
+  "pm": "م"
-  "carServices": "خدمات السيارات"
 }

assets/langs/en-US.json

@@ -842,7 +842,6 @@
   "latestOnMazaya": "Latest on Mazaya",
   "goodFoodGreatCompanyEvenBetterPerks": "Good food. Great company. Even better perks.",
   "travelEssentials": "Travel Essentials",
-  "carServices": "Car Services",
   "fromEverydayCareToYourNextAdventure": "From everyday care to your next adventure.",
   "homeAndKitchen": "Home & Kitchen",
   "curatedPicksForYourHomeAndKitchen": "Curated picks for your home and kitchen.",

lib/app_state/app_state.dart

@@ -92,7 +92,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.2, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 10.1, mobileType: Platform.isAndroid ? "android" : "ios");
 
   PostParamsModel get postParamsInitConfig {
     if (_postParamsInitConfig.pLegislationCode == null) {

lib/classes/consts.dart

@@ -12,10 +12,10 @@ class ApiConsts {
   // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   static String ssoBaseUrl = "https://sso.hmg.com"; // New Live server
   //
-  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
   // static String baseUrl = "http://10.201.214.101:2027/";
   // static String baseUrl = "http://10.20.200.111:1010/";
-  static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
   //static String eLearningBaseUrl = "https://elearning.hmg.com/moodle_dev/api/"; // Elearning server UAT
   static String eLearningBaseUrl =
       "https://elearning.hmg.com/moodle/api/"; // Elearning server live
@@ -53,8 +53,7 @@ class ApiConsts {
   static String processContactMazayaAccess =
       erpRest + "PROCESS_CONTACT_MAZAYA_ACCESS";
 
-  static String ssoAuthRedirection = "$ssoBaseUrl/api/auth/connect";
+  static String ssoAuthRedirection = "https://sso-uat.hmg.com/api/auth/connect";
-
   //Chat
   static String chatServerBaseUrl = "https://apiderichat.hmg.com/";
   static String chatServerBaseApiUrl = chatServerBaseUrl + "api/";

lib/generated/locale_keys.g.dart

@@ -2,7 +2,7 @@
 
 // ignore_for_file: constant_identifier_names
 
-abstract class  LocaleKeys {
+abstract class LocaleKeys {
   static const mohemm = 'mohemm';
   static const english = 'english';
   static const arabic = 'arabic';
@@ -14,7 +14,8 @@ abstract class  LocaleKeys {
   static const userSearch = 'userSearch';
   static const password = 'password';
   static const welcomeBack = 'welcomeBack';
-  static const wouldYouLikeToLoginWithCurrentUsername = 'wouldYouLikeToLoginWithCurrentUsername';
+  static const wouldYouLikeToLoginWithCurrentUsername =
+      'wouldYouLikeToLoginWithCurrentUsername';
   static const lastLoginDetails = 'lastLoginDetails';
   static const verificationType = 'verificationType';
   static const pleaseVerify = 'pleaseVerify';
@@ -24,8 +25,10 @@ abstract class  LocaleKeys {
   static const verifyThroughSMS = 'verifyThroughSMS';
   static const verifyThroughWhatsapp = 'verifyThroughWhatsapp';
   static const useAnotherAccount = 'useAnotherAccount';
-  static const pleaseEnterTheVerificationCodeSentTo = 'pleaseEnterTheVerificationCodeSentTo';
+  static const pleaseEnterTheVerificationCodeSentTo =
-  static const theVerificationCodeWillExpireIn = 'theVerificationCodeWillExpireIn';
+      'pleaseEnterTheVerificationCodeSentTo';
+  static const theVerificationCodeWillExpireIn =
+      'theVerificationCodeWillExpireIn';
   static const goodMorning = 'goodMorning';
   static const markAttendance = 'markAttendance';
   static const timeLeftToday = 'timeLeftToday';
@@ -49,7 +52,8 @@ abstract class  LocaleKeys {
   static const newString = 'newString';
   static const setTheNewPassword = 'setTheNewPassword';
   static const typeYourNewPasswordBelow = 'typeYourNewPasswordBelow';
-  static const typeYourNewActiveDirectoryPasswordBelow = 'typeYourNewActiveDirectoryPasswordBelow';
+  static const typeYourNewActiveDirectoryPasswordBelow =
+      'typeYourNewActiveDirectoryPasswordBelow';
   static const confirmPassword = 'confirmPassword';
   static const update = 'update';
   static const title = 'title';
@@ -58,7 +62,8 @@ abstract class  LocaleKeys {
   static const createRequest = 'createRequest';
   static const forgotPassword = 'forgotPassword';
   static const employeeId = 'employeeId';
-  static const loginCodeWillSentToMobileNumber = 'loginCodeWillSentToMobileNumber';
+  static const loginCodeWillSentToMobileNumber =
+      'loginCodeWillSentToMobileNumber';
   static const changePassword = 'changePassword';
   static const ok = 'ok';
   static const confirm = 'confirm';
@@ -94,7 +99,8 @@ abstract class  LocaleKeys {
   static const atLeastOneNumeric = 'atLeastOneNumeric';
   static const minimum8Characters = 'minimum8Characters';
   static const doNotAddRepeatingLetters = 'doNotAddRepeatingLetters';
-  static const itShouldContainSpecialCharacter = 'itShouldContainSpecialCharacter';
+  static const itShouldContainSpecialCharacter =
+      'itShouldContainSpecialCharacter';
   static const confirmPasswordMustMatch = 'confirmPasswordMustMatch';
   static const sms = 'sms';
   static const fingerPrint = 'fingerPrint';
@@ -137,7 +143,8 @@ abstract class  LocaleKeys {
   static const category = 'category';
   static const employeeEmailAddress = 'employeeEmailAddress';
   static const payrollBranch = 'payrollBranch';
-  static const yourChangeHasBeenSavedSuccessfully = 'yourChangeHasBeenSavedSuccessfully';
+  static const yourChangeHasBeenSavedSuccessfully =
+      'yourChangeHasBeenSavedSuccessfully';
   static const code = 'code';
   static const unit = 'unit';
   static const quantity = 'quantity';
@@ -232,7 +239,8 @@ abstract class  LocaleKeys {
   static const templateName = 'templateName';
   static const itemCreationStatus = 'itemCreationStatus';
   static const standardizationApprovalStatus = 'standardizationApprovalStatus';
-  static const standardizationApprovalRejectionReason = 'standardizationApprovalRejectionReason';
+  static const standardizationApprovalRejectionReason =
+      'standardizationApprovalRejectionReason';
   static const analyzedBy = 'analyzedBy';
   static const approvedDate = 'approvedDate';
   static const itemType = 'itemType';
@@ -258,7 +266,7 @@ abstract class  LocaleKeys {
   static const Payroll = 'Payroll';
   static const civilIdentityNumber = 'civilIdentityNumber';
   static const dateOfBirth = 'dateOfBirth';
-  static const maritalStatus  = 'maritalStatus ';
+  static const maritalStatus = 'maritalStatus ';
   static const fullName = 'fullName';
   static const remove = 'remove';
   static const submit = 'submit';
@@ -267,7 +275,8 @@ abstract class  LocaleKeys {
   static const comments = 'comments';
   static const writeComment = 'writeComment';
   static const approversList = 'approversList';
-  static const yourRequestHasBeenSubmittedForApprovals = 'yourRequestHasBeenSubmittedForApprovals';
+  static const yourRequestHasBeenSubmittedForApprovals =
+      'yourRequestHasBeenSubmittedForApprovals';
   static const monthlyPaySlip = 'monthlyPaySlip';
   static const particular = 'particular';
   static const earnings = 'earnings';
@@ -289,7 +298,7 @@ abstract class  LocaleKeys {
   static const enterNewInfo = 'enterNewInfo';
   static const endDate = 'endDate';
   static const removeThisMember = 'removeThisMember';
-  static const wantUpdateThisMember  = 'wantUpdateThisMember ';
+  static const wantUpdateThisMember = 'wantUpdateThisMember ';
   static const addNewFamilyMember = 'addNewFamilyMember';
   static const addRow = 'addRow';
   static const pleaseSelect = 'pleaseSelect';
@@ -336,7 +345,8 @@ abstract class  LocaleKeys {
   static const mark = 'mark';
   static const selectMethodOfAttendance = 'selectMethodOfAttendance';
   static const comeNearHMGWifi = 'comeNearHMGWifi';
-  static const deliverNotificationToMeRegardless = 'deliverNotificationToMeRegardless';
+  static const deliverNotificationToMeRegardless =
+      'deliverNotificationToMeRegardless';
   static const close = 'close';
   static const respond = 'respond';
   static const vacationRuleAdded = 'vacationRuleAdded';
@@ -355,8 +365,10 @@ abstract class  LocaleKeys {
   static const searchEmployeeForReplacement = 'searchEmployeeForReplacement';
   static const searchForEmployee = 'searchForEmployee';
   static const pleaseSpecifyEndTime = 'pleaseSpecifyEndTime';
-  static const pleaseSelectNotificationReassign = 'pleaseSelectNotificationReassign';
+  static const pleaseSelectNotificationReassign =
-  static const pleaseSelectEmployeeForReplacement = 'pleaseSelectEmployeeForReplacement';
+      'pleaseSelectNotificationReassign';
+  static const pleaseSelectEmployeeForReplacement =
+      'pleaseSelectEmployeeForReplacement';
   static const pleaseSelectAction = 'pleaseSelectAction';
   static const pleaseSelectDate = 'pleaseSelectDate';
   static const todayAttendance = 'todayAttendance';
@@ -441,8 +453,10 @@ abstract class  LocaleKeys {
   static const CorrectAddress = 'CorrectAddress';
   static const SelectChangeWantToMake = 'SelectChangeWantToMake';
   static const profile_reset_password_label = 'profile.reset_password.label';
-  static const profile_reset_password_username = 'profile.reset_password.username';
+  static const profile_reset_password_username =
-  static const profile_reset_password_password = 'profile.reset_password.password';
+      'profile.reset_password.username';
+  static const profile_reset_password_password =
+      'profile.reset_password.password';
   static const profile_reset_password = 'profile.reset_password';
   static const profile_profileCompletionPer = 'profile.profileCompletionPer';
   static const profile_completeProfile = 'profile.completeProfile';
@@ -537,7 +551,8 @@ abstract class  LocaleKeys {
   static const missingDocuments = 'missingDocuments';
   static const uploadedDocuments = 'uploadedDocuments';
   static const addAtLeastOneAttachment = 'addAtLeastOneAttachment';
-  static const pleaseClickButtonToJoinMarathon = 'pleaseClickButtonToJoinMarathon';
+  static const pleaseClickButtonToJoinMarathon =
+      'pleaseClickButtonToJoinMarathon';
   static const youCannotJoinTheMarathon = 'youCannotJoinTheMarathon';
   static const open = 'open';
   static const paymentRequest = 'paymentRequest';
@@ -595,8 +610,10 @@ abstract class  LocaleKeys {
   static const yes = 'yes';
   static const no = 'no';
   static const mazayaInviteInstructions = 'mazayaInviteInstructions';
-  static const cameraPermissionRequiredToScan = 'cameraPermissionRequiredToScan';
+  static const cameraPermissionRequiredToScan =
-  static const cameraPermissionPermanentlyDenied = 'cameraPermissionPermanentlyDenied';
+      'cameraPermissionRequiredToScan';
+  static const cameraPermissionPermanentlyDenied =
+      'cameraPermissionPermanentlyDenied';
   static const openSettings = 'openSettings';
   static const nationalIdOrIqamaFallback = 'nationalIdOrIqamaFallback';
   static const Attendance = 'Attendance';
@@ -761,7 +778,8 @@ abstract class  LocaleKeys {
   static const religionIslam = 'religionIslam';
   static const back = 'back';
   static const submitRequest = 'submitRequest';
-  static const enterDependentDetailsToContinue = 'enterDependentDetailsToContinue';
+  static const enterDependentDetailsToContinue =
+      'enterDependentDetailsToContinue';
   static const enterBasicDetailsDesc = 'enterBasicDetailsDesc';
   static const locations = 'locations';
   static const availableOffers = 'availableOffers';
@@ -783,14 +801,18 @@ abstract class  LocaleKeys {
   static const startDependentFlowsDesc = 'startDependentFlowsDesc';
   static const mazayaAccess = 'mazayaAccess';
   static const accessOff = 'accessOff';
-  static const allowDependentMazayaOffersDesc = 'allowDependentMazayaOffersDesc';
+  static const allowDependentMazayaOffersDesc =
+      'allowDependentMazayaOffersDesc';
   static const loginMethod = 'loginMethod';
   static const nationalIdAndDob = 'nationalIdAndDob';
   static const sponsorOtp = 'sponsorOtp';
   static const revokingPreventsAccessDesc = 'revokingPreventsAccessDesc';
-  static const locationPermissionRequiredForAttendance = 'locationPermissionRequiredForAttendance';
+  static const locationPermissionRequiredForAttendance =
-  static const locationServicesRequiredForAttendance = 'locationServicesRequiredForAttendance';
+      'locationPermissionRequiredForAttendance';
-  static const pleaseProvideLocationPermission = 'pleaseProvideLocationPermission';
+  static const locationServicesRequiredForAttendance =
+      'locationServicesRequiredForAttendance';
+  static const pleaseProvideLocationPermission =
+      'pleaseProvideLocationPermission';
   static const microphoneAccessRequired = 'microphoneAccessRequired';
   static const shareAccessGuide = 'shareAccessGuide';
   static const nationalIdOrIqamaNumber = 'nationalIdOrIqamaNumber';
@@ -816,22 +838,28 @@ abstract class  LocaleKeys {
   static const favoriteRemovedSuccess = 'favoriteRemovedSuccess';
   static const favoriteError = 'favoriteError';
   static const merchantWebsiteNotAvailable = 'merchantWebsiteNotAvailable';
-  static const locationServicesRequiredForNearestOffers = 'locationServicesRequiredForNearestOffers';
+  static const locationServicesRequiredForNearestOffers =
-  static const locationPermissionRequiredForNearestOffers = 'locationPermissionRequiredForNearestOffers';
+      'locationServicesRequiredForNearestOffers';
+  static const locationPermissionRequiredForNearestOffers =
+      'locationPermissionRequiredForNearestOffers';
   static const mazayaDeals = 'mazayaDeals';
   static const helloName = 'helloName';
   static const findABrandOrSomething = 'findABrandOrSomething';
   static const exploreYourBenefits = 'exploreYourBenefits';
   static const theMazayaEdit = 'theMazayaEdit';
   static const exclusivelyYours = 'exclusivelyYours';
-  static const aLittleExtraJustForMazayaMembers = 'aLittleExtraJustForMazayaMembers';
+  static const aLittleExtraJustForMazayaMembers =
+      'aLittleExtraJustForMazayaMembers';
   static const seeAll = 'seeAll';
   static const latestOnMazaya = 'latestOnMazaya';
-  static const goodFoodGreatCompanyEvenBetterPerks = 'goodFoodGreatCompanyEvenBetterPerks';
+  static const goodFoodGreatCompanyEvenBetterPerks =
+      'goodFoodGreatCompanyEvenBetterPerks';
   static const travelEssentials = 'travelEssentials';
-  static const fromEverydayCareToYourNextAdventure = 'fromEverydayCareToYourNextAdventure';
+  static const fromEverydayCareToYourNextAdventure =
+      'fromEverydayCareToYourNextAdventure';
   static const homeAndKitchen = 'homeAndKitchen';
-  static const curatedPicksForYourHomeAndKitchen = 'curatedPicksForYourHomeAndKitchen';
+  static const curatedPicksForYourHomeAndKitchen =
+      'curatedPicksForYourHomeAndKitchen';
   static const discover = 'discover';
   static const saved = 'saved';
   static const myFamily = 'myFamily';
@@ -870,6 +898,5 @@ abstract class  LocaleKeys {
   static const initializingChatPleaseWait = 'initializingChatPleaseWait';
   static const am = 'am';
   static const pm = 'pm';
-  static const carServices = 'carServices';
 
 }

lib/provider/dashboard_provider_model.dart

@@ -225,9 +225,9 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       notifyListeners();
     } catch (ex) {
       isLeaveTicketBalanceLoading = false;
-      // logger.wtf(ex);
+      logger.wtf(ex);
-      // notifyListeners();
+      notifyListeners();
-      // Utils.handleException(ex, context, null);
+      Utils.handleException(ex, context, null);
     }
   }
 

lib/ui/landing/dashboard_screen.dart

@@ -113,7 +113,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
         } else {
           cProvider.buildHubConnection();
           Future.delayed(const Duration(seconds: 2), () {
-            if (AppState().chatDetails != null) cProvider.invokeChatCounter(userId: AppState().chatDetails!.response!.id!);
+            cProvider.invokeChatCounter(userId: AppState().chatDetails!.response!.id!);
           });
         }
       }
@@ -519,8 +519,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                     itemBuilder: (BuildContext cxt, int index) {
                                       return model.isOffersLoading
                                           ? const OffersShimmerWidget()
-                                          : data.getOffersList.isNotEmpty
+                                        : data.getOffersList.isNotEmpty
-                                          ? InkWell(
+                                        ? InkWell(
                                             onTap: () {
                                               navigateToDetails(data.getOffersList[index]);
                                             },
@@ -556,8 +556,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                                                 ],
                                               ),
                                             ),
-                                          )
+                                        )
-                                          : Container();
+                                        : Container();
                                     },
                                     separatorBuilder: (BuildContext cxt, int index) => 8.width,
                                     itemCount: model.isOffersLoading ? 9 : (data.getOffersList.length > 9 ? 9 : data.getOffersList.length),

lib/ui/mazaya/mazaya_discover_screen.dart

@@ -534,7 +534,7 @@ class _MazayaDiscoverScreenState extends State<MazayaDiscoverScreen> {
               _buildBrandSection(
                 title: _sectionTitle(
                   _travelSection,
-                  LocaleKeys.carServices.tr(),
+                  LocaleKeys.travelEssentials.tr(),
                 ),
                 subtitle: LocaleKeys.fromEverydayCareToYourNextAdventure.tr(),
                 isLoading: _travelSection.isLoading,
@@ -544,7 +544,7 @@ class _MazayaDiscoverScreenState extends State<MazayaDiscoverScreen> {
                     () => _openRetailersGrid(
                       category: _categoryForSection(
                         _travelSection,
-                        LocaleKeys.carServices.tr(),
+                        LocaleKeys.travelEssentials.tr(),
                       ),
                     ),
               ),