Merge branch 'master' into faiz_cs

# Conflicts:
#	lib/classes/consts.dart

lib/classes/consts.dart

@@ -4,7 +4,7 @@ class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
   static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-   // static String baseUrl = "https://hmgwebservices.com"; // Live server
+  //  static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

lib/ui/leave_balance/leave_balance_screen.dart

@@ -72,7 +72,7 @@ class _LeaveBalanceState extends State<LeaveBalance> {
                   physics: const BouncingScrollPhysics(),
                   padding: const EdgeInsets.all(21),
                   children: [
-                    BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId),
+                    BalancesDashboardWidget(LocaleKeys.currentLeaveBalance.tr(), true, selectedEmp: employeeId, showLoading: false),
                     12.height,
                     ListView.separated(
                         physics: const NeverScrollableScrollPhysics(),