From 7af70694cadc8fd63f04af9bb14721446b83daa3 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 19 Jul 2024 12:10:24 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../redux/middlewares/TradeCryptoMiddleware.kt | 2 +- .../kotlin/com/tangem/common/routing/AppRoute.kt | 2 +- core/datasource/build.gradle.kts | 2 +- .../stakekit/models/request/ActionRequestBody.kt | 2 +- .../data/staking/DefaultStakingErrorResolver.kt | 2 +- .../data/staking/DefaultStakingRepository.kt | 15 +++++++++------ .../converters/StakingNetworkTypeConverter.kt | 2 +- .../data/staking/converters/TokenConverter.kt | 2 +- .../staking/converters/YieldBalanceConverter.kt | 8 ++++---- .../converters/YieldBalanceListConverter.kt | 2 +- .../data/staking/converters/YieldConverter.kt | 3 ++- .../converters/action/ActionStatusConverter.kt | 2 +- .../action/EnterActionResponseConverter.kt | 2 +- .../converters/action/PendingActionConverter.kt | 2 +- .../action/StakingActionTypeConverter.kt | 2 +- .../converters/error/StakeKitErrorConverter.kt | 2 +- .../transaction/GasEstimateConverter.kt | 2 +- .../transaction/StakingTransactionConverter.kt | 2 +- .../StakingTransactionStatusConverter.kt | 2 +- .../StakingTransactionTypeConverter.kt | 2 +- .../domain/staking/model/StakingAvailability.kt | 0 .../domain/staking/model/StakingEntryInfo.kt | 0 .../tangem/domain/staking/model/StakingToken.kt | 0 .../domain/staking/model/StakingTokenWithYield.kt | 0 .../model/UnsubmittedTransactionMetadata.kt | 0 .../staking/model/{ => stakekit}/NetworkType.kt | 2 +- .../staking/model/{ => stakekit}/StakingError.kt | 2 +- .../domain/staking/model/{ => stakekit}/Yield.kt | 2 +- .../staking/model/{ => stakekit}/YieldBalance.kt | 4 ++-- .../model/{ => stakekit}/YieldBalanceList.kt | 2 +- .../model/{ => stakekit}/action/StakingAction.kt | 4 ++-- .../action/StakingActionCommonType.kt | 2 +- .../{ => stakekit}/action/StakingActionStatus.kt | 2 +- .../{ => stakekit}/action/StakingActionType.kt | 2 +- .../{ => stakekit}/transaction/ActionParams.kt | 8 ++++---- .../transaction/StakingGasEstimate.kt | 4 ++-- .../transaction/StakingTransaction.kt | 4 ++-- .../transaction/StakingTransactionStatus.kt | 2 +- .../transaction/StakingTransactionType.kt | 2 +- .../tangem/domain/staking/EstimateGasUseCase.kt | 6 +++--- .../domain/staking/FetchStakingTokensUseCase.kt | 2 +- .../staking/FetchStakingYieldBalanceUseCase.kt | 2 +- .../staking/GetStakingAvailabilityUseCase.kt | 3 +-- .../domain/staking/GetStakingEntryInfoUseCase.kt | 2 +- .../staking/GetStakingTransactionUseCase.kt | 6 +++--- .../staking/GetStakingYieldBalanceUseCase.kt | 4 ++-- .../com/tangem/domain/staking/GetYieldUseCase.kt | 5 ++--- .../domain/staking/IsStakeMoreAvailableUseCase.kt | 2 +- .../domain/staking/SaveUnsubmittedHashUseCase.kt | 2 +- .../staking/SendUnsubmittedHashesUseCase.kt | 2 +- .../tangem/domain/staking/SubmitHashUseCase.kt | 2 +- .../staking/repositories/StakingErrorResolver.kt | 2 +- .../staking/repositories/StakingRepository.kt | 11 +++++++---- .../domain/tokens/model/CryptoCurrencyStatus.kt | 2 +- .../domain/tokens/legacy/TradeCryptoAction.kt | 2 +- .../operations/CurrenciesStatusesLceOperations.kt | 4 ++-- .../operations/CurrenciesStatusesOperations.kt | 4 ++-- .../tokens/operations/CurrencyStatusOperations.kt | 2 +- .../operations/TokenListFiatBalanceOperations.kt | 2 +- .../GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt | 2 +- .../tangem/domain/tokens/mock/MockTokensStates.kt | 2 +- .../tokens/repository/MockStakingRepository.kt | 9 +++++---- .../presentation/state/InnerYieldBalanceState.kt | 2 +- .../impl/presentation/state/ValidatorState.kt | 2 +- .../converters/RewardsValidatorStateConverter.kt | 8 ++++---- .../state/converters/YieldBalancesConverter.kt | 2 +- .../previewdata/ConfirmationStatePreviewData.kt | 2 +- .../previewdata/InitialStakingStatePreview.kt | 2 +- .../state/stub/StakingClickIntentsStub.kt | 2 +- .../SetConfirmationStateAssentTransformer.kt | 2 +- .../SetConfirmationStateCompletedTransformer.kt | 2 +- .../SetConfirmationStateLoadingTransformer.kt | 2 +- .../SetInitialDataStateTransformer.kt | 4 ++-- .../validator/ValidatorSelectChangeTransformer.kt | 2 +- .../presentation/viewmodel/StakingClickIntents.kt | 2 +- .../presentation/viewmodel/StakingViewModel.kt | 8 ++++---- .../router/DefaultTokenDetailsRouter.kt | 2 +- .../router/InnerTokenDetailsRouter.kt | 2 +- .../factory/TokenDetailsLoadedBalanceConverter.kt | 2 +- .../state/factory/TokenDetailsStateFactory.kt | 2 +- .../state/factory/TokenStakingStateConverter.kt | 2 +- .../converter/TokenItemStateConverter.kt | 2 +- 82 files changed, 121 insertions(+), 115 deletions(-) rename domain/staking/{src/main/java => models/src/main/kotlin}/com/tangem/domain/staking/model/StakingAvailability.kt (100%) rename domain/staking/{src/main/java => models/src/main/kotlin}/com/tangem/domain/staking/model/StakingEntryInfo.kt (100%) rename domain/staking/{src/main/java => models/src/main/kotlin}/com/tangem/domain/staking/model/StakingToken.kt (100%) rename domain/staking/{src/main/java => models/src/main/kotlin}/com/tangem/domain/staking/model/StakingTokenWithYield.kt (100%) rename domain/staking/{src/main/java => models/src/main/kotlin}/com/tangem/domain/staking/model/UnsubmittedTransactionMetadata.kt (100%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/NetworkType.kt (94%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/StakingError.kt (98%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/Yield.kt (98%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/YieldBalance.kt (94%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/YieldBalanceList.kt (91%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/action/StakingAction.kt (75%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/action/StakingActionCommonType.kt (56%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/action/StakingActionStatus.kt (71%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/action/StakingActionType.kt (82%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/transaction/ActionParams.kt (54%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/transaction/StakingGasEstimate.kt (54%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/transaction/StakingTransaction.kt (79%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/transaction/StakingTransactionStatus.kt (76%) rename domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/{ => stakekit}/transaction/StakingTransactionType.kt (92%) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt index 0f96c671b9..abb2a86125 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt @@ -7,7 +7,7 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.common.routing.AppRoute import com.tangem.common.routing.AppRouter import com.tangem.core.analytics.Analytics -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.tokens.legacy.TradeCryptoAction import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.NetworkAddress diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt index 8a2676a038..bdd1ea3030 100644 --- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt +++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt @@ -6,7 +6,7 @@ import com.tangem.common.routing.bundle.bundle import com.tangem.common.routing.entity.SerializableIntent import com.tangem.core.decompose.navigation.Route import com.tangem.domain.qrscanning.models.SourceType -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.wallets.models.UserWalletId import kotlinx.serialization.Serializable diff --git a/core/datasource/build.gradle.kts b/core/datasource/build.gradle.kts index b706481bfe..0a236d6e5a 100644 --- a/core/datasource/build.gradle.kts +++ b/core/datasource/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { implementation(projects.domain.wallets.models) implementation(projects.domain.balanceHiding.models) implementation(projects.domain.txhistory.models) - implementation(projects.domain.staking) // TODO staking create staking models module + implementation(projects.domain.staking.models) /** Tangem libraries */ implementation(deps.tangem.blockchain) diff --git a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt index fa3ec28913..d6c09517c1 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/api/stakekit/models/request/ActionRequestBody.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.Json import com.tangem.datasource.api.stakekit.models.request.ConstructTransactionRequestBody.GasArgs import com.tangem.datasource.api.stakekit.models.response.model.BalanceDTO import com.tangem.datasource.api.stakekit.models.response.model.TokenDTO -import com.tangem.domain.staking.model.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.action.StakingActionType data class PendingActionRequestBody( @Json(name = "type") diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingErrorResolver.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingErrorResolver.kt index 8fed7f5841..a991a4e1f6 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingErrorResolver.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingErrorResolver.kt @@ -2,7 +2,7 @@ package com.tangem.data.staking import com.tangem.data.staking.converters.error.StakeKitErrorConverter import com.tangem.datasource.api.common.response.ApiResponseError -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver internal class DefaultStakingErrorResolver( diff --git a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt index 646ff8d040..ddb05b9851 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/DefaultStakingRepository.kt @@ -24,12 +24,15 @@ import com.tangem.datasource.local.token.StakingYieldsStore import com.tangem.domain.core.lce.LceFlow import com.tangem.domain.core.lce.lceFlow import com.tangem.domain.staking.model.* -import com.tangem.domain.staking.model.action.StakingAction -import com.tangem.domain.staking.model.action.StakingActionCommonType -import com.tangem.domain.staking.model.action.StakingActionType -import com.tangem.domain.staking.model.transaction.ActionParams -import com.tangem.domain.staking.model.transaction.StakingGasEstimate -import com.tangem.domain.staking.model.transaction.StakingTransaction +import com.tangem.domain.staking.model.stakekit.Yield +import com.tangem.domain.staking.model.stakekit.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalanceList +import com.tangem.domain.staking.model.stakekit.action.StakingAction +import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType +import com.tangem.domain.staking.model.stakekit.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.transaction.ActionParams +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransaction import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.CryptoCurrencyAddress diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/StakingNetworkTypeConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/StakingNetworkTypeConverter.kt index a768417427..e3b284f5fc 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/StakingNetworkTypeConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/StakingNetworkTypeConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters import com.tangem.datasource.api.stakekit.models.response.model.NetworkTypeDTO -import com.tangem.domain.staking.model.NetworkType +import com.tangem.domain.staking.model.stakekit.NetworkType import com.tangem.utils.converter.TwoWayConverter @Suppress("CyclomaticComplexMethod", "LongMethod") diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/TokenConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/TokenConverter.kt index 2148e18511..2f67326a0c 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/TokenConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/TokenConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters import com.tangem.datasource.api.stakekit.models.response.model.TokenDTO -import com.tangem.domain.staking.model.Token +import com.tangem.domain.staking.model.stakekit.Token import com.tangem.utils.converter.TwoWayConverter class TokenConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt index c3dd742fbe..c46a15f279 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceConverter.kt @@ -2,10 +2,10 @@ package com.tangem.data.staking.converters import com.tangem.data.staking.converters.action.PendingActionConverter import com.tangem.datasource.api.stakekit.models.response.model.BalanceDTO -import com.tangem.domain.staking.model.BalanceItem -import com.tangem.domain.staking.model.BalanceType -import com.tangem.domain.staking.model.YieldBalance -import com.tangem.domain.staking.model.YieldBalanceItem +import com.tangem.domain.staking.model.stakekit.BalanceItem +import com.tangem.domain.staking.model.stakekit.BalanceType +import com.tangem.domain.staking.model.stakekit.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalanceItem import com.tangem.utils.converter.Converter internal class YieldBalanceConverter : Converter { diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceListConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceListConverter.kt index 883ba21acd..0476368b30 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceListConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldBalanceListConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters import com.tangem.datasource.api.stakekit.models.response.model.YieldBalanceWrapperDTO -import com.tangem.domain.staking.model.YieldBalanceList +import com.tangem.domain.staking.model.stakekit.YieldBalanceList import com.tangem.utils.converter.Converter internal class YieldBalanceListConverter : Converter, YieldBalanceList> { diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt index 09e1026127..ddf093c628 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/YieldConverter.kt @@ -2,7 +2,8 @@ package com.tangem.data.staking.converters import com.tangem.datasource.api.stakekit.models.response.model.AddressArgumentDTO import com.tangem.datasource.api.stakekit.models.response.model.YieldDTO -import com.tangem.domain.staking.model.* +import com.tangem.domain.staking.model.stakekit.AddressArgument +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.utils.converter.Converter class YieldConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/action/ActionStatusConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/action/ActionStatusConverter.kt index 360ebbbbf6..4bc04836a3 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/action/ActionStatusConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/action/ActionStatusConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters.action import com.tangem.datasource.api.stakekit.models.response.model.action.StakingActionStatusDTO -import com.tangem.domain.staking.model.action.StakingActionStatus +import com.tangem.domain.staking.model.stakekit.action.StakingActionStatus import com.tangem.utils.converter.Converter class ActionStatusConverter : Converter { diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/action/EnterActionResponseConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/action/EnterActionResponseConverter.kt index c228248f43..d06ab798d2 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/action/EnterActionResponseConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/action/EnterActionResponseConverter.kt @@ -2,7 +2,7 @@ package com.tangem.data.staking.converters.action import com.tangem.data.staking.converters.transaction.StakingTransactionConverter import com.tangem.datasource.api.stakekit.models.response.EnterActionResponse -import com.tangem.domain.staking.model.action.StakingAction +import com.tangem.domain.staking.model.stakekit.action.StakingAction import com.tangem.utils.converter.Converter class EnterActionResponseConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/action/PendingActionConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/action/PendingActionConverter.kt index d79c4fd101..c9ddee7f77 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/action/PendingActionConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/action/PendingActionConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters.action import com.tangem.datasource.api.stakekit.models.response.model.BalanceDTO -import com.tangem.domain.staking.model.PendingAction +import com.tangem.domain.staking.model.stakekit.PendingAction import com.tangem.utils.converter.Converter internal class PendingActionConverter : Converter { diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/action/StakingActionTypeConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/action/StakingActionTypeConverter.kt index 941020c57d..95829958e7 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/action/StakingActionTypeConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/action/StakingActionTypeConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters.action import com.tangem.datasource.api.stakekit.models.response.model.action.StakingActionTypeDTO -import com.tangem.domain.staking.model.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.action.StakingActionType import com.tangem.utils.converter.Converter @Suppress("CyclomaticComplexMethod") diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/error/StakeKitErrorConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/error/StakeKitErrorConverter.kt index eccee22fac..39aef18e1b 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/error/StakeKitErrorConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/error/StakeKitErrorConverter.kt @@ -4,7 +4,7 @@ import com.squareup.moshi.JsonAdapter import com.tangem.datasource.api.stakekit.models.response.model.error.AccessDeniedErrorTypeDTO import com.tangem.datasource.api.stakekit.models.response.model.error.StakeKitErrorMessageDTO import com.tangem.datasource.api.stakekit.models.response.model.error.StakeKitErrorResponse -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.utils.converter.Converter internal class StakeKitErrorConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/GasEstimateConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/GasEstimateConverter.kt index 3219d87359..6220823faf 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/GasEstimateConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/GasEstimateConverter.kt @@ -2,7 +2,7 @@ package com.tangem.data.staking.converters.transaction import com.tangem.data.staking.converters.TokenConverter import com.tangem.datasource.api.stakekit.models.response.model.transaction.StakingGasEstimateDTO -import com.tangem.domain.staking.model.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate import com.tangem.utils.converter.Converter class GasEstimateConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionConverter.kt index 1ad9ca3198..ef86c8ef8b 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionConverter.kt @@ -2,7 +2,7 @@ package com.tangem.data.staking.converters.transaction import com.tangem.data.staking.converters.StakingNetworkTypeConverter import com.tangem.datasource.api.stakekit.models.response.model.transaction.StakingTransactionDTO -import com.tangem.domain.staking.model.transaction.StakingTransaction +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransaction import com.tangem.utils.converter.Converter class StakingTransactionConverter( diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionStatusConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionStatusConverter.kt index 9569f61534..236c6e53cb 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionStatusConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionStatusConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters.transaction import com.tangem.datasource.api.stakekit.models.response.model.transaction.StakingTransactionStatusDTO -import com.tangem.domain.staking.model.transaction.StakingTransactionStatus +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransactionStatus import com.tangem.utils.converter.Converter class StakingTransactionStatusConverter : Converter { diff --git a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionTypeConverter.kt b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionTypeConverter.kt index 15e156f691..8466b36a37 100644 --- a/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionTypeConverter.kt +++ b/data/staking/src/main/java/com/tangem/data/staking/converters/transaction/StakingTransactionTypeConverter.kt @@ -1,7 +1,7 @@ package com.tangem.data.staking.converters.transaction import com.tangem.datasource.api.stakekit.models.response.model.transaction.StakingTransactionTypeDTO -import com.tangem.domain.staking.model.transaction.StakingTransactionType +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransactionType import com.tangem.utils.converter.Converter @Suppress("CyclomaticComplexMethod") diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingAvailability.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingAvailability.kt similarity index 100% rename from domain/staking/src/main/java/com/tangem/domain/staking/model/StakingAvailability.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingAvailability.kt diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingEntryInfo.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt similarity index 100% rename from domain/staking/src/main/java/com/tangem/domain/staking/model/StakingEntryInfo.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingEntryInfo.kt diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingToken.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingToken.kt similarity index 100% rename from domain/staking/src/main/java/com/tangem/domain/staking/model/StakingToken.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingToken.kt diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/StakingTokenWithYield.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingTokenWithYield.kt similarity index 100% rename from domain/staking/src/main/java/com/tangem/domain/staking/model/StakingTokenWithYield.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingTokenWithYield.kt diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/model/UnsubmittedTransactionMetadata.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/UnsubmittedTransactionMetadata.kt similarity index 100% rename from domain/staking/src/main/java/com/tangem/domain/staking/model/UnsubmittedTransactionMetadata.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/UnsubmittedTransactionMetadata.kt diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/NetworkType.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/NetworkType.kt similarity index 94% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/NetworkType.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/NetworkType.kt index 4359b0b39c..1d429683bc 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/NetworkType.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/NetworkType.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model +package com.tangem.domain.staking.model.stakekit enum class NetworkType { AVALANCHE_C, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingError.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/StakingError.kt similarity index 98% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingError.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/StakingError.kt index a604be48ae..9fc68971f3 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/StakingError.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/StakingError.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model +package com.tangem.domain.staking.model.stakekit sealed class StakingError { diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/Yield.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt similarity index 98% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/Yield.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt index 023b7ba52b..e173689c6f 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/Yield.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/Yield.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model +package com.tangem.domain.staking.model.stakekit import com.tangem.domain.core.serialization.SerializedBigDecimal import kotlinx.serialization.Serializable diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalance.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalance.kt similarity index 94% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalance.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalance.kt index b82ff8bf02..1c521e2ab3 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalance.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalance.kt @@ -1,6 +1,6 @@ -package com.tangem.domain.staking.model +package com.tangem.domain.staking.model.stakekit -import com.tangem.domain.staking.model.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.action.StakingActionType import java.math.BigDecimal sealed class YieldBalance { diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalanceList.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalanceList.kt similarity index 91% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalanceList.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalanceList.kt index c75d5c9f10..3d3ae126da 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/YieldBalanceList.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/YieldBalanceList.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model +package com.tangem.domain.staking.model.stakekit sealed class YieldBalanceList { diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingAction.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingAction.kt similarity index 75% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingAction.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingAction.kt index 5922003ad7..be1545d6da 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingAction.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingAction.kt @@ -1,6 +1,6 @@ -package com.tangem.domain.staking.model.action +package com.tangem.domain.staking.model.stakekit.action -import com.tangem.domain.staking.model.transaction.StakingTransaction +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransaction import org.joda.time.DateTime import java.math.BigDecimal diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionCommonType.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionCommonType.kt similarity index 56% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionCommonType.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionCommonType.kt index 56e96d2caa..1caf4b8942 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionCommonType.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionCommonType.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model.action +package com.tangem.domain.staking.model.stakekit.action enum class StakingActionCommonType { ENTER, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionStatus.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionStatus.kt similarity index 71% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionStatus.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionStatus.kt index a3e5da8836..33e1750e27 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionStatus.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionStatus.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model.action +package com.tangem.domain.staking.model.stakekit.action enum class StakingActionStatus { CANCELED, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionType.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionType.kt similarity index 82% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionType.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionType.kt index 7346957e59..5098ec0ce1 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/action/StakingActionType.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/action/StakingActionType.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model.action +package com.tangem.domain.staking.model.stakekit.action enum class StakingActionType { STAKE, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/ActionParams.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/ActionParams.kt similarity index 54% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/ActionParams.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/ActionParams.kt index 0d84c4146a..2adfaed13b 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/ActionParams.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/ActionParams.kt @@ -1,8 +1,8 @@ -package com.tangem.domain.staking.model.transaction +package com.tangem.domain.staking.model.stakekit.transaction -import com.tangem.domain.staking.model.Token -import com.tangem.domain.staking.model.action.StakingActionCommonType -import com.tangem.domain.staking.model.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.Token +import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType +import com.tangem.domain.staking.model.stakekit.action.StakingActionType import java.math.BigDecimal data class ActionParams( diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingGasEstimate.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingGasEstimate.kt similarity index 54% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingGasEstimate.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingGasEstimate.kt index 292adc35d5..585ae1edb5 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingGasEstimate.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingGasEstimate.kt @@ -1,6 +1,6 @@ -package com.tangem.domain.staking.model.transaction +package com.tangem.domain.staking.model.stakekit.transaction -import com.tangem.domain.staking.model.Token +import com.tangem.domain.staking.model.stakekit.Token import java.math.BigDecimal data class StakingGasEstimate( diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransaction.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransaction.kt similarity index 79% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransaction.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransaction.kt index 0e937d1243..4222203a21 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransaction.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransaction.kt @@ -1,6 +1,6 @@ -package com.tangem.domain.staking.model.transaction +package com.tangem.domain.staking.model.stakekit.transaction -import com.tangem.domain.staking.model.NetworkType +import com.tangem.domain.staking.model.stakekit.NetworkType data class StakingTransaction( val id: String, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionStatus.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionStatus.kt similarity index 76% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionStatus.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionStatus.kt index 9fc6d4464f..642276c7ca 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionStatus.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionStatus.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model.transaction +package com.tangem.domain.staking.model.stakekit.transaction enum class StakingTransactionStatus { NOT_FOUND, diff --git a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionType.kt b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionType.kt similarity index 92% rename from domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionType.kt rename to domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionType.kt index cb52db3b39..34caa67d0f 100644 --- a/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/transaction/StakingTransactionType.kt +++ b/domain/staking/models/src/main/kotlin/com/tangem/domain/staking/model/stakekit/transaction/StakingTransactionType.kt @@ -1,4 +1,4 @@ -package com.tangem.domain.staking.model.transaction +package com.tangem.domain.staking.model.stakekit.transaction enum class StakingTransactionType { SWAP, diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/EstimateGasUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/EstimateGasUseCase.kt index bbbac8f73f..381308b7a7 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/EstimateGasUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/EstimateGasUseCase.kt @@ -1,9 +1,9 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError -import com.tangem.domain.staking.model.transaction.ActionParams -import com.tangem.domain.staking.model.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.StakingError +import com.tangem.domain.staking.model.stakekit.transaction.ActionParams +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingTokensUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingTokensUseCase.kt index 24f9b37b0e..c591ae2bc2 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingTokensUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingTokensUseCase.kt @@ -3,7 +3,7 @@ package com.tangem.domain.staking import arrow.core.Either import arrow.core.raise.catch import arrow.core.raise.either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingYieldBalanceUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingYieldBalanceUseCase.kt index a2ff4120c1..333762d0e1 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingYieldBalanceUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/FetchStakingYieldBalanceUseCase.kt @@ -3,7 +3,7 @@ package com.tangem.domain.staking import arrow.core.Either import arrow.core.raise.catch import arrow.core.raise.either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrencyAddress diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingAvailabilityUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingAvailabilityUseCase.kt index 9000f0af29..46a2f010be 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingAvailabilityUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingAvailabilityUseCase.kt @@ -1,9 +1,8 @@ package com.tangem.domain.staking import arrow.core.Either -import arrow.core.raise.catch import com.tangem.domain.staking.model.StakingAvailability -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrency diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingEntryInfoUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingEntryInfoUseCase.kt index 451284a714..6192e9d92a 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingEntryInfoUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingEntryInfoUseCase.kt @@ -2,7 +2,7 @@ package com.tangem.domain.staking import arrow.core.Either import com.tangem.domain.staking.model.StakingEntryInfo -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingTransactionUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingTransactionUseCase.kt index 2c843b9161..02abd643a4 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingTransactionUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingTransactionUseCase.kt @@ -1,9 +1,9 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError -import com.tangem.domain.staking.model.transaction.ActionParams -import com.tangem.domain.staking.model.transaction.StakingTransaction +import com.tangem.domain.staking.model.stakekit.StakingError +import com.tangem.domain.staking.model.stakekit.transaction.ActionParams +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransaction import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import kotlinx.coroutines.delay diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingYieldBalanceUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingYieldBalanceUseCase.kt index 77ac00f093..5c5528b931 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingYieldBalanceUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/GetStakingYieldBalanceUseCase.kt @@ -4,8 +4,8 @@ import arrow.core.Either import arrow.core.left import arrow.core.right import com.tangem.domain.core.utils.EitherFlow -import com.tangem.domain.staking.model.StakingError -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.StakingError +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrencyAddress diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/GetYieldUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/GetYieldUseCase.kt index 92d0d6e3c4..3bf59574a6 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/GetYieldUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/GetYieldUseCase.kt @@ -1,9 +1,8 @@ package com.tangem.domain.staking import arrow.core.Either -import arrow.core.raise.catch -import com.tangem.domain.staking.model.StakingError -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.StakingError +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrency diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/IsStakeMoreAvailableUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/IsStakeMoreAvailableUseCase.kt index 30e148dccd..4dd7fc8f38 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/IsStakeMoreAvailableUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/IsStakeMoreAvailableUseCase.kt @@ -1,7 +1,7 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.Network diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/SaveUnsubmittedHashUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/SaveUnsubmittedHashUseCase.kt index 4e7e5efedc..0a83c395cb 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/SaveUnsubmittedHashUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/SaveUnsubmittedHashUseCase.kt @@ -1,7 +1,7 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.model.UnsubmittedTransactionMetadata import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/SendUnsubmittedHashesUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/SendUnsubmittedHashesUseCase.kt index 6a83ee4624..95f3ad9eea 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/SendUnsubmittedHashesUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/SendUnsubmittedHashesUseCase.kt @@ -1,7 +1,7 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/SubmitHashUseCase.kt b/domain/staking/src/main/java/com/tangem/domain/staking/SubmitHashUseCase.kt index 8fd4ce8d18..d810cfac8c 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/SubmitHashUseCase.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/SubmitHashUseCase.kt @@ -1,7 +1,7 @@ package com.tangem.domain.staking import arrow.core.Either -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.staking.repositories.StakingErrorResolver import com.tangem.domain.staking.repositories.StakingRepository diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingErrorResolver.kt b/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingErrorResolver.kt index c08fdb199d..f45ad158d8 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingErrorResolver.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingErrorResolver.kt @@ -1,6 +1,6 @@ package com.tangem.domain.staking.repositories -import com.tangem.domain.staking.model.* +import com.tangem.domain.staking.model.stakekit.StakingError interface StakingErrorResolver { diff --git a/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingRepository.kt b/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingRepository.kt index a374a30d09..356dc7aac9 100644 --- a/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingRepository.kt +++ b/domain/staking/src/main/java/com/tangem/domain/staking/repositories/StakingRepository.kt @@ -2,10 +2,13 @@ package com.tangem.domain.staking.repositories import com.tangem.domain.core.lce.LceFlow import com.tangem.domain.staking.model.* -import com.tangem.domain.staking.model.action.StakingAction -import com.tangem.domain.staking.model.transaction.ActionParams -import com.tangem.domain.staking.model.transaction.StakingGasEstimate -import com.tangem.domain.staking.model.transaction.StakingTransaction +import com.tangem.domain.staking.model.stakekit.Yield +import com.tangem.domain.staking.model.stakekit.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalanceList +import com.tangem.domain.staking.model.stakekit.action.StakingAction +import com.tangem.domain.staking.model.stakekit.transaction.ActionParams +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.transaction.StakingTransaction import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.CryptoCurrencyAddress import com.tangem.domain.tokens.model.Network diff --git a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt index cda5592ee6..d6db9ae7e0 100644 --- a/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt +++ b/domain/tokens/models/src/main/java/com/tangem/domain/tokens/model/CryptoCurrencyStatus.kt @@ -1,6 +1,6 @@ package com.tangem.domain.tokens.model -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.txhistory.models.TxHistoryItem import java.math.BigDecimal diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt index 92a29e7a39..0b04bf321b 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/legacy/TradeCryptoAction.kt @@ -1,6 +1,6 @@ package com.tangem.domain.tokens.legacy -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.domain.wallets.models.UserWallet diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesLceOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesLceOperations.kt index 0a542d0874..8dee89d0e6 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesLceOperations.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesLceOperations.kt @@ -7,8 +7,8 @@ import com.tangem.domain.core.lce.LceFlow import com.tangem.domain.core.lce.lce import com.tangem.domain.core.utils.lceError import com.tangem.domain.core.utils.lceLoading -import com.tangem.domain.staking.model.YieldBalance -import com.tangem.domain.staking.model.YieldBalanceList +import com.tangem.domain.staking.model.stakekit.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalanceList import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.error.TokenListError import com.tangem.domain.tokens.model.* diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt index a1c6c428a3..34e8a290cb 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrenciesStatusesOperations.kt @@ -3,8 +3,8 @@ package com.tangem.domain.tokens.operations import arrow.core.* import arrow.core.raise.* import com.tangem.domain.core.utils.EitherFlow -import com.tangem.domain.staking.model.YieldBalance -import com.tangem.domain.staking.model.YieldBalanceList +import com.tangem.domain.staking.model.stakekit.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalanceList import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.* import com.tangem.domain.tokens.repository.CurrenciesRepository diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt index ee8fa082a7..380f77dc4f 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/CurrencyStatusOperations.kt @@ -1,6 +1,6 @@ package com.tangem.domain.tokens.operations -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.* import java.math.BigDecimal diff --git a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt index 8f28b74ecc..e446ca55aa 100644 --- a/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt +++ b/domain/tokens/src/main/kotlin/com/tangem/domain/tokens/operations/TokenListFiatBalanceOperations.kt @@ -1,7 +1,7 @@ package com.tangem.domain.tokens.operations import arrow.core.NonEmptyList -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.domain.tokens.model.TotalFiatBalance import com.tangem.utils.extensions.orZero diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt index 4f52744205..824a8e89c2 100644 --- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt +++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/GetPrimaryCurrencyStatusUpdatesUseCaseTest.kt @@ -4,7 +4,7 @@ import arrow.core.Either import arrow.core.left import arrow.core.right import com.tangem.domain.core.error.DataError -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.error.CurrencyStatusError import com.tangem.domain.tokens.mock.MockNetworks import com.tangem.domain.tokens.mock.MockQuotes diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt index e3f88d9b52..78858d98c1 100644 --- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt +++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/mock/MockTokensStates.kt @@ -1,7 +1,7 @@ package com.tangem.domain.tokens.mock import arrow.core.nonEmptyListOf -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.CryptoCurrencyAmountStatus import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.domain.tokens.model.NetworkAddress diff --git a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockStakingRepository.kt b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockStakingRepository.kt index 68589655af..6116e0afda 100644 --- a/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockStakingRepository.kt +++ b/domain/tokens/src/test/kotlin/com/tangem/domain/tokens/repository/MockStakingRepository.kt @@ -3,10 +3,11 @@ package com.tangem.domain.tokens.repository import com.tangem.domain.core.lce.LceFlow import com.tangem.domain.core.lce.lceFlow import com.tangem.domain.staking.model.* -import com.tangem.domain.staking.model.action.StakingAction -import com.tangem.domain.staking.model.action.StakingActionStatus -import com.tangem.domain.staking.model.action.StakingActionType -import com.tangem.domain.staking.model.transaction.* +import com.tangem.domain.staking.model.stakekit.action.StakingAction +import com.tangem.domain.staking.model.stakekit.action.StakingActionStatus +import com.tangem.domain.staking.model.stakekit.action.StakingActionType +import com.tangem.domain.staking.model.stakekit.* +import com.tangem.domain.staking.model.stakekit.transaction.* import com.tangem.domain.staking.repositories.StakingRepository import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.CryptoCurrencyAddress diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/InnerYieldBalanceState.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/InnerYieldBalanceState.kt index 4d5cfcff8a..b5a01e4cf9 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/InnerYieldBalanceState.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/InnerYieldBalanceState.kt @@ -1,7 +1,7 @@ package com.tangem.features.staking.impl.presentation.state import com.tangem.core.ui.extensions.TextReference -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import kotlinx.collections.immutable.ImmutableList import java.math.BigDecimal diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/ValidatorState.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/ValidatorState.kt index 0510d12380..7871149443 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/ValidatorState.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/ValidatorState.kt @@ -1,7 +1,7 @@ package com.tangem.features.staking.impl.presentation.state import androidx.compose.runtime.Immutable -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield @Immutable internal sealed class ValidatorState { diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt index e05f2dfcdf..c162e9df1f 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/RewardsValidatorStateConverter.kt @@ -4,10 +4,10 @@ import com.tangem.core.ui.extensions.* import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.BalanceItem -import com.tangem.domain.staking.model.BalanceType -import com.tangem.domain.staking.model.Yield -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.BalanceItem +import com.tangem.domain.staking.model.stakekit.BalanceType +import com.tangem.domain.staking.model.stakekit.Yield +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.features.staking.impl.R import com.tangem.features.staking.impl.presentation.state.BalanceState diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt index f6d436f3c3..dbecbf6274 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/converters/YieldBalancesConverter.kt @@ -7,7 +7,7 @@ import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.core.ui.utils.parseBigDecimal import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.* +import com.tangem.domain.staking.model.stakekit.* import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.features.staking.impl.R import com.tangem.features.staking.impl.presentation.state.BalanceGroupType diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ConfirmationStatePreviewData.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ConfirmationStatePreviewData.kt index 3d1e0fcebf..9bb95df370 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ConfirmationStatePreviewData.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/ConfirmationStatePreviewData.kt @@ -4,7 +4,7 @@ import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.AmountType.Coin import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.* import com.tangem.features.staking.impl.presentation.state.StakingNotification import com.tangem.features.staking.impl.presentation.state.StakingStates diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt index 2c9ac37b88..ce4bd5f41a 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/previewdata/InitialStakingStatePreview.kt @@ -1,7 +1,7 @@ package com.tangem.features.staking.impl.presentation.state.previewdata import com.tangem.core.ui.extensions.stringReference -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.* import kotlinx.collections.immutable.persistentListOf diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt index e9a6ec4c62..5c29ffcb0e 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/stub/StakingClickIntentsStub.kt @@ -1,6 +1,6 @@ package com.tangem.features.staking.impl.presentation.state.stub -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.BalanceState import com.tangem.features.staking.impl.presentation.state.transformers.InfoType import com.tangem.features.staking.impl.presentation.viewmodel.StakingClickIntents diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateAssentTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateAssentTransformer.kt index df4fc57ae3..7c540291b5 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateAssentTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateAssentTransformer.kt @@ -2,7 +2,7 @@ package com.tangem.features.staking.impl.presentation.state.transformers import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.features.staking.impl.presentation.state.FeeState import com.tangem.features.staking.impl.presentation.state.StakingStates diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateCompletedTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateCompletedTransformer.kt index f83c870fc6..fa8af0041e 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateCompletedTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateCompletedTransformer.kt @@ -3,7 +3,7 @@ package com.tangem.features.staking.impl.presentation.state.transformers import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.transaction.Fee import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.features.staking.impl.presentation.state.* import com.tangem.features.staking.impl.presentation.state.StakingStates diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateLoadingTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateLoadingTransformer.kt index 0b12d8b8f8..382738bb2f 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateLoadingTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetConfirmationStateLoadingTransformer.kt @@ -1,6 +1,6 @@ package com.tangem.features.staking.impl.presentation.state.transformers -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.* import com.tangem.features.staking.impl.presentation.state.StakingNotification import com.tangem.features.staking.impl.presentation.state.StakingStates diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt index c001927cd1..c361dcf147 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/SetInitialDataStateTransformer.kt @@ -10,8 +10,8 @@ import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.Yield -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.Yield +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.domain.wallets.models.UserWallet import com.tangem.features.staking.impl.R diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/validator/ValidatorSelectChangeTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/validator/ValidatorSelectChangeTransformer.kt index 714a89de67..273108e5b5 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/validator/ValidatorSelectChangeTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/validator/ValidatorSelectChangeTransformer.kt @@ -1,6 +1,6 @@ package com.tangem.features.staking.impl.presentation.state.transformers.validator -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.StakingStates import com.tangem.features.staking.impl.presentation.state.StakingUiState import com.tangem.features.staking.impl.presentation.state.ValidatorState diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingClickIntents.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingClickIntents.kt index 05d121258a..e2cb8c86da 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingClickIntents.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingClickIntents.kt @@ -1,7 +1,7 @@ package com.tangem.features.staking.impl.presentation.viewmodel import com.tangem.common.ui.amountScreen.AmountScreenClickIntents -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.features.staking.impl.presentation.state.BalanceState import com.tangem.features.staking.impl.presentation.state.transformers.InfoType diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingViewModel.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingViewModel.kt index c2b477f54b..0e182f302b 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingViewModel.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/viewmodel/StakingViewModel.kt @@ -15,10 +15,10 @@ import com.tangem.domain.appcurrency.GetSelectedAppCurrencyUseCase import com.tangem.domain.appcurrency.model.AppCurrency import com.tangem.domain.balancehiding.GetBalanceHidingSettingsUseCase import com.tangem.domain.staking.* -import com.tangem.domain.staking.model.Yield -import com.tangem.domain.staking.model.action.StakingActionCommonType -import com.tangem.domain.staking.model.transaction.ActionParams -import com.tangem.domain.staking.model.transaction.StakingGasEstimate +import com.tangem.domain.staking.model.stakekit.Yield +import com.tangem.domain.staking.model.stakekit.action.StakingActionCommonType +import com.tangem.domain.staking.model.stakekit.transaction.ActionParams +import com.tangem.domain.staking.model.stakekit.transaction.StakingGasEstimate import com.tangem.domain.tokens.GetCryptoCurrencyStatusSyncUseCase import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.tokens.model.CryptoCurrencyStatus diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt index c2ddee4828..30a598c8df 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt @@ -5,7 +5,7 @@ import com.tangem.common.routing.AppRoute import com.tangem.common.routing.AppRouter import com.tangem.core.navigation.share.ShareManager import com.tangem.core.navigation.url.UrlOpener -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.wallets.models.UserWalletId import com.tangem.feature.tokendetails.presentation.TokenDetailsFragment diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt index 7060190ec5..b7c55e065b 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt @@ -1,6 +1,6 @@ package com.tangem.feature.tokendetails.presentation.router -import com.tangem.domain.staking.model.Yield +import com.tangem.domain.staking.model.stakekit.Yield import com.tangem.domain.tokens.model.CryptoCurrency import com.tangem.domain.wallets.models.UserWalletId import com.tangem.features.tokendetails.navigation.TokenDetailsRouter diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt index 5f47f33ef5..b5b0f8a5c6 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsLoadedBalanceConverter.kt @@ -11,7 +11,7 @@ import com.tangem.core.ui.extensions.stringReference import com.tangem.core.ui.extensions.wrappedList import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.error.CurrencyStatusError import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.feature.tokendetails.presentation.tokendetails.state.BalanceType diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt index 512875fb4b..3d6080faba 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenDetailsStateFactory.kt @@ -19,7 +19,7 @@ import com.tangem.domain.card.NetworkHasDerivationUseCase import com.tangem.domain.common.CardTypesResolver import com.tangem.domain.staking.model.StakingAvailability import com.tangem.domain.staking.model.StakingEntryInfo -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.domain.tokens.error.CurrencyStatusError import com.tangem.domain.tokens.model.* import com.tangem.domain.tokens.model.warnings.CryptoCurrencyWarning diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenStakingStateConverter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenStakingStateConverter.kt index 6f3e41632f..3bc3e36023 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenStakingStateConverter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/state/factory/TokenStakingStateConverter.kt @@ -3,7 +3,7 @@ package com.tangem.feature.tokendetails.presentation.tokendetails.state.factory import arrow.core.Either import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.domain.staking.model.StakingEntryInfo -import com.tangem.domain.staking.model.StakingError +import com.tangem.domain.staking.model.stakekit.StakingError import com.tangem.feature.tokendetails.presentation.tokendetails.state.StakingBlockUM import com.tangem.feature.tokendetails.presentation.tokendetails.state.TokenDetailsState import com.tangem.feature.tokendetails.presentation.tokendetails.viewmodels.TokenDetailsClickIntents diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt index 32651bb309..d7639404cc 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/TokenItemStateConverter.kt @@ -5,7 +5,7 @@ import com.tangem.core.ui.components.marketprice.PriceChangeType import com.tangem.core.ui.components.marketprice.utils.PriceChangeConverter import com.tangem.core.ui.utils.BigDecimalFormatter import com.tangem.domain.appcurrency.model.AppCurrency -import com.tangem.domain.staking.model.YieldBalance +import com.tangem.domain.staking.model.stakekit.YieldBalance import com.tangem.domain.tokens.model.CryptoCurrencyStatus import com.tangem.feature.wallet.presentation.common.state.TokenItemState import com.tangem.feature.wallet.presentation.wallet.viewmodels.intents.WalletClickIntents