Merge branch 'main' into majd_development

# Conflicts:
#	lib/controllers/api_routes/urls.dart
#	pubspec.lock

lib/controllers/api_routes/urls.dart

@@ -1,7 +1,8 @@
-class URLs {
+class URLs{
   URLs._();
   static const host2 = "http://194.163.164.213/atoms/api";
-  static const host1 = "https://atomsuat.hmg.com";
+ // static const host1 = "https://atoms.hmg.com/api"; // production url
+  static const host1 = "https://atomsdev.hmg.com/api"; // uat url
 
   // API Routes
   static const login = "/mobile/MobileAuth/Login"; // post
@@ -63,4 +64,5 @@ class URLs {
   static const getPentryStatus = "/return/pentry/status/list"; // get
   // contacts
   static const getPentryContacts = "/handle/return/all/contacts"; // get
-}
+
+}