diff --git a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json index ba8ee3c7b1..c6722f2a85 100644 --- a/core/config-toggles/src/main/assets/configs/feature_toggles_config.json +++ b/core/config-toggles/src/main/assets/configs/feature_toggles_config.json @@ -15,10 +15,6 @@ "name": "USEDESK_ENABLED", "version": "undefined" }, - { - "name": "SWAP_REDESIGN_ENABLED", - "version": "undefined" - }, { "name": "APP_REDESIGN_ENABLED", "version": "undefined" @@ -70,5 +66,9 @@ { "name": "SWAP_SWITCH_TO_TRANSFER_ENABLED", "version": "undefined" + }, + { + "name": "SWAP_INTEGRATED_APPROVE", + "version": "undefined" } ] diff --git a/features/swap-v2/api/src/main/java/com/tangem/features/swap/v2/api/SwapFeatureToggles.kt b/features/swap-v2/api/src/main/java/com/tangem/features/swap/v2/api/SwapFeatureToggles.kt deleted file mode 100644 index 2bc15c06e7..0000000000 --- a/features/swap-v2/api/src/main/java/com/tangem/features/swap/v2/api/SwapFeatureToggles.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.tangem.features.swap.v2.api - -interface SwapFeatureToggles { - val isSwapRedesignEnabled: Boolean -} \ No newline at end of file diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/DefaultSwapFeatureToggles.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/DefaultSwapFeatureToggles.kt deleted file mode 100644 index aeb7e33eb5..0000000000 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/DefaultSwapFeatureToggles.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.tangem.features.swap.v2.impl - -import com.tangem.core.configtoggle.FeatureToggles -import com.tangem.core.configtoggle.feature.FeatureTogglesManager -import com.tangem.features.swap.v2.api.SwapFeatureToggles - -internal class DefaultSwapFeatureToggles( - private val featureToggles: FeatureTogglesManager, -) : SwapFeatureToggles { - override val isSwapRedesignEnabled: Boolean - get() = featureToggles.isFeatureEnabled(FeatureToggles.SWAP_REDESIGN_ENABLED) -} \ No newline at end of file diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/di/SwapFeatureModules.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/di/SwapFeatureModules.kt deleted file mode 100644 index 3318c6d6c3..0000000000 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/di/SwapFeatureModules.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.tangem.features.swap.v2.impl.di - -import com.tangem.core.configtoggle.feature.FeatureTogglesManager -import com.tangem.features.swap.v2.api.SwapFeatureToggles -import com.tangem.features.swap.v2.impl.DefaultSwapFeatureToggles -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -internal object SwapFeatureModules { - - @Provides - @Singleton - fun provideSwapFeatureToggles(featureTogglesManager: FeatureTogglesManager): SwapFeatureToggles { - return DefaultSwapFeatureToggles(featureTogglesManager) - } -} \ No newline at end of file diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/swap/SwapRoute.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/swap/SwapRoute.kt deleted file mode 100644 index 2d7da88a11..0000000000 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/swap/SwapRoute.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.tangem.features.swap.v2.impl.swap - -import com.tangem.core.decompose.navigation.Route -import kotlinx.serialization.Serializable - -internal sealed class SwapRoute : Route { - - abstract val isEditMode: Boolean - - data object Empty : SwapRoute() { - override val isEditMode: Boolean = false - } - - @Serializable - data object Confirm : SwapRoute() { - override val isEditMode: Boolean = true - } - - @Serializable - data class Amount( - override val isEditMode: Boolean, - ) : SwapRoute() -} \ No newline at end of file diff --git a/features/swap/api/src/main/kotlin/com/tangem/features/swap/SwapFeatureToggles.kt b/features/swap/api/src/main/kotlin/com/tangem/features/swap/SwapFeatureToggles.kt index 45b24ac9b2..5c9df6c93e 100644 --- a/features/swap/api/src/main/kotlin/com/tangem/features/swap/SwapFeatureToggles.kt +++ b/features/swap/api/src/main/kotlin/com/tangem/features/swap/SwapFeatureToggles.kt @@ -2,4 +2,5 @@ package com.tangem.features.swap interface SwapFeatureToggles { val isSwapSwitchToTransferEnabled: Boolean + val isSwapIntegratedApproveEnabled: Boolean } \ No newline at end of file diff --git a/features/swap/domain/build.gradle.kts b/features/swap/domain/build.gradle.kts index d0853de0bc..6631516744 100644 --- a/features/swap/domain/build.gradle.kts +++ b/features/swap/domain/build.gradle.kts @@ -51,6 +51,7 @@ dependencies { implementation(projects.domain.visa) implementation(projects.domain.visa.models) + implementation(projects.features.swap.api) implementation(projects.features.swap.domain.api) implementation(projects.features.swap.domain.models) implementation(projects.libs.blockchainSdk) diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapFeatureToggles.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapFeatureToggles.kt index f6ac98d33d..bb5bc7efb5 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapFeatureToggles.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/DefaultSwapFeatureToggles.kt @@ -12,4 +12,7 @@ internal class DefaultSwapFeatureToggles @Inject constructor( override val isSwapSwitchToTransferEnabled: Boolean = featureTogglesManager.isFeatureEnabled( toggle = FeatureToggles.SWAP_SWITCH_TO_TRANSFER_ENABLED, ) + override val isSwapIntegratedApproveEnabled: Boolean = featureTogglesManager.isFeatureEnabled( + toggle = FeatureToggles.SWAP_INTEGRATED_APPROVE, + ) } \ No newline at end of file