Updated on 2026-08-14
This commit is contained in:
parent
9c8bfd4139
commit
0896f80f53
30 changed files with 483 additions and 263 deletions
|
|
@ -4,6 +4,7 @@ import com.tangem.core.decompose.factory.ComponentFactory
|
|||
import com.tangem.core.ui.decompose.ComposableContentComponent
|
||||
import com.tangem.core.ui.extensions.TextReference
|
||||
import com.tangem.core.ui.extensions.resourceReference
|
||||
import com.tangem.domain.models.account.Account
|
||||
import com.tangem.domain.models.account.AccountStatus
|
||||
import com.tangem.domain.models.currency.CryptoCurrency
|
||||
import com.tangem.domain.models.currency.CryptoCurrencyStatus
|
||||
|
|
@ -23,14 +24,14 @@ internal interface ChooseTokenBridge {
|
|||
val onClose: Channel<Unit>
|
||||
|
||||
// todo swap legacy api, remove
|
||||
val onTokenSelected: Channel<Pair<String, ChooseTokenAnalyticsPayload.IsSearched>>
|
||||
val onTokenSelected: Channel<ChooseTokenResultOld>
|
||||
val onNewTokenAdded: Channel<Pair<CryptoCurrency, ChooseTokenAnalyticsPayload.IsSearched>>
|
||||
|
||||
val searchQueryState: StateFlow<String>
|
||||
val currenciesGroup: Flow<CurrenciesGroup>
|
||||
|
||||
fun onTokenSelected(tokenId: Pair<String, ChooseTokenAnalyticsPayload.IsSearched>) {
|
||||
onTokenSelected.trySend(tokenId)
|
||||
fun onTokenSelected(result: ChooseTokenResultOld) {
|
||||
onTokenSelected.trySend(result)
|
||||
onSearchQuery("")
|
||||
}
|
||||
|
||||
|
|
@ -57,6 +58,12 @@ internal interface ChooseTokenBridge {
|
|||
}
|
||||
}
|
||||
|
||||
data class ChooseTokenResultOld(
|
||||
val cryptoCurrencyStatus: CryptoCurrencyStatus,
|
||||
val account: Account,
|
||||
val isSearched: Boolean,
|
||||
)
|
||||
|
||||
data class ChooseTokenResult(
|
||||
val currency: CryptoCurrencyStatus,
|
||||
val account: AccountStatus,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.tangem.domain.models.currency.CryptoCurrency
|
|||
import com.tangem.feature.swap.choosetoken.api.ChooseTokenAnalyticsPayload
|
||||
import com.tangem.feature.swap.choosetoken.api.ChooseTokenBridge
|
||||
import com.tangem.feature.swap.choosetoken.api.ChooseTokenResult
|
||||
import com.tangem.feature.swap.choosetoken.api.ChooseTokenResultOld
|
||||
import com.tangem.feature.swap.choosetoken.impl.model.ChooseTokenModel.Companion.DEBOUNCE_SEARCH_DELAY
|
||||
import com.tangem.feature.swap.domain.models.ui.CurrenciesGroup
|
||||
import dagger.assisted.Assisted
|
||||
|
|
@ -19,7 +20,7 @@ internal class DefaultChooseTokenBridge @AssistedInject constructor(
|
|||
|
||||
override val onCurrencyChosen: Channel<ChooseTokenResult> = Channel()
|
||||
|
||||
override val onTokenSelected: Channel<Pair<String, ChooseTokenAnalyticsPayload.IsSearched>> = Channel()
|
||||
override val onTokenSelected: Channel<ChooseTokenResultOld> = Channel()
|
||||
override val onNewTokenAdded: Channel<Pair<CryptoCurrency, ChooseTokenAnalyticsPayload.IsSearched>> = Channel()
|
||||
override val onClose: Channel<Unit> = Channel()
|
||||
|
||||
|
|
|
|||
|
|
@ -116,10 +116,13 @@ internal class ChooseTokenModel @Inject constructor(
|
|||
|
||||
TokensDataConverter(
|
||||
onSearchEntered = { query -> bridge.onSearchQuery(query) },
|
||||
onTokenClick = { tokenId ->
|
||||
val selected = tokenId to ChooseTokenAnalyticsPayload
|
||||
.IsSearched(isSearchingState)
|
||||
bridge.onTokenSelected(selected)
|
||||
onTokenClick = { account, cryptoCurrencyStatus ->
|
||||
val result = ChooseTokenResultOld(
|
||||
account = account,
|
||||
cryptoCurrencyStatus = cryptoCurrencyStatus,
|
||||
isSearched = searchQueryState.value.isNotEmpty(),
|
||||
)
|
||||
bridge.onTokenSelected(result)
|
||||
},
|
||||
onAccountClick = { account ->
|
||||
expandedAccountsFlow.update { expandedList ->
|
||||
|
|
|
|||
|
|
@ -2,15 +2,21 @@ package com.tangem.feature.swap.converters
|
|||
|
||||
import com.tangem.common.getTotalCryptoAmount
|
||||
import com.tangem.common.getTotalFiatAmount
|
||||
import com.tangem.common.ui.R
|
||||
import com.tangem.common.ui.account.AccountCryptoPortfolioItemStateConverter
|
||||
import com.tangem.common.ui.account.TokensListPortfolioItemConverter
|
||||
import com.tangem.common.ui.account.toUM
|
||||
import com.tangem.common.ui.tokens.TokenItemStateConverter
|
||||
import com.tangem.common.ui.tokens.TokenItemStateConverter.Companion.isFlickering
|
||||
import com.tangem.core.ui.components.currency.icon.CurrencyIconState
|
||||
import com.tangem.core.ui.components.currency.icon.converter.CryptoCurrencyToIconStateConverter
|
||||
import com.tangem.core.ui.components.token.state.TokenItemState
|
||||
import com.tangem.core.ui.components.token.state.TokenItemState.FiatAmountState
|
||||
import com.tangem.core.ui.components.tokenlist.state.TokensListItemUM
|
||||
import com.tangem.core.ui.extensions.TextReference
|
||||
import com.tangem.core.ui.extensions.pluralReference
|
||||
import com.tangem.core.ui.extensions.stringReference
|
||||
import com.tangem.core.ui.extensions.wrappedList
|
||||
import com.tangem.core.ui.format.bigdecimal.crypto
|
||||
import com.tangem.core.ui.format.bigdecimal.fiat
|
||||
import com.tangem.core.ui.format.bigdecimal.format
|
||||
|
|
@ -29,34 +35,68 @@ internal class AccountTokenItemConverter(
|
|||
private val appCurrency: AppCurrency,
|
||||
private val unavailableErrorText: TextReference,
|
||||
private val expandedAccounts: Map<AccountId, Boolean>,
|
||||
private val onTokenItemClick: (String) -> Unit,
|
||||
private val onAccountItemClick: (Account.CryptoPortfolio) -> Unit,
|
||||
private val onTokenItemClick: (Account, CryptoCurrencyStatus) -> Unit,
|
||||
private val onAccountItemClick: (Account) -> Unit,
|
||||
) : Converter<AccountSwapAvailability, TokensListItemUM.Portfolio> {
|
||||
|
||||
override fun convert(value: AccountSwapAvailability): TokensListItemUM.Portfolio {
|
||||
return TokensListPortfolioItemConverter(
|
||||
tokenItemUM = AccountCryptoPortfolioItemStateConverter(
|
||||
val headerTokenItemState = when (val account = value.account) {
|
||||
is Account.CryptoPortfolio -> AccountCryptoPortfolioItemStateConverter(
|
||||
appCurrency = appCurrency,
|
||||
account = value.account.copy(
|
||||
cryptoCurrencies = value.currencyList.map { it.cryptoCurrencyStatus.currency },
|
||||
),
|
||||
account = account.copy(cryptoCurrencies = value.currencyList.map { it.cryptoCurrencyStatus.currency }),
|
||||
onItemClick = onAccountItemClick,
|
||||
).convert(
|
||||
TotalFiatBalance.Loaded(
|
||||
amount = value.currencyList.sumOf { it.cryptoCurrencyStatus.value.fiatAmount.orZero() },
|
||||
source = StatusSource.ONLY_CACHE,
|
||||
),
|
||||
),
|
||||
)
|
||||
is Account.Payment -> createPaymentAccountHeaderState(value)
|
||||
}
|
||||
return TokensListPortfolioItemConverter(
|
||||
tokenItemUM = headerTokenItemState,
|
||||
isExpanded = expandedAccounts[value.account.accountId] != false,
|
||||
isCollapsable = true,
|
||||
tokens = value.currencyList.map { accountSwapCurrency ->
|
||||
createAvailableItemConverter()
|
||||
createAvailableItemConverter(value.account)
|
||||
.convert(accountSwapCurrency.cryptoCurrencyStatus)
|
||||
}.map(TokensListItemUM::Token).toPersistentList(),
|
||||
).convert(Unit)
|
||||
}
|
||||
|
||||
fun createAvailableItemConverter(): TokenItemStateConverter {
|
||||
private fun createPaymentAccountHeaderState(accountSwapAvailability: AccountSwapAvailability): TokenItemState {
|
||||
val account = accountSwapAvailability.account
|
||||
val tokensCount = accountSwapAvailability.currencyList.size
|
||||
val fiatBalance =
|
||||
accountSwapAvailability.currencyList.sumOf { it.cryptoCurrencyStatus.value.fiatAmount.orZero() }
|
||||
return TokenItemState.Content(
|
||||
id = account.accountId.value,
|
||||
iconState = CurrencyIconState.PaymentAccount(),
|
||||
titleState = TokenItemState.TitleState.Content(text = account.accountName.toUM().value),
|
||||
subtitleState = TokenItemState.SubtitleState.TextContent(
|
||||
value = pluralReference(
|
||||
R.plurals.common_tokens_count,
|
||||
count = tokensCount,
|
||||
formatArgs = wrappedList(tokensCount),
|
||||
),
|
||||
isAvailable = false,
|
||||
),
|
||||
onItemClick = { onAccountItemClick(account) },
|
||||
fiatAmountState = FiatAmountState.Content(
|
||||
text = fiatBalance.format {
|
||||
fiat(
|
||||
fiatCurrencyCode = appCurrency.code,
|
||||
fiatCurrencySymbol = appCurrency.symbol,
|
||||
)
|
||||
},
|
||||
isFlickering = false,
|
||||
),
|
||||
subtitle2State = null,
|
||||
onItemLongClick = null,
|
||||
)
|
||||
}
|
||||
|
||||
fun createAvailableItemConverter(account: Account): TokenItemStateConverter {
|
||||
return TokenItemStateConverter(
|
||||
appCurrency = appCurrency,
|
||||
subtitleStateProvider = { status ->
|
||||
|
|
@ -70,7 +110,7 @@ internal class AccountTokenItemConverter(
|
|||
fiatAmountStateProvider = {
|
||||
createFiatAmountStateProvider(status = it, appCurrency = appCurrency, isAvailable = true)
|
||||
},
|
||||
onItemClick = { account, currencyStatus -> onTokenItemClick(currencyStatus.currency.id.value) },
|
||||
onItemClick = { _, currencyStatus -> onTokenItemClick(account, currencyStatus) },
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.tangem.core.ui.extensions.resourceReference
|
|||
import com.tangem.domain.appcurrency.model.AppCurrency
|
||||
import com.tangem.domain.models.account.Account
|
||||
import com.tangem.domain.models.account.AccountId
|
||||
import com.tangem.domain.models.currency.CryptoCurrencyStatus
|
||||
import com.tangem.feature.swap.domain.models.ui.CurrenciesGroup
|
||||
import com.tangem.feature.swap.models.SwapSelectTokenStateHolder
|
||||
import com.tangem.feature.swap.models.TokenListUMData
|
||||
|
|
@ -16,10 +17,10 @@ import kotlinx.collections.immutable.toPersistentList
|
|||
|
||||
@Suppress("LongParameterList")
|
||||
internal class TokensDataConverter(
|
||||
private val onSearchEntered: (String) -> Unit,
|
||||
onTokenClick: (String) -> Unit,
|
||||
onAccountClick: (Account.CryptoPortfolio) -> Unit,
|
||||
onTokenClick: (Account, CryptoCurrencyStatus) -> Unit,
|
||||
onAccountClick: (Account) -> Unit,
|
||||
private val expandedAccounts: Map<AccountId, Boolean>,
|
||||
private val onSearchEntered: (String) -> Unit,
|
||||
private val tokensDataState: CurrenciesGroup,
|
||||
private val isBalanceHidden: Boolean,
|
||||
private val isAccountsMode: Boolean,
|
||||
|
|
@ -52,7 +53,7 @@ internal class TokensDataConverter(
|
|||
} else {
|
||||
val tokensList = accountList.flatMap { (_, currencyList) ->
|
||||
currencyList.asSequence().map { accountSwapCurrency ->
|
||||
accountListItemConverter.createAvailableItemConverter()
|
||||
accountListItemConverter.createAvailableItemConverter(accountSwapCurrency.account)
|
||||
.convert(accountSwapCurrency.cryptoCurrencyStatus)
|
||||
}.map(TokensListItemUM::Token).toPersistentList()
|
||||
}.toPersistentList()
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ import com.tangem.core.ui.message.EventMessageAction
|
|||
import com.tangem.core.ui.utils.InputNumberFormatter
|
||||
import com.tangem.core.ui.utils.parseBigDecimal
|
||||
import com.tangem.datasource.local.appsflyer.AppsFlyerStore
|
||||
import com.tangem.domain.account.status.model.AccountCryptoCurrencyStatus
|
||||
import com.tangem.domain.account.status.supplier.SingleAccountStatusListSupplier
|
||||
import com.tangem.domain.account.status.usecase.GetAccountCurrencyStatusUseCase
|
||||
import com.tangem.domain.account.status.usecase.GetFeePaidCryptoCurrencyStatusSyncUseCase
|
||||
|
|
@ -49,12 +48,14 @@ import com.tangem.domain.feedback.SendFeedbackEmailUseCase
|
|||
import com.tangem.domain.feedback.models.BlockchainErrorInfo
|
||||
import com.tangem.domain.feedback.models.FeedbackEmailType
|
||||
import com.tangem.domain.models.account.Account
|
||||
import com.tangem.domain.models.account.derivationIndex
|
||||
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.models.wallet.UserWalletId
|
||||
import com.tangem.domain.models.wallet.isHotWallet
|
||||
import com.tangem.domain.pay.WithdrawalResult
|
||||
import com.tangem.domain.pay.usecase.GetPaymentAccountCryptoCurrencyStatusUseCase
|
||||
import com.tangem.domain.promo.ShouldShowStoriesUseCase
|
||||
import com.tangem.domain.promo.models.StoryContentIds
|
||||
import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
|
||||
|
|
@ -144,6 +145,7 @@ internal class SwapModel @Inject constructor(
|
|||
private val appsFlyerStore: AppsFlyerStore,
|
||||
private val holdToConfirmButtonFeatureToggles: HoldToConfirmButtonFeatureToggles,
|
||||
private val messageSender: UiMessageSender,
|
||||
private val paymentAccountCryptoCurrencyStatusUseCase: GetPaymentAccountCryptoCurrencyStatusUseCase,
|
||||
chooseTokenBridgeFactory: ChooseTokenBridge.Factory,
|
||||
giveApprovalFeatureToggles: GiveApprovalFeatureToggles,
|
||||
) : Model() {
|
||||
|
|
@ -219,8 +221,10 @@ internal class SwapModel @Inject constructor(
|
|||
private val swapRouter: SwapRouter = SwapRouter(router = router)
|
||||
private var userCountry: UserCountry? = null
|
||||
|
||||
private var fromAccountCurrencyStatus: AccountCryptoCurrencyStatus? = null
|
||||
private var toAccountCurrencyStatus: AccountCryptoCurrencyStatus? = null
|
||||
private var fromAccount: Account? = null
|
||||
private var toAccount: Account? = null
|
||||
private var fromAccountStatus: CryptoCurrencyStatus? = null
|
||||
private var toAccountStatus: CryptoCurrencyStatus? = null
|
||||
|
||||
/**
|
||||
* If user came from Tangem Pay -> fromAccountCurrencyStatus == null
|
||||
|
|
@ -286,8 +290,12 @@ internal class SwapModel @Inject constructor(
|
|||
.launchIn(modelScope)
|
||||
|
||||
chooseTokenBridge.onTokenSelected.receiveAsFlow()
|
||||
.onEach { (addedToken, isSearched) ->
|
||||
onTokenSelect(addedToken, isSearched.value)
|
||||
.onEach { result ->
|
||||
onTokenSelect(
|
||||
account = result.account,
|
||||
cryptoCurrencyStatus = result.cryptoCurrencyStatus,
|
||||
isSearched = result.isSearched,
|
||||
)
|
||||
}
|
||||
.launchIn(modelScope)
|
||||
|
||||
|
|
@ -322,22 +330,31 @@ internal class SwapModel @Inject constructor(
|
|||
userWalletId = userWalletId,
|
||||
currency = initialCurrencyFrom,
|
||||
).getOrNull()
|
||||
val fromPaymentAccountStatus =
|
||||
paymentAccountCryptoCurrencyStatusUseCase(userWalletId, initialCurrencyFrom).getOrNull()
|
||||
val toAccountStatus = initialCurrencyTo?.let { currencyTo ->
|
||||
getAccountCurrencyStatusUseCase.invokeSync(
|
||||
userWalletId = userWalletId,
|
||||
currency = currencyTo,
|
||||
).getOrNull()
|
||||
}
|
||||
val toPaymentAccountStatus = initialCurrencyTo?.let { currencyTo ->
|
||||
paymentAccountCryptoCurrencyStatusUseCase(userWalletId, currencyTo).getOrNull()
|
||||
}
|
||||
val fromAccount = fromAccountStatus?.account ?: fromPaymentAccountStatus?.first
|
||||
val fromStatus = fromAccountStatus?.status ?: fromPaymentAccountStatus?.second
|
||||
|
||||
if (fromAccountStatus == null) {
|
||||
if (fromAccount != null && fromStatus != null) {
|
||||
this@SwapModel.fromAccount = fromAccount
|
||||
this@SwapModel.fromAccountStatus = fromStatus
|
||||
this@SwapModel.toAccount = toAccountStatus?.account ?: toPaymentAccountStatus?.first
|
||||
this@SwapModel.toAccountStatus = toAccountStatus?.status ?: toPaymentAccountStatus?.second
|
||||
this@SwapModel.initialFromStatus = fromStatus
|
||||
this@SwapModel.initialToStatus = toAccountStatus?.status ?: toPaymentAccountStatus?.second
|
||||
initTokens(isInitiallyReversed)
|
||||
} else {
|
||||
showAlert()
|
||||
swapRouter.back()
|
||||
} else {
|
||||
fromAccountCurrencyStatus = fromAccountStatus
|
||||
toAccountCurrencyStatus = toAccountStatus
|
||||
initialFromStatus = fromAccountStatus.status
|
||||
initialToStatus = toAccountStatus?.status
|
||||
initTokens(isInitiallyReversed)
|
||||
}
|
||||
} else {
|
||||
val fromStatus = getFromStatus()
|
||||
|
|
@ -405,7 +422,7 @@ internal class SwapModel @Inject constructor(
|
|||
updateTokensState(state)
|
||||
|
||||
val (selectedCurrency, selectedAccount) = run {
|
||||
var selectedAccountCurrency = toAccountCurrencyStatus
|
||||
var selectedAccountCurrency = toAccountStatus
|
||||
|
||||
if (selectedAccountCurrency == null) {
|
||||
val amountSwapCurrency = swapInteractor.getInitialCurrencyToSwap(
|
||||
|
|
@ -415,14 +432,11 @@ internal class SwapModel @Inject constructor(
|
|||
)
|
||||
|
||||
if (amountSwapCurrency != null) {
|
||||
selectedAccountCurrency = AccountCryptoCurrencyStatus(
|
||||
account = amountSwapCurrency.account,
|
||||
status = amountSwapCurrency.cryptoCurrencyStatus,
|
||||
)
|
||||
selectedAccountCurrency = amountSwapCurrency.cryptoCurrencyStatus
|
||||
}
|
||||
}
|
||||
|
||||
selectedAccountCurrency?.status to selectedAccountCurrency?.account
|
||||
selectedAccountCurrency to toAccount
|
||||
}
|
||||
|
||||
val isApplied = applyInitialTokenChoice(
|
||||
|
|
@ -534,7 +548,7 @@ internal class SwapModel @Inject constructor(
|
|||
private fun applyInitialTokenChoice(
|
||||
state: TokensDataStateExpress,
|
||||
selectedCurrency: CryptoCurrencyStatus?,
|
||||
selectedAccount: Account.CryptoPortfolio?,
|
||||
selectedAccount: Account?,
|
||||
isReverseFromTo: Boolean,
|
||||
): Boolean {
|
||||
// exceptional case
|
||||
|
|
@ -555,9 +569,9 @@ internal class SwapModel @Inject constructor(
|
|||
}
|
||||
val (fromAccount, toAccount) = if (canUseFromAccountCurrencyStatus) {
|
||||
if (isOrderReversed.value) {
|
||||
selectedAccount to requireNotNull(fromAccountCurrencyStatus).account
|
||||
selectedAccount to fromAccount
|
||||
} else {
|
||||
requireNotNull(fromAccountCurrencyStatus).account to selectedAccount
|
||||
fromAccount to selectedAccount
|
||||
}
|
||||
} else {
|
||||
null to null
|
||||
|
|
@ -600,9 +614,9 @@ internal class SwapModel @Inject constructor(
|
|||
|
||||
private fun startLoadingQuotes(
|
||||
fromToken: CryptoCurrencyStatus,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
toToken: CryptoCurrencyStatus,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account?,
|
||||
amount: String,
|
||||
reduceBalanceBy: BigDecimal,
|
||||
toProvidersList: List<SwapProvider>,
|
||||
|
|
@ -673,9 +687,9 @@ internal class SwapModel @Inject constructor(
|
|||
|
||||
private fun loadQuotesTask(
|
||||
fromToken: CryptoCurrencyStatus,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
toToken: CryptoCurrencyStatus,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account?,
|
||||
amount: String,
|
||||
reduceBalanceBy: BigDecimal,
|
||||
toProvidersList: List<SwapProvider>,
|
||||
|
|
@ -777,7 +791,7 @@ internal class SwapModel @Inject constructor(
|
|||
selectedFeeType = (getSelectedFee() as? TxFee.Legacy)?.feeType ?: FeeType.NORMAL,
|
||||
isReverseSwapPossible = isReverseSwapPossible(),
|
||||
needApplyFCARestrictions = userCountry.needApplyFCARestrictions(),
|
||||
hideFee = tangemPayInput?.isWithdrawal == true,
|
||||
hideFee = isTangemPayWithdrawal(),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -971,8 +985,9 @@ internal class SwapModel @Inject constructor(
|
|||
}
|
||||
val fromCurrency = requireNotNull(dataState.fromCryptoCurrency)
|
||||
val fee = getSelectedFee()
|
||||
val isTangemPayWithdrawal = isTangemPayWithdrawal()
|
||||
|
||||
if (fee == null && tangemPayInput?.isWithdrawal != true) {
|
||||
if (fee == null && !isTangemPayWithdrawal) {
|
||||
TangemLogger.e("onSwapClick: fee is null and isWithdrawal is ${tangemPayInput?.isWithdrawal}")
|
||||
showAlert(resourceReference(R.string.swapping_fee_estimation_error_text))
|
||||
modelScope.launch {
|
||||
|
|
@ -994,7 +1009,7 @@ internal class SwapModel @Inject constructor(
|
|||
includeFeeInAmount = lastLoadedQuotesState.preparedSwapConfigState.includeFeeInAmount,
|
||||
fee = fee,
|
||||
expressOperationType = ExpressOperationType.SWAP,
|
||||
isTangemPayWithdrawal = tangemPayInput?.isWithdrawal == true,
|
||||
isTangemPayWithdrawal = isTangemPayWithdrawal,
|
||||
)
|
||||
}.onSuccess { swapTransactionState ->
|
||||
when (swapTransactionState) {
|
||||
|
|
@ -1252,11 +1267,12 @@ internal class SwapModel @Inject constructor(
|
|||
}
|
||||
|
||||
@Suppress("LongMethod")
|
||||
private fun onTokenSelect(id: String, isSearched: Boolean) {
|
||||
private fun onTokenSelect(account: Account, cryptoCurrencyStatus: CryptoCurrencyStatus, isSearched: Boolean) {
|
||||
val tokens = dataState.tokensDataState ?: return
|
||||
val (foundToken, foundAccount) = getSelectedTokenAndAccount(tokens, id)
|
||||
val foundToken = cryptoCurrencyStatus
|
||||
val foundAccount = account
|
||||
|
||||
foundToken?.currency?.symbol?.let { symbol ->
|
||||
foundToken.currency.symbol.let { symbol ->
|
||||
analyticsEventHandler.send(
|
||||
SwapEvents.ChooseTokenScreenResult(isTokenChosen = true, token = symbol),
|
||||
)
|
||||
|
|
@ -1270,108 +1286,90 @@ internal class SwapModel @Inject constructor(
|
|||
)
|
||||
}
|
||||
|
||||
if (foundToken != null) {
|
||||
val fromToken: CryptoCurrencyStatus
|
||||
val fromAccount: Account.CryptoPortfolio?
|
||||
val toToken: CryptoCurrencyStatus
|
||||
val toAccount: Account.CryptoPortfolio?
|
||||
if (isOrderReversed.value) {
|
||||
fromToken = foundToken
|
||||
fromAccount = foundAccount
|
||||
toToken = initialFromStatus
|
||||
toAccount = fromAccountCurrencyStatus?.account
|
||||
val fromToken: CryptoCurrencyStatus
|
||||
val fromAccount: Account?
|
||||
val toToken: CryptoCurrencyStatus
|
||||
val toAccount: Account?
|
||||
if (isOrderReversed.value) {
|
||||
fromToken = foundToken
|
||||
fromAccount = foundAccount
|
||||
toToken = initialFromStatus
|
||||
toAccount = this.fromAccount
|
||||
|
||||
val newToken = fromToken.currency as? CryptoCurrency.Coin
|
||||
if (newToken != null) {
|
||||
subscribeToCoinBalanceUpdates(
|
||||
userWalletId = userWalletId,
|
||||
coin = newToken,
|
||||
isFromCurrency = true,
|
||||
)
|
||||
} else {
|
||||
fromTokenBalanceJobHolder.cancel()
|
||||
}
|
||||
val newToken = fromToken.currency as? CryptoCurrency.Coin
|
||||
if (newToken != null) {
|
||||
subscribeToCoinBalanceUpdates(
|
||||
userWalletId = userWalletId,
|
||||
coin = newToken,
|
||||
isFromCurrency = true,
|
||||
)
|
||||
} else {
|
||||
fromToken = initialFromStatus
|
||||
fromAccount = fromAccountCurrencyStatus?.account
|
||||
toToken = foundToken
|
||||
toAccount = foundAccount
|
||||
|
||||
val newToken = toToken.currency as? CryptoCurrency.Coin
|
||||
if (newToken != null) {
|
||||
subscribeToCoinBalanceUpdates(
|
||||
userWalletId = userWalletId,
|
||||
coin = newToken,
|
||||
isFromCurrency = false,
|
||||
)
|
||||
} else {
|
||||
toTokenBalanceJobHolder.cancel()
|
||||
}
|
||||
fromTokenBalanceJobHolder.cancel()
|
||||
}
|
||||
|
||||
if (dataState.fromCryptoCurrency != null && dataState.tokensDataState != null) {
|
||||
isAmountChangedByUser = true
|
||||
}
|
||||
|
||||
dataState = dataState.copy(
|
||||
fromCryptoCurrency = fromToken,
|
||||
fromAccount = fromAccount,
|
||||
toCryptoCurrency = toToken,
|
||||
toAccount = toAccount,
|
||||
selectedProvider = null,
|
||||
)
|
||||
swapRouter.openScreen(SwapNavScreen.Main)
|
||||
if (handleSwapNotSupported(
|
||||
state = tokens,
|
||||
fromToken = fromToken,
|
||||
toToken = toToken,
|
||||
fromAccount = fromAccount,
|
||||
toAccount = toAccount,
|
||||
)
|
||||
) {
|
||||
return
|
||||
}
|
||||
modelScope.launch {
|
||||
TangemLogger.i(
|
||||
"updateFeePaidCryptoCurrencyFor: id = ${fromToken.currency.id}, " +
|
||||
"isOrderReversed: ${isOrderReversed.value}",
|
||||
)
|
||||
if ((uiState.sendCardData as? SwapCardState.SwapCardData)?.type is TransactionCardType.ReadOnly) {
|
||||
uiState = stateBuilder.createInitialLoadingState(
|
||||
initialCurrencyFrom = fromToken.currency,
|
||||
initialCurrencyTo = toToken.currency,
|
||||
fromNetworkInfo = fromToken.currency.getNetworkInfo(),
|
||||
)
|
||||
}
|
||||
updateFeePaidCryptoCurrencyFor(fromToken)
|
||||
startLoadingQuotes(
|
||||
fromToken = fromToken,
|
||||
fromAccount = fromAccount,
|
||||
toToken = toToken,
|
||||
toAccount = toAccount,
|
||||
amount = lastAmount.value,
|
||||
reduceBalanceBy = lastReducedBalanceBy.value,
|
||||
toProvidersList = findSwapProviders(fromToken, toToken),
|
||||
)
|
||||
}
|
||||
updateTokensState(tokens)
|
||||
}
|
||||
}
|
||||
|
||||
private fun getSelectedTokenAndAccount(
|
||||
tokens: TokensDataStateExpress,
|
||||
id: String,
|
||||
): Pair<CryptoCurrencyStatus?, Account.CryptoPortfolio?> {
|
||||
val accountCryptoCurrencyStatus = if (isOrderReversed.value) {
|
||||
tokens.fromGroup
|
||||
} else {
|
||||
tokens.toGroup
|
||||
}.accountCurrencyList.firstNotNullOfOrNull { accountSwapAvailability ->
|
||||
accountSwapAvailability.currencyList.firstOrNull { accountSwapCurrency ->
|
||||
accountSwapCurrency.cryptoCurrencyStatus.currency.id.value == id
|
||||
fromToken = initialFromStatus
|
||||
fromAccount = this.fromAccount
|
||||
toToken = foundToken
|
||||
toAccount = foundAccount
|
||||
|
||||
val newToken = toToken.currency as? CryptoCurrency.Coin
|
||||
if (newToken != null) {
|
||||
subscribeToCoinBalanceUpdates(
|
||||
userWalletId = userWalletId,
|
||||
coin = newToken,
|
||||
isFromCurrency = false,
|
||||
)
|
||||
} else {
|
||||
toTokenBalanceJobHolder.cancel()
|
||||
}
|
||||
}
|
||||
return accountCryptoCurrencyStatus?.cryptoCurrencyStatus to accountCryptoCurrencyStatus?.account
|
||||
|
||||
if (dataState.fromCryptoCurrency != null && dataState.tokensDataState != null) {
|
||||
isAmountChangedByUser = true
|
||||
}
|
||||
|
||||
dataState = dataState.copy(
|
||||
fromCryptoCurrency = fromToken,
|
||||
fromAccount = fromAccount,
|
||||
toCryptoCurrency = toToken,
|
||||
toAccount = toAccount,
|
||||
selectedProvider = null,
|
||||
)
|
||||
swapRouter.openScreen(SwapNavScreen.Main)
|
||||
if (handleSwapNotSupported(
|
||||
state = tokens,
|
||||
fromToken = fromToken,
|
||||
toToken = toToken,
|
||||
fromAccount = fromAccount,
|
||||
toAccount = toAccount,
|
||||
)
|
||||
) {
|
||||
return
|
||||
}
|
||||
modelScope.launch {
|
||||
TangemLogger.i(
|
||||
"updateFeePaidCryptoCurrencyFor: id = ${fromToken.currency.id}, " +
|
||||
"isOrderReversed: ${isOrderReversed.value}",
|
||||
)
|
||||
if ((uiState.sendCardData as? SwapCardState.SwapCardData)?.type is TransactionCardType.ReadOnly) {
|
||||
uiState = stateBuilder.createInitialLoadingState(
|
||||
initialCurrencyFrom = fromToken.currency,
|
||||
initialCurrencyTo = toToken.currency,
|
||||
fromNetworkInfo = fromToken.currency.getNetworkInfo(),
|
||||
)
|
||||
}
|
||||
updateFeePaidCryptoCurrencyFor(fromToken)
|
||||
startLoadingQuotes(
|
||||
fromToken = fromToken,
|
||||
fromAccount = fromAccount,
|
||||
toToken = toToken,
|
||||
toAccount = toAccount,
|
||||
amount = lastAmount.value,
|
||||
reduceBalanceBy = lastReducedBalanceBy.value,
|
||||
toProvidersList = findSwapProviders(fromToken, toToken),
|
||||
)
|
||||
}
|
||||
updateTokensState(tokens)
|
||||
}
|
||||
|
||||
@Suppress("LongMethod", "CyclomaticComplexMethod")
|
||||
|
|
@ -1923,8 +1921,8 @@ internal class SwapModel @Inject constructor(
|
|||
state: TokensDataStateExpress,
|
||||
fromToken: CryptoCurrencyStatus,
|
||||
toToken: CryptoCurrencyStatus,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
toAccount: Account?,
|
||||
): Boolean {
|
||||
val selectedCurrency = if (isOrderReversed.value) fromToken else toToken
|
||||
if (isTokenAvailableForSwap(state, selectedCurrency, isOrderReversed.value)) return false
|
||||
|
|
@ -1972,8 +1970,12 @@ internal class SwapModel @Inject constructor(
|
|||
}
|
||||
}
|
||||
|
||||
private fun isTangemPayWithdrawal(): Boolean {
|
||||
return tangemPayInput?.isWithdrawal == true || dataState.fromAccount is Account.Payment
|
||||
}
|
||||
|
||||
private fun List<SwapProvider>.filterForTangemPayWithdrawal(): List<SwapProvider> {
|
||||
return if (tangemPayInput?.isWithdrawal == true) {
|
||||
return if (isTangemPayWithdrawal()) {
|
||||
filter { it.type == ExchangeProviderType.CEX }
|
||||
} else {
|
||||
this
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ data class SwapProcessDataState(
|
|||
val fromCryptoCurrency: CryptoCurrencyStatus? = null,
|
||||
val toCryptoCurrency: CryptoCurrencyStatus? = null,
|
||||
val feePaidCryptoCurrency: CryptoCurrencyStatus? = null,
|
||||
val fromAccount: Account.CryptoPortfolio? = null,
|
||||
val toAccount: Account.CryptoPortfolio? = null,
|
||||
val fromAccount: Account? = null,
|
||||
val toAccount: Account? = null,
|
||||
// Amount from input
|
||||
val amount: String? = null,
|
||||
val reduceBalanceBy: BigDecimal = BigDecimal.ZERO,
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.tangem.feature.swap.ui
|
|||
import androidx.compose.ui.text.SpanStyle
|
||||
import androidx.compose.ui.text.TextRange
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import com.tangem.common.ui.account.AccountIconUM
|
||||
import com.tangem.common.ui.account.AccountTitleUM
|
||||
import com.tangem.common.ui.account.CryptoPortfolioIconConverter
|
||||
import com.tangem.common.ui.account.toUM
|
||||
|
|
@ -177,8 +178,8 @@ internal class StateBuilder(
|
|||
uiStateHolder: SwapStateHolder,
|
||||
fromToken: CryptoCurrencyStatus,
|
||||
toToken: CryptoCurrencyStatus,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
toAccount: Account?,
|
||||
mainTokenId: String,
|
||||
): SwapStateHolder {
|
||||
val canSelectSendToken = mainTokenId != fromToken.currency.id.value
|
||||
|
|
@ -241,8 +242,8 @@ internal class StateBuilder(
|
|||
fromToken: CryptoCurrency,
|
||||
toToken: CryptoCurrency,
|
||||
mainTokenId: String,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
toAccount: Account?,
|
||||
): SwapStateHolder {
|
||||
val canSelectSendToken = mainTokenId != fromToken.id.value
|
||||
val canSelectReceiveToken = mainTokenId != toToken.id.value
|
||||
|
|
@ -501,7 +502,7 @@ internal class StateBuilder(
|
|||
swapProvider: SwapProvider,
|
||||
fromToken: TokenSwapInfo,
|
||||
toToken: CryptoCurrencyStatus?,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account?,
|
||||
includeFeeInAmount: IncludeFeeInAmount,
|
||||
expressDataError: ExpressDataError,
|
||||
isReverseSwapPossible: Boolean,
|
||||
|
|
@ -618,7 +619,7 @@ internal class StateBuilder(
|
|||
emptyAmountState: SwapState.EmptyAmountState,
|
||||
fromTokenStatus: CryptoCurrencyStatus,
|
||||
toTokenStatus: CryptoCurrencyStatus?,
|
||||
toAccount: Account.CryptoPortfolio?,
|
||||
toAccount: Account?,
|
||||
isReverseSwapPossible: Boolean,
|
||||
): SwapStateHolder {
|
||||
if (uiStateHolder.sendCardData !is SwapCardState.SwapCardData) return uiStateHolder
|
||||
|
|
@ -693,7 +694,7 @@ internal class StateBuilder(
|
|||
amountFormatted: String,
|
||||
amountRaw: String,
|
||||
fromToken: CryptoCurrency,
|
||||
fromAccount: Account.CryptoPortfolio?,
|
||||
fromAccount: Account?,
|
||||
minTxAmount: BigDecimal?,
|
||||
): SwapStateHolder {
|
||||
if (uiState.sendCardData !is SwapCardState.SwapCardData) return uiState
|
||||
|
|
@ -1327,30 +1328,37 @@ internal class StateBuilder(
|
|||
return FCA_RESTRICTED_PROVIDER_IDS.contains(providerId)
|
||||
}
|
||||
|
||||
private fun getFromCardAccountTitle(fromAccount: Account.CryptoPortfolio?): AccountTitleUM {
|
||||
private fun getFromCardAccountTitle(fromAccount: Account?): AccountTitleUM {
|
||||
return if (fromAccount != null && isAccountsModeProvider()) {
|
||||
AccountTitleUM.Account(
|
||||
prefixText = resourceReference(R.string.common_from),
|
||||
name = fromAccount.accountName.toUM().value,
|
||||
icon = CryptoPortfolioIconConverter.convert(fromAccount.icon),
|
||||
icon = fromAccount.toIconUM(),
|
||||
)
|
||||
} else {
|
||||
AccountTitleUM.Text(resourceReference(R.string.swapping_from_title))
|
||||
}
|
||||
}
|
||||
|
||||
private fun getToCardAccountTitle(toAccount: Account.CryptoPortfolio?): AccountTitleUM {
|
||||
private fun getToCardAccountTitle(toAccount: Account?): AccountTitleUM {
|
||||
return if (toAccount != null && isAccountsModeProvider()) {
|
||||
AccountTitleUM.Account(
|
||||
prefixText = resourceReference(R.string.common_to),
|
||||
name = toAccount.accountName.toUM().value,
|
||||
icon = CryptoPortfolioIconConverter.convert(toAccount.icon),
|
||||
icon = toAccount.toIconUM(),
|
||||
)
|
||||
} else {
|
||||
AccountTitleUM.Text(resourceReference(R.string.swapping_to_title))
|
||||
}
|
||||
}
|
||||
|
||||
private fun Account.toIconUM(): AccountIconUM {
|
||||
return when (this) {
|
||||
is Account.CryptoPortfolio -> CryptoPortfolioIconConverter.convert(icon)
|
||||
is Account.Payment -> AccountIconUM.Payment
|
||||
}
|
||||
}
|
||||
|
||||
private fun getChangeCardsButtonState(isReverseSwapPossible: Boolean) = if (isReverseSwapPossible) {
|
||||
ChangeCardsButtonState.ENABLED
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue