diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt index 03e2bf29c2..9e42edab58 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/DefaultGiveApprovalComponent.kt @@ -17,10 +17,10 @@ import com.tangem.core.ui.res.TangemTheme import com.tangem.features.approval.api.GiveApprovalComponent import com.tangem.features.approval.impl.model.GiveApprovalModel import com.tangem.features.approval.impl.ui.GiveApprovalContent -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt index ceabc3db34..e5a8cf2341 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/model/GiveApprovalModel.kt @@ -33,9 +33,9 @@ import com.tangem.domain.transaction.usecase.gasless.GetFeeForGaslessUseCase import com.tangem.domain.transaction.usecase.gasless.GetFeeForTokenUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.approval.api.GiveApprovalComponent -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.logging.TangemLogger diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt index 5d6e9c3384..f10531e8f7 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/GiveApprovalContent.kt @@ -34,7 +34,7 @@ import com.tangem.core.ui.extensions.* import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview import com.tangem.features.approval.impl.model.GiveApprovalUM -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt index 7d4fd8af04..3aabef7629 100644 --- a/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt +++ b/features/approval/impl/src/main/java/com/tangem/features/approval/impl/ui/PreviewFeeSelectorBlockComponent.kt @@ -2,8 +2,8 @@ package com.tangem.features.approval.impl.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM internal class PreviewFeeSelectorBlockComponent : FeeSelectorBlockComponent { override fun updateState(feeSelectorUM: FeeSelectorUM) { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt b/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt deleted file mode 100644 index 429b0bf0e4..0000000000 --- a/features/send/api/src/main/java/com/tangem/features/send/api/callbacks/FeeSelectorModelCallback.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.tangem.features.send.api.callbacks - -import com.tangem.features.send.api.entity.FeeSelectorUM - -interface FeeSelectorModelCallback { - fun onFeeResult(feeSelectorUM: FeeSelectorUM) -} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt similarity index 68% rename from features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt index ba927c8159..c4591a5fd2 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorBlockComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorBlockComponent.kt @@ -1,9 +1,9 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.feeSelector import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams interface FeeSelectorBlockComponent : ComposableContentComponent { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt similarity index 73% rename from features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt index ec13f68cb9..edd11d22c5 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/FeeSelectorComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/FeeSelectorComponent.kt @@ -1,8 +1,8 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.feeSelector import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams interface FeeSelectorComponent : ComposableBottomSheetComponent { interface Factory { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt new file mode 100644 index 0000000000..894bc190eb --- /dev/null +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/callbacks/FeeSelectorModelCallback.kt @@ -0,0 +1,7 @@ +package com.tangem.features.send.api.subcomponents.feeSelector.callbacks + +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM + +interface FeeSelectorModelCallback { + fun onFeeResult(feeSelectorUM: FeeSelectorUM) +} \ No newline at end of file diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt similarity index 89% rename from features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt index 7fbc332f08..7929b04fee 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/entity/CustomFeeFieldUM.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/CustomFeeFieldUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.entity +package com.tangem.features.send.api.subcomponents.feeSelector.entity import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt similarity index 98% rename from features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt index dbbdb74b2a..e370e2bd8a 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/entity/FeeSelectorUM.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/entity/FeeSelectorUM.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.entity +package com.tangem.features.send.api.subcomponents.feeSelector.entity import androidx.compose.runtime.Immutable import com.tangem.blockchain.common.Amount diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt similarity index 93% rename from features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt index 138dcbbf64..39bec2048a 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/params/FeeSelectorParams.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/params/FeeSelectorParams.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api.params +package com.tangem.features.send.api.subcomponents.feeSelector.params import arrow.core.Either import com.tangem.blockchain.common.transaction.Fee @@ -9,8 +9,8 @@ import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM sealed class FeeSelectorParams { abstract val state: FeeSelectorUM diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt index 0890d36b63..65835565d1 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/feeSelector/utils/FeeCalculationUtils.kt @@ -4,8 +4,8 @@ import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.extensions.isZero import java.math.BigDecimal import java.math.RoundingMode diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt similarity index 96% rename from features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt rename to features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt index 1a468d979c..157fdbdb0f 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/SendNotificationsComponent.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsComponent.kt @@ -1,4 +1,4 @@ -package com.tangem.features.send.api +package com.tangem.features.send.api.subcomponents.notifications import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.ui.Modifier diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt index 74354016a5..b0099072c3 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateListener.kt @@ -1,6 +1,5 @@ package com.tangem.features.send.api.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent import kotlinx.coroutines.flow.Flow interface SendNotificationsUpdateListener { diff --git a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt index aad417f873..f6e8e4a273 100644 --- a/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt +++ b/features/send/api/src/main/java/com/tangem/features/send/api/subcomponents/notifications/SendNotificationsUpdateTrigger.kt @@ -1,7 +1,5 @@ package com.tangem.features.send.api.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent - interface SendNotificationsUpdateTrigger { /** Trigger return callback with check result */ suspend fun callbackHasError(hasError: Boolean) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt b/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt index 4bd2d8d965..9e1dd361d2 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/common/ui/FeeBlockSuccess.kt @@ -15,7 +15,7 @@ import com.tangem.core.ui.format.bigdecimal.crypto import com.tangem.core.ui.format.bigdecimal.fee import com.tangem.core.ui.format.bigdecimal.format import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.impl.R @Composable diff --git a/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt b/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt index e3dd12db2f..7efcca40ff 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/di/SendFeatureModule.kt @@ -5,7 +5,7 @@ import com.tangem.features.send.api.NFTSendComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.SendEntryPointComponent import com.tangem.features.send.api.SendFeatureToggles -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.entrypoint.DefaultSendEntryPointComponent import com.tangem.features.send.send.DefaultSendComponent import com.tangem.features.send.sendnft.DefaultNFTSendComponent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt index 7c659cabe7..0d36c2717f 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorBlockComponent.kt @@ -12,10 +12,10 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.extensions.conditional -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorBlockModel import com.tangem.features.send.feeselector.ui.FeeSelectorBlockContent import com.tangem.utils.extensions.isSingleItem diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt index 83f48ddc42..b7da023cbe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/DefaultFeeSelectorComponent.kt @@ -12,8 +12,8 @@ import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.decompose.navigation.inner.InnerRouter import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.FeeSelectorComponent -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.extended.FeeExtendedSelectorComponent import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorComponent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt index c3d08ae74a..0ea1d30cc8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/FeeSelectorComponentParams.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.component -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import kotlinx.coroutines.flow.MutableStateFlow diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt index b9d3ec3795..61522ca99a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/entity/FeeExtendedSelectorUM.kt @@ -2,8 +2,8 @@ package com.tangem.features.send.feeselector.component.extended.entity import androidx.compose.runtime.Immutable import com.tangem.core.ui.components.token.state.TokenItemState -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM @Immutable data class FeeExtendedSelectorUM( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt index 65a0fb932e..f561191964 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/model/FeeExtendedSelectorModel.kt @@ -8,7 +8,7 @@ import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.navigation.Router import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.extended.entity.FeeExtendedSelectorUM import com.tangem.features.send.feeselector.route.FeeSelectorRoute diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt index a9c2c36ea4..7ffb08ae15 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/extended/ui/FeeExtendedSelectorContent.kt @@ -33,11 +33,11 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.extended.entity.FeeExtendedSelectorUM import com.tangem.features.send.feeselector.component.speed.ui.RegularFeeItemContent import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt index 92f17a436f..114f1e6a30 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/FeeSpeedSelectorComponent.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.speed.model.FeeSpeedSelectorModel import com.tangem.features.send.feeselector.component.speed.ui.FeeSpeedSelectorContent diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt index cf1d5205d9..886bc2f9fe 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/model/FeeSpeedSelectorModel.kt @@ -6,7 +6,7 @@ import com.tangem.core.decompose.di.ModelScoped import com.tangem.core.decompose.model.Model import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.navigation.url.UrlOpener -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorIntents import com.tangem.features.send.feeselector.model.FeeSelectorIntents diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt index acf86c17b2..a83404da68 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/speed/ui/FeeSpeedSelectorContent.kt @@ -54,12 +54,12 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.speed.FeeSpeedSelectorIntents import com.tangem.features.send.feeselector.component.speed.StubFeeSpeedSelectorIntents import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt index eda8e96501..08ce22781e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/entity/FeeTokenSelectorUM.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.feeselector.component.token.entity -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import kotlinx.collections.immutable.ImmutableList internal data class FeeTokenSelectorUM( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt index 74412b11e3..e89e0ceeff 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/model/FeeTokenSelectorModel.kt @@ -10,7 +10,7 @@ import com.tangem.core.navigation.url.UrlOpener import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.FeeSelectorComponentParams import com.tangem.features.send.feeselector.component.token.FeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.entity.FeeTokenItemState diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt index ea55af5078..d037607d2c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/component/token/ui/FeeTokenSelectorContent.kt @@ -36,11 +36,11 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.component.token.FeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.StubFeeTokenSelectorIntents import com.tangem.features.send.feeselector.component.token.entity.FeeTokenItemState diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt index dbe05e5489..46f9b441e9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/di/FeeSelectorFeatureModule.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.di -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadListener diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt index 3f4a77ef8f..f3d172f9c8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorAlertFactory.kt @@ -7,8 +7,8 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.message.DialogMessage import com.tangem.core.ui.message.EventMessageAction -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.impl.R import java.math.BigDecimal diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt index 4a6cd83145..207cdc1138 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorBlockModel.kt @@ -13,9 +13,9 @@ import com.tangem.core.navigation.url.UrlOpener import com.tangem.domain.settings.NeverShowTapHelpUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.utils.coroutines.CoroutineDispatcherProvider import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt index 91b38c7ea4..951d7ed573 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorIntents.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.feeselector.model import androidx.compose.runtime.Stable import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem @Stable internal interface FeeSelectorIntents { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt index b7f6258ee8..2f91b062fb 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorLogic.kt @@ -21,10 +21,10 @@ import com.tangem.domain.transaction.usecase.gasless.GetAvailableFeeTokensUseCas import com.tangem.domain.transaction.usecase.gasless.IsGaslessFeeSupportedForNetwork import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.NonceInserted -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadListener diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt index 548b0d7cb2..a5e24c65b7 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/FeeSelectorModel.kt @@ -10,9 +10,9 @@ import com.tangem.core.decompose.model.ParamsContainer import com.tangem.core.decompose.utils.stack import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.route.FeeSelectorRoute import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.extensions.isSingleItem diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt index c448124c08..0643b62c3c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemConverter.kt @@ -4,8 +4,8 @@ import com.tangem.blockchain.common.transaction.Fee import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.utils.converter.Converter import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt index ae47af1087..6d13550602 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeItemSelectedTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeItemSelectedTransformer(private val selectedFeeItem: FeeItem) : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt index ffbbeb9d55..28946cd5da 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomFieldConverter.kt @@ -5,8 +5,8 @@ import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.subcomponents.fee.model.converters.custom.bitcoin.BitcoinCustomFeeConverter import com.tangem.features.send.subcomponents.fee.model.converters.custom.ethereum.EthereumCustomFeeConverter diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt index 847e634471..d3efc25f19 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorCustomValueChangedTransformer.kt @@ -3,8 +3,8 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.utils.extensions.isZero import com.tangem.utils.transformer.Transformer diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt index 9b6d41ac15..b6d5f6ad11 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorErrorTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.domain.transaction.error.GetFeeError -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeSelectorErrorTransformer(private val error: GetFeeError) : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt index f1b4d6bdf2..691ee4e80e 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadedTransformer.kt @@ -4,12 +4,12 @@ import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.feeselector.model.FeeSelectorLogic import com.tangem.lib.crypto.BlockchainUtils.isTron diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt index 9ae1f81ee4..41b5cdcdea 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorLoadingTransformer.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal object FeeSelectorLoadingTransformer : Transformer { diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt index 5225d3abaf..75081f5f55 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorNonceChangeTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer internal class FeeSelectorNonceChangeTransformer( diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt index 7c6cae3fd0..530acc9494 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorRemoveSuggestedTransformer.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.feeselector.model.transformers -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer import kotlinx.collections.immutable.toImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt index e732f6629c..56bef3a944 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/model/transformers/FeeSelectorTokenSelectedTransformer.kt @@ -1,8 +1,8 @@ package com.tangem.features.send.feeselector.model.transformers import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.utils.transformer.Transformer import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt index 2ea1b4e78d..ccec69fca1 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorBlockContent.kt @@ -46,11 +46,11 @@ import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network import com.tangem.domain.transaction.error.GetFeeError -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.impl.R import com.tangem.utils.extensions.isSingleItem import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt index 7a710a0ca9..2e867817c8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/feeselector/ui/FeeSelectorModalBottomSheet.kt @@ -20,9 +20,9 @@ import com.tangem.core.ui.components.bottomsheets.modal.TangemModalBottomSheetWi import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.send.feeselector.model.FeeSelectorIntents import com.tangem.features.send.feeselector.route.FeeSelectorRoute import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt index cda575b53c..398b98b780 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/DefaultSendComponent.kt @@ -28,12 +28,12 @@ import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.res.TangemTheme import com.tangem.domain.models.account.derivationIndex -import com.tangem.features.send.api.FeeSelectorBlockComponent import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.SendContent import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt index 051fada063..6fbdf1342d 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/analytics/SendAnalyticHelper.kt @@ -8,8 +8,8 @@ import com.tangem.domain.account.status.usecase.GetAccountCurrencyByAddressUseCa import com.tangem.domain.models.account.Account import com.tangem.domain.models.account.derivationIndex import com.tangem.domain.models.currency.CryptoCurrency -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.send.ui.state.SendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt index 0b2def8145..24b5e89ce0 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/SendConfirmComponent.kt @@ -16,13 +16,12 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.send.confirm.model.SendConfirmModel @@ -107,7 +106,7 @@ internal class SendConfirmComponent( cryptoCurrencyStatus = params.cryptoCurrencyStatus, appCurrency = params.appCurrency, callback = model, - notificationData = NotificationData( + notificationData = SendNotificationsComponent.Params.NotificationData( destinationAddress = model.confirmData.enteredDestination.orEmpty(), memo = model.confirmData.enteredMemo, amountValue = model.confirmData.enteredAmount.orZero(), diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt index 90b2c60464..2eded657e2 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/SendConfirmModel.kt @@ -43,24 +43,25 @@ import com.tangem.domain.transaction.usecase.SendTransactionUseCase import com.tangem.domain.transaction.usecase.gasless.CreateAndSendGaslessTransactionUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateTrigger import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.SendBalanceUpdater import com.tangem.features.send.common.SendConfirmAlertFactory import com.tangem.features.send.common.ui.state.ConfirmUM +import com.tangem.features.send.impl.R import com.tangem.features.send.send.analytics.SendAnalyticHelper import com.tangem.features.send.send.confirm.SendConfirmComponent import com.tangem.features.send.send.confirm.model.transformers.SendConfirmInitialStateTransformer @@ -69,7 +70,6 @@ import com.tangem.features.send.send.confirm.model.transformers.SendConfirmSentS import com.tangem.features.send.send.confirm.model.transformers.SendConfirmationNotificationsTransformerV2 import com.tangem.features.send.send.ui.state.SendUM import com.tangem.features.send.subcomponents.amount.SendAmountReduceTrigger -import com.tangem.features.send.impl.R import com.tangem.utils.coroutines.CoroutineDispatcherProvider import com.tangem.utils.extensions.orZero import com.tangem.utils.extensions.stripZeroPlainString @@ -79,7 +79,7 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal import javax.inject.Inject -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned @Suppress("LongParameterList", "LargeClass") @Stable diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt index 141bcab743..f6e8b1f7e8 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2.kt @@ -13,7 +13,7 @@ import com.tangem.core.ui.format.bigdecimal.format import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.api.utils.formatFooterFiatFee import com.tangem.features.send.api.utils.getTronTokenFeeSendingText diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt index 2c36876bda..443ef0407d 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/confirm/ui/SendConfirmContent.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.components.SpacerH import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.common.ui.tapHelp import com.tangem.features.send.send.ui.state.SendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt index 84f2df688a..c1b9d32985 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/model/SendModel.kt @@ -46,11 +46,11 @@ import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.SendComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.entity.FeeSelectorUM import com.tangem.features.send.api.entity.PredefinedValues import com.tangem.features.send.api.entity.isFromMainScreenQr import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.SendConfirmAlertFactory import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt index 4ae371cce7..0ebe64eceb 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/send/ui/state/SendUM.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.send.ui.state import com.tangem.common.ui.amountScreen.models.AmountState import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.send.confirm.model.ConfirmData diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt index a98e44d9b7..b9615cf967 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/analytics/NFTSendAnalyticHelper.kt @@ -6,8 +6,8 @@ import com.tangem.core.analytics.models.Basic import com.tangem.core.decompose.di.ModelScoped import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.Companion.NFT_SEND_CATEGORY -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.sendnft.ui.state.NFTSendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt index df7d35b7b7..1093c06d6c 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/NFTSendConfirmComponent.kt @@ -19,12 +19,12 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.nft.models.NFTAsset import com.tangem.domain.transaction.error.GetFeeError import com.tangem.features.nft.component.NFTDetailsBlockComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams.DestinationBlockParams import com.tangem.features.send.common.CommonSendRoute import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt index cbb6353620..cec3676b65 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/NFTSendConfirmModel.kt @@ -32,11 +32,11 @@ import com.tangem.domain.transaction.usecase.CreateNFTTransferTransactionUseCase import com.tangem.domain.transaction.usecase.SendTransactionUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase import com.tangem.features.nft.entity.NFTSendSuccessTrigger -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadListener import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorCheckReloadTrigger @@ -62,7 +62,7 @@ import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal import javax.inject.Inject -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned @Suppress("LongParameterList", "LargeClass") @ModelScoped diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt index 9a209b8edf..3586fee3f0 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2.kt @@ -9,7 +9,7 @@ import com.tangem.core.ui.extensions.wrappedList import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.send.api.utils.formatFooterFiatFee import com.tangem.features.send.api.utils.getTronTokenFeeSendingText diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt index 867d877dc6..be82f1c7e7 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/confirm/ui/NFTSendConfirmContent.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.res.TangemTheme import com.tangem.features.nft.component.NFTDetailsBlockComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.common.ui.tapHelp import com.tangem.features.send.sendnft.ui.state.NFTSendUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt index e4069a5e5e..46af42fff2 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/model/NFTSendModel.kt @@ -36,7 +36,7 @@ import com.tangem.domain.transaction.usecase.GetFeeUseCase import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.nft.entity.NFTSendSuccessTrigger import com.tangem.features.send.api.NFTSendComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.CommonSendRoute diff --git a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt index e81c5a16b9..83701052e9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/sendnft/ui/state/NFTSendUM.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.sendnft.ui.state import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.common.ui.state.ConfirmUM diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt index 208f6c8958..a32ccd682a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/CustomFeeConverter.kt @@ -1,7 +1,7 @@ package com.tangem.features.send.subcomponents.fee.model.converters.custom import com.tangem.blockchain.common.transaction.Fee -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.utils.converter.Converter import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt index b46f34254d..dff135db11 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/bitcoin/BitcoinCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt index ad0a9617c8..895a54208b 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/BaseEthereumCustomFeeConverter.kt @@ -2,7 +2,7 @@ package com.tangem.features.send.subcomponents.fee.model.converters.custom.ether import com.tangem.blockchain.common.transaction.Fee import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import kotlinx.collections.immutable.ImmutableList /** diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt index d42363bd99..87e8df9782 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumCustomFeeConverter.kt @@ -10,7 +10,7 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.impl.R import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt index 975d2712e7..65e40f67c9 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumEIPCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.setEmpty import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt index 54084639bc..2cea86bd55 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/ethereum/EthereumLegacyCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkExceedBalance import com.tangem.features.send.subcomponents.fee.model.converters.custom.setEmpty import com.tangem.features.send.impl.R diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt index 4edb9bf359..b671ead4a3 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/fee/model/converters/custom/kaspa/KaspaCustomFeeConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.core.ui.utils.parseToBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM import com.tangem.features.send.subcomponents.fee.model.converters.custom.CustomFeeConverter import com.tangem.features.send.impl.R import kotlinx.collections.immutable.ImmutableList diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt index 4173587eba..c0738aabc6 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultNotificationsUpdateTrigger.kt @@ -1,6 +1,6 @@ package com.tangem.features.send.subcomponents.notifications -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateTrigger import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt index f20fa251a3..7e15ddef4b 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/DefaultSendNotificationsComponent.kt @@ -5,8 +5,8 @@ import androidx.compose.ui.Modifier import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.model.getOrCreateModel -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params import com.tangem.features.send.subcomponents.notifications import com.tangem.features.send.subcomponents.notifications.model.NotificationsModel import dagger.assisted.Assisted diff --git a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt index e831713c99..b54ae939af 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/subcomponents/notifications/model/NotificationsModel.kt @@ -35,8 +35,8 @@ import com.tangem.domain.tokens.IsAmountSubtractAvailableUseCase import com.tangem.domain.tokens.model.warnings.CryptoCurrencyCheck import com.tangem.domain.transaction.usecase.ValidateTransactionUseCase import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkAndCalculateSubtractedAmount import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkFeeCoverage import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt index 394a9dc9e1..3d27923356 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/NFTSendConfirmationNotificationsTransformerV2Test.kt @@ -10,12 +10,12 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.state.ConfirmUM import com.tangem.features.send.sendnft.confirm.model.transformers.NFTSendConfirmationNotificationsTransformerV2 import io.mockk.mockk @@ -381,7 +381,7 @@ class NFTSendConfirmationNotificationsTransformerV2Test { isFeeApproximate = false, isFeeConvertibleToFiat = false, isTronToken = false, - feeCryptoCurrencyStatus = cryptoCurrencyStatus + feeCryptoCurrencyStatus = cryptoCurrencyStatus, ), feeFiatRateUM = FeeFiatRateUM( rate = BigDecimal("50000"), diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt index 9694974592..05cd13af6c 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/send/confirm/model/transformers/SendConfirmationNotificationsTransformerV2Test.kt @@ -12,14 +12,13 @@ import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.models.currency.CryptoCurrency import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.network.Network -import com.tangem.features.send.api.entity.CustomFeeFieldUM -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeFiatRateUM -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.CustomFeeFieldUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeFiatRateUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.state.ConfirmUM -import com.tangem.features.send.send.confirm.model.transformers.SendConfirmationNotificationsTransformerV2 import io.mockk.mockk import io.mockk.verify import kotlinx.collections.immutable.persistentListOf diff --git a/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt b/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt index cc320a1341..7c18b9b971 100644 --- a/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt +++ b/features/send/impl/src/test/java/com/tangem/features/send/v2/subcomponents/destination/model/transformers/SendDestinationValidationResultTransformerTest.kt @@ -12,7 +12,6 @@ import com.tangem.domain.transaction.error.AddressValidationResult import com.tangem.domain.transaction.error.ValidateMemoError import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM -import com.tangem.features.send.subcomponents.destination.model.transformers.SendDestinationValidationResultTransformer import com.tangem.features.send.impl.R import kotlinx.collections.immutable.persistentListOf import org.junit.jupiter.api.Test diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt index f99651def0..6847325b82 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/common/entity/ConfirmUM.kt @@ -5,7 +5,7 @@ import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.extensions.TextReference import com.tangem.domain.express.models.ExpressProvider import com.tangem.domain.swap.models.SwapDataModel -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM import kotlinx.collections.immutable.ImmutableList diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt index 424c5d9d76..5b4ab5611d 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/SendWithSwapConfirmComponent.kt @@ -14,11 +14,11 @@ import com.tangem.domain.models.account.Account import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.swap.models.SwapDirection -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.entity.PredefinedValues -import com.tangem.features.send.api.params.FeeSelectorParams.* +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.* import com.tangem.features.send.api.subcomponents.destination.SendDestinationBlockComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponentParams import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt index d4f2c02323..7ef6c2aa13 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/SendWithSwapConfirmModel.kt @@ -37,12 +37,12 @@ import com.tangem.domain.transaction.usecase.EstimateFeeUseCase import com.tangem.domain.transaction.usecase.gasless.EstimateFeeForGaslessTxUseCase import com.tangem.domain.transaction.usecase.gasless.EstimateFeeForTokenUseCase import com.tangem.domain.txhistory.usecase.GetExplorerTransactionUrlUseCase -import com.tangem.features.send.api.SendNotificationsComponent -import com.tangem.features.send.api.SendNotificationsComponent.Params.NotificationData +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent.Params.NotificationData import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents.SendScreenSource -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsUpdateListener @@ -76,7 +76,7 @@ import jakarta.inject.Inject import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.math.BigDecimal -import com.tangem.features.send.api.entity.FeeSelectorUM as FeeSelectorUMRedesigned +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM as FeeSelectorUMRedesigned import com.tangem.utils.transformer.update as transformerUpdate @Suppress("LongParameterList", "LargeClass") diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt index b274568ef8..c62ecc15db 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/model/transformers/SendWithSwapConfirmationNotificationsTransformer.kt @@ -10,7 +10,7 @@ import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.format.bigdecimal.fiat import com.tangem.core.ui.format.bigdecimal.format import com.tangem.domain.swap.models.SwapDirection.Companion.withSwapDirection -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkIfCustomFeeTooHigh import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils.checkIfCustomFeeTooLow import com.tangem.features.send.api.utils.formatFooterFiatFee diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt index 7f3cb239cf..c78d8ef0fd 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/confirm/ui/SendWithSwapConfirmContent.kt @@ -12,8 +12,8 @@ import androidx.compose.ui.unit.dp import com.tangem.common.ui.notifications.NotificationUM import com.tangem.common.ui.notifications.notifications import com.tangem.core.ui.components.SpacerH16 -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.SendNotificationsComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.notifications.SendNotificationsComponent import com.tangem.features.send.api.subcomponents.destination.SendDestinationBlockComponent import com.tangem.features.swap.v2.impl.amount.SwapAmountBlockComponent import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt index 5c9d623672..1b3c333b80 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/entity/SendWithSwapUM.kt @@ -1,7 +1,7 @@ package com.tangem.features.swap.v2.impl.sendviaswap.entity import com.tangem.common.ui.navigationButtons.NavigationUM -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.amount.entity.SwapAmountUM import com.tangem.features.swap.v2.impl.common.entity.ConfirmUM diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt index b8196ae1b3..671ae85c1d 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/model/SendWithSwapModel.kt @@ -20,7 +20,7 @@ import com.tangem.domain.models.wallet.UserWallet import com.tangem.domain.swap.models.SwapDirection import com.tangem.domain.wallets.usecase.GetUserWalletUseCase import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.SendDestinationComponent import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.api.SendWithSwapComponent diff --git a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt index 2ecf5eeb36..bf24732fbe 100644 --- a/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt +++ b/features/swap-v2/impl/src/main/java/com/tangem/features/swap/v2/impl/sendviaswap/success/ui/SendWithSwapSuccessContent.kt @@ -45,10 +45,10 @@ import com.tangem.domain.express.models.ExpressProviderType import com.tangem.domain.swap.models.SwapDataModel import com.tangem.domain.swap.models.SwapDataTransactionModel import com.tangem.domain.utils.convertToSdkAmount -import com.tangem.features.send.api.entity.FeeExtraInfo -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeNonce -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeExtraInfo +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeNonce +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationTextFieldUM import com.tangem.features.send.api.subcomponents.destination.entity.DestinationUM import com.tangem.features.swap.v2.impl.R diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt index 59a76db3af..e55fb35d6f 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/component/SwapFeeSelectorBlockComponent.kt @@ -12,10 +12,10 @@ import com.tangem.domain.models.currency.CryptoCurrencyStatus import com.tangem.domain.models.wallet.UserWalletId import com.tangem.domain.transaction.error.GetFeeError import com.tangem.domain.transaction.models.TransactionFeeExtended -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt index 92f4f91db5..cec56c2b2f 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/model/SwapModel.kt @@ -109,8 +109,8 @@ import com.tangem.features.approval.api.SelectApprovalTypeComponent import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenAnalyticsPayload import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenBridge import com.tangem.features.commonfeatures.api.choosetoken.ChooseTokenResult -import com.tangem.features.send.api.entity.FeeItem -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeItem +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.impl.R import com.tangem.features.swap.SwapComponent diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt index ca1d72018b..9f0f4886a7 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt @@ -50,7 +50,7 @@ import com.tangem.feature.swap.models.SwapButton.Mode import com.tangem.feature.swap.models.states.* import com.tangem.feature.swap.presentation.R import com.tangem.feature.swap.utils.formatToUIRepresentation -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.swap.SwapFeatureToggles import com.tangem.utils.Provider import com.tangem.utils.StringsSigns diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt index 85e544a3cc..109479d7be 100644 --- a/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt +++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt @@ -31,7 +31,7 @@ import com.tangem.core.ui.utils.toTimeFormat import com.tangem.feature.swap.models.SwapSuccessStateHolder import com.tangem.feature.swap.presentation.R import com.tangem.feature.swap.preview.SwapSuccessStatePreview -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.common.ui.FeeBlockSuccess @Composable diff --git a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt index d1518baeda..2649a4b1df 100644 --- a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt +++ b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelApprovalSelectorCallbackTest.kt @@ -3,7 +3,7 @@ package com.tangem.feature.swap.model import com.google.common.truth.Truth.assertThat import com.tangem.common.ui.bottomsheet.permission.state.ApproveType import com.tangem.feature.swap.domain.models.ui.PermissionDataState -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import io.mockk.coVerify import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt index 03c4242987..c80e408980 100644 --- a/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt +++ b/features/swap/impl/src/test/java/com/tangem/feature/swap/model/SwapModelHandleFeeErrorTest.kt @@ -6,7 +6,7 @@ import com.tangem.core.analytics.models.AnalyticsEvent import com.tangem.domain.transaction.error.GetFeeError import com.tangem.feature.swap.analytics.SwapEvents import com.tangem.feature.swap.domain.models.ui.PermissionDataState -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import io.mockk.coVerify import io.mockk.verify import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt b/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt index 135cccb51e..b1d532d910 100644 --- a/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt +++ b/features/wallet/impl/src/test/kotlin/com/tangem/feature/wallet/presentation/wallet/deeplink/DefaultPromoDeeplinkHandlerTest.kt @@ -82,7 +82,6 @@ class DefaultPromoDeeplinkHandlerTest { every { analyticsEventHandler.send(any()) } returns Unit messages = mutableListOf() every { uiMessageSender.send(capture(messages)) } just runs - } @Test @@ -499,13 +498,21 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard, btcStatusCustom)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf( btcCoinCustom, btcCoinCard, ) - coEvery { activateBitcoinPromocodeUseCase.invoke(any(), "bc1qcustom", promoCode) } returns Either.Right("ok") + coEvery { + activateBitcoinPromocodeUseCase.invoke( + any(), + "bc1qcustom", + promoCode + ) + } returns Either.Right("ok") val dispatcherProvider = testDispatcherProvider(testScheduler) @@ -556,7 +563,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard, btcStatusCustom)) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCard) coEvery { activateBitcoinPromocodeUseCase.invoke(any(), "bc1qcard", promoCode) } returns Either.Right("ok") @@ -643,7 +651,7 @@ class DefaultPromoDeeplinkHandlerTest { Truth.assertThat(sent.title).isEqualTo(resourceReference(R.string.bitcoin_promo_no_address_title)) Truth.assertThat(sent.message).isEqualTo(resourceReference(R.string.bitcoin_promo_no_address)) - coVerify(exactly = 0) { activateBitcoinPromocodeUseCase.invoke(any(),any(), any()) } + coVerify(exactly = 0) { activateBitcoinPromocodeUseCase.invoke(any(), any(), any()) } verify( exactly = 1, @@ -673,8 +681,10 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf( btcCoinCustom, btcCoinCard, @@ -732,7 +742,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCustom)) - val btcCoinCard = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) + val btcCoinCard = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCard) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCard) val dispatcherProvider = testDispatcherProvider(testScheduler) @@ -787,7 +798,8 @@ class DefaultPromoDeeplinkHandlerTest { ) coEvery { multiNetworkStatusSupplier.invoke(any()) } returns flowOf(setOf(btcStatusCard)) - val btcCoinCustom = buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) + val btcCoinCustom = + buildCryptoCurrency(rawNetworkId = Blockchain.Bitcoin.toNetworkId(), derivationPath = dpCustom) coEvery { multiWalletCryptoCurrenciesSupplier.getSyncOrNull(any()) } returns setOf(btcCoinCustom) val dispatcherProvider = testDispatcherProvider(testScheduler) diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt index 7d579aa7b1..f4af23a286 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/connections/routing/DefaultWcRoutingComponent.kt @@ -15,8 +15,8 @@ import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableContentComponent import com.tangem.features.commonfeatures.api.portfolioselector.PortfolioSelectorComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.walletconnect.components.WcRoutingComponent import com.tangem.features.walletconnect.connections.components.AlertsComponent import com.tangem.features.walletconnect.connections.components.AlertsComponent.AlertType.* diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt index 9aa7cdf947..e6e22a52e5 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/PreviewFeeSelectorBlockComponent.kt @@ -17,8 +17,8 @@ import com.tangem.core.ui.components.audits.AuditLabelUM import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.stringResourceSafe import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.impl.R internal class PreviewFeeSelectorBlockComponent : FeeSelectorBlockComponent { diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt index fcb776bd14..e3a43c45ba 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/common/WcNavigationUtils.kt @@ -3,10 +3,10 @@ package com.tangem.features.walletconnect.transaction.components.common import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.domain.walletconnect.WcAnalyticEvents -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.params.FeeSelectorParams.FeeDisplaySource -import com.tangem.features.send.api.params.FeeSelectorParams.FeeSelectorDetailsParams +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeDisplaySource +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeSelectorDetailsParams import com.tangem.features.walletconnect.connections.components.AlertsComponentV2 import com.tangem.features.walletconnect.connections.utils.WcAlertsFactory.createCommonTransactionAppInfoAlertUM import com.tangem.features.walletconnect.transaction.components.send.WcCustomAllowanceComponent diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt index 9173c11909..a242b33bfd 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionComponent.kt @@ -7,10 +7,10 @@ import com.arkivanov.essenty.lifecycle.doOnResume import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.ui.decompose.ComposableBottomSheetComponent import com.tangem.domain.walletconnect.WcAnalyticEvents -import com.tangem.features.send.api.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent import com.tangem.features.send.api.analytics.CommonSendAnalyticEvents -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState import com.tangem.features.walletconnect.transaction.model.WcSendTransactionModel import com.tangem.features.walletconnect.transaction.ui.send.WcSendTransactionModalBottomSheet diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt index f7b4cc1549..9835a4c144 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/components/send/WcSendTransactionContainerComponent.kt @@ -5,8 +5,8 @@ import com.tangem.core.decompose.context.AppComponentContext import com.tangem.core.decompose.context.childByContext import com.tangem.core.decompose.model.getOrCreateModel import com.tangem.core.ui.decompose.ComposableBottomSheetComponent -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.FeeSelectorComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorComponent import com.tangem.features.walletconnect.transaction.components.common.WcCommonTransactionComponentDelegate import com.tangem.features.walletconnect.transaction.components.common.WcTransactionModelParams import com.tangem.features.walletconnect.transaction.components.common.getWcCommonScreen diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt index 6decf0a891..6bd7e45e31 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/converter/WcSendTransactionUMConverter.kt @@ -12,7 +12,7 @@ import com.tangem.domain.walletconnect.usecase.method.BlockAidTransactionCheck import com.tangem.domain.walletconnect.usecase.method.WcMethodContext import com.tangem.domain.walletconnect.usecase.method.WcSignState import com.tangem.domain.walletconnect.usecase.method.WcSignStep -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.blockaid.WcSendReceiveTransactionCheckResultsUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionActionsUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt index 63194291e0..44d556afff 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/entity/send/WcSendTransactionUM.kt @@ -4,7 +4,7 @@ import com.domain.blockaid.models.transaction.ValidationResult import com.tangem.common.ui.account.AccountTitleUM import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.ui.components.bottomsheets.TangemBottomSheetConfigContent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.approve.WcSpendAllowanceUM import com.tangem.features.walletconnect.transaction.entity.blockaid.WcSendReceiveTransactionCheckResultsUM import com.tangem.features.walletconnect.transaction.entity.common.WcCommonTransactionUM diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt index 89a265f09e..98ba26f87e 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/model/WcSendTransactionModel.kt @@ -44,9 +44,9 @@ import com.tangem.domain.walletconnect.model.WcPsbtOutput import com.tangem.domain.walletconnect.model.WcRequestError import com.tangem.domain.walletconnect.model.WcRequestError.Companion.message import com.tangem.domain.walletconnect.usecase.method.* -import com.tangem.features.send.api.callbacks.FeeSelectorModelCallback -import com.tangem.features.send.api.entity.FeeSelectorUM -import com.tangem.features.send.api.params.FeeSelectorParams.FeeStateConfiguration +import com.tangem.features.send.api.subcomponents.feeSelector.callbacks.FeeSelectorModelCallback +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.params.FeeSelectorParams.FeeStateConfiguration import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorReloadTrigger import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorData import com.tangem.features.walletconnect.connections.routing.WcInnerRoute diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt index 6a74692291..017fba171b 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/common/WcSendTransactionItems.kt @@ -15,8 +15,8 @@ import com.tangem.common.ui.account.AccountTitleUM import com.tangem.core.ui.components.divider.DividerWithPadding import com.tangem.core.ui.extensions.clickableSingle import com.tangem.core.ui.res.TangemTheme -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.transaction.entity.common.WcNetworkInfoUM import com.tangem.features.walletconnect.transaction.entity.common.WcTransactionFeeState diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt index 6f7f7fbff3..81d38d3315 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/transaction/ui/send/WcSendTransactionModalBottomSheet.kt @@ -31,8 +31,8 @@ import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.res.TangemTheme import com.tangem.core.ui.res.TangemThemePreview -import com.tangem.features.send.api.FeeSelectorBlockComponent -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.FeeSelectorBlockComponent +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.walletconnect.connections.entity.VerifiedDAppState import com.tangem.features.walletconnect.connections.ui.WcAppInfoItem import com.tangem.features.walletconnect.impl.R diff --git a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt index 1726479f92..50efc58e85 100644 --- a/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt +++ b/features/walletconnect/impl/src/main/kotlin/com/tangem/features/walletconnect/utils/WcNotificationsFactory.kt @@ -5,7 +5,7 @@ import com.tangem.core.ui.components.notifications.NotificationConfig import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.domain.models.currency.CryptoCurrencyStatus -import com.tangem.features.send.api.entity.FeeSelectorUM +import com.tangem.features.send.api.subcomponents.feeSelector.entity.FeeSelectorUM import com.tangem.features.send.api.subcomponents.feeSelector.utils.FeeCalculationUtils import com.tangem.features.walletconnect.impl.R import javax.inject.Inject