From d5868d213a34cfdc9323ea699e055fd749b388cc Mon Sep 17 00:00:00 2001
From: Manish <manish.zure@marcoaiot.com>
Date: Mon, 17 Nov 2025 11:32:07 +0530
Subject: [PATCH] Rebase issues solved

---
 lib/helpers/services/api_endpoints.dart | 2 +-
 lib/helpers/services/api_service.dart   | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/helpers/services/api_endpoints.dart b/lib/helpers/services/api_endpoints.dart
index 1a52cb4..91300af 100644
--- a/lib/helpers/services/api_endpoints.dart
+++ b/lib/helpers/services/api_endpoints.dart
@@ -1,7 +1,7 @@
 class ApiEndpoints {
   // static const String baseUrl = "https://stageapi.marcoaiot.com/api";
   // static const String baseUrl = "https://api.marcoaiot.com/api";
-  static const String baseUrl = "https://devapi.marcoaiot.com/api";
+  //static const String baseUrl = "https://devapi.marcoaiot.com/api";
 
   static const String getMasterCurrencies = "/Master/currencies/list";
   static const String getMasterExpensesCategories =
diff --git a/lib/helpers/services/api_service.dart b/lib/helpers/services/api_service.dart
index 7168892..d7379e0 100644
--- a/lib/helpers/services/api_service.dart
+++ b/lib/helpers/services/api_service.dart
@@ -436,8 +436,6 @@ class ApiService {
     final endpoint = "${ApiEndpoints.getServiceProjectDetail}/$projectId";
     logSafe("Fetching details for Service Project ID: $projectId");
 
-    try {
-      final response = await _getRequest(endpoint);
     try {
       final response = await _getRequest(endpoint);
 
@@ -454,10 +452,6 @@ class ApiService {
         return null;
       }
 
-      final jsonResponse = _parseResponseForAllData(
-        response,
-        label: "Service Project Detail",
-      );
       final jsonResponse = _parseResponseForAllData(
         response,
         label: "Service Project Detail",
@@ -487,8 +481,6 @@ class ApiService {
 
     return null;
   }
-    return null;
-  }
 
   /// Get Service Project List
   static Future<ServiceProjectListModel?> getServiceProjectsListApi({