From fbf22fe5ee5055dc9c8e1287f6e9fa7473212214 Mon Sep 17 00:00:00 2001 From: bakyt Date: Wed, 29 Nov 2023 16:53:05 +0600 Subject: [PATCH 1/2] Set correct fee token for Ton sending --- .../bankwallet/modules/send/ton/SendTonModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ton/SendTonModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ton/SendTonModule.kt index d6db6aa0887..37036d1507e 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ton/SendTonModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/send/ton/SendTonModule.kt @@ -30,7 +30,7 @@ object SendTonModule { val amountService = SendAmountService(amountValidator, wallet.coin.code, adapter.availableBalance) val addressService = SendTonAddressService(prefilledAddress) val xRateService = XRateService(App.marketKit, App.currencyManager.baseCurrency) - val feeToken = App.coinManager.getToken(TokenQuery(BlockchainType.Solana, TokenType.Native)) ?: throw IllegalArgumentException() + val feeToken = App.coinManager.getToken(TokenQuery(BlockchainType.Ton, TokenType.Native)) ?: throw IllegalArgumentException() SendTonViewModel( wallet, From d273020b6b0b1f668658dfbde0f479f01fdc7525 Mon Sep 17 00:00:00 2001 From: bakyt Date: Wed, 29 Nov 2023 17:45:10 +0600 Subject: [PATCH 2/2] Set ton info --- .../io/horizontalsystems/bankwallet/core/MarketKitExtensions.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/MarketKitExtensions.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/MarketKitExtensions.kt index 48da6037d28..960f7326f77 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/core/MarketKitExtensions.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/MarketKitExtensions.kt @@ -186,6 +186,7 @@ val Blockchain.description: String BlockchainType.Gnosis -> "xDAI, ERC20 tokens" BlockchainType.Fantom -> "FTM, ERC20 tokens" BlockchainType.Tron -> "TRX, TRC20 tokens" + BlockchainType.Ton -> "TON" else -> "" } @@ -209,6 +210,7 @@ private val blockchainOrderMap: Map by lazy { BlockchainType.Ethereum, BlockchainType.BinanceSmartChain, BlockchainType.Tron, + BlockchainType.Ton, BlockchainType.Polygon, BlockchainType.Avalanche, BlockchainType.Zcash,