diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/data/converters/FoundTokenConverter.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/data/converters/FoundTokenConverter.kt index 977869feb2..33271e9fb6 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/data/converters/FoundTokenConverter.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/data/converters/FoundTokenConverter.kt @@ -20,7 +20,7 @@ object FoundTokenConverter : Converter { network = value.networks.firstOrNull()?.let { network -> FoundToken.Network( id = network.networkId, - address = requireNotNull(network.contractAddress), + contractAddress = requireNotNull(network.contractAddress), decimalCount = requireNotNull(network.decimalCount).toString(), ) } ?: error("Found token networks is empty"), diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/models/FoundToken.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/models/FoundToken.kt index 6ca52f5eb5..5b39f2dd52 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/models/FoundToken.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/domain/models/FoundToken.kt @@ -22,9 +22,9 @@ data class FoundToken( /** * Found token network * - * @property id id - * @property address address - * @property decimalCount decimal count + * @property id id + * @property contractAddress address + * @property decimalCount decimal count */ - data class Network(val id: String, val address: String, val decimalCount: String) + data class Network(val id: String, val contractAddress: String, val decimalCount: String) } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt index 1e8a78eb4f..aedff94b31 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt @@ -827,11 +827,13 @@ internal class AddCustomTokenViewModel @Inject constructor( val currency = when (getCustomTokenType()) { CustomTokenType.TOKEN -> { + val contractAddress = foundToken?.network?.contractAddress + ?: uiState.form.contractAddressInputField.value CustomCurrency.CustomToken( token = Token( name = uiState.form.tokenNameInputField.value, symbol = uiState.form.tokenSymbolInputField.value, - contractAddress = uiState.form.contractAddressInputField.value, + contractAddress = contractAddress, decimals = requireNotNull(uiState.form.decimalsInputField.value.toIntOrNull()), id = foundToken?.id, ), diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index b38c9a9342..b839fda708 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -85,7 +85,7 @@ spr-client = "3.6.2" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "release-app_5.5-465" +tangemBlockchainSdk = "release-app_5.5-466" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds tangemCardSdk = "release-app_5.5-323" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^