diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt index 428b1bb0b3..2d446490ec 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/mercuryo/MercuryoService.kt @@ -6,9 +6,7 @@ import com.tangem.common.extensions.calculateSha512 import com.tangem.common.extensions.toHexString import com.tangem.common.services.Result import com.tangem.common.services.performRequest -import com.tangem.domain.common.extensions.removePrefixFromAddress import com.tangem.network.common.createRetrofitInstance -import com.tangem.tap.common.extensions.urlEncode import com.tangem.tap.common.redux.global.CryptoCurrencyName import com.tangem.tap.features.wallet.redux.Currency import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager @@ -101,18 +99,17 @@ class MercuryoService( cryptoCurrencyName: CryptoCurrencyName, fiatCurrencyName: String, walletAddress: String - ): String? { + ): String { if (action == CurrencyExchangeManager.Action.Sell) throw UnsupportedOperationException() - val walletAddressCorrected = blockchain.removePrefixFromAddress(walletAddress) val builder = Uri.Builder() .scheme(ExchangeUrlBuilder.SCHEME) .authority("exchange.mercuryo.io") .appendQueryParameter("widget_id", mercuryoWidgetId) .appendQueryParameter("type", action.name.lowercase()) .appendQueryParameter("currency", cryptoCurrencyName) - .appendQueryParameter("address", walletAddressCorrected.urlEncode()) - .appendQueryParameter("signature", signature(walletAddressCorrected).urlEncode()) + .appendQueryParameter("address", walletAddress) + .appendQueryParameter("signature", signature(walletAddress)) .appendQueryParameter("fix_currency", "true") .appendQueryParameter("return_url", ExchangeUrlBuilder.SUCCESS_URL) diff --git a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index ec8fcce10c..b69ffb1c49 100644 --- a/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -1,6 +1,5 @@ package com.tangem.domain.common.extensions -import com.tangem.blockchain.blockchains.bitcoincash.cashaddr.CashAddr import com.tangem.blockchain.common.Blockchain fun Blockchain.Companion.fromNetworkId(networkId: String): Blockchain? { @@ -105,12 +104,4 @@ fun Blockchain.toCoinId(): String { Blockchain.Tron, Blockchain.TronTestnet -> "tron" else -> "unknown" } -} - -fun Blockchain.removePrefixFromAddress(address: String): String { - return when (this) { - Blockchain.BitcoinCash -> address - .removePrefix(CashAddr.MAIN_NET_PREFIX).removePrefix(":") - else -> address - } } \ No newline at end of file