GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2026-05-04 09:12:42 +02:00
parent 371916a2e9
commit 68a237a603
12 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
features/swap/impl/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
View file

@ -25,6 +25,7 @@ import com.tangem.feature.swap.domain.models.ExpressDataError
import com.tangem.feature.swap.domain.models.SwapAmount
import com.tangem.feature.swap.domain.models.domain.ExchangeProviderType
import com.tangem.feature.swap.domain.models.domain.IncludeFeeInAmount
import com.tangem.feature.swap.domain.models.domain.RateType
import com.tangem.feature.swap.domain.models.domain.SwapProvider
import com.tangem.feature.swap.domain.models.ui.*
import com.tangem.feature.swap.model.SwapNotificationsFactory
@ -255,7 +256,7 @@ internal class StateBuilder(
inputError = TransactionCardType.InputError.Empty,
accountTitleUM = AccountTitleUM.Text(
title = resourceReference(
if (isFromCard) R.string.swapping_from_title else R.string.swapping_to_title,
if (isFromCard) R.string.swapping_from_title_v2 else R.string.swapping_to_title,
),
),
),
@ -816,6 +817,7 @@ internal class StateBuilder(
val toFiatAmount = getFormattedFiatAmount(toSwapCurrencyStatus.status.value.fiatRate?.multiply(toAmount))
val shouldShowStatus = providerState.type == ExchangeProviderType.CEX.providerName
val isFloatRate = dataState.selectedProvider?.rateTypes?.contains(RateType.FLOAT) == true
return uiState.copy(
successState = SwapSuccessStateHolder(
timestamp = swapTransactionState.timestamp,
@ -831,7 +833,10 @@ internal class StateBuilder(
fromTitle = getCardAccountTitle(fromSwapCurrencyStatus.account, isFromCard = true),
toTitle = getCardAccountTitle(toSwapCurrencyStatus.account, isFromCard = false),
fromTokenAmount = stringReference(swapTransactionState.fromAmount.orEmpty()),
toTokenAmount = stringReference(swapTransactionState.toAmount.orEmpty()),
toTokenAmount = stringReference(
swapTransactionState.toAmount.orEmpty()
.let { if (isFloatRate) it.appendApproximateSign() else it },
),
fromTokenFiatAmount = fromFiatAmount,
toTokenFiatAmount = toFiatAmount,
fromTokenIconState = iconStateConverter.convert(fromSwapCurrencyStatus.status),
@ -1205,9 +1210,9 @@ internal class StateBuilder(
private fun getCardAccountTitle(account: Account?, isFromCard: Boolean): AccountTitleUM {
val (prefix, placeholder) = if (isFromCard) {
R.string.common_from to R.string.swapping_from_title
R.string.swapping_from_account_title to R.string.swapping_from_title_v2
} else {
R.string.common_to to R.string.swapping_to_title
R.string.swapping_to_account_title to R.string.swapping_to_title
}
return if (account != null && isAccountsModeProvider()) {
AccountTitleUM.Account(

4
features/swap/impl/src/main/java/com/tangem/feature/swap/ui/SwapSuccessScreen.kt
View file

@ -73,7 +73,7 @@ private fun SwapSuccessScreenContent(
.padding(horizontal = TangemTheme.dimens.spacing16),
) {
TransactionDoneTitle(
title = resourceReference(R.string.common_in_progress),
title = resourceReference(R.string.swap_in_progress),
subtitle = resourceReference(
R.string.send_date_format,
wrappedList(
@ -190,7 +190,7 @@ private fun SwapSuccessScreenButtons(
if (shouldShowStatusButton) {
SpacerW12()
SecondaryButtonIconStart(
text = stringResourceSafe(id = R.string.express_cex_status_button_title),
text = stringResourceSafe(id = R.string.express_provider),
iconResId = R.drawable.ic_arrow_top_right_24,
onClick = onStatusClick,
modifier = Modifier.weight(1f),