diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/entity/conterter/SetOnrampSuccessContentConverter.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/entity/conterter/SetOnrampSuccessContentConverter.kt index a88f509d15..4712b04759 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/entity/conterter/SetOnrampSuccessContentConverter.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/entity/conterter/SetOnrampSuccessContentConverter.kt @@ -161,7 +161,11 @@ internal class SetOnrampSuccessContentConverter( resourceReference(R.string.express_status_bought, wrappedList(cryptoCurrency.name)) } }, - state = getStatusState(OnrampStatus.Status.Paid), + state = when { + this == OnrampStatus.Status.RefundInProgress || + this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Error + else -> getStatusState(OnrampStatus.Status.Paid) + }, ) private fun OnrampStatus.Status.getSendingItem() = ExpressStatusItemUM( @@ -185,7 +189,11 @@ internal class SetOnrampSuccessContentConverter( resourceReference(R.string.express_exchange_status_sent, wrappedList(cryptoCurrency.name)) } }, - state = getStatusState(OnrampStatus.Status.Sending), + state = when { + this == OnrampStatus.Status.RefundInProgress -> ExpressStatusItemState.Active + this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Done + else -> getStatusState(OnrampStatus.Status.Sending) + }, ) private fun getStatusLink(externalTxId: String?): ExpressLinkUM { diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletOnrampTransactionConverter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletOnrampTransactionConverter.kt index 6c056b3973..5b487cb700 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletOnrampTransactionConverter.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/transformers/converter/SingleWalletOnrampTransactionConverter.kt @@ -137,6 +137,7 @@ internal class SingleWalletOnrampTransactionConverter( private fun getIconState(status: OnrampStatus.Status): ExpressTransactionStateIconUM { return when (status) { OnrampStatus.Status.Verifying, + OnrampStatus.Status.RefundInProgress, -> ExpressTransactionStateIconUM.Warning OnrampStatus.Status.Refunded, OnrampStatus.Status.Failed, @@ -231,7 +232,11 @@ internal class SingleWalletOnrampTransactionConverter( resourceReference(R.string.express_status_bought, wrappedList(currency.name)) } }, - state = getStatusState(OnrampStatus.Status.Paid), + state = when { + this == OnrampStatus.Status.RefundInProgress || + this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Error + else -> getStatusState(OnrampStatus.Status.Paid) + }, ) private fun OnrampStatus.Status.getSendingItem() = ExpressStatusItemUM( @@ -261,7 +266,11 @@ internal class SingleWalletOnrampTransactionConverter( ) } }, - state = getStatusState(OnrampStatus.Status.Sending), + state = when { + this == OnrampStatus.Status.RefundInProgress -> ExpressStatusItemState.Active + this == OnrampStatus.Status.Refunded -> ExpressStatusItemState.Done + else -> getStatusState(OnrampStatus.Status.Sending) + }, ) private fun getStatusLink(externalTxUrl: String?): ExpressLinkUM {