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 7fba896fe3..d9bd6cc757 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 @@ -61,8 +61,6 @@ object FirebaseRemoteConfigHelper { const val ACCEPT_ENCODING_DEFAULT_VALUE = "ACCEPT_ENCODING_DEFAULT_VALUE" const val UST_IN_GOLD_ENABLED = "UST_IN_GOLD_ENABLED" const val UST_IN_AMC_ENABLED = "UST_IN_AMC_ENABLED" - const val NAVI_UPI_NOT_RESET_CL_SERVICE_ON_DISCONNECT = - "NAVI_UPI_NOT_RESET_CL_SERVICE_ON_DISCONNECT" const val AMC_CSAT_TIMER_DELAY_IN_SEC = "AMC_CSAT_TIMER_DELAY_IN_SEC" const val AMC_ORDER_STATUS_POLLING_SCREEN_UI_DATA = "AMC_ORDER_STATUS_POLLING_SCREEN_UI_DATA" const val AMC_ORDER_STATUS_POLLING_SCREEN_UI_DATA_V2 = @@ -82,9 +80,7 @@ object FirebaseRemoteConfigHelper { const val NAVI_PAY_HELP_CTA = "NAVI_PAY_HELP_CTA_" const val DISABLE_ALFRED = "DISABLE_ALFRED" const val INTENT_DATA_INSERT_DISABLED = "INTENT_DATA_INSERT_DISABLED" - const val UPI_NUMBER_DISABLED = "UPI_NUMBER_DISABLED" const val UPI_LITE_LOGO_URL = "UPI_LITE_LOGO_URL" - const val UPI_HOME_JSON_MODIFICATION_DISABLED = "UPI_HOME_JSON_MODIFICATION_DISABLED" const val UW_INGESTION_POLLING = "UW_INGESTION_POLLING" const val USER_DATA_UPLOAD_CONFIG = "USER_DATA_UPLOAD_CONFIG" const val PD_SPLASH_BUTTON_TEXT = "PD_SPLASH_BUTTON_TEXT" @@ -219,8 +215,6 @@ object FirebaseRemoteConfigHelper { const val ENABLE_REACT_PREFETCH_IN_JOURNEY = "ENABLE_REACT_PREFETCH_IN_JOURNEY" const val ENABLE_REACT_PREFETCH_IN_TAB = "ENABLE_REACT_PREFETCH_IN_TAB" const val NATIVE_GEOLOCATION_ENABLED = "NATIVE_GEOLOCATION_ENABLED" - const val UPI_LINKED_ACCOUNT_SYNC_DISABLED = "UPI_LINKED_ACCOUNT_SYNC_DISABLED" - const val UPI_PROFILE_CONFIG_SYNC_DISABLED = "UPI_PROFILE_CONFIG_SYNC_DISABLED" const val ENABLE_BHARAT_QR_PARSING_LOGIC = "ENABLE_BHARAT_QR_PARSING_LOGIC" const val ADVERSE_NETWORK_TIMEOUT = "ADVERSE_NETWORK_TIMEOUT" const val DEEPLINK_RESOLVER_WAIT_TIME = "DEEPLINK_RESOLVER_WAIT_TIME" diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/model/config/NaviPayDefaultConfig.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/model/config/NaviPayDefaultConfig.kt index aff0a4f70f..c62976e227 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/model/config/NaviPayDefaultConfig.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/model/config/NaviPayDefaultConfig.kt @@ -145,8 +145,6 @@ data class ConfigMessage( val invalidAmountGenericMessage: String = "Invalid amount", @SerializedName("sendMoneyDefaultRemarks") val sendMoneyDefaultRemarks: String = "Paid via Navi", - @SerializedName("requestMoneyDefaultRemarks") - val requestMoneyDefaultRemarks: String = "Requested via Navi", @SerializedName("aadhaarConsentBottomSheetDescription") val aadhaarConsentBottomSheetDescription: String = "I hereby give my consent to {{BANK_NAME}} to collect & use my Aadhaar number for Aadhaar based authentication for the purpose of providing me UPI based payment facilities. I understand that my Aadhaar number shall be used solely for authenticating my identity through Aadhaar Authentication System for the purpose stated above.", diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPaySdkUtils.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPaySdkUtils.kt index 83bfd0e5c7..98d481c80b 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPaySdkUtils.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPaySdkUtils.kt @@ -16,9 +16,7 @@ import com.google.gson.reflect.TypeToken import com.navi.base.sharedpref.PreferenceManager import com.navi.base.utils.UNDERSCORE import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper -import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.UPI_LINKED_ACCOUNT_SYNC_DISABLED import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.UPI_LITE_LOGO_URL -import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper.UPI_PROFILE_CONFIG_SYNC_DISABLED import com.navi.common.upi.AMOUNT import com.navi.common.upi.BANK_ACCOUNT_ID import com.navi.common.upi.CONNECTED_ACCOUNTS @@ -286,10 +284,7 @@ object NaviPaySdkUtils { screenName: String ): SettingResponse { return withContext(Dispatchers.IO) { - if ( - FirebaseRemoteConfigHelper.getBoolean(UPI_LINKED_ACCOUNT_SYNC_DISABLED).not() && - linkedAccounts.isEmpty() - ) { + if (linkedAccounts.isEmpty()) { refreshLinkedAccountsUseCase .get() .execute(skipLastSyncedTimestampCheck = false, screenName = screenName) @@ -380,30 +375,22 @@ object NaviPaySdkUtils { screenName: String ): SettingConfigContent { val config = - if (FirebaseRemoteConfigHelper.getBoolean(UPI_PROFILE_CONFIG_SYNC_DISABLED).not()) { - if (isUserOnboarded) { - naviPayConfigUseCase - .execute( - configKey = ConfigKey.UPI_SETTING_ONBOARDING, - type = object : TypeToken() {}.type, - screenName = screenName - ) - ?.config ?: NaviPaySettingOnboardingConfig().config - } else { - naviPayConfigUseCase - .execute( - configKey = ConfigKey.UPI_SETTING_NON_ONBOARDING, - type = object : TypeToken() {}.type, - screenName = screenName - ) - ?.config ?: NaviPaySettingNonOnboardingConfig().config - } + if (isUserOnboarded) { + naviPayConfigUseCase + .execute( + configKey = ConfigKey.UPI_SETTING_ONBOARDING, + type = object : TypeToken() {}.type, + screenName = screenName + ) + ?.config ?: NaviPaySettingOnboardingConfig().config } else { - if (isUserOnboarded) { - NaviPaySettingOnboardingConfig().config - } else { - NaviPaySettingNonOnboardingConfig().config - } + naviPayConfigUseCase + .execute( + configKey = ConfigKey.UPI_SETTING_NON_ONBOARDING, + type = object : TypeToken() {}.type, + screenName = screenName + ) + ?.config ?: NaviPaySettingNonOnboardingConfig().config } return config } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt index b06816a0ff..75f98b5a8e 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/entry/NaviPayActivity.kt @@ -127,8 +127,7 @@ class NaviPayActivity : BaseActivity() { window.decorView.setBackgroundColor(Color.WHITE) launchOnboardingFlowIfRequired( - isNaviPayAccessible = naviPayAccessEligibility.isNaviPayAccessible, - bundle = this.intent?.extras + isNaviPayAccessible = naviPayAccessEligibility.isNaviPayAccessible ) } @@ -140,7 +139,7 @@ class NaviPayActivity : BaseActivity() { super.onPause() } - private fun launchOnboardingFlowIfRequired(isNaviPayAccessible: Boolean, bundle: Bundle?) { + private fun launchOnboardingFlowIfRequired(isNaviPayAccessible: Boolean) { if (!isNaviPayAccessible || viewModel.isScreenAllowWithoutOnboarding(intent)) return val isOnboarded = viewModel.isUserOnboarded() diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionBottomSheetContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionBottomSheetContent.kt index 5926225032..16b6807e97 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionBottomSheetContent.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionBottomSheetContent.kt @@ -24,6 +24,5 @@ fun SimSelectionBottomSheetContent( currentSimInfoList = simSelectionBottomSheet.currentSimInfoList, naviPayOnboardingViewModel = naviPayOnboardingViewModel, isFirstTimeUserExperience = isFirstTimeUserExperience, - fullScreenTheme = false ) } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionContent.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionContent.kt index fd192ca433..24b5f14790 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionContent.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/onboardingV2/ui/SimSelectionContent.kt @@ -50,8 +50,7 @@ fun SimSelectionContent( naviPayAnalytics: NaviPayAnalytics.NaviPaySetup, currentSimInfoList: List, naviPayOnboardingViewModel: NaviPayOnboardingViewModel, - isFirstTimeUserExperience: Boolean, - fullScreenTheme: Boolean + isFirstTimeUserExperience: Boolean ) { val currentSimSelected by naviPayOnboardingViewModel.selectedSimInfo.collectAsStateWithLifecycle() @@ -154,10 +153,6 @@ fun SimSelectionContent( Spacer(modifier = Modifier.height(32.dp)) - if (fullScreenTheme) { - Spacer(modifier = Modifier.weight(1f)) - } - ThemeRoundedButton( modifier = Modifier.fillMaxWidth(), text = stringResource(id = R.string.verify)