diff --git a/android/build.gradle b/android/build.gradle
index 93d82389..419b3fd3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.20'
     repositories {
         google()
         mavenCentral()
diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index 84f37a09..64815ebc 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -1,19 +1,23 @@
 class URLs {
   URLs._();
 
-  static const host2 = "http://194.163.164.213/atoms/api";
-  static const host1 = "https://atomsuat.hmg.com"; // uat url
-  static const host3 = "https://atomsmdev.hmg.com"; // uat url
+  static const host2 = "http://194.163.164.213/atoms/api"; // todo @sikander will remove after confirmation
+
+  //static const host1 = "https://atomsuat.hmg.com"; // old uat url
+  //static const host1 = "https://atomsm.hmg.com"; // production url
+
+  static const host1 = "https://atomsmdev.hmg.com"; // local UAT url
 
   // static const host1 = "http://109.123.243.118:9000";
 
   static String _baseUrl = "$_host/mobile";
 
-  static String _host = host3;
+  static String _host = host1;
 
   set host(String value) => _host = value;
 
   static String getFileUrl(String file) => (file == null || file.isEmpty) ? null : (file.contains("/") ? file : "$_baseUrl/Files/DownloadFile?fileName=$file");
+
   // static String getFileUrl(String file) => (file == null || file.isEmpty) ? null :1 (file.contains("/") ? file : "$_host/attachment/$file");
 
   // API Routes
@@ -53,6 +57,7 @@ class URLs {
 
   static get getSingleServiceRequest => "$_baseUrl/return/call/information"; // get
   static get getSuppliersAutoComplete => "$_baseUrl/Supplier/GetSuppliersAutoComplete";
+
   static get getNotifications => "$_baseUrl/return/user/notification"; // get
   static get getRecentNotifications => "$_baseUrl/return/user/recent/notification"; // get
   static get createRequest => "$_baseUrl/CallRequest/AddCallRequest"; // get
@@ -65,6 +70,7 @@ class URLs {
   static get getServiceReport => "$_baseUrl/WorkOrder/GetWorkOrderById"; // get
   static get createDuplicatedReport => "$_baseUrl/handle/duplicate/request"; // get
   static get searchWorkOrders => "$_baseUrl/WorkOrder/SearchWorkOrders";
+
   static get getSubWorkerInfoAccordingToPreviousStep => "$_baseUrl/WorkOrder/GetDataPreviousStep";
 
   static get getServiceReportReasons => "$_baseUrl/Lookups/GetLookup?lookupEnum=522"; // get
diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
index abe97d88..6e4df099 100644
--- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
+++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
@@ -260,7 +260,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
                                       backgroundColor: Colors.transparent,
                                       builder: (context) => WorkOrderDetailsBottomSheet(subWorkOrder: _subWorkOrders),
                                     );
-                                    log(_subWorkOrders?.toJson()?.toString());
+                                    //log(_subWorkOrders?.toJson()?.toString());
                                   },
                                   child: Card(
                                     child: ListTile(
diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart
index e6283e15..8228da29 100644
--- a/lib/views/pages/user/gas_refill/request_gas_refill.dart
+++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart
@@ -87,7 +87,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
       }
     }
     if (_gasRefillProvider.department?.name == null) {
-      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text("Failed to complete your request")));
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text("Select department")));
       _isLoading = false;
       setState(() {});
       return;