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 2025-11-10 16:27:16 +05:00
parent 540d1382f1
commit c54ca6134c
6 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/ui/src/main/java/com/tangem/common/ui/notifications/NotificationUM.kt
View file

@ -275,14 +275,6 @@ sealed class NotificationUM(val config: NotificationConfig) {
title = resourceReference(id = R.string.yield_module_balance_info_sheet_title, wrappedList(tokenName)),
subtitle = resourceReference(id = R.string.yield_module_balance_info_sheet_subtitle),
)
data class YieldSupplyNotAllAmountSupplied(val formattedAmount: String, val symbol: String) : Warning(
title = resourceReference(
id = R.string.yield_module_amount_not_transfered_to_aave_title,
formatArgs = wrappedList(formattedAmount, symbol),
),
subtitle = TextReference.EMPTY,
)
}
open class Info(
@ -301,7 +293,15 @@ sealed class NotificationUM(val config: NotificationConfig) {
onCloseClick = onCloseClick,
iconTint = iconTint,
),
)
) {
data class YieldSupplyNotAllAmountSupplied(val formattedAmount: String, val symbol: String) : Info(
title = resourceReference(
id = R.string.yield_module_amount_not_transfered_to_aave_title,
formatArgs = wrappedList(formattedAmount, symbol),
),
subtitle = TextReference.EMPTY,
)
}
sealed interface Cardano {

1
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/entity/YieldSupplyUM.kt
View file

@ -26,6 +26,7 @@ internal sealed class YieldSupplyUM {
val rewardsApy: TextReference,
val onClick: () -> Unit,
val showWarningIcon: Boolean,
val showInfoIcon: Boolean,
) : YieldSupplyUM()
@Immutable

6
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/model/YieldSupplyModel.kt
View file

@ -253,8 +253,8 @@ internal class YieldSupplyModel @Inject constructor(
private fun loadActiveState(cryptoCurrencyStatus: CryptoCurrencyStatus, yieldSupplyStatus: YieldSupplyStatus) {
val cryptoCurrencyToken = cryptoCurrency as? CryptoCurrency.Token ?: return
val showWarningIcon = !yieldSupplyStatus.isAllowedToSpend ||
cryptoCurrencyStatus.yieldSupplyNotAllAmountSupplied()
val showWarningIcon = !yieldSupplyStatus.isAllowedToSpend
val showInfoIcon = cryptoCurrencyStatus.yieldSupplyNotAllAmountSupplied()
if (!yieldSupplyStatus.isAllowedToSpend) {
analyticsEventsHandler.send(
YieldSupplyAnalytics.NoticeApproveNeeded(
@ -282,6 +282,7 @@ internal class YieldSupplyModel @Inject constructor(
),
onClick = ::onActiveClick,
showWarningIcon = showWarningIcon,
showInfoIcon = showInfoIcon,
apy = tokenStatus.apy.toString(),
)
}
@ -298,6 +299,7 @@ internal class YieldSupplyModel @Inject constructor(
rewardsApy = TextReference.EMPTY,
onClick = ::onActiveClick,
showWarningIcon = showWarningIcon,
showInfoIcon = showInfoIcon,
apy = "",
)
}

23
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/main/ui/YieldSupplyBlockContent.kt
View file

@ -149,12 +149,21 @@ private fun SupplyContent(supplyUM: YieldSupplyUM.Content, modifier: Modifier =
)
}
SpacerW8()
AnimatedVisibility(supplyUM.showWarningIcon) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_alert_triangle_20),
contentDescription = null,
tint = TangemTheme.colors.icon.attention,
)
AnimatedContent(
targetState = supplyUM,
) { currentState ->
when {
currentState.showWarningIcon -> Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_alert_triangle_20),
contentDescription = null,
tint = TangemTheme.colors.icon.attention,
)
currentState.showInfoIcon -> Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_alert_circle_red_20),
contentDescription = null,
tint = TangemTheme.colors.icon.accent,
)
}
}
Icon(
imageVector = ImageVector.vectorResource(R.drawable.ic_chevron_right_24),
@ -355,6 +364,7 @@ private class PreviewProvider : PreviewParameterProvider<YieldSupplyUM> {
onClick = {},
apy = "5.1",
showWarningIcon = false,
showInfoIcon = true,
),
YieldSupplyUM.Content(
title = stringReference("Aave lending is active "),
@ -363,6 +373,7 @@ private class PreviewProvider : PreviewParameterProvider<YieldSupplyUM> {
onClick = {},
apy = "5.1",
showWarningIcon = true,
showInfoIcon = false,
),
YieldSupplyUM.Loading,
YieldSupplyUM.Processing.Enter,

2
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/model/YieldSupplyActiveModel.kt
View file

@ -195,7 +195,7 @@ internal class YieldSupplyActiveModel @Inject constructor(
blockchain = cryptoCurrency.network.name,
),
)
NotificationUM.Warning.YieldSupplyNotAllAmountSupplied(
NotificationUM.Info.YieldSupplyNotAllAmountSupplied(
formattedAmount = formattedAmount,
symbol = cryptoCurrency.symbol,
)

5
features/yield-supply/impl/src/main/java/com/tangem/features/yield/supply/impl/subcomponents/active/ui/YieldSupplyActiveContent.kt
View file

@ -74,6 +74,11 @@ internal fun YieldSupplyActiveContent(
Notification(
config = notificationUM.config,
containerColor = TangemTheme.colors.background.action,
iconTint = if (notificationUM is NotificationUM.Info) {
TangemTheme.colors.icon.accent
} else {
null
},
)
}
}