diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 6eca54cb33..078e9b7128 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -392,6 +392,7 @@ Check your internet connection or switch to a different network Terms of service Default Address + Legacy Address Receive assets Sending assets in other networks will result in permanent loss. %s network diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/ReceiveAddress.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/ReceiveAddress.kt index 0157541c0c..b5264d8402 100644 --- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/ReceiveAddress.kt +++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/entity/ReceiveAddress.kt @@ -16,10 +16,7 @@ internal data class ReceiveAddress( val displayName: TextReference - data class Default( - val title: TextReference?, - override val displayName: TextReference, - ) : Primary + data class Default(override val displayName: TextReference) : Primary data class Legacy(override val displayName: TextReference) : Primary } diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt index 6ae1b86f6e..784431f702 100644 --- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt +++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/model/TokenReceiveModel.kt @@ -110,26 +110,28 @@ internal class TokenReceiveModel @Inject constructor( addresses: List, networkName: String, ): ImmutableMap { - val conditionToUseTitle = addresses.any { it.nameService == ReceiveAddressModel.NameService.Legacy } + val needUseToLegacyAndDefaultName = addresses.any { it.nameService == ReceiveAddressModel.NameService.Legacy } return buildMap { addresses.mapIndexed { index, model -> val type = when (model.nameService) { ReceiveAddressModel.NameService.Default -> { Primary.Default( - displayName = TextReference.Res( - id = R.string.domain_receive_assets_onboarding_network_name, - formatArgs = wrappedList(networkName), - ), - title = if (conditionToUseTitle) { + displayName = if (needUseToLegacyAndDefaultName) { TextReference.Res(R.string.domain_receive_assets_default_address) } else { - null + TextReference.Combined( + wrappedList( + TextReference.Str(networkName), + TextReference.Str(" "), + TextReference.Res(R.string.common_address), + ), + ) }, ) } ReceiveAddressModel.NameService.Ens -> Ens ReceiveAddressModel.NameService.Legacy -> Primary.Legacy( - displayName = TextReference.Res(R.string.common_legacy_bitcoin_address), + displayName = TextReference.Res(R.string.domain_receive_assets_legacy_address), ) } diff --git a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt index 84c59aeb20..73f31d7f8d 100644 --- a/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt +++ b/features/token-recieve/impl/src/main/java/com/tangem/features/tokenreceive/ui/TokenReceiveAssetsContent.kt @@ -27,7 +27,6 @@ import androidx.compose.ui.util.fastForEach import com.tangem.common.ui.notifications.NotificationUM import com.tangem.core.res.getStringSafe 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.SpacerH8 import com.tangem.core.ui.components.SpacerW12 @@ -198,20 +197,6 @@ private fun AddressItem( Column( 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( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, @@ -336,7 +321,6 @@ private class TokenReceiveAssetsContentProvider : PreviewParameterProvider