diff --git a/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt b/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
index 22df02f958..104c7355cc 100644
--- a/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
+++ b/android/navi-common/src/main/java/com/navi/common/firebaseremoteconfig/FirebaseRemoteConfigHelper.kt
@@ -94,8 +94,6 @@ object FirebaseRemoteConfigHelper {
const val GUARD_DOG_FEATURE_FLAG = "GUARD_DOG_FEATURE_FLAG"
const val GOOGLE_MAPS_REDIRECTION_BASE_URL = "GOOGLE_MAPS_REDIRECTION_BASE_URL"
const val PERIODIC_USER_DATA_UPLOAD_CONFIG = "PERIODIC_USER_DATA_UPLOAD_CONFIG"
- const val NAVI_PAY_TRANSACTION_HISTORY_DYNAMIC_FILTER_ENABLED =
- "NAVI_PAY_TRANSACTION_HISTORY_DYNAMIC_FILTER_ENABLED"
const val PAN_VERIFICATION_HPC_PAN_SCREEN_NAME = "PAN_VERIFICATION_HPC_PAN_SCREEN_NAME"
const val ONE_TIME_DATA_UPLOAD_DISABLED = "ONE_TIME_DATA_UPLOAD_DISABLED"
const val NAVI_PAY_MINIMUM_APP_VERSION_ALLOWED_FOR_ONBOARDING =
@@ -111,7 +109,6 @@ object FirebaseRemoteConfigHelper {
const val NAVI_PAY_SEARCH_QUERY_DEBOUNCE_TIME_MS = "NAVI_PAY_SEARCH_QUERY_DEBOUNCE_TIME_MS"
const val NAVI_PAY_LITMUS_EXPERIMENTS_CACHE_DURATION_IN_MILLIS =
"NAVI_PAY_LITMUS_EXPERIMENTS_CACHE_DURATION_IN_MILLIS"
- const val NAVI_PAY_IS_CREDIT_LINE_ENABLED = "NAVI_PAY_IS_CREDIT_LINE_ENABLED"
const val NAVI_PAY_ENABLE_VALIDATE_VPA_CACHING = "NAVI_PAY_ENABLE_VALIDATE_VPA_CACHING"
const val NAVI_PAY_VALIDATE_VPA_CACHING_TTL_IN_HOURS =
"NAVI_PAY_VALIDATE_VPA_CACHING_TTL_IN_HOURS"
@@ -136,8 +133,6 @@ object FirebaseRemoteConfigHelper {
const val NAVI_PAY_PPS_CROSS_SELL_AD_FALLBACK_TIMEOUT =
"NAVI_PAY_PPS_CROSS_SELL_AD_FALLBACK_TIMEOUT"
const val NAVI_PAY_PPS_CROSS_SELL_AD_RE_ID = "NAVI_PAY_PPS_CROSS_SELL_AD_RE_ID"
- const val NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED =
- "NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED"
const val NAVI_PAY_SCRATCH_CARD_OPTIMISATION_V2_ENABLED =
"NAVI_PAY_SCRATCH_CARD_OPTIMISATION_V2_ENABLED"
const val NAVI_PAY_PPS_SHARE_RECEIPT_CALLOUT_TEXT = "NAVI_PAY_PPS_SHARE_RECEIPT_CALLOUT_TEXT"
diff --git a/android/navi-common/src/main/res/xml/default_remote_config.xml b/android/navi-common/src/main/res/xml/default_remote_config.xml
index 79f4fc3fe9..0f2e726088 100644
--- a/android/navi-common/src/main/res/xml/default_remote_config.xml
+++ b/android/navi-common/src/main/res/xml/default_remote_config.xml
@@ -434,10 +434,6 @@
PROXY_SELECTOR_ENABLED
true
-
- NAVI_PAY_IS_CREDIT_LINE_ENABLED
- false
-
NAVI_PAY_ENABLE_VALIDATE_VPA_CACHING
false
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
index 2a2c9ebb6a..eab5f3b36a 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/analytics/NaviPayAnalytics.kt
@@ -2516,12 +2516,6 @@ class NaviPayAnalytics private constructor() {
)
}
- fun onDynamicFilterDisabledViaFireBase() {
- NaviTrackEvent.trackEventOnClickStream(
- "NaviPay_Dev_TransactionHistory_DynamicFilterDisabledViaFireBase"
- )
- }
-
fun onSendMoneyCtaClicked() {
NaviTrackEvent.trackEventOnClickStream("NaviPay_ViewHistory_SendMoney_Clicked")
}
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreenV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreenV2.kt
index e3b609ece4..7a05154206 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreenV2.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/common/paymentsummary/ui/PaymentSummaryScreenV2.kt
@@ -51,8 +51,6 @@ import com.navi.base.deeplink.DeepLinkManager
import com.navi.base.model.CtaData
import com.navi.base.utils.BaseUtils.areNotificationsEnabled
import com.navi.common.R as CommonR
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED
import com.navi.common.utils.Constants.COIN_HOME_URL
import com.navi.design.font.FontWeightEnum
import com.navi.design.theme.getFontWeight
@@ -293,10 +291,7 @@ fun PaymentSummaryScreenV2(
onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
}
- if (
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE &&
- FirebaseRemoteConfigHelper.getBoolean(NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED)
- ) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
DisposableEffect(Unit) {
val screenCaptureCallback =
Activity.ScreenCaptureCallback {
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/ui/TransactionHistoryDetailScreenV2.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/ui/TransactionHistoryDetailScreenV2.kt
index bc5d4af6cd..3118e50982 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/ui/TransactionHistoryDetailScreenV2.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/ui/TransactionHistoryDetailScreenV2.kt
@@ -25,8 +25,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED
import com.navi.pay.R
import com.navi.pay.analytics.NaviPayAnalytics
import com.navi.pay.common.setup.NaviPayRouter
@@ -189,10 +187,7 @@ fun TransactionHistoryDetailScreenV2(
}
}
- if (
- Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE &&
- FirebaseRemoteConfigHelper.getBoolean(NAVI_PAY_SCREENSHOT_SHARE_RECEIPT_ENABLED)
- ) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
DisposableEffect(Unit) {
val screenCaptureCallback =
Activity.ScreenCaptureCallback {
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/viewmodel/TransactionHistoryViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/viewmodel/TransactionHistoryViewModel.kt
index bf14e1ebdb..1bec553542 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/viewmodel/TransactionHistoryViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/management/transactionhistory/viewmodel/TransactionHistoryViewModel.kt
@@ -18,8 +18,6 @@ import com.navi.base.utils.EMPTY
import com.navi.base.utils.ResourceProvider
import com.navi.base.utils.orFalse
import com.navi.common.di.CoroutineDispatcherProvider
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.NAVI_PAY_TRANSACTION_HISTORY_DYNAMIC_FILTER_ENABLED
import com.navi.common.model.common.NudgeDetailEntity
import com.navi.common.usecase.LitmusExperimentsUseCase
import com.navi.common.usecase.RewardsNudgeEntityFetchUseCase
@@ -126,12 +124,6 @@ constructor(
private val _categoryTagsHolder = MutableStateFlow((getDefaultCategoryTags()))
val categoryTagsHolder = _categoryTagsHolder.asStateFlow()
- private val isCreditLineEnabled =
- FirebaseRemoteConfigHelper.getBoolean(
- FirebaseRemoteConfigHelper.NAVI_PAY_IS_CREDIT_LINE_ENABLED,
- defaultValue = false
- )
-
val isCategoryTagActive =
categoryTagsHolder
.map { tags -> tags.any { it.isActive } }
@@ -619,17 +611,15 @@ constructor(
)
)
- if (isCreditLineEnabled) {
- defaultPaymentModeTags.add(
- TransactionTagHolder(
- id = 3,
- displayTextId = R.string.np_transaction_payment_mode_credit_line,
- dbSearchTag = listOf(TransactionPaymentModeTags.CREDIT_LINE.value),
- isSelected = false,
- isActive = false
- )
+ defaultPaymentModeTags.add(
+ TransactionTagHolder(
+ id = 3,
+ displayTextId = R.string.np_transaction_payment_mode_credit_line,
+ dbSearchTag = listOf(TransactionPaymentModeTags.CREDIT_LINE.value),
+ isSelected = false,
+ isActive = false
)
- }
+ )
return defaultPaymentModeTags
}
@@ -719,17 +709,6 @@ constructor(
private fun updateEnabledStateForTags(
transactionHistoryScreenBottomSheetUIState: TransactionHistoryScreenBottomSheetUIState
) {
-
- if (
- !FirebaseRemoteConfigHelper.getBoolean(
- key = NAVI_PAY_TRANSACTION_HISTORY_DYNAMIC_FILTER_ENABLED,
- defaultValue = true
- )
- ) {
- naviPayAnalytics.onDynamicFilterDisabledViaFireBase()
- return
- }
-
if (tagEnablingStateJob?.isActive == true) {
naviPayAnalytics.onTagEnablingStateJobRunning()
return
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
index 21897d3344..6969e59a78 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboarding/account/linked/ui/LinkedAccountsScreen.kt
@@ -54,7 +54,6 @@ import androidx.constraintlayout.compose.atMost
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.navi.common.R as CommonR
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
import com.navi.common.utils.navigateUp
import com.navi.design.font.FontWeightEnum
import com.navi.design.theme.getFontWeight
@@ -135,13 +134,6 @@ fun LinkedAccountsScreen(
val showButtonLoader by linkedAccountsViewModel.showButtonLoader.collectAsStateWithLifecycle()
val lastClickedCardId by linkedAccountsViewModel.accountId.collectAsStateWithLifecycle()
- val isCreditLineEnabled = remember {
- FirebaseRemoteConfigHelper.getBoolean(
- FirebaseRemoteConfigHelper.NAVI_PAY_IS_CREDIT_LINE_ENABLED,
- defaultValue = false
- )
- }
-
val bottomSheetState =
rememberModalBottomSheetState(
initialValue = ModalBottomSheetValue.Hidden,
@@ -236,7 +228,6 @@ fun LinkedAccountsScreen(
)
is LinkedAccountsScreenUIState.LinkedAccountsScreen ->
RenderLinkedAccountsScreen(
- isCreditLineEnabled = isCreditLineEnabled,
navigator = navigator,
bottomSheetState = bottomSheetState,
bottomSheetUIState = bottomSheetStateHolder.bottomSheetUIState,
@@ -339,7 +330,6 @@ fun RenderLinkedAccountsScreen(
onBackClick: () -> Unit,
onAddRuPayCreditCardClicked: () -> Unit,
onAddCreditLineClicked: () -> Unit,
- isCreditLineEnabled: Boolean,
showButtonLoader: Boolean = false,
lastClickedCardId: String = ""
) {
@@ -405,13 +395,11 @@ fun RenderLinkedAccountsScreen(
Spacer(modifier = Modifier.height(16.dp))
- if (isCreditLineEnabled) {
- AddAccountCard(
- modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
- onAddAccountClicked = onAddCreditLineClicked,
- addAccountText = R.string.add_credit_line
- )
- }
+ AddAccountCard(
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
+ onAddAccountClicked = onAddCreditLineClicked,
+ addAccountText = R.string.add_credit_line
+ )
}
}
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/viewmodel/OrderHistoryViewModel.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/viewmodel/OrderHistoryViewModel.kt
index fef90ade1c..e2af54bb1c 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/viewmodel/OrderHistoryViewModel.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/viewmodel/OrderHistoryViewModel.kt
@@ -22,7 +22,6 @@ import androidx.paging.cachedIn
import com.navi.base.utils.DateUtils
import com.navi.base.utils.EMPTY
import com.navi.base.utils.ResourceProvider
-import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper
import com.navi.common.model.common.NudgeDetailEntity
import com.navi.common.usecase.RewardsNudgeEntityFetchUseCase
import com.navi.pay.R
@@ -129,12 +128,6 @@ constructor(
private val _goToNextScreen = MutableSharedFlow()
val goToNextScreen = _goToNextScreen.asSharedFlow()
- private val isCreditLineEnabled =
- FirebaseRemoteConfigHelper.getBoolean(
- FirebaseRemoteConfigHelper.NAVI_PAY_IS_CREDIT_LINE_ENABLED,
- defaultValue = false
- )
-
val isCategoryTagActive =
categoryTagsHolder
.map { tags -> tags.any { it.isActive } }
@@ -572,17 +565,15 @@ constructor(
)
)
- if (isCreditLineEnabled) {
- defaultPaymentModeTags.add(
- TransactionTagHolder(
- id = 3,
- displayTextId = R.string.np_transaction_payment_mode_credit_line,
- dbSearchTag = listOf(TransactionPaymentModeTags.CREDIT_LINE.value),
- isSelected = false,
- isActive = false
- )
+ defaultPaymentModeTags.add(
+ TransactionTagHolder(
+ id = 3,
+ displayTextId = R.string.np_transaction_payment_mode_credit_line,
+ dbSearchTag = listOf(TransactionPaymentModeTags.CREDIT_LINE.value),
+ isSelected = false,
+ isActive = false
)
- }
+ )
return defaultPaymentModeTags
}