From d7fe717dea9814660c2acf80a07a42e632a246e2 Mon Sep 17 00:00:00 2001
From: Ayushman Sharma <ayushman.sharma@navi.com>
Date: Mon, 5 Aug 2024 01:08:01 +0530
Subject: [PATCH] =?UTF-8?q?NTP-1224=20|=20AS=20|=20Fix=20for=20CommonLibMa?=
 =?UTF-8?q?nager.baseUrl=20null=20for=20PaymentNetw=E2=80=A6=20(#11993)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/navi/common/CommonLibManager.kt  |  6 +++++-
 .../navi/payment/network/di/PaymentNetworkModule.kt    | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/android/navi-common/src/main/java/com/navi/common/CommonLibManager.kt b/android/navi-common/src/main/java/com/navi/common/CommonLibManager.kt
index 7bafbcfe19..804e76b1b4 100644
--- a/android/navi-common/src/main/java/com/navi/common/CommonLibManager.kt
+++ b/android/navi-common/src/main/java/com/navi/common/CommonLibManager.kt
@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright © 2021-2023 by Navi Technologies Limited
+ *  * Copyright © 2021-2024 by Navi Technologies Limited
  *  * All rights reserved. Strictly confidential
  *
  */
@@ -138,4 +138,8 @@ object CommonLibManager {
     fun getHeaderInterceptorForReact(): Interceptor {
         return reactHeaderInterceptor
     }
+
+    fun isBaseUrlInitialized(): Boolean {
+        return this::baseUrl.isInitialized
+    }
 }
diff --git a/android/navi-payment/src/main/java/com/navi/payment/network/di/PaymentNetworkModule.kt b/android/navi-payment/src/main/java/com/navi/payment/network/di/PaymentNetworkModule.kt
index 5b22aa9b87..26087f2072 100644
--- a/android/navi-payment/src/main/java/com/navi/payment/network/di/PaymentNetworkModule.kt
+++ b/android/navi-payment/src/main/java/com/navi/payment/network/di/PaymentNetworkModule.kt
@@ -9,6 +9,7 @@ package com.navi.payment.network.di
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.navi.base.utils.BaseUtils
 import com.navi.common.CommonLibManager
 import com.navi.common.model.ModuleNameV2
 import com.navi.common.network.converter.EmptyBodyHandlingConverterFactory
@@ -134,8 +135,15 @@ object PaymentNetworkModule {
      * Dynamic Feature module doesn't allow Hilt
      */
     fun getPaymentRetrofitService(): RetrofitService {
+        val updatedBaseUrl =
+            if (CommonLibManager.isBaseUrlInitialized()) {
+                CommonLibManager.baseUrl
+            } else {
+                BaseUtils.getUpdatedBaseUrl()
+            }
+
         return Retrofit.Builder()
-            .baseUrl(CommonLibManager.baseUrl)
+            .baseUrl(updatedBaseUrl)
             .addConverterFactory(
                 EmptyBodyHandlingConverterFactory(ModuleNameV2.NAVI_PAYMENT_SCREEN.name)
             )