From 0c55931ddc73b74f20ba7ac85293fe4d7f72c79b Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 7 Apr 2025 20:22:00 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../v2/send/confirm/model/SendConfirmModel.kt | 2 +- .../amount/SendAmountReduceTrigger.kt | 1 + .../subcomponents/amount/di/SendAmountModule.kt | 16 ++++++---------- .../amount/model/SendAmountModel.kt | 2 +- .../destination/model/SendDestinationModel.kt | 2 +- .../v2/subcomponents/fee/model/SendFeeModel.kt | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt index 5ddadd49f3..7e089f9d66 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/send/confirm/model/SendConfirmModel.kt @@ -485,7 +485,7 @@ internal class SendConfirmModel @Inject constructor( flow = uiState, flow2 = params.currentRoute, transform = { state, route -> state to route }, - ).distinctUntilChanged().onEach { (state, _) -> + ).onEach { (state, _) -> val amountUM = state.amountUM as? AmountState.Data val confirmUM = state.confirmUM params.callback.onResult( diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountReduceTrigger.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountReduceTrigger.kt index a168fe3532..901ee1f0df 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountReduceTrigger.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/SendAmountReduceTrigger.kt @@ -29,6 +29,7 @@ interface SendAmountReduceListener { internal class DefaultSendAmountReduceTrigger @Inject constructor() : SendAmountReduceTrigger, SendAmountReduceListener { + override val reduceToTriggerFlow = MutableSharedFlow() override val reduceByTriggerFlow = MutableSharedFlow() override val ignoreReduceTriggerFlow = MutableSharedFlow() diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/di/SendAmountModule.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/di/SendAmountModule.kt index 5152941ae4..b486aeaeae 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/di/SendAmountModule.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/di/SendAmountModule.kt @@ -3,25 +3,21 @@ package com.tangem.features.send.v2.subcomponents.amount.di import com.tangem.features.send.v2.subcomponents.amount.DefaultSendAmountReduceTrigger import com.tangem.features.send.v2.subcomponents.amount.SendAmountReduceListener import com.tangem.features.send.v2.subcomponents.amount.SendAmountReduceTrigger +import dagger.Binds import dagger.Module -import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton @InstallIn(SingletonComponent::class) @Module -internal object SendAmountModule { +internal interface SendAmountModule { - @Provides @Singleton - fun provideSendAmountReduceTrigger(): SendAmountReduceTrigger { - return DefaultSendAmountReduceTrigger() - } + @Binds + fun provideSendAmountReduceTrigger(impl: DefaultSendAmountReduceTrigger): SendAmountReduceTrigger - @Provides @Singleton - fun provideSendAmountReduceListener(): SendAmountReduceListener { - return DefaultSendAmountReduceTrigger() - } + @Binds + fun provideSendAmountReduceListener(impl: DefaultSendAmountReduceTrigger): SendAmountReduceListener } \ No newline at end of file diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt index d0817e99ca..5f37e5f84f 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/amount/model/SendAmountModel.kt @@ -212,7 +212,7 @@ internal class SendAmountModel @Inject constructor( flow = uiState, flow2 = params.currentRoute, transform = { state, route -> state to route }, - ).distinctUntilChanged().onEach { (state, route) -> + ).onEach { (state, route) -> params.callback.onNavigationResult( NavigationUM.Content( title = resourceReference(R.string.send_amount_label), diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt index 8c1016c434..2f4e77b25d 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/destination/model/SendDestinationModel.kt @@ -292,7 +292,7 @@ internal class SendDestinationModel @Inject constructor( flow = uiState, flow2 = params.currentRoute, transform = { state, route -> state to route }, - ).distinctUntilChanged().onEach { (state, route) -> + ).onEach { (state, route) -> params.callback.onNavigationResult( NavigationUM.Content( title = resourceReference(R.string.send_recipient_label), diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt index 861798a122..0b53128a92 100644 --- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt +++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/subcomponents/fee/model/SendFeeModel.kt @@ -278,7 +278,7 @@ internal class SendFeeModel @Inject constructor( flow = uiState, flow2 = params.currentRoute, transform = { state, route -> state to route }, - ).distinctUntilChanged().onEach { (state, _) -> + ).onEach { (state, _) -> params.callback.onNavigationResult( NavigationUM.Content( title = resourceReference(R.string.common_fee_selector_title),