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-08-29 19:54:20 +02:00
parent f5b7b1df64
commit 8a74fcc5fb
4 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/res/src/main/res/values/strings.xml
View file

@ -392,6 +392,7 @@
<string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string> <string name="disclaimer_error_loading">Check your internet connection or switch to a different network</string>
<string name="disclaimer_title">Terms of service</string> <string name="disclaimer_title">Terms of service</string>
<string name="domain_receive_assets_default_address">Default Address</string> <string name="domain_receive_assets_default_address">Default Address</string>
<string name="domain_receive_assets_legacy_address">Legacy Address</string>
<string name="domain_receive_assets_navigation_title">Receive assets</string> <string name="domain_receive_assets_navigation_title">Receive assets</string>
<string name="domain_receive_assets_onboarding_description">Sending assets in other networks will result in permanent loss.</string> <string name="domain_receive_assets_onboarding_description">Sending assets in other networks will result in permanent loss.</string>
<string name="domain_receive_assets_onboarding_network_name">%s network</string> <string name="domain_receive_assets_onboarding_network_name">%s network</string>

5
features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/ReceiveAddress.kt
View file

@ -16,10 +16,7 @@ internal data class ReceiveAddress(
val displayName: TextReference val displayName: TextReference
data class Default( data class Default(override val displayName: TextReference) : Primary
val title: TextReference?,
override val displayName: TextReference,
) : Primary
data class Legacy(override val displayName: TextReference) : Primary data class Legacy(override val displayName: TextReference) : Primary
} }

18
features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt
View file

@ -110,26 +110,28 @@ internal class TokenReceiveModel @Inject constructor(
addresses: List<ReceiveAddressModel>, addresses: List<ReceiveAddressModel>,
networkName: String, networkName: String,
): ImmutableMap<Int, ReceiveAddress> { ): ImmutableMap<Int, ReceiveAddress> {
val conditionToUseTitle = addresses.any { it.nameService == ReceiveAddressModel.NameService.Legacy } val needUseToLegacyAndDefaultName = addresses.any { it.nameService == ReceiveAddressModel.NameService.Legacy }
return buildMap { return buildMap {
addresses.mapIndexed { index, model -> addresses.mapIndexed { index, model ->
val type = when (model.nameService) { val type = when (model.nameService) {
ReceiveAddressModel.NameService.Default -> { ReceiveAddressModel.NameService.Default -> {
Primary.Default( Primary.Default(
displayName = TextReference.Res( displayName = if (needUseToLegacyAndDefaultName) {
id = R.string.domain_receive_assets_onboarding_network_name,
formatArgs = wrappedList(networkName),
),
title = if (conditionToUseTitle) {
TextReference.Res(R.string.domain_receive_assets_default_address) TextReference.Res(R.string.domain_receive_assets_default_address)
} else { } else {
null TextReference.Combined(
wrappedList(
TextReference.Str(networkName),
TextReference.Str(" "),
TextReference.Res(R.string.common_address),
),
)
}, },
) )
} }
ReceiveAddressModel.NameService.Ens -> Ens ReceiveAddressModel.NameService.Ens -> Ens
ReceiveAddressModel.NameService.Legacy -> Primary.Legacy( ReceiveAddressModel.NameService.Legacy -> Primary.Legacy(
displayName = TextReference.Res(R.string.common_legacy_bitcoin_address), displayName = TextReference.Res(R.string.domain_receive_assets_legacy_address),
) )
} }

16
features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt
View file

@ -27,7 +27,6 @@ import androidx.compose.ui.util.fastForEach
import com.tangem.common.ui.notifications.NotificationUM import com.tangem.common.ui.notifications.NotificationUM
import com.tangem.core.res.getStringSafe import com.tangem.core.res.getStringSafe
import com.tangem.core.ui.R import com.tangem.core.ui.R
import com.tangem.core.ui.components.SpacerH
import com.tangem.core.ui.components.SpacerH12 import com.tangem.core.ui.components.SpacerH12
import com.tangem.core.ui.components.SpacerH8 import com.tangem.core.ui.components.SpacerH8
import com.tangem.core.ui.components.SpacerW12 import com.tangem.core.ui.components.SpacerW12
@ -198,20 +197,6 @@ private fun AddressItem(
Column( Column(
modifier = Modifier.padding(vertical = 14.dp, horizontal = 12.dp), modifier = Modifier.padding(vertical = 14.dp, horizontal = 12.dp),
) { ) {
when (primaryType) {
is ReceiveAddress.Type.Primary.Default -> {
primaryType.title?.let {
Text(
text = it.resolveReference(),
style = TangemTheme.typography.subtitle2,
color = TangemTheme.colors.text.tertiary,
)
SpacerH(12.dp)
}
}
is ReceiveAddress.Type.Primary.Legacy -> Unit
}
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@ -336,7 +321,6 @@ private class TokenReceiveAssetsContentProvider : PreviewParameterProvider<Recei
value = "0xe5178c7d4d0e861ed2e9414e045b501226b0de8d", value = "0xe5178c7d4d0e861ed2e9414e045b501226b0de8d",
type = ReceiveAddress.Type.Primary.Default( type = ReceiveAddress.Type.Primary.Default(
displayName = stringReference("Etherium address"), displayName = stringReference("Etherium address"),
title = null,
), ),
) )
private val config = ReceiveAssetsUM( private val config = ReceiveAssetsUM(