diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 4deafcaa4..92f66133c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -27,6 +27,9 @@ jobs:
           distribution: 'temurin'
           java-version: 20.0.2+9
 
+      - name: Accept Android SDK licenses
+        run: yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
+
       - name: Decode signing certificate into a file
         env:
          CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fb6ee35d1..ba65d0894 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -47,6 +47,7 @@
             <option value="$PROJECT_DIR$/apps/wallet/data/rn" />
             <option value="$PROJECT_DIR$/apps/wallet/data/settings" />
             <option value="$PROJECT_DIR$/apps/wallet/data/staking" />
+            <option value="$PROJECT_DIR$/apps/wallet/data/swap" />
             <option value="$PROJECT_DIR$/apps/wallet/data/tokens" />
             <option value="$PROJECT_DIR$/apps/wallet/instance" />
             <option value="$PROJECT_DIR$/apps/wallet/instance/app" />
@@ -69,6 +70,9 @@
             <option value="$PROJECT_DIR$/lib/security" />
             <option value="$PROJECT_DIR$/lib/sqlite" />
             <option value="$PROJECT_DIR$/lib/ur" />
+            <option value="$PROJECT_DIR$/shared" />
+            <option value="$PROJECT_DIR$/shared/core" />
+            <option value="$PROJECT_DIR$/shared/ui" />
             <option value="$PROJECT_DIR$/tonapi" />
             <option value="$PROJECT_DIR$/ui" />
             <option value="$PROJECT_DIR$/ui/blur" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d4b7accba..c224ad564 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.20" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/apps/signer/build.gradle.kts b/apps/signer/build.gradle.kts
index 10c0c5cb5..7f017ed7d 100644
--- a/apps/signer/build.gradle.kts
+++ b/apps/signer/build.gradle.kts
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         applicationId = Build.namespacePrefix("signer")
         minSdk = Build.minSdkVersion
-        targetSdk = 34
+        targetSdk = Build.compileSdkVersion
         versionCode = 22
         versionName = "0.2.2"
     }
@@ -58,36 +58,36 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.AndroidX.appCompat)
-    implementation(Dependence.AndroidX.activity)
-    implementation(Dependence.AndroidX.fragment)
-    implementation(Dependence.AndroidX.recyclerView)
-    implementation(Dependence.AndroidX.viewPager2)
-    implementation(Dependence.AndroidX.splashscreen)
+    implementation(libs.androidX.core)
+    implementation(libs.androidX.appCompat)
+    implementation(libs.androidX.activity)
+    implementation(libs.androidX.fragment)
+    implementation(libs.androidX.recyclerView)
+    implementation(libs.androidX.viewPager2)
+    implementation(libs.androidX.splashscreen)
 
-    implementation(Dependence.UI.material)
-    implementation(Dependence.UI.flexbox)
-    implementation(Dependence.AndroidX.Camera.base)
-    implementation(Dependence.AndroidX.Camera.core)
-    implementation(Dependence.AndroidX.Camera.lifecycle)
-    implementation(Dependence.AndroidX.Camera.view)
-    implementation(Dependence.AndroidX.security)
-    implementation(Dependence.AndroidX.constraintlayout)
-    implementation(Dependence.AndroidX.lifecycleSavedState)
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
+    implementation(libs.material)
+    implementation(libs.flexbox)
+    implementation(libs.cameraX.base)
+    implementation(libs.cameraX.core)
+    implementation(libs.cameraX.lifecycle)
+    implementation(libs.cameraX.view)
+    implementation(libs.androidX.security)
+    implementation(libs.androidX.constraintlayout)
+    implementation(libs.androidX.lifecycleSavedState)
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
 
-    implementation(Dependence.KotlinX.guava)
+    implementation(libs.kotlinX.coroutines.guava)
 
-    implementation(project(Dependence.UIKit.core)) {
+    implementation(project(ProjectModules.UIKit.core)) {
         exclude("com.airbnb.android", "lottie")
         exclude("com.facebook.fresco", "fresco")
     }
 
-    implementation(project(Dependence.Lib.qr))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.icu))
-    implementation(Dependence.Koin.core)
+    implementation(project(ProjectModules.Lib.qr))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(libs.koin.core)
 }
 
diff --git a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
index 7a7724169..949e2d83f 100644
--- a/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
+++ b/apps/signer/src/main/java/com/tonapps/signer/screen/sign/SignViewModel.kt
@@ -200,7 +200,7 @@ class SignViewModel(
 
     private fun formatCoins(coins: Coins): String {
         val value = BigDecimal(coins.amount.toLong() / 1000000000L.toDouble())
-        return CurrencyFormatter.format("TON", value, 9).toString()
+        return CurrencyFormatter.format("TON", value).toString()
     }
 
     private fun parseAddress(address: MsgAddressInt, bounceable: Boolean = true): String {
diff --git a/apps/wallet/api/build.gradle.kts b/apps/wallet/api/build.gradle.kts
index 38e336367..9dd4ebe08 100644
--- a/apps/wallet/api/build.gradle.kts
+++ b/apps/wallet/api/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
+    kotlin("plugin.serialization")
 }
 
 android {
@@ -23,16 +24,16 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.Koin.core)
-    implementation(Dependence.KotlinX.guava)
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.icu))
-    implementation(Dependence.GooglePlay.cronet)
-    implementation(Dependence.Squareup.okhttp)
-    implementation(Dependence.Squareup.sse)
-    implementation(Dependence.Squareup.moshi)
-    implementation(Dependence.Squareup.moshiAdapters)
+    implementation(libs.kotlinX.serialization.core)
+    implementation(libs.kotlinX.serialization.json)
+    implementation(libs.kotlinX.coroutines.guava)
+    implementation(libs.koin.core)
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(libs.google.play.cronet)
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.sse)
 }
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
index 3ff24163f..06ffd3a9f 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt
@@ -3,7 +3,6 @@ package com.tonapps.wallet.api
 import android.content.Context
 import android.net.Uri
 import android.util.ArrayMap
-import com.squareup.moshi.JsonAdapter
 import com.tonapps.blockchain.ton.contract.BaseWalletContract
 import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.extensions.EmptyPrivateKeyEd25519
@@ -21,25 +20,27 @@ import com.tonapps.network.post
 import com.tonapps.network.postJSON
 import com.tonapps.network.requestBuilder
 import com.tonapps.network.sse
-import com.tonapps.wallet.api.core.SourceAPI
 import com.tonapps.wallet.api.entity.AccountDetailsEntity
 import com.tonapps.wallet.api.entity.AccountEventEntity
 import com.tonapps.wallet.api.entity.BalanceEntity
 import com.tonapps.wallet.api.entity.ChartEntity
 import com.tonapps.wallet.api.entity.ConfigEntity
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.OnRampArgsEntity
 import com.tonapps.wallet.api.entity.OnRampMerchantEntity
+import com.tonapps.wallet.api.entity.SwapEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.api.internal.ConfigRepository
 import com.tonapps.wallet.api.internal.InternalApi
+import com.tonapps.wallet.api.internal.SwapApi
 import com.tonapps.wallet.api.tron.TronApi
-import io.batteryapi.apis.BatteryApi
-import io.batteryapi.apis.BatteryApi.UnitsGetBalance
+import io.Serializer
+import io.batteryapi.apis.DefaultApi
 import io.batteryapi.models.Balance
 import io.batteryapi.models.Config
+import io.batteryapi.models.EstimateGaslessCostRequest
 import io.batteryapi.models.RechargeMethods
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.Serializer
+import io.infrastructure.ClientException
 import io.tonapi.models.Account
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.AccountEvent
@@ -58,6 +59,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -69,7 +72,6 @@ import org.json.JSONObject
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.cell.Cell
 import org.ton.crypto.hex
-import java.math.BigDecimal
 import java.util.Locale
 
 class API(
@@ -78,6 +80,7 @@ class API(
 ) : CoreAPI(context) {
 
     private val internalApi = InternalApi(context, defaultHttpClient, appVersionName)
+    private val swapApi = SwapApi(defaultHttpClient)
     private val configRepository = ConfigRepository(context, scope, internalApi)
 
     val config: ConfigEntity
@@ -93,8 +96,12 @@ class API(
     private val bridgeUrl: String
         get() = "${config.tonConnectBridgeHost}/bridge"
 
-    @Volatile
-    private var cachedCountry: String? = null
+    val country: String
+        get() = internalApi.country
+
+    fun setCountry(deviceCountry: String, storeCountry: String?) = internalApi.setCountry(deviceCountry, storeCountry)
+
+    suspend fun initConfig() = configRepository.initConfig()
 
     suspend fun tonapiFetch(
         url: String,
@@ -140,19 +147,14 @@ class API(
         Provider(config.tonapiMainnetHost, config.tonapiTestnetHost, tonAPIHttpClient)
     }
 
-    private val batteryApi by lazy {
-        SourceAPI(
-            BatteryApi(config.batteryHost, tonAPIHttpClient),
-            BatteryApi(config.batteryTestnetHost, tonAPIHttpClient)
-        )
+    private val batteryProvider: BatteryProvider by lazy {
+        BatteryProvider(config.batteryHost, config.batteryTestnetHost, tonAPIHttpClient)
     }
 
-    private val emulationJSONAdapter: JsonAdapter<MessageConsequences> by lazy {
-        Serializer.moshi.adapter(MessageConsequences::class.java)
+    val tron: TronApi by lazy {
+        TronApi(config, defaultHttpClient, batteryProvider.default.get(false))
     }
 
-    val tron = TronApi(config, defaultHttpClient, batteryApi.get(false))
-
     fun accounts(testnet: Boolean) = provider.accounts.get(testnet)
 
     fun jettons(testnet: Boolean) = provider.jettons.get(testnet)
@@ -173,7 +175,11 @@ class API(
 
     fun rates() = provider.rates.get(false)
 
-    fun battery(testnet: Boolean) = batteryApi.get(testnet)
+    fun battery(testnet: Boolean) = batteryProvider.default.get(testnet)
+
+    fun batteryWallet(testnet: Boolean) = batteryProvider.wallet.get(testnet)
+
+    fun batteryEmulation(testnet: Boolean) = batteryProvider.emulation.get(testnet)
 
     fun getBatteryConfig(testnet: Boolean): Config? {
         return withRetry { battery(testnet).getConfig() }
@@ -183,22 +189,36 @@ class API(
         return withRetry { battery(testnet).getRechargeMethods(false) }
     }
 
-    fun getOnRampData(country: String) = internalApi.getOnRampData(country)
+    fun getOnRampData() = internalApi.getOnRampData()
+
+    fun getOnRampPaymentMethods() = internalApi.getOnRampPaymentMethods()
 
-    suspend fun calculateOnRamp(args: OnRampArgsEntity): List<OnRampMerchantEntity> = withContext(Dispatchers.IO) {
-        val data = internalApi.calculateOnRamp(args) ?: return@withContext emptyList()
-        val items = JSONObject(data).getJSONArray("items")
-        items.map { OnRampMerchantEntity(it) }
+    fun getOnRampMerchants() = internalApi.getOnRampMerchants()
+
+    fun getSwapAssets(): JSONArray = runCatching {
+        swapApi.getSwapAssets()?.let(::JSONArray)
+    }.getOrNull() ?: JSONArray()
+
+    @kotlin.Throws
+    suspend fun calculateOnRamp(args: OnRampArgsEntity): OnRampMerchantEntity.Data = withContext(Dispatchers.IO) {
+        val data = internalApi.calculateOnRamp(args) ?: throw Exception("Empty response")
+        val json = JSONObject(data)
+        val items = json.getJSONArray("items").map { OnRampMerchantEntity(it) }
+        val suggested = json.optJSONArray("suggested")?.map { OnRampMerchantEntity(it) } ?: emptyList()
+        OnRampMerchantEntity.Data(
+            items = items,
+            suggested = suggested
+        )
     }
 
-    suspend fun getEthenaStakingAPY(address: String): BigDecimal = withContext(Dispatchers.IO) {
-        internalApi.getEthenaStakingAPY(address)
+    suspend fun getEthena(accountId: String): EthenaEntity? = withContext(Dispatchers.IO) {
+        withRetry { internalApi.getEthena(accountId) }
     }
 
     fun getBatteryBalance(
         tonProofToken: String,
         testnet: Boolean,
-        units: UnitsGetBalance = UnitsGetBalance.ton
+        units: DefaultApi.UnitsGetBalance = DefaultApi.UnitsGetBalance.ton
     ): Balance? {
         return withRetry { battery(testnet).getBalance(tonProofToken, units) }
     }
@@ -210,7 +230,7 @@ class API(
     private fun isOkStatus(testnet: Boolean): Boolean {
         try {
             val status = withRetry {
-                provider.blockchain.get(testnet).status()
+                provider.utilities.get(testnet).status()
             } ?: return false
             if (!status.restOnline) {
                 return false
@@ -235,6 +255,12 @@ class API(
         return seeHttpClient.sse(url, onFailure = onFailure)
     }
 
+    suspend fun refreshConfig(testnet: Boolean) {
+        configRepository.refresh(testnet)
+    }
+
+    fun swapStream(from: SwapAssetParam, to: SwapAssetParam, userAddress: String) = swapApi.stream(from, to, userAddress)
+
     suspend fun getPageTitle(url: String): String = withContext(Dispatchers.IO) {
         try {
             val headers = ArrayMap<String, String>().apply {
@@ -276,6 +302,14 @@ class API(
         "UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ"
     }
 
+    suspend fun getDnsExpiring(
+        accountId: String,
+        testnet: Boolean,
+        period: Int
+    ) = withContext(Dispatchers.IO) {
+        withRetry { accounts(testnet).getAccountDnsExpiring(accountId, period).items } ?: emptyList()
+    }
+
     fun getEvents(
         accountId: String,
         testnet: Boolean,
@@ -329,6 +363,7 @@ class API(
             lt = event.lt,
             inProgress = event.inProgress,
             extra = 0L,
+            progress = 0f,
         )
         listOf(accountEvent)
     }
@@ -400,7 +435,7 @@ class API(
             accounts(testnet).getAccountJettonsBalances(
                 accountId = accountId,
                 currencies = currency?.let { listOf(it) },
-                extensions = extensions,
+                supportedExtensions = extensions,
             ).balances
         } ?: return null
         return jettonsBalances.map { BalanceEntity(it) }.filter { it.value.isPositive }
@@ -439,7 +474,11 @@ class API(
             val wallets = withRetry {
                 wallet(testnet).getWalletsByPublicKey(query).accounts
             } ?: return emptyList()
-            wallets.map { AccountDetailsEntity(query, it, testnet) }.map {
+            wallets.map { AccountDetailsEntity(
+                query = query,
+                wallet = it,
+                testnet = testnet
+            ) }.map {
                 if (it.walletVersion == WalletVersion.UNKNOWN) {
                     it.copy(
                         walletVersion = BaseWalletContract.resolveVersion(
@@ -566,7 +605,7 @@ class API(
         cell: Cell,
         testnet: Boolean,
     ): String? {
-        val request = io.batteryapi.models.EstimateGaslessCostRequest(cell.base64(), false)
+        val request = EstimateGaslessCostRequest(cell.base64(), false)
 
         return withRetry {
             battery(testnet).estimateGaslessCost(jettonMaster, request, tonProofToken).commission
@@ -601,7 +640,11 @@ class API(
         val withBattery = supportedByBattery && allowedByBattery
 
         val string = response.body?.string() ?: return null
-        val consequences = emulationJSONAdapter.fromJson(string) ?: return null
+        val consequences = try {
+            Serializer.JSON.decodeFromString<MessageConsequences>(string)
+        } catch (e: Throwable) {
+            return null
+        }
         return Pair(consequences, withBattery)
     }
 
@@ -619,7 +662,7 @@ class API(
         val request = EmulateMessageToWalletRequest(
             boc = boc,
             params = params,
-            safeMode = safeModeEnabled
+            // safeMode = safeModeEnabled
         )
         withRetry {
             emulation(testnet).emulateMessageToWallet(request)
@@ -667,12 +710,15 @@ class API(
             return@withContext SendBlockchainState.STATUS_ERROR
         }
 
+        val meta = hashMapOf(
+            "platform" to "android",
+            "version" to appVersionName,
+            "source" to source,
+            "confirmation_time" to confirmationTime.toString()
+        )
         val request = SendBlockchainMessageRequest(
             boc = boc,
-            platform = "android",
-            version = appVersionName,
-            source = source,
-            confirmationTime = confirmationTime
+            meta = meta
         )
         withRetry {
             blockchain(testnet).sendBlockchainMessage(request)
@@ -889,17 +935,26 @@ class API(
         }
     }
 
-    fun getServerTime(testnet: Boolean) = withRetry {
-        liteServer(testnet).getRawTime().time
-    } ?: (System.currentTimeMillis() / 1000).toInt()
-
-    suspend fun resolveCountry(): String? = withContext(Dispatchers.IO) {
-        if (cachedCountry == null) {
-            cachedCountry = internalApi.resolveCountry()
+    fun getServerTime(testnet: Boolean): Int {
+        /*val time = serverTimeProvider.getServerTime(testnet)
+        if (time == null) {
+            val serverTimeSeconds = withRetry { liteServer(testnet).getRawTime().time }
+            if (serverTimeSeconds == null) {
+                return (System.currentTimeMillis() / 1000).toInt()
+            }
+            serverTimeProvider.setServerTime(testnet, serverTimeSeconds)
+            return serverTimeSeconds
+        }
+        return time*/
+        val serverTimeSeconds = withRetry { liteServer(testnet).getRawTime().time }
+        if (serverTimeSeconds == null) {
+            return (System.currentTimeMillis() / 1000).toInt()
         }
-        cachedCountry
+        return serverTimeSeconds
     }
 
+    suspend fun resolveCountry(): String? = internalApi.resolveCountry()
+
     suspend fun reportNtfSpam(
         nftAddress: String,
         scam: Boolean
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/BatteryProvider.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/BatteryProvider.kt
new file mode 100644
index 000000000..0ef717b48
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/BatteryProvider.kt
@@ -0,0 +1,23 @@
+package com.tonapps.wallet.api
+
+import com.tonapps.wallet.api.core.BatteryAPI
+import com.tonapps.wallet.api.core.SourceAPI
+import okhttp3.OkHttpClient
+
+internal class BatteryProvider(
+    mainnetHost: String,
+    testnetHost: String,
+    okHttpClient: OkHttpClient,
+) {
+
+    private val main = BatteryAPI(mainnetHost, okHttpClient)
+    private val test = BatteryAPI(testnetHost, okHttpClient)
+
+    val default = SourceAPI(main.default, test.default)
+
+    val emulation = SourceAPI(main.emulation, test.emulation)
+
+    val wallet = SourceAPI(main.wallet, test.wallet)
+
+
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/CoreAPI.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/CoreAPI.kt
index 906dcec0b..e11e3a200 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/CoreAPI.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/CoreAPI.kt
@@ -26,7 +26,7 @@ abstract class CoreAPI(private val context: Context) {
 
     val defaultHttpClient = baseOkHttpClientBuilder(
         cronetEngine = { cronetEngine },
-        timeoutSeconds = 15,
+        timeoutSeconds = 30,
         interceptors = listOf(
             UserAgentInterceptor(userAgent),
         )
@@ -34,7 +34,7 @@ abstract class CoreAPI(private val context: Context) {
 
     val seeHttpClient = baseOkHttpClientBuilder(
         cronetEngine = { null },
-        timeoutSeconds = 30,
+        timeoutSeconds = 60,
         interceptors = listOf(
             UserAgentInterceptor(userAgent),
         )
@@ -71,7 +71,7 @@ abstract class CoreAPI(private val context: Context) {
 
         private fun baseOkHttpClientBuilder(
             cronetEngine: () -> CronetEngine?,
-            timeoutSeconds: Long = 5,
+            timeoutSeconds: Long = 30,
             interceptors: List<Interceptor> = emptyList()
         ): OkHttpClient.Builder {
             val builder = OkHttpClient().newBuilder()
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Extensions.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Extensions.kt
index a299e0091..3719a108f 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Extensions.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Extensions.kt
@@ -1,35 +1,15 @@
 package com.tonapps.wallet.api
 
 import android.os.SystemClock
-import io.tonapi.infrastructure.Serializer
-import com.squareup.moshi.adapter
-import io.tonapi.infrastructure.ClientException
 import android.util.Log
-import android.widget.Toast
-import com.google.firebase.crashlytics.BuildConfig
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.network.OkHttpError
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.Response
-import io.tonapi.infrastructure.ServerError
-import kotlinx.coroutines.delay
+import io.infrastructure.ClientError
+import io.infrastructure.ClientException
+import io.infrastructure.ServerError
 import kotlinx.coroutines.CancellationException
 import kotlinx.io.IOException
 import java.net.SocketTimeoutException
-import java.net.UnknownHostException
-
-@OptIn(ExperimentalStdlibApi::class)
-inline fun <reified T> toJSON(obj: T?): String {
-    if (obj == null) {
-        return ""
-    }
-    return Serializer.moshi.adapter<T>().toJson(obj)
-}
-
-@OptIn(ExperimentalStdlibApi::class)
-inline fun <reified T> fromJSON(json: String): T {
-    return Serializer.moshi.adapter<T>().fromJson(json)!!
-}
 
 fun <R> withRetry(
     times: Int = 5,
@@ -44,14 +24,15 @@ fun <R> withRetry(
         } catch (e: CancellationException) {
             throw e
         } catch (e: SocketTimeoutException) {
+            Log.e("RetryLogNew", "SocketTimeoutException occurred: ${e.message}", e)
             SystemClock.sleep(delay + 100)
             return null
         } catch (e: IOException) {
-            Log.e("WithRetryLog", "IOException: ${e.message}", e)
+            Log.e("RetryLogNew", "IOException occurred: ${e.message}", e)
             SystemClock.sleep(delay + 100)
             return null
         } catch (e: Throwable) {
-            Log.e("WithRetryLog", "Error: ${e.message}", e)
+            Log.e("RetryLogNew", "Error occurred: ${e.message}", e)
             val statusCode = e.getHttpStatusCode()
             if (statusCode == 429 || statusCode == 401 || statusCode == 502 || statusCode == 520) {
                 SystemClock.sleep(delay + 100)
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Provider.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Provider.kt
index 05c65ed23..dd14fd69f 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Provider.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/Provider.kt
@@ -42,4 +42,6 @@ internal class Provider(
     val wallet = SourceAPI(main.wallet, test.wallet)
 
     val gasless = SourceAPI(main.gasless, test.gasless)
+
+    val utilities = SourceAPI(main.utilities, test.utilities)
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/ServerTimeProvider.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/ServerTimeProvider.kt
new file mode 100644
index 000000000..b409a3e61
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/ServerTimeProvider.kt
@@ -0,0 +1,48 @@
+package com.tonapps.wallet.api
+
+import android.content.Context
+import android.os.SystemClock
+import com.tonapps.extensions.prefs
+import androidx.core.content.edit
+
+internal class ServerTimeProvider(context: Context) {
+
+    private companion object {
+        const val SERVER_TIME_KEY = "server_time"
+        const val LOCAL_TIME_KEY = "local_time"
+
+        // 24 hours in milliseconds
+        private const val CACHE_EXPIRATION_MS = 24 * 60 * 60 * 1000L
+
+        private fun getServerTimePrefKey(testnet: Boolean) = "${SERVER_TIME_KEY}_${if (testnet) "test" else "main"}"
+
+        private fun getLocalTimePrefKey(testnet: Boolean) = "${LOCAL_TIME_KEY}_${if (testnet) "test" else "main"}"
+
+    }
+
+    private val prefs = context.prefs("server_time")
+
+    fun setServerTime(testnet: Boolean, serverTimeSeconds: Int) {
+        val localTimeMillis = SystemClock.elapsedRealtime()
+
+        prefs.edit {
+            putInt(getServerTimePrefKey(testnet), serverTimeSeconds)
+            putLong(getLocalTimePrefKey(testnet), localTimeMillis)
+        }
+    }
+
+    fun getServerTime(testnet: Boolean): Int? {
+        val savedServerSeconds = prefs.getInt(getServerTimePrefKey(testnet), 0)
+        val savedLocalMillis = prefs.getLong(getLocalTimePrefKey(testnet), 0L)
+        if (0 >= savedServerSeconds || 0 >= savedLocalMillis) {
+            return null
+        }
+        val elapsedTimeMillis = SystemClock.elapsedRealtime() - savedLocalMillis
+        if (elapsedTimeMillis > CACHE_EXPIRATION_MS) {
+            return null
+        }
+        val elapsedSeconds = elapsedTimeMillis / 1000
+        val currentServerTime = savedServerSeconds + elapsedSeconds
+        return currentServerTime.toInt()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/SwapAssetParam.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/SwapAssetParam.kt
new file mode 100644
index 000000000..e1bb70ec2
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/SwapAssetParam.kt
@@ -0,0 +1,24 @@
+package com.tonapps.wallet.api
+
+import android.net.Uri
+
+data class SwapAssetParam(
+    val address: String,
+    val amount: String?,
+) {
+
+    val isEmpty: Boolean
+        get() = amount.isNullOrBlank() || amount == "0"
+
+    fun apply(prefix: String, builder: Uri.Builder): Uri.Builder {
+        if (address.equals("ton", true)) {
+            builder.appendQueryParameter("${prefix}Asset", "0:0000000000000000000000000000000000000000000000000000000000000000")
+        } else {
+            builder.appendQueryParameter("${prefix}Asset", address)
+        }
+        amount?.let {
+            builder.appendQueryParameter("${prefix}Amount", it)
+        }
+        return builder
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BaseAPI.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BaseAPI.kt
index f9f003714..f4627c99d 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BaseAPI.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BaseAPI.kt
@@ -1,6 +1,5 @@
 package com.tonapps.wallet.api.core
 
-import io.batteryapi.apis.BatteryApi
 import io.tonapi.apis.AccountsApi
 import io.tonapi.apis.BlockchainApi
 import io.tonapi.apis.ConnectApi
@@ -15,6 +14,7 @@ import io.tonapi.apis.RatesApi
 import io.tonapi.apis.StakingApi
 import io.tonapi.apis.StorageApi
 import io.tonapi.apis.TracesApi
+import io.tonapi.apis.UtilitiesApi
 import io.tonapi.apis.WalletApi
 import okhttp3.OkHttpClient
 
@@ -53,4 +53,6 @@ class BaseAPI(
 
     val gasless: GaslessApi by lazy { GaslessApi(basePath, okHttpClient) }
 
+    val utilities: UtilitiesApi by lazy { UtilitiesApi(basePath, okHttpClient) }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BatteryAPI.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BatteryAPI.kt
new file mode 100644
index 000000000..52703cddc
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/core/BatteryAPI.kt
@@ -0,0 +1,18 @@
+package com.tonapps.wallet.api.core
+
+import io.batteryapi.apis.DefaultApi
+import io.batteryapi.apis.EmulationApi
+import io.batteryapi.apis.WalletApi
+import okhttp3.OkHttpClient
+
+class BatteryAPI(
+    basePath: String,
+    okHttpClient: OkHttpClient
+) {
+
+    val emulation: EmulationApi by lazy { EmulationApi(basePath, okHttpClient) }
+
+    val default: DefaultApi by lazy { DefaultApi(basePath, okHttpClient) }
+
+     val wallet: WalletApi by lazy { WalletApi(basePath, okHttpClient) }
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountDetailsEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountDetailsEntity.kt
index cb14f235a..2e1a7c20f 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountDetailsEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountDetailsEntity.kt
@@ -9,6 +9,7 @@ import com.tonapps.blockchain.ton.extensions.toRawAddress
 import com.tonapps.blockchain.ton.extensions.toUserFriendly
 import io.tonapi.models.Account
 import io.tonapi.models.AccountStatus
+import io.tonapi.models.Wallet
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -61,6 +62,22 @@ data class AccountDetailsEntity(
         testnet = testnet,
     )
 
+    constructor(
+        query: String,
+        wallet: Wallet,
+        testnet: Boolean,
+        new: Boolean = false
+    ) : this(
+        query = query,
+        preview = AccountEntity(wallet, testnet),
+        active = wallet.status == AccountStatus.active,
+        walletVersion = resolveVersion(testnet, wallet.interfaces, wallet.address),
+        balance = wallet.balance,
+        new = new,
+        initialized = wallet.status == AccountStatus.active || wallet.status == AccountStatus.frozen,
+        testnet = testnet,
+    )
+
     private companion object {
 
         private fun resolveVersion(testnet: Boolean, interfaces: List<String>?, address: String): WalletVersion {
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountEntity.kt
index b72a2aa44..9d563eab0 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/AccountEntity.kt
@@ -9,8 +9,10 @@ import com.tonapps.blockchain.ton.extensions.toWalletAddress
 import com.tonapps.extensions.short4
 import io.tonapi.models.Account
 import io.tonapi.models.AccountAddress
+import io.tonapi.models.Wallet
 import kotlinx.parcelize.Parcelize
 import org.ton.block.AddrStd
+import androidx.core.net.toUri
 
 @Parcelize
 data class AccountEntity(
@@ -43,7 +45,7 @@ data class AccountEntity(
         address = model.address.toUserFriendly(model.isWallet, testnet),
         accountId = model.address.toRawAddress(),
         name = model.name,
-        iconUri = model.icon?.let { Uri.parse(it) },
+        iconUri = model.icon?.toUri(),
         isWallet = model.isWallet,
         isScam = model.isScam
     )
@@ -52,8 +54,17 @@ data class AccountEntity(
         address = account.address.toUserFriendly(account.isWallet, testnet),
         accountId = account.address.toRawAddress(),
         name = account.name,
-        iconUri = account.icon?.let { Uri.parse(it) },
+        iconUri = account.icon?.toUri(),
         isWallet = account.isWallet,
         isScam = account.isScam ?: false
     )
+
+    constructor(wallet: Wallet, testnet: Boolean) : this(
+        address = wallet.address.toUserFriendly(wallet.isWallet, testnet),
+        accountId = wallet.address.toRawAddress(),
+        name = wallet.name,
+        iconUri = wallet.icon?.toUri(),
+        isWallet = wallet.isWallet,
+        isScam = false
+    )
 }
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
index d021ea68c..f70510830 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/BalanceEntity.kt
@@ -55,6 +55,9 @@ data class BalanceEntity(
     val customPayloadApiUri: String?
         get() = token.customPayloadApiUri
 
+    val blockchain: Blockchain
+        get() = token.blockchain
+
     constructor(jettonBalance: JettonBalance) : this(
         token = TokenEntity(jettonBalance.jetton, jettonBalance.extensions, jettonBalance.lock),
         value = Coins.of(BigDecimal(jettonBalance.balance).movePointLeft(jettonBalance.jetton.decimals), jettonBalance.jetton.decimals),
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt
index 44266a929..a82fdae0a 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt
@@ -8,6 +8,7 @@ import com.tonapps.icu.Coins
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
+import androidx.core.net.toUri
 
 @Parcelize
 data class ConfigEntity(
@@ -35,7 +36,6 @@ data class ConfigEntity(
     val batteryHost: String,
     val batteryTestnetHost: String,
     val batteryBeta: Boolean,
-    val batteryDisabled: Boolean,
     val batterySendDisabled: Boolean,
     val batteryMeanFees: String,
     val batteryMeanPriceNft: String,
@@ -59,15 +59,13 @@ data class ConfigEntity(
     val apkDownloadUrl: String?,
     val apkName: AppVersion?,
     val tronApiUrl: String,
+    val enabledStaking: List<String>,
+    val qrScannerExtends: List<QRScannerExtendsEntity>,
 ): Parcelable {
 
     @IgnoredOnParcel
     val swapUri: Uri
-        get() = Uri.parse(stonfiUrl)
-
-    @IgnoredOnParcel
-    val isBatteryDisabled: Boolean
-        get() = batteryDisabled || batterySendDisabled
+        get() = stonfiUrl.toUri()
 
     @IgnoredOnParcel
     val domains: List<String> by lazy {
@@ -81,6 +79,26 @@ data class ConfigEntity(
         ApkEntity(url, name)
     }
 
+    @IgnoredOnParcel
+    val meanFees: Coins by lazy {
+        Coins.of(batteryMeanFees)
+    }
+
+    @IgnoredOnParcel
+    val meanFeeNft: Coins by lazy {
+        Coins.of(batteryMeanPriceNft)
+    }
+
+    @IgnoredOnParcel
+    val meanFeeSwap: Coins by lazy {
+        Coins.of(batteryMeanPriceSwap)
+    }
+
+    @IgnoredOnParcel
+    val meanFeeJetton: Coins by lazy {
+        Coins.of(batteryMeanPriceJetton)
+    }
+
     constructor(json: JSONObject, debug: Boolean) : this(
         empty = false,
         supportLink = json.getString("supportLink"),
@@ -110,7 +128,6 @@ data class ConfigEntity(
         batteryHost = json.optString("batteryHost", "https://battery.tonkeeper.com"),
         batteryTestnetHost = json.optString("batteryTestnetHost", "https://testnet-battery.tonkeeper.com"),
         batteryBeta = json.optBoolean("battery_beta", true),
-        batteryDisabled = json.optBoolean("disable_battery", false),
         batterySendDisabled = json.optBoolean("disable_battery_send", false),
         batteryMeanFees = json.optString("batteryMeanFees", "0.0055"),
         disableBatteryIapModule = json.optBoolean("disable_battery_iap_module", false),
@@ -136,6 +153,12 @@ data class ConfigEntity(
         apkDownloadUrl = json.optString("apk_download_url"),
         apkName = json.optString("apk_name")?.let { AppVersion(it.removePrefix("v")) },
         tronApiUrl = json.optString("tron_api_url", "https://api.trongrid.io"),
+        enabledStaking = json.optJSONArray("enabled_staking")?.let { array ->
+            (0 until array.length()).map { array.getString(it) }
+        } ?: emptyList(),
+        qrScannerExtends = json.optJSONArray("qr_scanner_extends")?.let { array ->
+            QRScannerExtendsEntity.of(array)
+        } ?: emptyList()
     )
 
     constructor() : this(
@@ -163,7 +186,6 @@ data class ConfigEntity(
         batteryHost = "https://battery.tonkeeper.com",
         batteryTestnetHost = "https://testnet-battery.tonkeeper.com",
         batteryBeta = true,
-        batteryDisabled = false,
         batterySendDisabled = false,
         batteryMeanFees = "0.0055",
         disableBatteryIapModule = false,
@@ -187,6 +209,8 @@ data class ConfigEntity(
         apkDownloadUrl = null,
         apkName = null,
         tronApiUrl = "https://api.trongrid.io",
+        enabledStaking = emptyList(),
+        qrScannerExtends = emptyList()
     )
 
     companion object {
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/EthenaEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/EthenaEntity.kt
new file mode 100644
index 000000000..e07c77c0b
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/EthenaEntity.kt
@@ -0,0 +1,87 @@
+package com.tonapps.wallet.api.entity
+
+import android.os.Parcelable
+import com.tonapps.extensions.map
+import kotlinx.parcelize.Parcelize
+import org.json.JSONObject
+import java.math.BigDecimal
+
+@Parcelize
+data class EthenaEntity(
+    val methods: List<Method>,
+    val about: About,
+) : Parcelable {
+
+    @Parcelize
+    data class About(
+        val description: String,
+        val tsusdeDescription: String,
+        val faqUrl: String,
+        val aboutUrl: String,
+        val stakeTitle: String,
+        val stakeDescription: String,
+    ) : Parcelable {
+        constructor(json: JSONObject) : this(
+            description = json.getString("description"),
+            tsusdeDescription = json.getString("tsusde_description"),
+            faqUrl = json.getString("faq_url"),
+            aboutUrl = json.getString("about_url"),
+            stakeTitle = json.getString("tsusde_stake_title"),
+            stakeDescription = json.getString("tsusde_stake_description"),
+        )
+    }
+
+    @Parcelize
+    data class Method(
+        val type: Type,
+        val name: String,
+        val apy: BigDecimal,
+        val apyTitle: String,
+        val apyDescription: String,
+        val bonusApy: BigDecimal?,
+        val bonusTitle: String?,
+        val bonusDescription: String?,
+        val eligibleBonusUrl: String?,
+        val depositUrl: String,
+        val withdrawalUrl: String,
+        val jettonMaster: String,
+        val links: List<String>,
+    ) : Parcelable {
+        enum class Type(val id: String) {
+            STONFI("stonfi"),
+            AFFLUENT("affluent");
+
+            companion object {
+                fun fromId(id: String): Type {
+                    return entries.find { it.id.equals(id, ignoreCase = true) }
+                        ?: throw IllegalArgumentException("Invalid type: $id")
+                }
+            }
+        }
+
+        constructor(json: JSONObject) : this(
+            type = Type.fromId(json.getString("type")),
+            name = json.getString("name"),
+            apy = BigDecimal.valueOf(json.getDouble("apy")),
+            apyTitle = json.getString("apy_title"),
+            apyDescription = json.getString("apy_description"),
+            bonusApy = json.optString("bonus_apy").takeIf { it.isNotEmpty() }?.let {
+                BigDecimal(it)
+            },
+            bonusTitle = json.optString("apy_bonus_title"),
+            bonusDescription = json.optString("apy_bonus_description"),
+            eligibleBonusUrl = json.optString("eligible_bonus_url"),
+            depositUrl = json.getString("deposit_url"),
+            withdrawalUrl = json.getString("withdrawal_url"),
+            jettonMaster = json.getString("jetton_master"),
+            links = json.optJSONArray("links")?.let { array ->
+                (0 until array.length()).map { array.getString(it) }
+            } ?: emptyList()
+        )
+    }
+
+    constructor(json: JSONObject) : this(
+        methods = json.getJSONArray("methods").map { Method(it) },
+        about = About(json.getJSONObject("about"))
+    )
+}
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/FlagsEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/FlagsEntity.kt
index 25d7eb95f..c35ea92ea 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/FlagsEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/FlagsEntity.kt
@@ -14,7 +14,14 @@ data class FlagsEntity(
     val disableLegacyBlur: Boolean,
     val disableSigner: Boolean,
     val safeModeEnabled: Boolean,
-): Parcelable {
+    val disableStaking: Boolean,
+    val disableTron: Boolean,
+    val disableBattery: Boolean,
+    val disableGasless: Boolean,
+    val disableUsde: Boolean,
+    val disableNativeSwap: Boolean,
+    val disableOnboardingStory: Boolean
+) : Parcelable {
 
     constructor(json: JSONObject) : this(
         disableSwap = json.optBoolean("disable_swap", false),
@@ -23,7 +30,14 @@ data class FlagsEntity(
         disableBlur = json.optBoolean("disable_blur", false),
         disableLegacyBlur = json.optBoolean("disable_legacy_blur", false),
         disableSigner = json.optBoolean("disable_signer", false),
-        safeModeEnabled = json.optBoolean("safe_mode_enabled", false)
+        safeModeEnabled = json.optBoolean("safe_mode_enabled", false),
+        disableStaking = json.optBoolean("disable_staking", false),
+        disableTron = json.optBoolean("disable_tron", false),
+        disableBattery = json.optBoolean("disable_battery", false),
+        disableGasless = json.optBoolean("disable_gaseless", false),
+        disableUsde = json.optBoolean("disable_usde", false),
+        disableNativeSwap = json.optBoolean("disable_native_swap", false),
+        disableOnboardingStory = json.optBoolean("disable_onboarding_story", false)
     )
 
     constructor() : this(
@@ -33,6 +47,13 @@ data class FlagsEntity(
         disableBlur = false,
         disableLegacyBlur = false,
         disableSigner = false,
-        safeModeEnabled = false
+        safeModeEnabled = false,
+        disableStaking = false,
+        disableTron = false,
+        disableBattery = false,
+        disableGasless = false,
+        disableUsde = false,
+        disableNativeSwap = false,
+        disableOnboardingStory = false
     )
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampArgsEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampArgsEntity.kt
index 7b29ca647..48891bdc6 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampArgsEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampArgsEntity.kt
@@ -10,7 +10,6 @@ data class OnRampArgsEntity(
     val wallet: String,
     val purchaseType: String,
     val amount: Coins,
-    val country: String,
     val paymentMethod: String?
 ) {
 
@@ -21,7 +20,6 @@ data class OnRampArgsEntity(
         put("wallet", wallet)
         put("purchase_type", purchaseType)
         put("amount", amount.value.toPlainString())
-        put("country", country)
         paymentMethod?.let {
             put("payment_method", it)
         }
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampMerchantEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampMerchantEntity.kt
index f854b6239..498fbe376 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampMerchantEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampMerchantEntity.kt
@@ -5,12 +5,26 @@ import org.json.JSONObject
 data class OnRampMerchantEntity(
     val merchant: String,
     val amount: Double,
-    val widgetUrl: String
+    val widgetUrl: String,
+    val minAmount: Double,
 ) {
 
+    data class Data(
+        val items: List<OnRampMerchantEntity> = emptyList(),
+        val suggested: List<OnRampMerchantEntity> = emptyList()
+    ) {
+
+        val isEmpty: Boolean
+            get() = items.isEmpty() && suggested.isEmpty()
+
+        val size: Int
+            get() = items.size + suggested.size
+    }
+
     constructor(json: JSONObject) : this(
         merchant = json.getString("merchant"),
         amount = json.getDouble("amount"),
-        widgetUrl = json.getString("widget_url")
+        widgetUrl = json.getString("widget_url"),
+        minAmount = json.optDouble("min_amount", 0.0)
     )
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/QRScannerExtendsEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/QRScannerExtendsEntity.kt
new file mode 100644
index 000000000..3ff6fadcd
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/QRScannerExtendsEntity.kt
@@ -0,0 +1,55 @@
+package com.tonapps.wallet.api.entity
+
+import android.os.Parcelable
+import android.util.Log
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import org.json.JSONArray
+import org.json.JSONObject
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
+
+@Parcelize
+data class QRScannerExtendsEntity(
+    val version: Int,
+    val regexp: String,
+    val url: String
+): Parcelable {
+
+    @IgnoredOnParcel
+    val regex: Regex by lazy {
+        Regex(regexp)
+    }
+
+    constructor(json: JSONObject) : this(
+        version = json.getInt("version"),
+        regexp = json.getString("regexp"),
+        url = json.getString("url")
+    )
+
+    fun isMatch(input: String): Boolean {
+        return regex.containsMatchIn(input)
+    }
+
+    fun buildUrl(input: String): String? {
+        if (!isMatch(input)) {
+            return null
+        }
+        val encoded = URLEncoder.encode(input, StandardCharsets.UTF_8.name())
+        return url.replace("{{QR_CODE}}", encoded)
+    }
+
+    companion object {
+
+        fun of(array: JSONArray): List<QRScannerExtendsEntity> {
+            return (0 until array.length()).mapNotNull {
+                val json = array.getJSONObject(it)
+                if (json.getInt("version") == 1) {
+                    QRScannerExtendsEntity(array.getJSONObject(it))
+                } else {
+                    null
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/SwapEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/SwapEntity.kt
new file mode 100644
index 000000000..dc04e6d3e
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/SwapEntity.kt
@@ -0,0 +1,51 @@
+package com.tonapps.wallet.api.entity
+
+import io.Serializer
+import kotlinx.serialization.Serializable
+
+object SwapEntity {
+
+    @Serializable
+    data class Message(
+        val targetAddress: String,
+        val sendAmount: String,
+        val payload: String?,
+    )
+
+    @Serializable
+    data class Messages(
+        val messages: List<Message>,
+        val quoteId: String,
+        val resolverName: String,
+        val askUnits: String,
+        val bidUnits: String,
+        val protocolFeeUnits: String,
+        val tradeStartDeadline: String,
+        val gasBudget: String,
+        val estimatedGasConsumption: String,
+        val slippage: Int
+    ) {
+
+        val isEmpty: Boolean
+            get() = messages.isEmpty()
+    }
+
+    val empty = Messages(
+        messages = emptyList(),
+        quoteId = "",
+        resolverName = "",
+        askUnits = "",
+        bidUnits = "",
+        protocolFeeUnits = "",
+        tradeStartDeadline = "",
+        gasBudget = "",
+        estimatedGasConsumption = "",
+        slippage = 100
+    )
+
+    fun parse(data: String) = try {
+        Serializer.fromJSON<Messages>(data)
+    } catch (ignored: Throwable) {
+        null
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
index 4e01f4633..0f5b40854 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/TokenEntity.kt
@@ -90,9 +90,14 @@ data class TokenEntity(
 
         val TON_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_ton_with_bg.toString()).build()
         val USDT_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_usdt_with_bg.toString()).build()
+        val USDE_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_udse_ethena_with_bg.toString()).build()
+        val TS_USDE_ICON_URI = Uri.Builder().scheme("res").path(R.drawable.ic_tsusde_with_bg.toString()).build()
 
         const val TRC20_USDT = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
         const val TON_USDT = "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe"
+        const val TON_USDE = "0:086fa2a675f74347b08dd4606a549b8fdb98829cb282bc1949d3b12fbaed9dcc"
+
+        const val TON_TS_USDE = "0:d0e545323c7acb7102653c073377f7e3c67f122eb94d430a250739f109d4a57d"
 
         val TON = TokenEntity(
             blockchain = Blockchain.TON,
@@ -133,6 +138,32 @@ data class TokenEntity(
             customPayloadApiUri = null
         )
 
+        val USDE = TokenEntity(
+            blockchain = Blockchain.TON,
+            address = TON_USDE,
+            name = "Ethena USDe",
+            symbol = "USDe",
+            imageUri = USDE_ICON_URI,
+            decimals = 6,
+            verification = Verification.whitelist,
+            isRequestMinting = false,
+            isTransferable = true,
+            customPayloadApiUri = null
+        )
+
+        val TS_USDE = TokenEntity(
+            blockchain = Blockchain.TON,
+            address = TON_TS_USDE,
+            name = "Ethena tsUSDe",
+            symbol = "tsUSDe",
+            imageUri = TS_USDE_ICON_URI,
+            decimals = 6,
+            verification = Verification.whitelist,
+            isRequestMinting = false,
+            isTransferable = true,
+            customPayloadApiUri = null
+        )
+
         private fun convertVerification(verification: JettonVerificationType): Verification {
             return when (verification) {
                 JettonVerificationType.whitelist -> Verification.whitelist
@@ -194,6 +225,6 @@ data class TokenEntity(
         isRequestMinting = extensions?.contains(Extension.CustomPayload.value) == true,
         isTransferable = extensions?.contains(Extension.NonTransferable.value) != true,
         lock = lock?.let { Lock(it) },
-        customPayloadApiUri = jetton.customPayloadApiUri
+        customPayloadApiUri = jetton.metadata.customPayloadApiUri
     )
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/ConfigRepository.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/ConfigRepository.kt
index 7e0bed499..56d5fa014 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/ConfigRepository.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/ConfigRepository.kt
@@ -1,7 +1,6 @@
 package com.tonapps.wallet.api.internal
 
 import android.content.Context
-import android.util.Log
 import com.tonapps.extensions.file
 import com.tonapps.extensions.toByteArray
 import com.tonapps.extensions.toParcel
@@ -10,7 +9,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
@@ -33,11 +31,11 @@ internal class ConfigRepository(
 
     init {
         scope.launch(Dispatchers.IO) {
-            readCache()?.let {
-                setConfig(it)
-            }
-            remote(false)?.let {
-                setConfig(it)
+            val cached = readCache()
+            if (cached != null) {
+                setConfig(cached)
+            } else {
+                initConfig()
             }
         }
     }
@@ -59,4 +57,15 @@ internal class ConfigRepository(
         config
     }
 
+    suspend fun refresh(testnet: Boolean) {
+        val config = remote(testnet) ?: return
+        setConfig(config)
+    }
+
+    suspend fun initConfig() {
+        remote(false)?.let {
+            setConfig(it)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt
index ee70b799f..b34dd98f3 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt
@@ -4,19 +4,21 @@ import android.content.Context
 import android.net.Uri
 import android.util.ArrayMap
 import android.util.Log
+import androidx.core.net.toUri
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.tonapps.extensions.deviceCountry
-import com.tonapps.extensions.getStoreCountry
 import com.tonapps.extensions.isDebug
 import com.tonapps.extensions.locale
 import com.tonapps.extensions.map
 import com.tonapps.network.get
 import com.tonapps.network.postJSON
 import com.tonapps.wallet.api.entity.ConfigEntity
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.NotificationEntity
 import com.tonapps.wallet.api.entity.OnRampArgsEntity
 import com.tonapps.wallet.api.entity.StoryEntity
+import com.tonapps.wallet.api.entity.SwapEntity
 import com.tonapps.wallet.api.withRetry
+import io.Serializer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -31,12 +33,24 @@ internal class InternalApi(
     private val appVersionName: String
 ) {
 
+    private var _deviceCountry: String? = null
+    private var _storeCountry: String? = null
+
+    val country: String
+        get() = _storeCountry ?: _deviceCountry ?: Locale.getDefault().country.uppercase()
+
+    fun setCountry(deviceCountry: String, storeCountry: String?) {
+        _deviceCountry = deviceCountry.uppercase()
+        _storeCountry = storeCountry?.uppercase()
+    }
+
     private fun endpoint(
         path: String,
         testnet: Boolean,
         platform: String,
         build: String,
         boot: Boolean = false,
+        queryParams: Map<String, String> = emptyMap(),
     ): String = runBlocking {
         val builder = Uri.Builder()
         builder.scheme("https")
@@ -48,11 +62,16 @@ internal class InternalApi(
             .appendQueryParameter("chainName", if (testnet) "testnet" else "mainnet")
             .appendQueryParameter("bundle_id", context.packageName)
 
-        val storeCountry = context.getStoreCountry()
-        storeCountry?.let {
-            builder.appendQueryParameter("store_country_code", storeCountry)
+        _storeCountry?.let {
+            builder.appendQueryParameter("store_country_code", it)
+        }
+        _deviceCountry?.let {
+            builder.appendQueryParameter("device_country_code", it)
+        }
+
+        queryParams.forEach {
+            builder.appendQueryParameter(it.key, it.value)
         }
-        builder.appendQueryParameter("device_country_code", context.deviceCountry)
 
         builder.build().toString()
     }
@@ -64,8 +83,9 @@ internal class InternalApi(
         build: String = appVersionName,
         locale: Locale,
         boot: Boolean = false,
+        queryParams: Map<String, String> = emptyMap(),
     ): JSONObject {
-        val url = endpoint(path, testnet, platform, build, boot)
+        val url = endpoint(path, testnet, platform, build, boot, queryParams)
         val headers = ArrayMap<String, String>()
         headers["Accept-Language"] = locale.toString()
         val body = withRetry {
@@ -74,18 +94,45 @@ internal class InternalApi(
         return JSONObject(body)
     }
 
-    fun getOnRampData(country: String) = withRetry {
-        okHttpClient.get("https://swap.tonkeeper.com/v2/onramp/currencies?country=${country.uppercase()}")
+    private fun swapEndpoint(path: String): String {
+        val builder = "https://swap.tonkeeper.com".toUri().buildUpon()
+            .appendEncodedPath(path)
+        _deviceCountry?.let {
+            builder.appendQueryParameter("device_country_code", _deviceCountry)
+            builder.appendQueryParameter("country", _storeCountry ?: _deviceCountry)
+        }
+        _storeCountry?.let {
+            builder.appendQueryParameter("store_country_code", _storeCountry)
+        }
+
+        return builder.build().toString()
+    }
+
+    fun getSwapAssets() = withRetry {
+        okHttpClient.get(swapEndpoint("v2/swap/assets"))
+    }
+
+    fun getOnRampData() = withRetry {
+        okHttpClient.get(swapEndpoint("v2/onramp/currencies"))
     }
 
-    fun getEthenaStakingAPY(address: String): BigDecimal = withRetry {
-        val json = request("ethena/staking?address=$address", false, locale = context.locale)
-        BigDecimal.valueOf(json.getDouble("value"))
-    } ?: BigDecimal.ZERO
+    fun getOnRampPaymentMethods() = withRetry {
+        okHttpClient.get(swapEndpoint("v2/onramp/payment_methods"))
+    }
 
-    fun calculateOnRamp(args: OnRampArgsEntity) = withRetry {
-        val url = "https://swap.tonkeeper.com/v2/onramp/calculate"
-        okHttpClient.postJSON(url, args.toJSON().toString()).body?.string()
+    fun getOnRampMerchants() = withRetry {
+        okHttpClient.get(swapEndpoint("v2/onramp/merchants"))
+    }
+
+    fun calculateOnRamp(args: OnRampArgsEntity): String? {
+        val json = args.toJSON()
+        _deviceCountry?.let { json.put("country", _deviceCountry) }
+        return withRetry {
+            okHttpClient.postJSON(
+                swapEndpoint("v2/onramp/calculate"),
+                json.toString()
+            ).body.string()
+        }
     }
 
     fun getNotifications(): List<NotificationEntity> {
@@ -113,7 +160,11 @@ internal class InternalApi(
         val telegramBots = domains.filter { it.startsWith("@") }.map { "t.me/${it.substring(1)}" }
         val maskDomains = domains.filter { it.startsWith("*.") }
         val cleanDomains = domains.filter { domain ->
-            !domain.startsWith("@") && !domain.startsWith("*.") && maskDomains.none { mask -> domain.endsWith(".$mask") }
+            !domain.startsWith("@") && !domain.startsWith("*.") && maskDomains.none { mask ->
+                domain.endsWith(
+                    ".$mask"
+                )
+            }
         }
 
         return (maskDomains + cleanDomains + telegramBots).toTypedArray()
@@ -173,4 +224,14 @@ internal class InternalApi(
         }
     }
 
+    fun getEthena(accountId: String): EthenaEntity? = withRetry {
+        val json = request(
+            "staking/ethena",
+            false,
+            locale = context.locale,
+            queryParams = mapOf("address" to accountId)
+        )
+        EthenaEntity(json)
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/SwapApi.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/SwapApi.kt
new file mode 100644
index 000000000..8bb42e6e3
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/SwapApi.kt
@@ -0,0 +1,36 @@
+package com.tonapps.wallet.api.internal
+
+import androidx.core.net.toUri
+import com.tonapps.network.get
+import com.tonapps.network.sse
+import com.tonapps.wallet.api.SwapAssetParam
+import com.tonapps.wallet.api.entity.SwapEntity
+import com.tonapps.wallet.api.withRetry
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.map
+import okhttp3.OkHttpClient
+
+internal class SwapApi(
+    private val okHttpClient: OkHttpClient
+) {
+
+    fun getSwapAssets() = withRetry {
+        okHttpClient.get("https://swap.tonkeeper.com/v2/swap/assets")
+    }
+
+    fun stream(from: SwapAssetParam, to: SwapAssetParam, userAddress: String): Flow<SwapEntity.Messages?> {
+        if (from.isEmpty && to.isEmpty) {
+            return emptyFlow()
+        }
+        val builder = "https://swap.tonkeeper.com/v2/swap/omniston/stream".toUri().buildUpon()
+        from.apply("from", builder)
+        to.apply("to", builder)
+        builder.appendQueryParameter("userAddress", userAddress)
+        val url = builder.build().toString()
+        return okHttpClient.sse(url) { }.map {
+            SwapEntity.parse(it.data)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/omniston/Omniston.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/omniston/Omniston.kt
new file mode 100644
index 000000000..28010a31f
--- /dev/null
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/omniston/Omniston.kt
@@ -0,0 +1,155 @@
+package com.tonapps.wallet.api.omniston
+
+import kotlinx.serialization.Serializable
+
+object Omniston {
+
+    fun fixAddress(address: String): String {
+        if (address.equals("ton", true)) {
+            return "EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM9c"
+        }
+        return address
+    }
+
+    @Serializable
+    data class AssetAddress(
+        val blockchain: Int = 607,
+        val address: String
+    )
+
+    @Serializable
+    data class Amount(
+        val offer_units: String? = null,
+        val ask_units: String? = null
+    )
+
+    @Serializable
+    data class SettlementParams(
+        val max_price_slippage_bps: Int = 500,
+        val max_outgoing_messages: Int = 4
+    )
+
+    @Serializable
+    data class QuoteParams(
+        val offer_asset_address: AssetAddress,
+        val ask_asset_address: AssetAddress,
+        val amount: Amount,
+        val referrer_fee_bps: Int = 0,
+        val settlement_methods: List<Int> = listOf(0),
+        val settlement_params: SettlementParams
+    )
+
+    @Serializable
+    data class QuoteResult(
+        val quote_id: String,
+        val offer_asset_address: AssetAddress,
+        val ask_asset_address: AssetAddress,
+        val offer_amount: Amount,
+        val ask_amount: Amount,
+        val rate: String,
+        val expires_at: Long,
+        val settlement_methods: List<Int>
+    )
+
+    @Serializable
+    data class EventWrapper(
+        val jsonrpc: String,
+        val method: String,
+        val params: EventParams
+    )
+
+    @Serializable
+    data class EventParams(
+        val subscription: Long,
+        val result: EventResult
+    )
+
+    @Serializable
+    data class EventResult(
+        val event: Event
+    )
+
+    @Serializable
+    data class Event(
+        val quote_updated: QuoteUpdated? = null,
+    )
+
+    @Serializable
+    data class QuoteUpdated(
+        val quote_id: String,
+        val resolver_id: String,
+        val resolver_name: String,
+        val offer_asset_address: AssetAddress,
+        val ask_asset_address: AssetAddress,
+        val offer_units: String,
+        val ask_units: String,
+        val referrer_address: String?,
+        val referrer_fee_units: String,
+        val protocol_fee_units: String,
+        val quote_timestamp: Long,
+        val trade_start_deadline: Long,
+        val gas_budget: String,
+        val estimated_gas_consumption: String,
+        val referrer_fee_asset: AssetAddress,
+        val protocol_fee_asset: AssetAddress,
+        val params: SwapParams
+    )
+
+    @Serializable
+    data class SwapParams(
+        val swap: SwapDetails
+    )
+
+    @Serializable
+    data class SwapDetails(
+        val routes: List<Route>
+    )
+
+    @Serializable
+    data class Route(
+        val steps: List<Step>,
+        val gas_budget: String
+    )
+
+    @Serializable
+    data class Step(
+        val offer_asset_address: AssetAddress,
+        val ask_asset_address: AssetAddress,
+        val chunks: List<Chunk>
+    )
+
+    @Serializable
+    data class Chunk(
+        val protocol: String,
+        val offer_amount: String,
+        val ask_amount: String,
+        val extra_version: Int,
+        val extra: List<Int>
+    )
+
+    @Serializable
+    data class TonEventResult(
+        val ton: TonPayload
+    )
+
+    @Serializable
+    data class TonPayload(
+        val messages: List<TonMessage>
+    )
+
+    @Serializable
+    data class TonMessage(
+        val target_address: String,
+        val send_amount: String,
+        val payload: String
+    )
+
+    @Serializable
+    data class TransactionBuildTransfer(
+        val destination_address: AssetAddress,
+        val gas_excess_address: AssetAddress,
+        val source_address: AssetAddress,
+        val quote: QuoteUpdated,
+    )
+
+}
\ No newline at end of file
diff --git a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/tron/TronApi.kt b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/tron/TronApi.kt
index 407d8d9fe..53fd2f052 100644
--- a/apps/wallet/api/src/main/java/com/tonapps/wallet/api/tron/TronApi.kt
+++ b/apps/wallet/api/src/main/java/com/tonapps/wallet/api/tron/TronApi.kt
@@ -16,7 +16,7 @@ import com.tonapps.wallet.api.tron.entity.TronEstimationEntity
 import com.tonapps.wallet.api.tron.entity.TronEventEntity
 import com.tonapps.wallet.api.tron.entity.TronResourcesEntity
 import com.tonapps.wallet.api.withRetry
-import io.batteryapi.apis.BatteryApi
+import io.batteryapi.apis.DefaultApi
 import io.batteryapi.models.TronSendRequest
 import io.ktor.util.encodeBase64
 import kotlinx.serialization.json.buildJsonObject
@@ -28,7 +28,7 @@ import java.math.BigInteger
 class TronApi(
     private val config: ConfigEntity,
     private val okHttpClient: OkHttpClient,
-    private val batteryApi: BatteryApi
+    private val batteryApi: DefaultApi
 ) {
 
     companion object {
diff --git a/apps/wallet/api/src/main/res/drawable/ic_tsusde_with_bg.png b/apps/wallet/api/src/main/res/drawable/ic_tsusde_with_bg.png
new file mode 100644
index 000000000..da88b1238
Binary files /dev/null and b/apps/wallet/api/src/main/res/drawable/ic_tsusde_with_bg.png differ
diff --git a/apps/wallet/data/account/build.gradle.kts b/apps/wallet/data/account/build.gradle.kts
index dd77e2ecf..38b476884 100644
--- a/apps/wallet/data/account/build.gradle.kts
+++ b/apps/wallet/data/account/build.gradle.kts
@@ -9,24 +9,24 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.KotlinX.serializationJSON)
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.Koin.core)
-    implementation(Dependence.TON.tvm)
-    implementation(Dependence.TON.crypto)
-    implementation(Dependence.TON.tlb)
-    implementation(Dependence.TON.blockTlb)
-    implementation(Dependence.TON.tonapiTl)
-    implementation(Dependence.TON.contract)
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.rn))
-    implementation(project(Dependence.Wallet.Data.rates))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Lib.ledger))
+    implementation(libs.kotlinX.serialization.json)
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.koin.core)
+    implementation(libs.ton.tvm)
+    implementation(libs.ton.crypto)
+    implementation(libs.ton.tlb)
+    implementation(libs.ton.blockTlb)
+    implementation(libs.ton.tonapiTl)
+    implementation(libs.ton.contract)
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.rn))
+    implementation(project(ProjectModules.Wallet.Data.rates))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Lib.ledger))
 }
diff --git a/apps/wallet/data/backup/build.gradle.kts b/apps/wallet/data/backup/build.gradle.kts
index fa81eb7ab..f9429764e 100644
--- a/apps/wallet/data/backup/build.gradle.kts
+++ b/apps/wallet/data/backup/build.gradle.kts
@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Wallet.Data.rn))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Wallet.Data.rn))
 }
 
diff --git a/apps/wallet/data/battery/build.gradle.kts b/apps/wallet/data/battery/build.gradle.kts
index 56d40c87c..631851974 100644
--- a/apps/wallet/data/battery/build.gradle.kts
+++ b/apps/wallet/data/battery/build.gradle.kts
@@ -8,16 +8,14 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.Squareup.moshi)
-    implementation(Dependence.Squareup.moshiAdapters)
-    implementation(Dependence.Squareup.okhttp)
+    implementation(libs.okhttp)
 
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.icu))
-    implementation(project(Dependence.Lib.security))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(project(ProjectModules.Lib.security))
 }
diff --git a/apps/wallet/data/browser/build.gradle.kts b/apps/wallet/data/browser/build.gradle.kts
index 403a84b4d..d4430de92 100644
--- a/apps/wallet/data/browser/build.gradle.kts
+++ b/apps/wallet/data/browser/build.gradle.kts
@@ -8,13 +8,13 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.Squareup.okhttp)
+    implementation(libs.okhttp)
 
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.account))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.account))
 
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.extensions))
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.extensions))
 }
 
diff --git a/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt b/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt
index e191773bd..861c54f8a 100644
--- a/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt
+++ b/apps/wallet/data/browser/src/main/java/com/tonapps/wallet/data/browser/BrowserRepository.kt
@@ -41,6 +41,9 @@ class BrowserRepository(context: Context, api: API) {
     }
 
     suspend fun isTrustedApp(country: String, testnet: Boolean, locale: Locale, deeplink: Uri): Boolean {
+        if (deeplink.host == "dapp.aeon.xyz" || deeplink.host == "tonkeeper.com" || deeplink.host?.endsWith(".tonkeeper.com") == true) {
+            return true
+        }
         val host = deeplink.host ?: return false
         val apps = getApps(country, testnet, locale)
         for (app in apps) {
diff --git a/apps/wallet/data/collectibles/build.gradle.kts b/apps/wallet/data/collectibles/build.gradle.kts
index 158b9210b..aa2a5a682 100644
--- a/apps/wallet/data/collectibles/build.gradle.kts
+++ b/apps/wallet/data/collectibles/build.gradle.kts
@@ -8,10 +8,10 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.sqlite))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.sqlite))
 }
diff --git a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/CollectiblesRepository.kt b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/CollectiblesRepository.kt
index ef5be2757..bb9c01368 100644
--- a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/CollectiblesRepository.kt
+++ b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/CollectiblesRepository.kt
@@ -3,12 +3,19 @@ package com.tonapps.wallet.data.collectibles
 import android.content.Context
 import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.withRetry
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.collectibles.entities.NftEntity
 import com.tonapps.wallet.data.collectibles.entities.NftListResult
 import com.tonapps.wallet.data.collectibles.source.LocalDataSource
+import io.extensions.renderType
+import io.tonapi.models.TrustType
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.withContext
 
 class CollectiblesRepository(
     private val context: Context,
@@ -19,6 +26,24 @@ class CollectiblesRepository(
         LocalDataSource(context)
     }
 
+    suspend fun getDnsExpiring(accountId: String, testnet: Boolean, period: Int) = api.getDnsExpiring(accountId, testnet, period).map { model ->
+        DnsExpiringEntity(
+            expiringAt = model.expiringAt,
+            name = model.name,
+            dnsItem = model.dnsItem?.let { NftEntity(it, testnet) }
+        )
+    }.sortedBy { it.daysUntilExpiration }
+
+    suspend fun getDnsSoonExpiring(accountId: String, testnet: Boolean, period: Int = 30) = getDnsExpiring(accountId, testnet, period)
+
+    suspend fun getDnsNftExpiring(
+        accountId: String,
+        testnet: Boolean,
+        nftAddress: String
+    ) = getDnsExpiring(accountId, testnet, 366).firstOrNull {
+        it.dnsItem?.address?.equalsAddress(nftAddress) == true
+    }
+
     fun getNft(accountId: String, testnet: Boolean, address: String): NftEntity? {
         val nft = localDataSource.getSingle(accountId, testnet, address)
         if (nft != null) {
@@ -64,7 +89,7 @@ class CollectiblesRepository(
     ): List<NftEntity>? {
         val nftItems = api.getNftItems(address, testnet) ?: return null
         val items = nftItems.filter {
-            it.trust != "blacklist" && it.metadata["render_type"] != "hidden"
+            it.trust != TrustType.blacklist && it.renderType != "hidden"
         }.map { NftEntity(it, testnet) }
 
         localDataSource.save(address, testnet, items.toList())
diff --git a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/DnsExpiringEntity.kt b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/DnsExpiringEntity.kt
new file mode 100644
index 000000000..afdc90908
--- /dev/null
+++ b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/DnsExpiringEntity.kt
@@ -0,0 +1,37 @@
+package com.tonapps.wallet.data.collectibles.entities
+
+import android.os.Parcelable
+import com.tonapps.blockchain.ton.extensions.toRawAddress
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class DnsExpiringEntity(
+    val expiringAt: Long,
+    val name: String,
+    val dnsItem: NftEntity? = null
+): Parcelable {
+
+    @IgnoredOnParcel
+    val addressRaw: String by lazy {
+        dnsItem?.address?.toRawAddress() ?: ""
+    }
+
+    @IgnoredOnParcel
+    val inSale: Boolean by lazy {
+        dnsItem?.inSale ?: false
+    }
+
+    @IgnoredOnParcel
+    val daysUntilExpiration: Int by lazy {
+        val currentTime = System.currentTimeMillis() / 1000
+        val remainingSeconds = expiringAt - currentTime
+
+        if (remainingSeconds <= 0) {
+            0
+        } else {
+            (remainingSeconds / (24 * 60 * 60)).toInt()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftEntity.kt b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftEntity.kt
index eaeb39552..6e3362af0 100644
--- a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftEntity.kt
+++ b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftEntity.kt
@@ -119,6 +119,6 @@ data class NftEntity(
         verified = item.approvedBy.isNotEmpty(),
         inSale = item.sale != null,
         dns = item.dns,
-        trust = Trust(item.trust),
+        trust = Trust(item.trust.value),
     )
 }
\ No newline at end of file
diff --git a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftMetadataEntity.kt b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftMetadataEntity.kt
index c7e52f642..6e3eaff71 100644
--- a/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftMetadataEntity.kt
+++ b/apps/wallet/data/collectibles/src/main/java/com/tonapps/wallet/data/collectibles/entities/NftMetadataEntity.kt
@@ -3,6 +3,7 @@ package com.tonapps.wallet.data.collectibles.entities
 import android.os.Parcelable
 import android.util.Base64
 import android.util.Log
+import io.JsonAny
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -43,12 +44,18 @@ data class NftMetadataEntity(
         "https://c.tonapi.io/json?url=$encoded"
     }
 
-    constructor(map: Map<String, Any>) : this(
-        strings = map.filter { it.value is String }.mapValues { it.value as String } as HashMap<String, String>,
-        buttons = map["buttons"]?.let { buttons ->
-            (buttons as List<Map<String, String>>).map {
-                Button(it)
+    constructor(map: Map<String, JsonAny>) : this(
+        strings = HashMap(map.mapNotNull { (key, value) ->
+            value.asString()?.let { key to it }
+        }.toMap()),
+
+        buttons = map["buttons"]?.asArray()?.mapNotNull { buttonElement ->
+            buttonElement.asObject()?.let { buttonMap ->
+                val stringMap = buttonMap.mapNotNull { (key, value) ->
+                    value.asString()?.let { key to it }
+                }.toMap()
+                Button(stringMap)
             }
-        } ?: arrayListOf()
+        } ?: emptyList()
     )
 }
\ No newline at end of file
diff --git a/apps/wallet/data/contacts/build.gradle.kts b/apps/wallet/data/contacts/build.gradle.kts
index 876fd596b..976af010e 100644
--- a/apps/wallet/data/contacts/build.gradle.kts
+++ b/apps/wallet/data/contacts/build.gradle.kts
@@ -8,8 +8,8 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Wallet.Data.rn))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Wallet.Data.rn))
 }
diff --git a/apps/wallet/data/core/build.gradle.kts b/apps/wallet/data/core/build.gradle.kts
index a83654d66..659586419 100644
--- a/apps/wallet/data/core/build.gradle.kts
+++ b/apps/wallet/data/core/build.gradle.kts
@@ -23,23 +23,23 @@ android {
 }
 
 dependencies {
-    api(platform(Dependence.Firebase.bom))
-    api(Dependence.Firebase.crashlytics)
-
-    implementation(Dependence.TON.tvm)
-    implementation(Dependence.TON.crypto)
-    implementation(Dependence.TON.tlb)
-    implementation(Dependence.TON.blockTlb)
-    implementation(Dependence.TON.tonapiTl)
-    implementation(Dependence.TON.contract)
-    implementation(Dependence.Koin.core)
-    implementation(Dependence.AndroidX.biometric)
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.UIKit.flag))
+    api(platform(libs.firebase.bom))
+    api(libs.firebase.crashlytics)
+
+    implementation(libs.ton.tvm)
+    implementation(libs.ton.crypto)
+    implementation(libs.ton.tlb)
+    implementation(libs.ton.blockTlb)
+    implementation(libs.ton.tonapiTl)
+    implementation(libs.ton.contract)
+    implementation(libs.koin.core)
+    implementation(libs.androidX.biometric)
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.UIKit.flag))
 }
 
 
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt
index 944ebc8a3..88a9c5fa2 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/BlobDataSource.kt
@@ -2,17 +2,14 @@ package com.tonapps.wallet.data.core
 
 import android.content.Context
 import android.os.Parcelable
-import android.util.Log
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.cacheFolder
 import com.tonapps.extensions.file
 import com.tonapps.extensions.toByteArray
 import com.tonapps.extensions.toParcel
-import com.tonapps.wallet.api.fromJSON
-import com.tonapps.wallet.api.toJSON
+import io.Serializer
 import java.io.File
 import java.io.IOException
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 
 abstract class BlobDataSource<D>(
@@ -40,7 +37,7 @@ abstract class BlobDataSource<D>(
             timeout: Long = TimeUnit.DAYS.toMillis(90)
         ): BlobDataSource<T> {
             return object : BlobDataSource<T>(context, path, timeout) {
-                override fun onMarshall(data: T) = toJSON(data).toByteArray()
+                override fun onMarshall(data: T) = Serializer.toJSON(data).toByteArray()
 
                 override fun onUnmarshall(bytes: ByteArray): T? {
                     if (bytes.isEmpty()) {
@@ -48,7 +45,7 @@ abstract class BlobDataSource<D>(
                     }
                     return try {
                         val string = String(bytes)
-                        fromJSON(string)
+                        Serializer.fromJSON(string)
                     } catch (e: Throwable) {
                         FirebaseCrashlytics.getInstance().recordException(e)
                         null
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/Extensions.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/Extensions.kt
index 4befdaead..f9ac18470 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/Extensions.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/Extensions.kt
@@ -3,6 +3,12 @@ package com.tonapps.wallet.data.core
 import android.content.Context
 import androidx.biometric.BiometricManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+fun List<WalletCurrency>.query(value: String) = firstOrNull {
+    it.address.equalsAddress(value)
+}
 
 fun accountId(accountId: String, testnet: Boolean): String {
     if (testnet) {
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/CurrencyCountries.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/CurrencyCountries.kt
index 9c89dda23..1efd99ef5 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/CurrencyCountries.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/CurrencyCountries.kt
@@ -229,4 +229,8 @@ object CurrencyCountries {
         return currencyToCountryMap[code.uppercase()] ?: ""
     }
 
+    fun getCurrencyCode(countryCode: String): String? {
+        return currencyToCountryMap.entries.firstOrNull { it.value.equals(countryCode, ignoreCase = true) }?.key
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/WalletCurrency.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/WalletCurrency.kt
index fbf614fb5..923f325e1 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/WalletCurrency.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/currency/WalletCurrency.kt
@@ -2,6 +2,7 @@ package com.tonapps.wallet.data.core.currency
 
 import android.net.Uri
 import android.os.Parcelable
+import android.util.Log
 import androidx.annotation.DrawableRes
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.uikit.flag.getFlagDrawable
@@ -193,19 +194,22 @@ data class WalletCurrency(
             "KWD", // Kuwaiti Dinar
             "RON", // Romanian Leu
             "EGP", // Egyptian Pound
+            "NOK" // Norwegian Krone
         )
 
         const val USDT_KEY = "USDT"
         const val USDE_KEY = "USDE"
+        const val TS_USDE_KEY = "TS_USDE"
         const val TON_KEY = "TON"
         const val BTC_KEY = "BTC"
         const val ETH_KEY = "ETH"
 
         private val USDT_TRON_ADDRESS = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
-        private val USDT_TON_ADDRESS = "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe"
+        val USDT_TON_ADDRESS = "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe"
         private val USDT_ETH_ADDRESS = "0xdac17f958d2ee523a2206206994597c13d831ec7"
 
         val USDE_TON_ETHENA_ADDRESS = "0:086fa2a675f74347b08dd4606a549b8fdb98829cb282bc1949d3b12fbaed9dcc"
+        val TS_USDE_TON_ETHENA_ADDRESS = "0:d0e545323c7acb7102653c073377f7e3c67f122eb94d430a250739f109d4a57d"
 
         val USD = WalletCurrency(
             code = "USD",
@@ -263,6 +267,13 @@ data class WalletCurrency(
             chain = Chain.TON(USDE_TON_ETHENA_ADDRESS, 6)
         )
 
+        val TS_USDE_TON_ETHENA = WalletCurrency(
+            code = TS_USDE_KEY,
+            alias = createAlias(TON_KEY, TS_USDE_KEY),
+            title = "Staked USDe",
+            chain = Chain.TON(TS_USDE_TON_ETHENA_ADDRESS, 6)
+        )
+
         val USDT_TRON = WalletCurrency(
             code = USDT_KEY,
             alias = createAlias("TRON", USDT_KEY),
@@ -349,6 +360,9 @@ data class WalletCurrency(
         }
 
         fun of(code: String?): WalletCurrency? {
+            if (code == "US") {
+                return of("USD")
+            }
             if (code.isNullOrBlank()) {
                 return null
             } else if (code in FIAT) {
@@ -386,6 +400,10 @@ data class WalletCurrency(
     val isTONChain: Boolean
         get() = chain is Chain.TON
 
+    @IgnoredOnParcel
+    val isTronChain: Boolean
+        get() = chain is Chain.TRON
+
     @IgnoredOnParcel
     val decimals: Int
         get() = chain.decimals
@@ -414,6 +432,29 @@ data class WalletCurrency(
         }
     }
 
+
+    @IgnoredOnParcel
+    val address: String by lazy {
+        when (chain) {
+            is Chain.TON -> chain.address
+            is Chain.TRON -> chain.address
+            is Chain.ETC -> chain.address
+            else -> code
+        }
+    }
+
+    @IgnoredOnParcel
+    val symbol: String by lazy {
+        /*if (chain is Chain.FIAT) {
+            code
+        } else if (chain is Chain.TON) {
+            chain.address
+        } else {
+            chain.name // code
+        }*/
+        code
+    }
+
     override fun equals(other: Any?): Boolean {
         val currency = other as? WalletCurrency ?: return false
         if (!code.equals(currency.code, true)) {
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
index a97f64032..a0d6ae5b7 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/RawMessageEntity.kt
@@ -1,10 +1,10 @@
 package com.tonapps.wallet.data.core.entity
 
 import android.os.Parcelable
-import android.util.Log
+import com.tonapps.blockchain.ton.TonAddressTags
+import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.cellFromBase64
 import com.tonapps.blockchain.ton.extensions.isValidTonAddress
-import com.tonapps.extensions.optStringCompat
 import com.tonapps.extensions.optStringCompatJS
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
@@ -31,6 +31,11 @@ data class RawMessageEntity(
         AddrStd.parse(addressValue)
     }
 
+    @IgnoredOnParcel
+    val addressTags: TonAddressTags by lazy {
+        TonAddressTags.of(addressValue)
+    }
+
     @IgnoredOnParcel
     val coins: Coins by lazy {
         Coins.ofNano(amount)
@@ -70,6 +75,24 @@ data class RawMessageEntity(
 
     companion object {
 
+        fun of(address: String, amount: Long, payload: String?) = RawMessageEntity(
+            addressValue = address,
+            amount = amount,
+            stateInitValue = null,
+            payloadValue = payload,
+        )
+
+        fun of(
+            amount: Long,
+            address: String,
+            payload: Cell?
+        ) = RawMessageEntity(
+            addressValue = address,
+            amount = amount,
+            stateInitValue = null,
+            payloadValue = payload?.base64()
+        )
+
         private fun parseAmount(value: Any): Long {
             if (value is Long) {
                 return value
diff --git a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/SignRequestEntity.kt b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/SignRequestEntity.kt
index ebd0dd4f1..114be4711 100644
--- a/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/SignRequestEntity.kt
+++ b/apps/wallet/data/core/src/main/java/com/tonapps/wallet/data/core/entity/SignRequestEntity.kt
@@ -26,7 +26,8 @@ data class SignRequestEntity(
     val validUntil: Long,
     val messages: List<RawMessageEntity>,
     val network: TonNetwork,
-    val messagesVariants: MessagesVariantsEntity? = null
+    val messagesVariants: MessagesVariantsEntity? = null,
+    val seqNo: Int? = null
 ): Parcelable {
 
     @IgnoredOnParcel
@@ -73,6 +74,9 @@ data class SignRequestEntity(
         private var validUntil: Long? = null
         private var network: TonNetwork = TonNetwork.MAINNET
         private val messages = mutableListOf<RawMessageEntity>()
+        private var seqNo: Int? = null
+
+        fun setSeqNo(seqNo: Int) = apply { this.seqNo = seqNo }
 
         fun setFrom(from: AddrStd) = apply { this.from = from }
 
@@ -84,6 +88,8 @@ data class SignRequestEntity(
 
         fun addMessage(message: RawMessageEntity) = apply { messages.add(message) }
 
+        fun addMessages(messages: List<RawMessageEntity>) = apply { this.messages.addAll(messages) }
+
         fun build(appUri: Uri): SignRequestEntity {
             return SignRequestEntity(
                 fromValue = from?.toAccountId(),
@@ -91,7 +97,8 @@ data class SignRequestEntity(
                 validUntil = validUntil ?: 0,
                 messages = messages.toList(),
                 network = network,
-                appUri = appUri
+                appUri = appUri,
+                seqNo = seqNo
             )
         }
     }
diff --git a/apps/wallet/data/dapps/build.gradle.kts b/apps/wallet/data/dapps/build.gradle.kts
index 50661ca7b..cd0ae5059 100644
--- a/apps/wallet/data/dapps/build.gradle.kts
+++ b/apps/wallet/data/dapps/build.gradle.kts
@@ -9,19 +9,19 @@ android {
 
 
 dependencies {
-    implementation(Dependence.TON.tvm)
-    implementation(Dependence.TON.crypto)
-    implementation(Dependence.TON.tlb)
-    implementation(Dependence.TON.blockTlb)
-    implementation(Dependence.TON.tonapiTl)
-    implementation(Dependence.TON.contract)
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.rn))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.base64))
+    implementation(libs.ton.tvm)
+    implementation(libs.ton.crypto)
+    implementation(libs.ton.tlb)
+    implementation(libs.ton.blockTlb)
+    implementation(libs.ton.tonapiTl)
+    implementation(libs.ton.contract)
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.rn))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.base64))
 }
\ No newline at end of file
diff --git a/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppEntity.kt b/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppEntity.kt
index fc5cd1ad3..424958bb4 100644
--- a/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppEntity.kt
+++ b/apps/wallet/data/dapps/src/main/java/com/tonapps/wallet/data/dapps/entities/AppEntity.kt
@@ -48,8 +48,10 @@ data class AppEntity(
 
     companion object {
 
+        val ETHENA_BASE_URL = "https://ethena.ston.fi".toUri()
+
         val ethena = AppEntity(
-            url = "https://ethena.ston.fi/".toUri(),
+            url = ETHENA_BASE_URL,
             name = "ethena.ston.fi",
             iconUrl = "https://static.ston.fi/logo/external-logo.jpg",
             empty = false
diff --git a/apps/wallet/data/events/build.gradle.kts b/apps/wallet/data/events/build.gradle.kts
index 7d07bf655..f9249e412 100644
--- a/apps/wallet/data/events/build.gradle.kts
+++ b/apps/wallet/data/events/build.gradle.kts
@@ -8,14 +8,14 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.rates))
-    implementation(project(Dependence.Wallet.Data.collectibles))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.icu))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.sqlite))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.rates))
+    implementation(project(ProjectModules.Wallet.Data.collectibles))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.sqlite))
 }
diff --git a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/Extensions.kt b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/Extensions.kt
index 5d84c8ab4..593446fbe 100644
--- a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/Extensions.kt
+++ b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/Extensions.kt
@@ -7,7 +7,7 @@ import io.tonapi.models.Action
 
 val Action.isTransfer: Boolean
     get() {
-        return type == TxActionType.TonTransfer || type == TxActionType.JettonTransfer || type == TxActionType.NftItemTransfer
+        return type == Action.Type.TonTransfer || type == Action.Type.JettonTransfer || type == Action.Type.NftItemTransfer || type == Action.Type.Purchase
     }
 
 fun AccountEvent.isOutTransfer(accountId: String): Boolean {
diff --git a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/source/DatabaseSource.kt b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/source/DatabaseSource.kt
index 71b863881..9731f5ddd 100644
--- a/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/source/DatabaseSource.kt
+++ b/apps/wallet/data/events/src/main/java/com/tonapps/wallet/data/events/source/DatabaseSource.kt
@@ -3,12 +3,10 @@ package com.tonapps.wallet.data.events.source
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
-import android.util.Log
 import com.tonapps.blockchain.ton.extensions.toRawAddress
 import com.tonapps.sqlite.SQLiteHelper
 import com.tonapps.sqlite.withTransaction
-import com.tonapps.wallet.api.fromJSON
-import com.tonapps.wallet.api.toJSON
+import io.Serializer
 import io.tonapi.models.AccountEvent
 import kotlinx.coroutines.CoroutineScope
 
@@ -37,7 +35,7 @@ internal class DatabaseSource(
             values.put(SPAM_TABLE_EVENT_ID_COLUMN, eventId)
             values.put(SPAM_TABLE_ACCOUNT_ID_COLUMN, accountId.toRawAddress())
             values.put(SPAM_TABLE_TESTNET_COLUMN, if (testnet) 1 else 0)
-            values.put(SPAM_TABLE_BODY_COLUMN, toJSON(this))
+            values.put(SPAM_TABLE_BODY_COLUMN, Serializer.toJSON(this))
             values.put(SPAM_TABLE_DATE_COLUMN, timestamp)
             return values
         }
@@ -63,7 +61,7 @@ internal class DatabaseSource(
     fun addSpam(accountId: String, testnet: Boolean, events: List<AccountEvent>) {
         writableDatabase.withTransaction {
             for (event in events) {
-                writableDatabase.insert(SPAM_TABLE_NAME, null, event.toValues(accountId, testnet))
+                writableDatabase.insertWithOnConflict(SPAM_TABLE_NAME, null, event.toValues(accountId, testnet), SQLiteDatabase.CONFLICT_REPLACE)
             }
         }
     }
@@ -81,7 +79,7 @@ internal class DatabaseSource(
         val events = mutableListOf<AccountEvent>()
         while (cursor.moveToNext()) {
             val body = cursor.getString(bodyIndex)
-            events.add(fromJSON(body))
+            events.add(Serializer.fromJSON(body))
         }
         cursor.close()
         return events.toList()
diff --git a/apps/wallet/data/passcode/build.gradle.kts b/apps/wallet/data/passcode/build.gradle.kts
index 4f4c35a07..5a397012c 100644
--- a/apps/wallet/data/passcode/build.gradle.kts
+++ b/apps/wallet/data/passcode/build.gradle.kts
@@ -8,14 +8,14 @@ android {
 
 dependencies {
 
-    implementation(Dependence.AndroidX.biometric)
+    implementation(libs.androidX.biometric)
 
-    implementation(project(Dependence.UIKit.core))
+    implementation(project(ProjectModules.UIKit.core))
 
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.account))
-    implementation(project(Dependence.Wallet.Data.settings))
-    implementation(project(Dependence.Wallet.Data.rn))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.security))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.account))
+    implementation(project(ProjectModules.Wallet.Data.settings))
+    implementation(project(ProjectModules.Wallet.Data.rn))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.security))
 }
diff --git a/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/dialog/PasscodeDialog.kt b/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/dialog/PasscodeDialog.kt
index b9e0d33cb..3a2f7181a 100644
--- a/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/dialog/PasscodeDialog.kt
+++ b/apps/wallet/data/passcode/src/main/java/com/tonapps/wallet/data/passcode/dialog/PasscodeDialog.kt
@@ -2,6 +2,7 @@ package com.tonapps.wallet.data.passcode.dialog
 
 import android.content.Context
 import android.os.Bundle
+import android.view.View
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.lifecycleScope
 import com.tonapps.wallet.data.passcode.PasscodeHelper
@@ -51,6 +52,7 @@ class PasscodeDialog(
 
     init {
         setContentView(R.layout.dialog_password)
+        findViewById<View>(R.id.container).setOnClickListener { }
         headerView = findViewById(R.id.header)
         headerView.doOnCloseClick = { dismiss() }
 
diff --git a/apps/wallet/data/passcode/src/main/res/layout/dialog_password.xml b/apps/wallet/data/passcode/src/main/res/layout/dialog_password.xml
index 45669b74c..33c52cfc8 100644
--- a/apps/wallet/data/passcode/src/main/res/layout/dialog_password.xml
+++ b/apps/wallet/data/passcode/src/main/res/layout/dialog_password.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/apps/wallet/data/purchase/build.gradle.kts b/apps/wallet/data/purchase/build.gradle.kts
index 1d81edf57..1dd88c190 100644
--- a/apps/wallet/data/purchase/build.gradle.kts
+++ b/apps/wallet/data/purchase/build.gradle.kts
@@ -9,14 +9,15 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.extensions))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Module.tonApi))
 
-    api(Dependence.TON.tvm)
-    api(Dependence.TON.crypto)
-    api(Dependence.TON.tlb)
-    api(Dependence.TON.blockTlb)
-    api(Dependence.TON.tonapiTl)
-    api(Dependence.TON.contract)
+    api(libs.ton.tvm)
+    api(libs.ton.crypto)
+    api(libs.ton.tlb)
+    api(libs.ton.blockTlb)
+    api(libs.ton.tonapiTl)
+    api(libs.ton.contract)
 }
diff --git a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/OnRampUtils.kt b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/OnRampUtils.kt
new file mode 100644
index 000000000..a70b8e48c
--- /dev/null
+++ b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/OnRampUtils.kt
@@ -0,0 +1,42 @@
+package com.tonapps.wallet.data.purchase
+
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.floor
+import kotlin.math.log10
+import kotlin.math.pow
+
+object OnRampUtils {
+
+    fun normalizeType(currency: WalletCurrency): String? {
+        if (currency.fiat) {
+            return null
+        } else if (3 >= currency.address.length) {
+            return "native"
+        }
+        return when (currency.chain.name.lowercase()) {
+            "etc", "erc-20" -> "erc-20"
+            "ton", "jetton" -> "jetton"
+            "tron", "trc-20" -> "trc-20"
+            "sol", "spl" -> "spl"
+            "bnb", "bep-20" -> "bep-20"
+            "avalanche" -> "avalanche"
+            "arbitrum" -> "arbitrum"
+            else -> null
+        }
+    }
+
+    fun smartRoundUp(value: Double): Double {
+        if (value <= 0.0) return value
+        val mag = 10.0.pow(floor(log10(value)))
+        val ticks = doubleArrayOf(1.0, 1.5, 2.0, 5.0)
+        for (t in ticks) {
+            val target = t * mag
+            if (value <= target + 1e-12) {
+                return if (abs(value - target) < 1e-9) value else target
+            }
+        }
+        return 10.0 * mag
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/PurchaseRepository.kt b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/PurchaseRepository.kt
index bfa97715f..3a16e0d8b 100644
--- a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/PurchaseRepository.kt
+++ b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/PurchaseRepository.kt
@@ -2,32 +2,24 @@ package com.tonapps.wallet.data.purchase
 
 import android.content.Context
 import android.util.Log
-import com.tonapps.extensions.JSON
 import com.tonapps.extensions.getParcelable
 import com.tonapps.extensions.prefs
 import com.tonapps.extensions.putParcelable
-import com.tonapps.extensions.putString
-import com.tonapps.extensions.state
 import com.tonapps.extensions.toByteArray
 import com.tonapps.extensions.toParcel
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.core.BlobDataSource
 import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.purchase.entity.MerchantEntity
 import com.tonapps.wallet.data.purchase.entity.OnRamp
 import com.tonapps.wallet.data.purchase.entity.PurchaseCategoryEntity
 import com.tonapps.wallet.data.purchase.entity.PurchaseDataEntity
 import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
+import io.Serializer
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import org.ton.crypto.digest.sha512
 import org.ton.crypto.hex
@@ -45,57 +37,66 @@ class PurchaseRepository(
     timeout = TimeUnit.DAYS.toMillis(1)
 ) {
 
-    private companion object {
-        private const val SEND_CURRENCY_KEY = "send_currency"
-        private const val RECEIVE_CURRENCY_KEY = "receive_currency"
-    }
-
-    private val prefs = context.prefs("onramp")
     private val onRampCache = simple<OnRamp.Data>(context, "onRamp", TimeUnit.DAYS.toMillis(1))
+    private val paymentMethodCache = simpleJSON<List<OnRamp.PaymentMethodMerchant>>(context,"payment_methods", TimeUnit.DAYS.toMillis(1))
+    private val merchantsCache = simpleJSON<List<MerchantEntity>>(context,"merchants", TimeUnit.DAYS.toMillis(1))
 
-    private val _sendCurrencyFlow = MutableStateFlow<WalletCurrency?>(null)
-    val sendCurrencyFlow = _sendCurrencyFlow.asStateFlow()
-
-    private val _receiveCurrencyFlow = MutableStateFlow(WalletCurrency.TON)
-    val receiveCurrencyFlow = _receiveCurrencyFlow.asStateFlow()
+    suspend fun getOnRamp(): OnRamp.Data? = withContext(Dispatchers.IO) {
+        getOnRampData()
+    }
 
-    var sendCurrency: WalletCurrency?
-        get() = prefs.getParcelable(SEND_CURRENCY_KEY)
-        set(value) {
-            _sendCurrencyFlow.value = value
-            prefs.putParcelable(SEND_CURRENCY_KEY, value)
+    private fun loadOnRampMerchants(): List<MerchantEntity> {
+        return try {
+            val data = api.getOnRampMerchants() ?: throw Exception("No merchants found")
+            Log.d("PurchaseRepositoryLog", "data: $data")
+            Serializer.JSON.decodeFromString<List<MerchantEntity>>(data)
+        } catch (e: Throwable) {
+            Log.e("PurchaseRepositoryLog", "loadOnRampMerchants", e)
+            emptyList()
         }
+    }
 
-    var receiveCurrency: WalletCurrency
-        get() = prefs.getParcelable(RECEIVE_CURRENCY_KEY) ?: WalletCurrency.TON
-        set(value) {
-            _receiveCurrencyFlow.value = value
-            prefs.putParcelable(RECEIVE_CURRENCY_KEY, value)
+    fun getMerchants(): List<MerchantEntity> {
+        var list = merchantsCache.getCache("main") ?: emptyList()
+        if (list.isEmpty()) {
+            list = loadOnRampMerchants()
+            merchantsCache.setCache("main", list)
         }
+        return list
+    }
 
-    init {
-        _sendCurrencyFlow.value = sendCurrency
-        _receiveCurrencyFlow.value = receiveCurrency
+    private fun loadOnRampPaymentMethods(): List<OnRamp.PaymentMethodMerchant> {
+        return try {
+            val data = api.getOnRampPaymentMethods() ?: throw Exception("No payment methods found for country: ${api.country}")
+            Serializer.JSON.decodeFromString<List<OnRamp.PaymentMethodMerchant>>(data)
+        } catch (e: Throwable) {
+            emptyList()
+        }
     }
 
-    suspend fun getOnRamp(country: String): OnRamp.Data? = withContext(Dispatchers.IO) {
-        getOnRampData(country)
+    suspend fun getPaymentMethods(): List<OnRamp.PaymentMethodMerchant> = withContext(Dispatchers.IO) {
+        var list = paymentMethodCache.getCache(api.country) ?: emptyList()
+        if (list.isEmpty() || list.map { it.methods }.flatten().isEmpty()) {
+            list = loadOnRampPaymentMethods()
+            paymentMethodCache.setCache(api.country, list)
+        }
+        list
     }
 
-    private suspend fun loadOnRampData(country: String): OnRamp.Data? = withContext(Dispatchers.IO) {
-        val data = api.getOnRampData(country) ?: return@withContext null
+    private suspend fun loadOnRampData(): OnRamp.Data? = withContext(Dispatchers.IO) {
+        val data = api.getOnRampData() ?: return@withContext null
         try {
-            JSON.decodeFromString<OnRamp.Data>(data)
+            Serializer.fromJSON<OnRamp.Data>(data)
         } catch (e: Throwable) {
             null
         }
     }
 
-    private suspend fun getOnRampData(country: String): OnRamp.Data? {
-        val cacheKey = "data_$country"
+    private suspend fun getOnRampData(): OnRamp.Data? {
+        val cacheKey = "data_${api.country}"
         var data = onRampCache.getCache(cacheKey)
         if (data == null) {
-            data = loadOnRampData(country) ?: return null
+            data = loadOnRampData() ?: return null
             onRampCache.setCache(cacheKey, data)
         }
         return data
diff --git a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/MerchantEntity.kt b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/MerchantEntity.kt
new file mode 100644
index 000000000..d1c35595e
--- /dev/null
+++ b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/MerchantEntity.kt
@@ -0,0 +1,24 @@
+package com.tonapps.wallet.data.purchase.entity
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Parcelize
+@Serializable
+data class MerchantEntity(
+    val id: String,
+    val title: String,
+    val description: String,
+    val image: String,
+    val fee: Double,
+    val buttons: List<Button>
+): Parcelable {
+
+    @Parcelize
+    @Serializable
+    data class Button(
+        val title: String,
+        val url: String
+    ): Parcelable
+}
diff --git a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/OnRamp.kt b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/OnRamp.kt
index 15dfff10d..db9c1d9cd 100644
--- a/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/OnRamp.kt
+++ b/apps/wallet/data/purchase/src/main/java/com/tonapps/wallet/data/purchase/entity/OnRamp.kt
@@ -3,10 +3,13 @@ package com.tonapps.wallet.data.purchase.entity
 import android.os.Parcelable
 import android.util.Log
 import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.purchase.OnRampUtils
+import kotlinx.coroutines.flow.map
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.ranges.contains
 
 @Parcelize
 sealed class OnRamp: Parcelable {
@@ -15,6 +18,20 @@ sealed class OnRamp: Parcelable {
     @Parcelize
     data class SymbolWrapper(val symbol: String): OnRamp()
 
+    @Serializable
+    @Parcelize
+    data class Method(
+        val image: String,
+        val type: String
+    ): OnRamp()
+
+    @Serializable
+    @Parcelize
+    data class PaymentMethodMerchant(
+        val merchant: String,
+        val methods: List<Method>
+    ): OnRamp()
+
     @Serializable
     @Parcelize
     data class Limits(
@@ -42,7 +59,18 @@ sealed class OnRamp: Parcelable {
         val from: SymbolWrapper,
         val to: SymbolWrapper,
         val merchants: List<SlugWrapper>
-    ): OnRamp()
+    ): OnRamp() {
+
+        @IgnoredOnParcel
+        val min: Double by lazy {
+            merchants.mapNotNull { it.limits?.min }.minOrNull() ?: 0.0
+        }
+
+        @IgnoredOnParcel
+        val max: Double? by lazy {
+            merchants.mapNotNull { it.limits?.max }.maxOrNull()
+        }
+    }
 
     @Serializable
     @Parcelize
@@ -133,12 +161,40 @@ sealed class OnRamp: Parcelable {
             WalletCurrency.sort(list)
         }
 
-        fun isValidPair(from: String, to: String): AllowedPair? {
-            return allowedPairs.find { pair ->
+        fun resolveNetwork(input: Boolean, currency: WalletCurrency): String? {
+            if (currency.fiat) {
+                return null
+            }
+            val assets = assets.filter { asset ->
+                asset.slug.equals(currency.code, true)
+            }
+            val methods = assets.flatMap {
+                if (input) it.inputMethods else it.outputMethods
+            }
+            return OnRampUtils.normalizeType(currency) ?: methods.firstOrNull()?.type
+        }
+
+        fun findValidPairs(from: String, to: String): Pairs {
+            val pairs = allowedPairs.filter { pair ->
                 (pair.from.symbol.equals(from, true) && pair.to.symbol.equals(to, true))
-                // || (pair.from.symbol.equals(to, true) && pair.to.symbol.equals(from, true))
             }
+            val merchantSlugs = pairs.map { it.merchants }.flatten().map { it.slug }
+            val availableMerchants = merchants.filter { merchantSlugs.contains(it.slug) }
+            return Pairs(pairs, availableMerchants)
+        }
+    }
+
+    data class Pairs(
+        val pairs: List<AllowedPair>,
+        val merchants: List<Merchant>
+    ) {
+
+        val pair: AllowedPair? by lazy {
+            pairs.firstOrNull()
         }
 
+        val min: Double by lazy {
+            pairs.minOfOrNull { it.min } ?: 0.0
+        }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/data/rates/build.gradle.kts b/apps/wallet/data/rates/build.gradle.kts
index 463931e2b..9a821a184 100644
--- a/apps/wallet/data/rates/build.gradle.kts
+++ b/apps/wallet/data/rates/build.gradle.kts
@@ -8,11 +8,11 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.icu))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
 }
 
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
index 750c2582c..10aa8c178 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/RatesRepository.kt
@@ -1,6 +1,8 @@
 package com.tonapps.wallet.data.rates
 
 import android.content.Context
+import android.util.Log
+import com.google.firebase.annotations.concurrent.Background
 import com.tonapps.icu.Coins
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.TokenEntity
@@ -21,6 +23,14 @@ class RatesRepository(
 
     private val localDataSource = BlobDataSource(context)
 
+    suspend fun updateAll(currency: WalletCurrency, tokens: List<String>) = withContext(Dispatchers.IO) {
+        load(currency, tokens.take(100).toMutableList())
+    }
+
+    suspend fun updateAll(currency: WalletCurrency) = withContext(Dispatchers.IO) {
+        updateAll(currency, localDataSource.get(currency).tokens)
+    }
+
     fun cache(currency: WalletCurrency, tokens: List<String>): RatesEntity {
         return localDataSource.get(currency).filter(tokens)
     }
@@ -36,7 +46,10 @@ class RatesRepository(
         if (!tokens.contains(TokenEntity.USDT.address)) {
             tokens.add(TokenEntity.USDT.address)
         }
-        val rates = api.getRates(currency.code, tokens)?.toMutableMap() ?: return
+        val rates = mutableMapOf<String, TokenRates>()
+        for (chunk in tokens.chunked(100)) {
+            runCatching { fetchRates(currency.code, chunk) }.onSuccess(rates::putAll)
+        }
         val usdtRate = rates[TokenEntity.USDT.address]
         usdtRate?.let {
             rates.put(TokenEntity.TRON_USDT.address, usdtRate)
@@ -44,6 +57,13 @@ class RatesRepository(
         insertRates(currency, rates)
     }
 
+    private fun fetchRates(code: String, tokens: List<String>): Map<String, TokenRates> {
+        if (tokens.size > 100) {
+            throw IllegalArgumentException("Too many tokens requested: ${tokens.size}")
+        }
+        return api.getRates(code, tokens) ?: throw IllegalStateException("Failed to fetch rates for $code with tokens: $tokens")
+    }
+
     fun insertRates(currency: WalletCurrency, rates: Map<String, TokenRates>) {
         if (rates.isEmpty()) {
             return
@@ -51,7 +71,8 @@ class RatesRepository(
         val entities = mutableListOf<RateEntity>()
         for (rate in rates) {
             val value = rate.value
-            val bigDecimal = value.prices?.get(currency.code) ?: BigDecimal.ZERO
+            val prices = value.prices?.get(currency.code)?.let(::BigDecimal)
+            val bigDecimal = prices ?: BigDecimal.ZERO
 
             entities.add(RateEntity(
                 tokenCode = rate.key,
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
index 92c3cb137..014e8fa6d 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/entity/RatesEntity.kt
@@ -1,10 +1,13 @@
 package com.tonapps.wallet.data.rates.entity
 
 import android.os.Parcelable
+import android.util.Log
 import com.tonapps.icu.Coins
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import kotlinx.parcelize.Parcelize
+import java.math.BigDecimal
+import java.math.MathContext
 import java.math.RoundingMode
 
 @Parcelize
@@ -29,6 +32,9 @@ data class RatesEntity(
     val currencyCode: String
         get() = currency.code
 
+    val tokens: List<String>
+        get() = map.keys.toList()
+
     fun hasToken(token: String): Boolean {
         return map.containsKey(token)
     }
@@ -75,6 +81,47 @@ data class RatesEntity(
         return convert(TokenEntity.TON.address, value)
     }
 
+    fun convert(
+        from: WalletCurrency,
+        value: Coins,
+        to: WalletCurrency
+    ): Coins {
+        if (from == to) {
+            return value
+        }
+        if (from.isUSDT && to == WalletCurrency.USD || from == WalletCurrency.USD && to.isUSDT) {
+            return value
+        }
+        if (!value.isPositive || isEmpty || (from.fiat && to.fiat)) {
+            return Coins.ZERO
+        }
+        return if (from.fiat) {
+            convertFromFiat(to.address, value)
+        } else if (to.fiat) {
+            convert(from.address, value)
+        } else {
+            convertJetton(from, value, to)
+        }
+    }
+
+    private fun convertJetton(
+        from: WalletCurrency,
+        value: Coins,
+        to: WalletCurrency
+    ): Coins {
+        if (from == to || value.isZero) {
+            return value
+        }
+        val fromRate = rateValue(from.address)
+        val toRate = rateValue(to.address)
+        if (fromRate.isZero || toRate.isZero) {
+            return Coins.of(BigDecimal.ZERO, to.decimals)
+        }
+        val fiatValue = value.value.multiply(fromRate.value, Coins.mathContext)
+        val finalAmount = fiatValue.divide(toRate.value, to.decimals, RoundingMode.HALF_EVEN)
+        return Coins.of(finalAmount, to.decimals)
+    }
+
     fun convert(token: String, value: Coins): Coins {
         if (currency.code == token || value == Coins.ZERO) {
             return value
@@ -84,13 +131,27 @@ data class RatesEntity(
         return (value * rate)
     }
 
+    fun convertJetton(fromToken: String, toToken: String, value: Coins): Coins {
+        if (fromToken == toToken || value == Coins.ZERO) {
+            return value
+        }
+        val fromRate = rateValue(fromToken)
+        val toRate = rateValue(toToken)
+
+        if (fromRate.isZero || toRate.isZero) {
+            return Coins.ZERO
+        }
+        val valueInMaster = value * fromRate
+        return valueInMaster.div(toRate, roundingMode = RoundingMode.HALF_DOWN)
+    }
+
     fun convertFromFiat(token: String, value: Coins): Coins {
         if (currency.code == token) {
             return value
         }
 
         val rate = rateValue(token)
-        return value.div(rate, roundingMode = RoundingMode.HALF_DOWN)
+        return value.div(rate, roundingMode = RoundingMode.HALF_EVEN)
     }
 
     fun getRate(token: String): Coins {
diff --git a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/source/BlobDataSource.kt b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/source/BlobDataSource.kt
index 28378e526..b1473dbc8 100644
--- a/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/source/BlobDataSource.kt
+++ b/apps/wallet/data/rates/src/main/java/com/tonapps/wallet/data/rates/source/BlobDataSource.kt
@@ -7,10 +7,12 @@ import com.tonapps.wallet.data.core.BlobDataSource
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.rates.entity.RateEntity
 import com.tonapps.wallet.data.rates.entity.RatesEntity
+import java.util.concurrent.TimeUnit
 
 internal class BlobDataSource(context: Context): BlobDataSource<RatesEntity>(
     context = context,
-    path = "rates"
+    path = "rates",
+    timeout = TimeUnit.HOURS.toMillis(12)
 ) {
 
     override fun onUnmarshall(bytes: ByteArray) = bytes.toParcel<RatesEntity>()
diff --git a/apps/wallet/data/rn/build.gradle.kts b/apps/wallet/data/rn/build.gradle.kts
index fe41b76d2..4bef1d33e 100644
--- a/apps/wallet/data/rn/build.gradle.kts
+++ b/apps/wallet/data/rn/build.gradle.kts
@@ -8,15 +8,15 @@ android {
 }
 
 dependencies {
-    api(platform(Dependence.Firebase.bom))
-    api(Dependence.Firebase.crashlytics)
+    api(platform(libs.firebase.bom))
+    api(libs.firebase.crashlytics)
 
-    implementation(Dependence.AndroidX.biometric)
-    implementation(Dependence.TON.crypto)
+    implementation(libs.androidX.biometric)
+    implementation(libs.ton.crypto)
 
-    implementation(project(Dependence.Lib.sqlite))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.extensions))
+    implementation(project(ProjectModules.Lib.sqlite))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.extensions))
 }
 
 
diff --git a/apps/wallet/data/settings/build.gradle.kts b/apps/wallet/data/settings/build.gradle.kts
index cc6ffdbeb..2111fb392 100644
--- a/apps/wallet/data/settings/build.gradle.kts
+++ b/apps/wallet/data/settings/build.gradle.kts
@@ -7,8 +7,8 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.rn))
-    implementation(project(Dependence.Wallet.localization))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.rn))
+    implementation(project(ProjectModules.Wallet.localization))
 }
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
index dd523f7d5..15156ccb6 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/SettingsRepository.kt
@@ -3,6 +3,7 @@ package com.tonapps.wallet.data.settings
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
+import android.icu.util.Currency
 import androidx.core.content.edit
 import androidx.core.os.LocaleListCompat
 import com.tonapps.extensions.MutableEffectFlow
@@ -57,7 +58,6 @@ class SettingsRepository(
         private const val SEARCH_ENGINE_KEY = "search_engine"
         private const val ENCRYPTED_COMMENT_MODAL_KEY = "encrypted_comment_modal"
         private const val BATTERY_VIEWED_KEY = "battery_viewed"
-        private const val PAYMENT_METHOD_VIEWED_KEY = "payment_method_viewed"
         private const val CHART_PERIOD_KEY = "chart_period"
         private const val SAFE_MODE_DISABLED_UNIX_KEY = "safe_mode_disabled_unix"
         private const val SHOW_SAFE_MODE_SETUP_KEY = "show_safe_mode_setup"
@@ -78,6 +78,8 @@ class SettingsRepository(
         _hiddenBalancesFlow.stateIn(scope, SharingStarted.Eagerly, null).filterNotNull()
 
     private val _countryFlow = MutableEffectFlow<String>()
+
+    @Deprecated("Use Environment.countryFlow instead")
     val countryFlow = _countryFlow.stateIn(scope, SharingStarted.Eagerly, null).filterNotNull()
         .map { fixCountryCode(it) }
 
@@ -228,6 +230,7 @@ class SettingsRepository(
             }
         }
 
+    @Deprecated("Use Environment.countryFlow instead")
     var country: String = fixCountryCode(prefs.getString(COUNTRY_KEY, null))
         set(value) {
             if (value != field) {
@@ -256,14 +259,6 @@ class SettingsRepository(
             }
         }
 
-    var paymentMethodViewed: Boolean = prefs.getBoolean(PAYMENT_METHOD_VIEWED_KEY, false)
-        set(value) {
-            if (value != field) {
-                prefs.putBoolean(PAYMENT_METHOD_VIEWED_KEY, value)
-                field = value
-            }
-        }
-
     var showSafeModeSetup: Boolean = prefs.getBoolean(SHOW_SAFE_MODE_SETUP_KEY, false)
         set(value) {
             if (value != field) {
@@ -426,6 +421,17 @@ class SettingsRepository(
         return language.locale
     }
 
+    fun getDeviceCurrency(): WalletCurrency {
+        val locale = context.locale
+        val deviceCurrency = Currency.getInstance(locale)
+        return WalletCurrency(
+            code = deviceCurrency.currencyCode,
+            title = deviceCurrency.displayName,
+            alias = deviceCurrency.symbol,
+            chain = WalletCurrency.Chain.FIAT(locale.country)
+        )
+    }
+
     suspend fun setTokenHidden(
         walletId: String,
         tokenAddress: String,
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/PreferredFeeMethod.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/PreferredFeeMethod.kt
index 19c36d1ea..84d6d569f 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/PreferredFeeMethod.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/entities/PreferredFeeMethod.kt
@@ -8,7 +8,7 @@ enum class PreferredFeeMethod(val id: Int) {
 
     companion object {
         fun fromId(id: Int): PreferredFeeMethod {
-            return values().find { it.id == id }
+            return entries.find { it.id == id }
                 ?: throw IllegalArgumentException("Invalid PreferredFeeMethod id: $id")
         }
     }
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
index 5a42f1fb4..f374c59d0 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/TokenPrefsFolder.kt
@@ -4,7 +4,8 @@ import android.content.Context
 import com.tonapps.wallet.data.settings.entities.TokenPrefsEntity
 import kotlinx.coroutines.CoroutineScope
 
-internal class TokenPrefsFolder(context: Context, scope: CoroutineScope): BaseSettingsFolder(context, scope, "token_prefs") {
+internal class TokenPrefsFolder(context: Context, scope: CoroutineScope) :
+    BaseSettingsFolder(context, scope, "token_prefs") {
 
     private companion object {
         private const val PINNED_PREFIX = "pinned_"
@@ -46,12 +47,33 @@ internal class TokenPrefsFolder(context: Context, scope: CoroutineScope): BaseSe
     }
 
     fun getPinned(walletId: String, tokenAddress: String): Boolean {
-        val defValue = tokenAddress.equals("0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe", ignoreCase = true) || tokenAddress.equals("ton", ignoreCase = true)
+        val defValue = tokenAddress.equals(
+            "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe",
+            ignoreCase = true
+        ) || tokenAddress.equals("ton", ignoreCase = true) || tokenAddress.equals(
+            "0:086fa2a675f74347b08dd4606a549b8fdb98829cb282bc1949d3b12fbaed9dcc",
+            ignoreCase = true
+        )
         return getBoolean(keyPinned(walletId, tokenAddress), defValue)
     }
 
     fun getIndex(walletId: String, tokenAddress: String): Int {
-        return getInt(keySort(walletId, tokenAddress))
+        val index = getInt(keySort(walletId, tokenAddress), -1)
+        if (tokenAddress.equals("0:086fa2a675f74347b08dd4606a549b8fdb98829cb282bc1949d3b12fbaed9dcc", ignoreCase = true) && index == -1) {
+            val trc20UsdtIndex = getIndex(walletId, "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t")
+            if (trc20UsdtIndex != -1) {
+                return trc20UsdtIndex + 1 // USDe should be after TRC20
+            }
+
+            val tonUsdtIndex = getIndex(walletId, "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe")
+            if (tonUsdtIndex != -1) {
+                return tonUsdtIndex + 1 // USDe should be after USDT
+            }
+
+            return 2
+        }
+
+        return index
     }
 
     fun setPinned(walletId: String, tokenAddress: String, pinned: Boolean) {
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
index 74dfdd2d0..295fe4fb5 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/WalletPrefsFolder.kt
@@ -129,7 +129,6 @@ internal class WalletPrefsFolder(context: Context, scope: CoroutineScope): BaseS
     }
 
     fun getPreferredFeeMethod(walletId: String): PreferredFeeMethod {
-        val key = keyPreferredFeeMethod(walletId)
         val value = getInt(keyPreferredFeeMethod(walletId), PreferredFeeMethod.UNSPECIFIED.id)
         return PreferredFeeMethod.fromId(value)
     }
diff --git a/apps/wallet/data/staking/build.gradle.kts b/apps/wallet/data/staking/build.gradle.kts
index 58b935312..c9dfa38b4 100644
--- a/apps/wallet/data/staking/build.gradle.kts
+++ b/apps/wallet/data/staking/build.gradle.kts
@@ -8,13 +8,13 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.icu))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
 
-    implementation(project(Dependence.Module.tonApi))
+    implementation(project(ProjectModules.Module.tonApi))
 
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.tokens))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.tokens))
 }
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingPool.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingPool.kt
index 242c10aa7..8de75053a 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingPool.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingPool.kt
@@ -8,7 +8,7 @@ object StakingPool {
     enum class Implementation(
         val title: String
     ) {
-        Whales("whales"), TF("tf"), LiquidTF("liquidTF"), Ethena("ethena")
+        Whales("whales"), TF("tf"), LiquidTF("liquidTF")
     }
 
     fun implementation(type: PoolImplementationType): Implementation {
@@ -16,6 +16,7 @@ object StakingPool {
             PoolImplementationType.whales -> Implementation.Whales
             PoolImplementationType.tf -> Implementation.TF
             PoolImplementationType.liquidTF -> Implementation.LiquidTF
+            else -> throw IllegalArgumentException("Unknown PoolImplementationType: $type")
         }
     }
 
@@ -24,7 +25,6 @@ object StakingPool {
             Implementation.Whales -> R.string.stake_whales
             Implementation.TF -> R.string.stake_nominators
             Implementation.LiquidTF -> R.string.stake_tonstakers
-            Implementation.Ethena -> R.string.stake_ethena
         }
     }
 
@@ -33,7 +33,6 @@ object StakingPool {
             Implementation.Whales -> R.drawable.whales
             Implementation.TF -> R.drawable.tf
             Implementation.LiquidTF -> R.drawable.ic_tonstakers
-            Implementation.Ethena -> R.drawable.ethena
         }
     }
 
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolDetailsEntity.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolDetailsEntity.kt
index 45d280052..dbedbb81d 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolDetailsEntity.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolDetailsEntity.kt
@@ -9,6 +9,7 @@ data class PoolDetailsEntity(
     val name: String,
     val description: String,
     val url: String,
+    val additionalUrl: String? = null,
     val socials: List<String>,
 ): Parcelable {
 
@@ -20,18 +21,11 @@ data class PoolDetailsEntity(
     )
 
     fun getLinks(address: String): List<String> {
-        val links = mutableListOf(url, "https://tonviewer.com/${address}")
+        val links = mutableListOf(url)
+        additionalUrl?.let { links.add(it) }
+        links.add("https://tonviewer.com/${address}")
         links.addAll(socials)
         return links.toList()
     }
 
-    companion object {
-
-        val ethena = PoolDetailsEntity(
-            name = "Ethena",
-            description = "The tsUSDe token represents USDe held through Ethena, a decentralized staking service. tsUSDe automatically accrues staking rewards, with minimal lock up.",
-            url = "https://ethena.fi/",
-            socials = listOf("https://t.me/ethena_labs", "https://x.com/ethena_labs", "https://github.com/ethena-labs")
-        )
-    }
 }
\ No newline at end of file
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolEntity.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolEntity.kt
index 2961cea0d..86f65d1c7 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolEntity.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/PoolEntity.kt
@@ -14,6 +14,7 @@ data class PoolEntity(
     val implementation: StakingPool.Implementation,
     val minStake: Coins,
     val apy: BigDecimal,
+    val bonusApy: BigDecimal? = null,
     val verified: Boolean,
     val cycleStart: Long,
     val cycleEnd: Long,
@@ -24,9 +25,6 @@ data class PoolEntity(
     val isTonstakers: Boolean
         get() = implementation == StakingPool.Implementation.LiquidTF
 
-    val isEthena: Boolean
-        get() = implementation == StakingPool.Implementation.Ethena
-
     constructor(
         info: PoolInfo,
         maxApy: Boolean
@@ -35,7 +33,7 @@ data class PoolEntity(
         name = info.name,
         implementation = StakingPool.implementation(info.implementation),
         minStake = Coins.of(info.minStake),
-        apy = info.apy,
+        apy = BigDecimal(info.apy),
         verified = info.verified,
         cycleStart = info.cycleStart,
         cycleEnd = info.cycleEnd,
@@ -43,21 +41,4 @@ data class PoolEntity(
         maxApy = maxApy
     )
 
-    companion object {
-
-        val ethenaTokenAddress = "0:d0e545323c7acb7102653c073377f7e3c67f122eb94d430a250739f109d4a57d"
-
-        val ethena = PoolEntity(
-            address = "0:d0e545323c7acb7102653c073377f7e3c67f122eb94d430a250739f109d4a57d",
-            name = "Ethena",
-            implementation = StakingPool.Implementation.Ethena,
-            minStake = Coins.ZERO,
-            apy = BigDecimal.ZERO,
-            verified = true,
-            cycleStart = 0,
-            cycleEnd = 0,
-            liquidJettonMaster = ethenaTokenAddress,
-            maxApy = false
-        )
-    }
 }
\ No newline at end of file
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/StakingEntity.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/StakingEntity.kt
index 127cb46f9..a37788cc2 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/StakingEntity.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/entities/StakingEntity.kt
@@ -22,9 +22,6 @@ data class StakingEntity(
     }
 
     fun getDetails(implementation: StakingPool.Implementation): PoolDetailsEntity? {
-        if (implementation == StakingPool.Implementation.Ethena) {
-            return PoolDetailsEntity.ethena
-        }
         return pools.find { it.implementation == implementation }?.details
     }
 
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/source/RemoteDataSource.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/source/RemoteDataSource.kt
index d32fd6e7b..a9686cdd5 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/source/RemoteDataSource.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/source/RemoteDataSource.kt
@@ -17,9 +17,7 @@ internal class RemoteDataSource(
 ) {
 
     suspend fun load(
-        accountId: String,
-        testnet: Boolean,
-        initializedAccount: Boolean
+        accountId: String, testnet: Boolean, initializedAccount: Boolean
     ): StakingEntity = withContext(Dispatchers.IO) {
         val poolsDeferred = async { loadPools(accountId, testnet) }
         val infoDeferred = async {
@@ -29,15 +27,18 @@ internal class RemoteDataSource(
                 emptyList()
             }
         }
+
+        val pools = poolsDeferred.await()
+        val info = infoDeferred.await()
+
         StakingEntity(
-            pools = poolsDeferred.await(),
-            info = infoDeferred.await()
+            pools = pools,
+            info = info
         )
     }
 
     private fun loadInfo(
-        accountId: String,
-        testnet: Boolean
+        accountId: String, testnet: Boolean
     ): List<StakingInfoEntity> {
         val list = withRetry {
             api.staking(testnet).getAccountNominatorsPools(accountId).pools
@@ -46,8 +47,7 @@ internal class RemoteDataSource(
     }
 
     private fun loadPools(
-        accountId: String,
-        testnet: Boolean
+        accountId: String, testnet: Boolean
     ): List<PoolInfoEntity> {
         val response = withRetry {
             api.staking(testnet).getStakingPools(accountId, includeUnverified = false)
diff --git a/apps/wallet/data/staking/src/main/res/drawable/ethena.png b/apps/wallet/data/staking/src/main/res/drawable/ethena.png
deleted file mode 100644
index 072d440b2..000000000
Binary files a/apps/wallet/data/staking/src/main/res/drawable/ethena.png and /dev/null differ
diff --git a/apps/wallet/data/staking/src/main/res/values/strings.xml b/apps/wallet/data/staking/src/main/res/values/strings.xml
index 54d6ea44e..d7743a64f 100644
--- a/apps/wallet/data/staking/src/main/res/values/strings.xml
+++ b/apps/wallet/data/staking/src/main/res/values/strings.xml
@@ -3,5 +3,4 @@
     <string name="stake_tonstakers" translatable="false">Tonstakers</string>
     <string name="stake_whales" translatable="false">TON Whales</string>
     <string name="stake_nominators" translatable="false">TON Nominators</string>
-    <string name="stake_ethena" translatable="false">Ethena</string>
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/data/swap/.gitignore b/apps/wallet/data/swap/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/apps/wallet/data/swap/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/apps/wallet/data/swap/build.gradle.kts b/apps/wallet/data/swap/build.gradle.kts
new file mode 100644
index 000000000..d7b4b01bb
--- /dev/null
+++ b/apps/wallet/data/swap/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("com.tonapps.wallet.data")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = Build.namespacePrefix("wallet.data.swap")
+}
+
+dependencies {
+    implementation(libs.koin.core)
+    implementation(libs.kotlinX.coroutines.guava)
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
+}
diff --git a/apps/wallet/data/swap/src/main/AndroidManifest.xml b/apps/wallet/data/swap/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..227314eeb
--- /dev/null
+++ b/apps/wallet/data/swap/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
\ No newline at end of file
diff --git a/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/Module.kt b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/Module.kt
new file mode 100644
index 000000000..7ab9521c9
--- /dev/null
+++ b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/Module.kt
@@ -0,0 +1,8 @@
+package com.tonapps.wallet.data.swap
+
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+
+val swapModule = module {
+    singleOf(::SwapRepository)
+}
\ No newline at end of file
diff --git a/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/SwapRepository.kt b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/SwapRepository.kt
new file mode 100644
index 000000000..696682432
--- /dev/null
+++ b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/SwapRepository.kt
@@ -0,0 +1,56 @@
+package com.tonapps.wallet.data.swap
+
+import android.content.Context
+import com.tonapps.extensions.map
+import com.tonapps.extensions.mapList
+import com.tonapps.extensions.toByteArray
+import com.tonapps.extensions.toListParcel
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.core.BlobDataSource
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.swap.entity.SwapAssetEntity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.withContext
+import java.util.concurrent.TimeUnit
+
+class SwapRepository(
+    private val context: Context,
+    private val api: API,
+    private val scope: CoroutineScope,
+) : BlobDataSource<List<SwapAssetEntity>>(
+    context = context,
+    path = "swap",
+    timeout = TimeUnit.DAYS.toMillis(1)
+) {
+
+    private companion object {
+        private const val ASSETS_KEY = "assets"
+    }
+
+    val assetsFlow = flow {
+        emit(getAssets())
+    }.mapList { it.currency }.stateIn(scope, SharingStarted.Lazily, null).filterNotNull()
+
+    suspend fun getAssets(): List<SwapAssetEntity> = withContext(Dispatchers.IO) {
+        getCache(ASSETS_KEY) ?: loadAssets()
+    }
+
+    private fun loadAssets(): List<SwapAssetEntity> {
+        val list = api.getSwapAssets().map(::SwapAssetEntity)
+        if (list.isEmpty()) {
+            return emptyList()
+        }
+        setCache(ASSETS_KEY, list)
+        return list
+    }
+
+    override fun onMarshall(data: List<SwapAssetEntity>) = data.toByteArray()
+
+    override fun onUnmarshall(bytes: ByteArray) = bytes.toListParcel<SwapAssetEntity>()
+}
diff --git a/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/entity/SwapAssetEntity.kt b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/entity/SwapAssetEntity.kt
new file mode 100644
index 000000000..6413bb5f6
--- /dev/null
+++ b/apps/wallet/data/swap/src/main/java/com/tonapps/wallet/data/swap/entity/SwapAssetEntity.kt
@@ -0,0 +1,41 @@
+package com.tonapps.wallet.data.swap.entity
+
+import android.os.Parcelable
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import org.json.JSONObject
+
+@Parcelize
+data class SwapAssetEntity(
+    val address: String,
+    val decimals: Int,
+    val image: String,
+    val name: String,
+    val symbol: String
+): Parcelable {
+
+    @IgnoredOnParcel
+    val currency: WalletCurrency by lazy {
+        if (address.equals("ton", true)) {
+            WalletCurrency.TON
+        } else if (address == WalletCurrency.USDT_TON_ADDRESS) {
+            WalletCurrency.USDT_TON
+        } else {
+            WalletCurrency(
+                code = symbol,
+                title = name,
+                chain = WalletCurrency.Chain.TON(address, decimals),
+                iconUrl = image,
+            )
+        }
+    }
+
+    constructor(json: JSONObject) : this(
+        address = json.getString("address"),
+        decimals = json.getInt("decimals"),
+        image = json.getString("image"),
+        name = json.getString("name"),
+        symbol = json.getString("symbol")
+    )
+}
\ No newline at end of file
diff --git a/apps/wallet/data/tokens/build.gradle.kts b/apps/wallet/data/tokens/build.gradle.kts
index 0c5ceed44..d42770fb3 100644
--- a/apps/wallet/data/tokens/build.gradle.kts
+++ b/apps/wallet/data/tokens/build.gradle.kts
@@ -8,11 +8,11 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.rates))
-    implementation(project(Dependence.Wallet.api))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.icu))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.rates))
+    implementation(project(ProjectModules.Wallet.api))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.icu))
 }
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
index 391488d16..e8798803c 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/TokenRepository.kt
@@ -1,12 +1,15 @@
 package com.tonapps.wallet.data.token
 
 import android.content.Context
+import android.util.Log
 import androidx.collection.ArrayMap
 import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.icu.Coins
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.core.BlobDataSource
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.rates.entity.RatesEntity
@@ -15,15 +18,17 @@ import com.tonapps.wallet.data.token.entities.TokenRateEntity
 import com.tonapps.wallet.data.token.source.LocalDataSource
 import com.tonapps.wallet.data.token.source.RemoteDataSource
 import io.tonapi.models.TokenRates
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.concurrent.ConcurrentHashMap
 
 class TokenRepository(
     private val context: Context,
-    private val ratesRepository: RatesRepository,
-    private val api: API
+    private val scope: CoroutineScope,
+    private val ratesRepository: RatesRepository, private val api: API
 ) {
 
     private val totalBalanceCache = ConcurrentHashMap<String, Coins>(3, 1.0f, 2)
@@ -31,6 +36,8 @@ class TokenRepository(
     private val localDataSource = LocalDataSource(context)
     private val remoteDataSource = RemoteDataSource(api)
 
+    private val ethenaCache = BlobDataSource.simple<EthenaEntity>(context, "ethena")
+
     fun getToken(accountId: String, testnet: Boolean): TokenEntity? {
         if (accountId.equals("TON", ignoreCase = true)) {
             return TokenEntity.TON
@@ -74,21 +81,28 @@ class TokenRepository(
         return tokens.firstOrNull { it.isTon }
     }
 
+    suspend fun getTonBalance(
+        currency: WalletCurrency,
+        accountId: String,
+        testnet: Boolean
+    ): Coins? {
+        val token = getTON(currency, accountId, testnet, false) ?: return null
+        return token.balance.value
+    }
 
     suspend fun refreshTron(
-        accountId: String,
-        testnet: Boolean,
-        tronAddress: String
+        accountId: String, testnet: Boolean, tronAddress: String
     ) {
         val tronUsdtBalance = remoteDataSource.loadTronUsdt(tronAddress)
 
         val cached = localDataSource.getCache(cacheKey(accountId, false)) ?: return
         val entities = cached.toMutableList()
-        val index = entities.indexOfFirst { it.token.address.equalsAddress(TokenEntity.TRON_USDT.address) }
+        val index =
+            entities.indexOfFirst { it.token.address.equalsAddress(TokenEntity.TRON_USDT.address) }
 
         if (index != -1) {
             entities[index] = tronUsdtBalance
-        } else {
+        } else if (!api.config.flags.disableTron) {
             entities.add(tronUsdtBalance)
         }
 
@@ -122,10 +136,7 @@ class TokenRepository(
     }
 
     private suspend fun getRemote(
-        currency: WalletCurrency,
-        accountId: String,
-        tronAddress: String?,
-        testnet: Boolean
+        currency: WalletCurrency, accountId: String, tronAddress: String?, testnet: Boolean
     ): List<AccountTokenEntity>? = withContext(Dispatchers.IO) {
         val balances = load(currency, accountId, tronAddress, testnet) ?: return@withContext null
         if (testnet) {
@@ -139,17 +150,12 @@ class TokenRepository(
 
         val fiatRates = ratesRepository.getRates(currency, balances.map { it.token.address })
         buildTokens(
-            currency = currency,
-            balances = balances,
-            fiatRates = fiatRates,
-            testnet = false
+            currency = currency, balances = balances, fiatRates = fiatRates, testnet = false
         )
     }
 
     suspend fun getLocal(
-        currency: WalletCurrency,
-        accountId: String,
-        testnet: Boolean
+        currency: WalletCurrency, accountId: String, testnet: Boolean
     ): List<AccountTokenEntity> = withContext(Dispatchers.IO) {
         val balances = cache(accountId, testnet) ?: return@withContext emptyList()
         if (testnet) {
@@ -167,10 +173,7 @@ class TokenRepository(
             emptyList()
         } else {
             buildTokens(
-                currency = currency,
-                balances = balances,
-                fiatRates = fiatRates,
-                testnet = false
+                currency = currency, balances = balances, fiatRates = fiatRates, testnet = false
             )
         }
     }
@@ -192,8 +195,7 @@ class TokenRepository(
                 rateDiff24h = fiatRates.getDiff24h(tokenAddress)
             )
             val token = AccountTokenEntity(
-                balance = balance,
-                fiatRate = fiatRate
+                balance = balance, fiatRate = fiatRate
             )
             if (token.verified) {
                 verified.add(token)
@@ -230,8 +232,7 @@ class TokenRepository(
     }
 
     private fun cache(
-        accountId: String,
-        testnet: Boolean
+        accountId: String, testnet: Boolean
     ): List<BalanceEntity>? {
         val key = cacheKey(accountId, testnet)
         return localDataSource.getCache(key)
@@ -242,10 +243,7 @@ class TokenRepository(
     }
 
     private suspend fun load(
-        currency: WalletCurrency,
-        accountId: String,
-        tronAddress: String?,
-        testnet: Boolean
+        currency: WalletCurrency, accountId: String, tronAddress: String?, testnet: Boolean
     ): List<BalanceEntity>? = withContext(Dispatchers.IO) {
         val tonBalanceDeferred = async { remoteDataSource.loadTON(currency, accountId, testnet) }
         val jettonsDeferred = async { remoteDataSource.loadJettons(currency, accountId, testnet) }
@@ -267,10 +265,14 @@ class TokenRepository(
             it.token.address == TokenEntity.USDT.address
         }
 
+        val usdeIndex = jettons.indexOfFirst {
+            it.token.address == TokenEntity.USDE.address
+        }
+
         val entities = mutableListOf<BalanceEntity>()
         entities.add(tonBalance)
 
-        if (tronUsdt != null) {
+        if (tronUsdt != null && (!api.config.flags.disableTron || tronUsdt.value.isPositive)) {
             entities.add(tronUsdt)
         }
 
@@ -291,6 +293,23 @@ class TokenRepository(
             )
         }
 
+        if (usdeIndex == -1 && !testnet && !api.config.flags.disableUsde) {
+            entities.add(
+                BalanceEntity(
+                    token = TokenEntity.USDE,
+                    value = Coins.ZERO,
+                    walletAddress = accountId,
+                    initializedAccount = tonBalance.initializedAccount,
+                    isRequestMinting = false,
+                    isTransferable = true
+                )
+            )
+        } else if (usdeIndex >= 0) {
+            jettons[usdeIndex] = jettons[usdeIndex].copy(
+                token = TokenEntity.USDE
+            )
+        }
+
         entities.addAll(jettons)
 
         updateRates(currency, listOf(TokenEntity.TON.symbol))
@@ -316,4 +335,20 @@ class TokenRepository(
         }
         ratesRepository.insertRates(currency, rates)
     }
+
+    suspend fun getEthena(accountId: String, refresh: Boolean = false): EthenaEntity? {
+        if (refresh) {
+            return getEthenaRemote(accountId)
+        }
+        val cached = ethenaCache.getCache(accountId)
+        return cached ?: getEthenaRemote(accountId)
+    }
+
+    suspend fun getEthenaRemote(accountId: String): EthenaEntity? = withContext(Dispatchers.IO) {
+        val data = api.getEthena(accountId)
+        data?.let {
+            ethenaCache.setCache(accountId, data)
+        }
+        data
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
index 1a7fb337f..37ca7ccf5 100644
--- a/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
+++ b/apps/wallet/data/tokens/src/main/java/com/tonapps/wallet/data/token/entities/AccountTokenEntity.kt
@@ -4,7 +4,9 @@ import android.net.Uri
 import android.os.Parcelable
 import com.tonapps.icu.Coins
 import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
 import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
@@ -69,12 +71,18 @@ data class AccountTokenEntity(
     val isTsUSDe: Boolean
         get() = balance.token.isTsUSDe
 
+    val isUSDe: Boolean
+        get() = address == TokenEntity.TON_USDE
+
     val isUsdt: Boolean
         get() = address == TokenEntity.TON_USDT
 
     val isTrc20: Boolean
         get() = address == TokenEntity.TRC20_USDT
 
+    val isStable: Boolean
+        get() = isUsdt || isTrc20 || isUSDe
+
     val fiat: Coins
         get() = fiatRate?.fiat ?: Coins.ZERO
 
@@ -102,4 +110,7 @@ data class AccountTokenEntity(
     val token: TokenEntity
         get() = balance.token
 
+    val blockchain: Blockchain
+        get() = balance.token.blockchain
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/build.gradle.kts b/apps/wallet/instance/app/build.gradle.kts
index d422fcd35..4485a1d9d 100644
--- a/apps/wallet/instance/app/build.gradle.kts
+++ b/apps/wallet/instance/app/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 android {
     namespace = Build.namespacePrefix("tonkeeperx")
     compileSdk = Build.compileSdkVersion
+    ndkVersion = Build.ndkVersion
 
     defaultConfig {
         minSdk = Build.minSdkVersion
@@ -38,100 +39,98 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.Koin.core)
-    implementation(Dependence.Koin.workmanager)
-    implementation(Dependence.KotlinX.datetime)
-    implementation(Dependence.j2objc)
-    implementation(Dependence.cbor)
-    implementation(Dependence.TON.tvm)
-    implementation(Dependence.TON.crypto)
-    implementation(Dependence.TON.tlb)
-    implementation(Dependence.TON.blockTlb)
-    implementation(Dependence.TON.tonapiTl)
-    implementation(Dependence.TON.contract)
-
-    implementation(project(Dependence.Wallet.localization))
-    implementation(project(Dependence.Wallet.api))
-
-    implementation(project(Dependence.Wallet.Data.core))
-    implementation(project(Dependence.Wallet.Data.tokens))
-    implementation(project(Dependence.Wallet.Data.account))
-    implementation(project(Dependence.Wallet.Data.settings))
-    implementation(project(Dependence.Wallet.Data.rates))
-    implementation(project(Dependence.Wallet.Data.collectibles))
-    implementation(project(Dependence.Wallet.Data.events))
-    implementation(project(Dependence.Wallet.Data.browser))
-    implementation(project(Dependence.Wallet.Data.backup))
-    implementation(project(Dependence.Wallet.Data.rn))
-    implementation(project(Dependence.Wallet.Data.passcode))
-    implementation(project(Dependence.Wallet.Data.staking))
-    implementation(project(Dependence.Wallet.Data.purchase))
-    implementation(project(Dependence.Wallet.Data.battery))
-    implementation(project(Dependence.Wallet.Data.dapps))
-    implementation(project(Dependence.Wallet.Data.contacts))
-
-    implementation(project(Dependence.UIKit.core))
-    implementation(project(Dependence.UIKit.flag))
-
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.AndroidX.shortcuts)
-    implementation(Dependence.AndroidX.appCompat)
-    implementation(Dependence.AndroidX.activity)
-    implementation(Dependence.AndroidX.fragment)
-    implementation(Dependence.AndroidX.recyclerView)
-    implementation(Dependence.AndroidX.viewPager2)
-    implementation(Dependence.AndroidX.workManager)
-    implementation(Dependence.AndroidX.biometric)
-    implementation(Dependence.AndroidX.swiperefreshlayout)
-    implementation(Dependence.AndroidX.lifecycle)
-    implementation(Dependence.AndroidX.webkit)
-    implementation(Dependence.AndroidX.browser)
-
-
-    implementation(Dependence.UI.material)
-    implementation(Dependence.UI.flexbox)
-
-    implementation(Dependence.Squareup.moshi)
-    implementation(Dependence.Squareup.moshiAdapters)
-
-    implementation(platform(Dependence.Firebase.bom))
-    implementation(Dependence.Firebase.analytics)
-    implementation(Dependence.Firebase.config)
-    implementation(Dependence.Firebase.crashlytics)
-    implementation(Dependence.Firebase.messaging)
-    implementation(Dependence.Firebase.performance)
-
-    implementation(project(Dependence.Module.tonApi))
-    implementation(project(Dependence.Module.blur))
-
-    implementation(project(Dependence.Lib.network))
-    implementation(project(Dependence.Lib.icu))
-    implementation(project(Dependence.Lib.qr))
-    implementation(project(Dependence.Lib.emoji))
-    implementation(project(Dependence.Lib.security))
-    implementation(project(Dependence.Lib.blockchain))
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.ledger))
-    implementation(project(Dependence.Lib.ur))
-    implementation(project(Dependence.Lib.base64))
-
-    implementation(Dependence.AndroidX.Camera.base)
-    implementation(Dependence.AndroidX.Camera.core)
-    implementation(Dependence.AndroidX.Camera.lifecycle)
-    implementation(Dependence.AndroidX.Camera.view)
-
-    implementation(Dependence.GooglePlay.review)
-    implementation(Dependence.GooglePlay.billing)
-    implementation(Dependence.GooglePlay.update)
-    implementation(Dependence.GooglePlay.installreferrer)
-
-    implementation(Dependence.Squareup.okhttp)
-    implementation(Dependence.Squareup.sse)
-    implementation(Dependence.Analytics.aptabase)
-
-    implementation(Dependence.LedgerHQ.bleManager)
-
-    implementation(Dependence.fresco) {
+    implementation(libs.koin.core)
+    implementation(libs.koin.workmanager)
+    implementation(libs.kotlinX.datetime)
+    implementation(libs.j2objc)
+    implementation(libs.cbor)
+    implementation(libs.ton.tvm)
+    implementation(libs.ton.crypto)
+    implementation(libs.ton.tlb)
+    implementation(libs.ton.blockTlb)
+    implementation(libs.ton.tonapiTl)
+    implementation(libs.ton.contract)
+
+    implementation(project(ProjectModules.Wallet.localization))
+    implementation(project(ProjectModules.Wallet.api))
+
+    implementation(project(ProjectModules.Wallet.Data.core))
+    implementation(project(ProjectModules.Wallet.Data.tokens))
+    implementation(project(ProjectModules.Wallet.Data.account))
+    implementation(project(ProjectModules.Wallet.Data.settings))
+    implementation(project(ProjectModules.Wallet.Data.rates))
+    implementation(project(ProjectModules.Wallet.Data.collectibles))
+    implementation(project(ProjectModules.Wallet.Data.events))
+    implementation(project(ProjectModules.Wallet.Data.browser))
+    implementation(project(ProjectModules.Wallet.Data.backup))
+    implementation(project(ProjectModules.Wallet.Data.rn))
+    implementation(project(ProjectModules.Wallet.Data.passcode))
+    implementation(project(ProjectModules.Wallet.Data.staking))
+    implementation(project(ProjectModules.Wallet.Data.purchase))
+    implementation(project(ProjectModules.Wallet.Data.battery))
+    implementation(project(ProjectModules.Wallet.Data.dapps))
+    implementation(project(ProjectModules.Wallet.Data.contacts))
+    implementation(project(ProjectModules.Wallet.Data.swap))
+
+    implementation(project(ProjectModules.UIKit.core))
+    implementation(project(ProjectModules.UIKit.flag))
+
+    implementation(libs.androidX.core)
+    implementation(libs.androidX.shortcuts)
+    implementation(libs.androidX.appCompat)
+    implementation(libs.androidX.activity)
+    implementation(libs.androidX.fragment)
+    implementation(libs.androidX.recyclerView)
+    implementation(libs.androidX.viewPager2)
+    implementation(libs.androidX.workManager)
+    implementation(libs.androidX.biometric)
+    implementation(libs.androidX.swiperefreshlayout)
+    implementation(libs.androidX.lifecycle)
+    implementation(libs.androidX.webkit)
+    implementation(libs.androidX.browser)
+
+
+    implementation(libs.material)
+    implementation(libs.flexbox)
+
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.config)
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.messaging)
+    implementation(libs.firebase.performance)
+
+    implementation(project(ProjectModules.Module.tonApi))
+    implementation(project(ProjectModules.Module.blur))
+
+    implementation(project(ProjectModules.Lib.network))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(project(ProjectModules.Lib.qr))
+    implementation(project(ProjectModules.Lib.emoji))
+    implementation(project(ProjectModules.Lib.security))
+    implementation(project(ProjectModules.Lib.blockchain))
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.ledger))
+    implementation(project(ProjectModules.Lib.ur))
+    implementation(project(ProjectModules.Lib.base64))
+
+    implementation(libs.cameraX.base)
+    implementation(libs.cameraX.core)
+    implementation(libs.cameraX.lifecycle)
+    implementation(libs.cameraX.view)
+
+    implementation(libs.google.play.review)
+    implementation(libs.google.play.billing)
+    implementation(libs.google.play.update)
+    implementation(libs.google.play.installreferrer)
+
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.sse)
+    implementation(libs.aptabase)
+
+    implementation(libs.bleManager)
+
+    implementation(libs.fresco) {
         exclude(group = "com.facebook.soloader", module = "soloader")
         exclude(group = "com.facebook.fresco", module = "soloader")
         exclude(group = "com.facebook.fresco", module = "nativeimagefilters")
@@ -140,14 +139,14 @@ dependencies {
         exclude(group = "com.facebook.fresco", module = "imagepipeline-native")
     }
 
-    implementation(platform(Dependence.AndroidX.Compose.bom))
-    implementation(Dependence.AndroidX.Compose.foundation)
-    implementation(Dependence.AndroidX.Compose.foundationLayout)
-    implementation(Dependence.AndroidX.Compose.ui)
-    implementation(Dependence.AndroidX.Compose.material3)
-    implementation(Dependence.AndroidX.Compose.preview)
-    debugImplementation(Dependence.AndroidX.Compose.debugTooling)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.foundation)
+    implementation(libs.compose.foundationLayout)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.preview)
+    debugImplementation(libs.compose.debugTooling)
 
 
-    implementation(Dependence.AndroidX.Compose.viewModel)
+    implementation(libs.compose.viewModel)
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/App.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/App.kt
index 94e2f1f38..3aec3df48 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/App.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/App.kt
@@ -13,11 +13,7 @@ import com.facebook.imagepipeline.core.DownsampleMode
 import com.facebook.imagepipeline.core.ImagePipelineConfig
 import com.facebook.imagepipeline.core.ImageTranscoderType
 import com.facebook.imagepipeline.core.MemoryChunkType
-import com.facebook.imagepipeline.decoder.ImageDecoderConfig
 import com.google.firebase.FirebaseApp
-import com.tonapps.blockchain.MnemonicHelper
-import com.tonapps.blockchain.ton.contract.BaseWalletContract
-import com.tonapps.blockchain.ton.extensions.toWalletAddress
 import com.tonapps.extensions.setLocales
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.koin.koinModel
@@ -28,6 +24,7 @@ import com.tonapps.wallet.api.apiModule
 import com.tonapps.wallet.data.account.accountModule
 import com.tonapps.wallet.data.rates.ratesModule
 import com.tonapps.wallet.data.token.tokenModule
+import com.tonapps.wallet.data.swap.swapModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import com.tonapps.wallet.data.backup.backupModule
@@ -82,7 +79,7 @@ class App: Application(), CameraXConfig.Provider, KoinComponent {
 
         startKoin {
             androidContext(this@App)
-            modules(koinModel, contactsModule, workerModule, dAppsModule, viewModelWalletModule, purchaseModule, batteryModule, stakingModule, passcodeModule, rnLegacyModule, backupModule, dataModule, browserModule, apiModule, accountModule, ratesModule, tokenModule, eventsModule, collectiblesModule)
+            modules(koinModel, contactsModule, workerModule, dAppsModule, viewModelWalletModule, purchaseModule, batteryModule, stakingModule, passcodeModule, rnLegacyModule, swapModule, backupModule, dataModule, browserModule, apiModule, accountModule, ratesModule, tokenModule, eventsModule, collectiblesModule)
             workManagerFactory()
         }
         setLocales(settingsRepository.localeList)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/Environment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/Environment.kt
index d1fd0fff1..b2bdb186f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/Environment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/Environment.kt
@@ -3,16 +3,86 @@ package com.tonapps.tonkeeper
 import android.content.Context
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
+import com.tonapps.tonkeeper.core.DevSettings
 import com.tonapps.tonkeeper.extensions.isDarkMode
 import com.tonapps.tonkeeper.os.AppInstall
+import com.tonapps.tonkeeper.os.DeviceCountry
+import com.tonapps.tonkeeperx.BuildConfig
 import com.tonapps.wallet.data.settings.SettingsRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.mapNotNull
 import uikit.compose.AppTheme
+import java.util.Locale
 
 class Environment(
     private val context: Context,
     private val settingsRepository: SettingsRepository,
 ) {
 
+    data class CountryData(
+        val fromStore: String? = null,
+        val bySimCard: String? = null,
+        val byNetwork: String? = null,
+        val byIPAddress: String? = null,
+        val byLocale: String? = null,
+        val debug: String? = null,
+    ) {
+
+        private val debugValue: String?
+            get() = if (BuildConfig.DEBUG) debug else null
+
+        val value: String?
+            get() = (debugValue ?: bySimCard ?: byNetwork ?: byIPAddress ?: byLocale)?.let(::fixCountryCode)
+
+        val storeCountry: String?
+            get() = (debugValue ?: fromStore)?.let(::fixCountryCode)
+    }
+
+    private val _countryDataFlow = MutableStateFlow<CountryData>(CountryData())
+    val countryDataFlow = _countryDataFlow.asStateFlow()
+    val countryFlow = _countryDataFlow.asStateFlow().mapNotNull { it.value }.distinctUntilChanged()
+
+    val country: String
+        get() = _countryDataFlow.value.value ?: Locale.getDefault().country
+
+    val storeCountry: String?
+        get() = _countryDataFlow.value.storeCountry
+
+    init {
+        setDebugCountry(DevSettings.country)
+        setCountryBySimCard(DeviceCountry.fromSIM(context))
+        setCountryByNetwork(DeviceCountry.fromNetwork(context))
+        setCountryByLocale(DeviceCountry.fromLocale())
+    }
+
+    fun setDebugCountry(country: String?) {
+        if (BuildConfig.DEBUG) {
+            _countryDataFlow.value = _countryDataFlow.value.copy(debug = country?.uppercase())
+        }
+    }
+
+    fun setCountryFromStore(country: String?) {
+        _countryDataFlow.value = _countryDataFlow.value.copy(fromStore = country?.uppercase())
+    }
+
+    fun setCountryBySimCard(country: String?) {
+        _countryDataFlow.value = _countryDataFlow.value.copy(bySimCard = country?.uppercase())
+    }
+
+    fun setCountryByNetwork(country: String?) {
+        _countryDataFlow.value = _countryDataFlow.value.copy(byNetwork = country?.uppercase())
+    }
+
+    fun setCountryByIPAddress(country: String?) {
+        _countryDataFlow.value = _countryDataFlow.value.copy(byIPAddress = country?.uppercase())
+    }
+
+    fun setCountryByLocale(country: String?) {
+        _countryDataFlow.value = _countryDataFlow.value.copy(byLocale = country?.uppercase())
+    }
+
     val theme: AppTheme
         get() {
             return when(settingsRepository.theme.key) {
@@ -34,4 +104,14 @@ class Environment(
         val resultCode = googleApiAvailability.isGooglePlayServicesAvailable(context)
         resultCode == ConnectionResult.SUCCESS
     }
+
+    private companion object {
+        private fun fixCountryCode(country: String): String {
+            val fixedCountry = if (country.length == 2) country.uppercase() else "AE"
+            if (BuildConfig.DEBUG) {
+                return DevSettings.country ?: fixedCountry
+            }
+            return fixedCountry
+        }
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/RemoteConfig.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/RemoteConfig.kt
index a0a3cdb5f..6fc1a0cef 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/RemoteConfig.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/RemoteConfig.kt
@@ -4,24 +4,21 @@ import android.content.Context
 import android.util.Log
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
+import com.tonapps.wallet.api.API
 
-class RemoteConfig(context: Context) {
+class RemoteConfig(context: Context, private val api: API) {
     private val remoteConfig: FirebaseRemoteConfig = FirebaseRemoteConfig.getInstance()
 
     private enum class FeatureFlag(val key: String) {
-        IS_SWAP_DISABLE("isSwapDisable"),
-        IS_STAKING_DISABLE("isStakingDisable"),
         IS_DAPPS_DISABLE("isDappsDisable"),
-        DISABLE_BATTERY_CRYPTO_RECHARGE_MODULE("disableBatteryCryptoRechargeModule"),
         HARDCODED_COUNTRY_CODE("hardcodedCountryCode"),
         IN_APP_UPDATE_AVAILABLE("inAppUpdateAvailable"),
         IS_COUNTRY_PICKER_DISABLE("isCountryPickerDisable"),
-        IS_TRON_DISABLED("isTronDisabled"),
         NATIVE_ONRAMP_ENABLED("native_onrmap_enabled"),
-        ETHENA_ENABLED("ethena_enabled"),
         ONBOARDING_STORIES_ENABLED("onboarding_stories_enabled");
     }
 
+    //
     init {
         val configSettings = FirebaseRemoteConfigSettings.Builder()
             .setMinimumFetchIntervalInSeconds(0)
@@ -29,11 +26,7 @@ class RemoteConfig(context: Context) {
         remoteConfig.setConfigSettingsAsync(configSettings)
 
         val defaults = mapOf(
-            FeatureFlag.IS_SWAP_DISABLE.key to true,
-            FeatureFlag.IS_STAKING_DISABLE.key to true,
             FeatureFlag.IS_DAPPS_DISABLE.key to true,
-            FeatureFlag.DISABLE_BATTERY_CRYPTO_RECHARGE_MODULE.key to true,
-            FeatureFlag.IS_TRON_DISABLED.key to false,
             FeatureFlag.ONBOARDING_STORIES_ENABLED.key to true
         )
 
@@ -53,33 +46,18 @@ class RemoteConfig(context: Context) {
     val inAppUpdateAvailable: Boolean
         get() = remoteConfig.getBoolean(FeatureFlag.IN_APP_UPDATE_AVAILABLE.key)
 
-    val isSwapDisable: Boolean
-        get() = remoteConfig.getBoolean(FeatureFlag.IS_SWAP_DISABLE.key)
-
     val nativeOnrmapEnabled: Boolean
         get() = remoteConfig.getBoolean(FeatureFlag.NATIVE_ONRAMP_ENABLED.key)
 
     val isCountryPickerDisable: Boolean
         get() = remoteConfig.getBoolean(FeatureFlag.IS_COUNTRY_PICKER_DISABLE.key)
 
-    val isStakingDisable: Boolean
-        get() = remoteConfig.getBoolean(FeatureFlag.IS_STAKING_DISABLE.key)
-
     val hardcodedCountryCode: String?
         get() = remoteConfig.getString(FeatureFlag.HARDCODED_COUNTRY_CODE.key).takeIf { it.isNotEmpty() }
 
     val isDappsDisable: Boolean
         get() = remoteConfig.getBoolean(FeatureFlag.IS_DAPPS_DISABLE.key)
 
-    val isBatteryCryptoRechargeDisable: Boolean
-        get() = remoteConfig.getBoolean(FeatureFlag.DISABLE_BATTERY_CRYPTO_RECHARGE_MODULE.key)
-
-    val isTronDisabled: Boolean
-        get() = remoteConfig.getBoolean(FeatureFlag.IS_TRON_DISABLED.key)
-
-    val isEthenaEnabled: Boolean
-        get() = remoteConfig.getBoolean(FeatureFlag.ETHENA_ENABLED.key)
-
     val isOnboardingStoriesEnabled: Boolean
         get() = remoteConfig.getBoolean(FeatureFlag.ONBOARDING_STORIES_ENABLED.key)
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
index df7da274c..173ecbffb 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/api/Extensions.kt
@@ -72,6 +72,7 @@ val PoolImplementationType.icon: Int
             PoolImplementationType.tf -> R.drawable.ic_staking_tf
             PoolImplementationType.whales -> R.drawable.ic_staking_whales
             PoolImplementationType.liquidTF -> R.drawable.ic_staking_tonstakers
+            else -> throw IllegalArgumentException("Unknown PoolImplementationType: $this")
         }
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/billing/BillingManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/billing/BillingManager.kt
index 75a8b5340..862d7fca4 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/billing/BillingManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/billing/BillingManager.kt
@@ -8,6 +8,8 @@ import com.android.billingclient.api.BillingClient.ProductType
 import com.android.billingclient.api.BillingFlowParams
 import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeParams
+import com.android.billingclient.api.GetBillingConfigParams
+import com.android.billingclient.api.PendingPurchasesParams
 import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
@@ -17,6 +19,7 @@ import com.android.billingclient.api.consumePurchase
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.filterList
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.FlowPreview
@@ -40,11 +43,12 @@ import kotlin.time.Duration.Companion.seconds
 class BillingManager(
     context: Context,
     scope: CoroutineScope,
+    private val environment: Environment,
 ) : PurchasesUpdatedListener {
 
     private var billingClient: BillingClient = BillingClient.newBuilder(context)
         .setListener(this)
-        .enablePendingPurchases()
+        .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().enablePrepaidPlans().build())
         .build()
 
     private val _productsFlow = MutableStateFlow<List<ProductDetails>?>(null)
@@ -90,7 +94,7 @@ class BillingManager(
     private suspend fun getProductDetails(client: BillingClient, params: QueryProductDetailsParams): List<ProductDetails> = suspendCancellableCoroutine { continuation ->
         client.queryProductDetailsAsync(params) { billingResult, productDetailsList ->
             if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-                continuation.resume(productDetailsList)
+                continuation.resume(productDetailsList.productDetailsList)
             } else {
                 continuation.resumeWithException(BillingException(billingResult))
             }
@@ -175,6 +179,20 @@ class BillingManager(
         Unit
     }
 
+    private suspend fun requestCountry(client: BillingClient): String? = suspendCancellableCoroutine { continuation ->
+        client.getBillingConfigAsync(GetBillingConfigParams.newBuilder().build()) { billingResult, billingConfig ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK && billingConfig != null) {
+                continuation.resume(billingConfig.countryCode)
+            } else {
+                continuation.resume(null)
+            }
+        }
+    }
+
+    suspend fun getCountry() = billingClient.ready { client ->
+        requestCountry(client)
+    }
+
     @OptIn(FlowPreview::class)
     fun productFlow(productId: String) = productsFlow.take(1).filterList { product ->
         product.productId == productId
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/AnalyticsHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/AnalyticsHelper.kt
index 20af61efe..e3b00ca9c 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/AnalyticsHelper.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/AnalyticsHelper.kt
@@ -1,60 +1,34 @@
 package com.tonapps.tonkeeper.core
 
 import android.content.Context
+import android.net.Uri
 import android.util.Log
 import androidx.annotation.UiThread
 import com.aptabase.Aptabase
 import com.aptabase.InitOptions
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.tonapps.blockchain.ton.TonAddressTags
+import com.tonapps.extensions.hostOrNull
+import com.tonapps.extensions.toUriOrNull
 import com.tonapps.wallet.api.entity.ConfigEntity
 import com.tonapps.wallet.api.entity.StoryEntity
+import com.tonapps.wallet.data.settings.SettingsRepository
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.collections.set
 
-object AnalyticsHelper {
-
-    /*var allEvents = arrayOf(
-        "first_launch",
-        "battery_success",
-        "onramp_open",
-        "onramp_click",
-        "push_click",
-        "browser_open",
-        "story_click",
-        "story_page_view",
-        "story_open",
-        "click_dapp",
-        "battery_open",
-        "battery_select",
-        "scan_open",
-        "collectibles_open",
-        "history_open",
-        "create_wallet",
-        "import_wallet",
-        "wallet_import",
-        "browser_click",
-        "collectibles_select",
-        "receive_open",
-        "send_open",
-        "send_click",
-        "send_confirm",
-        "send_success",
-        "settings_open",
-        "settings_select",
-        "delete_wallet",
-        "staking_open",
-        "swap_open",
-        "swap_click",
-        "swap_success",
-        "token_open",
-        "dapp_sharing_copy"
-    )*/
+class AnalyticsHelper(
+    private val settingsRepository: SettingsRepository
+) {
 
     private data class QueuedEvent(
         val eventName: String,
         val props: Map<String, Any>
     )
 
+    private val installId: String
+        get() = settingsRepository.installId
+
     private val isInitialized = AtomicBoolean(false)
     private val eventQueue = ConcurrentLinkedQueue<QueuedEvent>()
     private val regexPrivateData: Regex by lazy {
@@ -62,20 +36,19 @@ object AnalyticsHelper {
     }
 
     private fun getAddressType(address: String): String {
-        return when {
-            address.startsWith("0:") -> "raw"
-            address.startsWith("E") -> "bounce"
-            else -> "non-bounce"
+        if (address.startsWith("0:")) {
+            return "raw"
         }
+        val tags = TonAddressTags.of(address)
+        return if (tags.isBounceable) "bounce" else "non-bounce"
     }
 
     @UiThread
     fun simpleTrackEvent(
         eventName: String,
-        installId: String,
         props: MutableMap<String, Any> = hashMapOf()
     ) {
-        props["firebase_user_id"] = installId
+
         trackEvent(eventName, props)
     }
 
@@ -88,13 +61,21 @@ object AnalyticsHelper {
     }
 
     private fun send(eventName: String, props: Map<String, Any> = hashMapOf()) {
-        Aptabase.instance.trackEvent(eventName, props)
+        val fixedProps = props.mapValues {
+            if (it is Uri) {
+                it.value.toString()
+            } else {
+                it.value
+            }
+        }.toMutableMap()
+        fixedProps["firebase_user_id"] = installId
+        Aptabase.instance.trackEvent(eventName, fixedProps)
     }
 
     @UiThread
-    fun simpleTrackScreenEvent(eventName: String, installId: String, from: String) {
+    fun simpleTrackScreenEvent(eventName: String, from: String) {
         simpleTrackEvent(
-            eventName, installId, hashMapOf(
+            eventName, hashMapOf(
                 "from" to from
             )
         )
@@ -113,18 +94,82 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun tcRequest(installId: String, url: String) {
+    fun tcRequest(url: String) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "dapp_url" to url
         )
         trackEvent("tc_request", props)
     }
 
     @UiThread
-    fun dappSharingCopy(installId: String, name: String, from: String, url: String) {
+    fun swapOpen(uri: Uri, native: Boolean) {
+        val props = hashMapOf(
+            "provider_name" to (uri.host ?: "unknown"),
+            "provider_domain" to uri
+        )
+        if (native) {
+            props["type"] = "native"
+        } else {
+            props["type"] = "old"
+        }
+        trackEvent("swap_open", props)
+    }
+
+    @UiThread
+    fun swapClick(
+        jettonSymbolFrom: String,
+        jettonSymbolTo: String,
+        native: Boolean,
+        providerName: String,
+    ) {
+        val props = hashMapOf(
+            "jetton_symbol_from" to jettonSymbolFrom,
+            "jetton_symbol_to" to jettonSymbolTo,
+            "type" to if (native) "native" else "old",
+            "provider_name" to providerName
+        )
+        trackEvent("swap_click", props)
+    }
+
+    @UiThread
+    fun swapConfirm(
+        jettonSymbolFrom: String,
+        jettonSymbolTo: String,
+        providerName: String,
+        providerUrl: String,
+        native: Boolean
+    ) {
+        val props = hashMapOf(
+            "jetton_symbol_from" to jettonSymbolFrom,
+            "jetton_symbol_to" to jettonSymbolTo,
+            "type" to if (native) "native" else "old",
+            "provider_name" to providerName,
+            "provider_domain" to (providerUrl.toUriOrNull()?.hostOrNull ?: providerUrl)
+        )
+        trackEvent("swap_confirm", props)
+    }
+
+    @UiThread
+    fun swapSuccess(
+        jettonSymbolFrom: String,
+        jettonSymbolTo: String,
+        providerName: String,
+        providerUrl: String,
+        native: Boolean
+    ) {
+        val props = hashMapOf(
+            "jetton_symbol_from" to jettonSymbolFrom,
+            "jetton_symbol_to" to jettonSymbolTo,
+            "type" to if (native) "native" else "old",
+            "provider_name" to providerName,
+            "provider_domain" to (providerUrl.toUriOrNull()?.hostOrNull ?: providerUrl)
+        )
+        trackEvent("swap_success", props)
+    }
+
+    @UiThread
+    fun dappSharingCopy(name: String, from: String, url: String) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "name" to name,
             "from" to from,
             "url" to url
@@ -133,9 +178,8 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun tcConnect(installId: String, url: String, pushEnabled: Boolean) {
+    fun tcConnect(url: String, pushEnabled: Boolean) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "dapp_url" to url,
             "allow_notifications" to pushEnabled
         )
@@ -143,9 +187,8 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun tcViewConfirm(installId: String, url: String, address: String) {
+    fun tcViewConfirm(url: String, address: String) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "dapp_url" to url,
             "address_type" to getAddressType(address)
         )
@@ -153,9 +196,8 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun tcSendSuccess(installId: String, url: String, address: String, feePaid: String) {
+    fun tcSendSuccess(url: String, address: String, feePaid: String) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "dapp_url" to url,
             "address_type" to getAddressType(address),
             "network_fee_paid" to feePaid
@@ -164,10 +206,8 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun firstLaunch(installId: String, referrer: String?, deeplink: String?) {
-        val props = hashMapOf(
-            "firebase_user_id" to installId
-        )
+    fun firstLaunch(referrer: String?, deeplink: String?) {
+        val props = emptyMap<String, Any>().toMutableMap()
         referrer?.let {
             props["referrer"] = it
         }
@@ -178,9 +218,8 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun openRefDeeplink(installId: String, deeplink: String) {
+    fun openRefDeeplink(deeplink: String) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "deeplink" to deeplink
         )
         trackEvent("ads_deeplink", props)
@@ -188,14 +227,13 @@ object AnalyticsHelper {
 
     @UiThread
     fun batterySuccess(
-        installId: String,
         type: String,
         promo: String,
         token: String,
         size: String? = null
     ) {
         simpleTrackEvent(
-            "battery_success", installId, hashMapOf(
+            "battery_success", hashMapOf(
                 "type" to type,
                 "promo" to promo,
                 "jetton" to token,
@@ -205,20 +243,18 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun onRampOpen(installId: String, source: String) {
-        simpleTrackScreenEvent("onramp_open", installId, source)
+    fun onRampOpen(source: String) {
+        simpleTrackScreenEvent("onramp_open", source)
     }
 
     @UiThread
     fun onRampEnterAmount(
-        installId: String,
         type: String,
         sellAsset: String,
         buyAsset: String,
         countryCode: String
     ) {
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "type" to type,
             "sell_asset" to sellAsset,
             "buy_asset" to buyAsset,
@@ -229,7 +265,6 @@ object AnalyticsHelper {
 
     @UiThread
     fun onRampOpenWebview(
-        installId: String,
         type: String,
         sellAsset: String,
         buyAsset: String,
@@ -250,7 +285,6 @@ object AnalyticsHelper {
         }
 
         val props = hashMapOf(
-            "firebase_user_id" to installId,
             "type" to type,
             "sell_asset" to sellAsset,
             "buy_asset" to buyAsset,
@@ -264,7 +298,6 @@ object AnalyticsHelper {
 
     @UiThread
     fun onRampClick(
-        installId: String,
         type: String,
         placement: String,
         location: String,
@@ -273,7 +306,6 @@ object AnalyticsHelper {
     ) {
         trackEvent(
             "onramp_click", hashMapOf(
-                "firebase_user_id" to installId,
                 "type" to type,
                 "placement" to placement,
                 "location" to location,
@@ -284,10 +316,9 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun trackPushClick(installId: String, pushId: String, payload: String) {
+    fun trackPushClick(pushId: String, payload: String) {
         trackEvent(
             "push_click", hashMapOf(
-                "firebase_user_id" to installId,
                 "push_id" to pushId,
                 "payload" to removePrivateDataFromUrl(payload)
             )
@@ -296,14 +327,12 @@ object AnalyticsHelper {
 
     @UiThread
     fun trackStoryClick(
-        installId: String,
         storiesId: String,
         button: StoryEntity.Button,
         index: Int
     ) {
         trackEvent(
             "story_click", hashMapOf(
-                "firebase_user_id" to installId,
                 "story_id" to storiesId,
                 "button_title" to button.title,
                 "button_type" to button.type,
@@ -314,10 +343,9 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun trackStoryView(installId: String, storiesId: String, index: Int) {
+    fun trackStoryView(storiesId: String, index: Int) {
         trackEvent(
             "story_page_view", hashMapOf(
-                "firebase_user_id" to installId,
                 "story_id" to storiesId,
                 "page_number" to index
             )
@@ -325,10 +353,9 @@ object AnalyticsHelper {
     }
 
     @UiThread
-    fun trackStoryOpen(installId: String, storiesId: String, from: String) {
+    fun trackStoryOpen(storiesId: String, from: String) {
         trackEvent(
             "story_open", hashMapOf(
-                "firebase_user_id" to installId,
                 "story_id" to storiesId,
                 "from" to from
             )
@@ -340,7 +367,6 @@ object AnalyticsHelper {
         url: String,
         name: String,
         source: String,
-        installId: String,
         country: String,
     ) {
         trackEvent(
@@ -348,7 +374,6 @@ object AnalyticsHelper {
                 "url" to url,
                 "name" to name,
                 "from" to source,
-                "firebase_user_id" to installId,
                 "location" to country
             )
         )
@@ -371,7 +396,6 @@ object AnalyticsHelper {
         appKey: String,
         host: String
     ) {
-        Log.d("AnalyticsHelper", "initAptabase: appKey=$appKey, host=$host")
         try {
             val options = InitOptions(
                 host = host
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/DevSettings.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/DevSettings.kt
index 635ee1f98..ffb1607d8 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/DevSettings.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/DevSettings.kt
@@ -11,6 +11,14 @@ object DevSettings {
 
     private val prefs = App.instance.getSharedPreferences("dev_settings", 0)
 
+    var country: String? = prefs.getString("country", null)
+        set(value) {
+            if (field != value) {
+                field = value
+                prefs.putString("country", value)
+            }
+        }
+
     var blurEnabled: Boolean = prefs.getBoolean("blur_enabled", true)
         set(value) {
             if (field != value) {
@@ -19,6 +27,14 @@ object DevSettings {
             }
         }
 
+    var dnsAll: Boolean = prefs.getBoolean("dns_all", false)
+        set(value) {
+            if (field != value) {
+                field = value
+                prefs.putBoolean("dns_all", value)
+            }
+        }
+
     var firstLaunchDate: Long = prefs.getLong("first_launch_date", 0)
         set(value) {
             if (field != value) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/FirebaseHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/FirebaseHelper.kt
index 26c89b23d..8541ff290 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/FirebaseHelper.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/FirebaseHelper.kt
@@ -1,8 +1,8 @@
 package com.tonapps.tonkeeper.core
 
-import com.google.firebase.analytics.ktx.analytics
+import com.google.firebase.Firebase
+import com.google.firebase.analytics.analytics
 import com.google.firebase.analytics.logEvent
-import com.google.firebase.ktx.Firebase
 import com.tonapps.wallet.data.settings.SafeModeState
 
 object FirebaseHelper {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/InsufficientFundsException.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/InsufficientFundsException.kt
new file mode 100644
index 000000000..1858dfb2f
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/InsufficientFundsException.kt
@@ -0,0 +1,16 @@
+package com.tonapps.tonkeeper.core
+
+import com.tonapps.icu.Coins
+import com.tonapps.tonkeeper.ui.screen.send.main.helper.InsufficientBalanceType
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+class InsufficientFundsException(
+    val currency: WalletCurrency,
+    val required: Coins,
+    val available: Coins,
+    val type: InsufficientBalanceType,
+    val withRechargeBattery: Boolean,
+    val singleWallet: Boolean
+) : Exception("Insufficient funds: required $required, available $available, currency $currency") {
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/AssetsEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/AssetsEntity.kt
index daf5c0b7a..ad6ee5ab8 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/AssetsEntity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/AssetsEntity.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.core.entities
 
 import com.tonapps.icu.Coins
 import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
@@ -49,6 +50,18 @@ sealed class AssetsEntity(
         val address: String
             get() = token.address
 
+        val decimals: Int
+            get() = token.decimals
+
+        val balance: Coins
+            get() = token.balance.value
+
+        val symbol: String
+            get() = token.symbol
+
+        val blockchain: Blockchain
+            get() = token.balance.token.blockchain
+
         constructor(token: TokenEntity): this(
             AccountTokenEntity.createEmpty(token, "")
         )
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/StakedEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/StakedEntity.kt
index b601416f9..59969a5da 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/StakedEntity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/StakedEntity.kt
@@ -28,9 +28,6 @@ data class StakedEntity(
     val isTonstakers: Boolean
         get() = pool.isTonstakers
 
-    val isEthena: Boolean
-        get() = pool.isEthena
-
     val maxApy: Boolean
         get() = pool.maxApy
 
@@ -48,32 +45,7 @@ data class StakedEntity(
             val list = mutableListOf<StakedEntity>()
             val activePools = getActivePools(staking, tokens)
             for (pool in activePools) {
-                if (pool.implementation == StakingPool.Implementation.Ethena) {
-                    val isEthenaAlready = list.any { it.isEthena }
-                    if (isEthenaAlready) {
-                        continue
-                    }
-                    val liquidJettonMaster = pool.liquidJettonMaster ?: continue
-                    val token = tokens.find { it.address.equalsAddress(liquidJettonMaster) } ?: continue
-                    val tokenBalance = token.balance.value
-                    val rates = ratesRepository.getRates(WalletCurrency.USD, token.address)
-                    val balance = rates.convert(token.address, tokenBalance)
-                    val apy = api.getEthenaStakingAPY(wallet.address)
-                    list.add(StakedEntity(
-                        pool = pool.copy(
-                            apy = apy
-                        ),
-                        balance = balance,
-                        fiatBalance = token.fiat,
-                        readyWithdraw = Coins.ZERO,
-                        fiatReadyWithdraw = Coins.ZERO,
-                        liquidToken = token.balance.copy(),
-                        pendingDeposit = Coins.ZERO,
-                        pendingWithdraw = Coins.ZERO,
-                        cycleStart = pool.cycleStart,
-                        cycleEnd = pool.cycleEnd,
-                    ))
-                } else if (pool.implementation == StakingPool.Implementation.LiquidTF) {
+                if (pool.implementation == StakingPool.Implementation.LiquidTF) {
                     val isTonstakersAlready = list.any { it.isTonstakers }
                     if (isTonstakersAlready) {
                         continue
@@ -128,11 +100,6 @@ data class StakedEntity(
                 staking.findPoolByTokenAddress(token.address)?.let { pools.add(it) }
             }
 
-            val tsUSDeEthena = tokens.find { it.address.equalsAddress(PoolEntity.ethenaTokenAddress) }
-            if (tsUSDeEthena != null) {
-                pools.add(PoolEntity.ethena)
-            }
-
             for (info in staking.info) {
                 staking.findPoolByAddress(info.pool)?.let { pools.add(it) }
             }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/ActionType.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/ActionType.kt
index e1410e394..2787beea9 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/ActionType.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/ActionType.kt
@@ -21,4 +21,5 @@ enum class ActionType {
     Subscribe,
     Fee,
     Refund,
+    Purchase
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/Extensions.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/Extensions.kt
index 488b2e626..f93fd9bbe 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/Extensions.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/Extensions.kt
@@ -61,7 +61,7 @@ val ActionType.iconRes: Int
         ActionType.Swap -> R.drawable.ic_swap_horizontal_alternative_28
         ActionType.DeployContract, ActionType.WithdrawStakeRequest, ActionType.WithdrawStake -> UIKitIcon.ic_donemark_28
         ActionType.DomainRenewal -> R.drawable.ic_return_28
-        ActionType.NftPurchase -> R.drawable.ic_shopping_bag_28
+        ActionType.NftPurchase, ActionType.Purchase -> R.drawable.ic_shopping_bag_28
         ActionType.JettonBurn -> R.drawable.ic_fire_28
         ActionType.UnSubscribe -> R.drawable.ic_xmark_28
         ActionType.Subscribe -> R.drawable.ic_bell_28
@@ -89,4 +89,5 @@ val ActionType.nameRes: Int
         ActionType.Subscribe -> Localization.subscribed
         ActionType.Fee -> Localization.network_fee
         ActionType.Refund -> Localization.refund
+        ActionType.Purchase -> Localization.purchase
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
index ad26c902d..634dba70f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/HistoryHelper.kt
@@ -1,9 +1,7 @@
 package com.tonapps.tonkeeper.core.history
 
 import android.content.Context
-import android.util.Log
 import androidx.collection.arrayMapOf
-import com.squareup.moshi.Json
 import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.icu.Coins
 import com.tonapps.extensions.max24
@@ -23,13 +21,13 @@ import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem.Event.Comment.Type
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.AccountEvent
-import io.tonapi.models.Action
 import io.tonapi.models.ActionSimplePreview
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import com.tonapps.tonkeeper.extensions.with
 import com.tonapps.tonkeeper.helper.DateHelper
 import com.tonapps.tonkeeper.ui.screen.dialog.encrypted.EncryptedCommentScreen
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
 import com.tonapps.tonkeeper.usecase.emulation.Emulated
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.API
@@ -43,15 +41,13 @@ import com.tonapps.wallet.data.collectibles.CollectiblesRepository
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.events.CommentEncryption
 import com.tonapps.wallet.data.events.EventsRepository
-import com.tonapps.wallet.data.events.TxActionType
 import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.data.rates.RatesRepository
-import com.tonapps.wallet.data.rates.entity.RatesEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.localization.Localization
 import com.tonapps.wallet.localization.Plurals
+import io.tonapi.models.Action
 import io.tonapi.models.JettonVerificationType
-import io.tonapi.models.MessageConsequences
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -59,7 +55,6 @@ import kotlinx.coroutines.flow.take
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
-import kotlin.math.abs
 
 // TODO request refactoring
 class HistoryHelper(
@@ -203,69 +198,8 @@ class HistoryHelper(
 
     suspend fun create(
         wallet: WalletEntity,
-        response: MessageConsequences,
-        rates: RatesEntity,
-        isBattery: Boolean = false,
-        options: ActionOptions
-    ): Details {
-        val items = mapping(
-            wallet = wallet,
-            event = response.event,
-            options = options.copy(
-                removeDate = true,
-                positionExtra = 1
-            )
-        ).toMutableList()
-        val extra = response.event.extra
-
-        val fee = if (0 > extra) Coins.of(abs(extra)) else Coins.ZERO
-        val feeFormat = "≈ " + CurrencyFormatter.format("TON", fee)
-        val feeFiat = rates.convert("TON", fee)
-        val feeFiatFormat = CurrencyFormatter.formatFiat(rates.currency.code, feeFiat)
-
-        val refund = if (extra > 0) Coins.of(extra) else Coins.ZERO
-        val refundFormat = "≈ " + CurrencyFormatter.format("TON", refund)
-        val refundFiat = rates.convert("TON", refund)
-        val refundFiatFormat = CurrencyFormatter.formatFiat(rates.currency.code, refundFiat)
-
-        val isRefund = extra > 0
-
-
-        items.add(
-            HistoryItem.Event(
-                index = items.lastIndex + 1,
-                position = ListCell.Position.LAST,
-                txId = "fee",
-                iconURL = "",
-                action = if (isRefund) ActionType.Refund else ActionType.Fee,
-                title = "",
-                subtitle = if (isBattery) context.getString(Localization.will_be_paid_with_battery) else "",
-                value = if (isRefund) refundFormat else feeFormat,
-                date = if (isRefund) refundFiatFormat.toString() else feeFiatFormat.toString(),
-                isOut = true,
-                sender = null,
-                recipient = null,
-                failed = false,
-                isScam = false,
-                wallet = wallet,
-                isMaybeSpam = false,
-                actionOutStatus = ActionOutStatus.Send
-            )
-        )
-
-        return Details(
-            accountId = wallet.accountId,
-            items = items.toList(),
-            fee = fee,
-            feeFormat = feeFormat,
-            feeFiat = feeFiat,
-            feeFiatFormat = feeFiatFormat
-        )
-    }
-
-    suspend fun create(
-        wallet: WalletEntity,
-        emulated: Emulated
+        emulated: Emulated,
+        fee: SendFee,
     ): Details {
         val items = mapping(
             wallet = wallet,
@@ -302,6 +236,15 @@ class HistoryHelper(
         val feeFormat = "≈ " + CurrencyFormatter.format("TON", emulated.extra.value)
         val feeFiatFormat = CurrencyFormatter.formatFiat(emulated.currency.code, emulated.extra.fiat)
 
+        val value = if (fee is SendFee.Battery) {
+            "≈ " + context.resources.getQuantityString(
+                Plurals.battery_charges,
+                fee.charges,
+                CurrencyFormatter.format(value = fee.charges.toBigDecimal())
+            )
+        } else {
+            feeFormat
+        }
         items.add(
             HistoryItem.Event(
                 index = items.lastIndex + 1,
@@ -310,9 +253,20 @@ class HistoryHelper(
                 iconURL = "",
                 action = if (emulated.extra.isRefund) ActionType.Refund else ActionType.Fee,
                 title = "",
-                subtitle = if (emulated.withBattery) context.getString(Localization.will_be_paid_with_battery) else "",
-                value = feeFormat,
-                date = feeFiatFormat.toString(),
+                subtitle = "",
+                value = value,
+                valueFullFormatted = value,
+                valueFullFormatted2 = null,
+                date = if (fee is SendFee.Battery) {
+                    context.getString(
+                        Localization.out_of_available_charges,
+                        CurrencyFormatter.format(
+                            value = fee.chargesBalance.toBigDecimal()
+                        )
+                    )
+                } else {
+                    feeFiatFormat.toString()
+                },
                 isOut = true,
                 sender = null,
                 recipient = null,
@@ -320,6 +274,7 @@ class HistoryHelper(
                 isScam = false,
                 wallet = wallet,
                 actionOutStatus = ActionOutStatus.Any,
+                sendFee = fee,
             )
         )
 
@@ -431,13 +386,20 @@ class HistoryHelper(
             } else {
                 event.from
             }
-            val amount = CurrencyFormatter.format(token.symbol, event.amount, 2)
+            val amount = CurrencyFormatter.format(token.symbol, event.amount)
             val value = if (event.from == tronAddress) {
                 amount.withMinus
             } else {
                 amount.withPlus
             }
 
+            val amountFull = CurrencyFormatter.formatFull(token.symbol, event.amount, token.decimals)
+            val valueFullFormatted = if (event.from == tronAddress) {
+                amountFull.withMinus
+            } else {
+                amountFull.withPlus
+            }
+
             items.add(
                 HistoryItem.Event(
                     blockchain = Blockchain.TRON,
@@ -447,6 +409,7 @@ class HistoryHelper(
                     title = "",
                     subtitle = subtitle.shortTron,
                     value = value,
+                    valueFullFormatted = valueFullFormatted,
                     tokenAddress = token.address,
                     tokenCode = token.symbol,
                     coinIconUrl = token.imageUri.toString(),
@@ -553,13 +516,11 @@ class HistoryHelper(
                         fee = if (fee.isPositive) CurrencyFormatter.format(
                             TokenEntity.TON.symbol,
                             fee,
-                            TokenEntity.TON.decimals
                         ) else null,
                         feeInCurrency = CurrencyFormatter.formatFiat(currency.code, feeInCurrency),
                         refund = if (refund.isPositive) CurrencyFormatter.format(
                             TokenEntity.TON.symbol,
                             refund,
-                            TokenEntity.TON.decimals
                         ) else null,
                         refundInCurrency = CurrencyFormatter.formatFiat(
                             currency.code,
@@ -616,7 +577,43 @@ class HistoryHelper(
         val dateDetails = DateHelper.formatTransactionDetailsTime(timestamp, settingsRepository.getLocale())
 
         // actionArgs.isTon && !actionArgs.isOut && !actionArgs.isScam && actionArgs.comment != null
-        if (action.jettonSwap != null) {
+        if (action.purchase != null) {
+            val purchase = action.purchase!!
+
+            val tokenCode = purchase.amount.tokenName
+            val isTon = tokenCode.equals("TON", true)
+            val token = if (isTon) TokenEntity.TON else TokenEntity.USDT
+            val amount = Coins.ofNano(purchase.amount.value, token.decimals)
+            val value = CurrencyFormatter.format(tokenCode, amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull(tokenCode, amount, token.decimals)
+
+            val isOut = wallet.isMyAddress(purchase.destination.address)
+            val rates = ratesRepository.getRates(currency, token.address)
+            val inCurrency = rates.convert(token.address, amount)
+
+            return HistoryItem.Event(
+                index = index,
+                txId = txId,
+                action = ActionType.Purchase,
+                title = simplePreview.name,
+                subtitle = purchase.invoiceId.shortAddress,
+                value = if (isOut) value.withPlus else value.withMinus,
+                valueFullFormatted = if (isOut) valueFullFormatted.withPlus else valueFullFormatted.withMinus,
+                tokenCode = tokenCode,
+                coinIconUrl = if (isTon) TokenEntity.TON.imageUri.toString() else TokenEntity.USDT.imageUri.toString(),
+                timestamp = timestamp,
+                date = date,
+                dateDetails = dateDetails,
+                isOut = isOut,
+                sender = HistoryItem.Account.ofSender(action, wallet.testnet),
+                recipient = HistoryItem.Account.ofRecipient(action, wallet.testnet),
+                failed = action.status == Action.Status.failed,
+                currency = CurrencyFormatter.formatFiat(currency.code, inCurrency),
+                isScam = isScam,
+                wallet = wallet,
+                actionOutStatus = if (isOut) ActionOutStatus.Send else ActionOutStatus.Received,
+            )
+        } else if (action.jettonSwap != null) {
             val jettonSwap = action.jettonSwap!!
             val tokenIn = jettonSwap.tokenIn
             val tokenOut = jettonSwap.tokenOut
@@ -628,8 +625,11 @@ class HistoryHelper(
             val amountIn = jettonSwap.amountCoinsIn
             val amountOut = jettonSwap.amountCoinsOut
 
-            val value = CurrencyFormatter.format(tokenOut.symbol, amountOut, 2).withPlus
-            val value2 = CurrencyFormatter.format(tokenIn.symbol, amountIn, 2).withMinus
+            val value = CurrencyFormatter.format(tokenOut.symbol, amountOut).withPlus
+            val value2 = CurrencyFormatter.format(tokenIn.symbol, amountIn).withMinus
+
+            val valueFullFormatted = CurrencyFormatter.formatFull(tokenOut.symbol, amountOut, tokenOut.decimals).withPlus
+            val valueFullFormatted2 = CurrencyFormatter.formatFull(tokenIn.symbol, amountIn, tokenIn.decimals).withMinus
 
             val rates = ratesRepository.getRates(currency, tokenIn.address)
             val inCurrency = rates.convert(tokenIn.address, amountIn)
@@ -643,6 +643,8 @@ class HistoryHelper(
                 subtitle = wallet.address.short4,
                 value = value,
                 value2 = value2,
+                valueFullFormatted = valueFullFormatted,
+                valueFullFormatted2 = valueFullFormatted2,
                 coinIconUrl = tokenIn.imageUri.toString(),
                 coinIconUrl2 = tokenOut.imageUri.toString(),
                 timestamp = timestamp,
@@ -674,7 +676,8 @@ class HistoryHelper(
             } ?: false
 
             val amount = Coins.ofNano(jettonTransfer.amount, jettonTransfer.jetton.decimals)
-            var value = CurrencyFormatter.format(symbol, amount, 2)
+            var value = CurrencyFormatter.format(symbol, amount)
+            var valueFullFormatted = CurrencyFormatter.formatFull(symbol, amount, jettonTransfer.jetton.decimals)
 
             val itemAction: ActionType
             val accountAddress: AccountAddress?
@@ -683,14 +686,17 @@ class HistoryHelper(
                 itemAction = ActionType.JettonBurn
                 accountAddress = jettonTransfer.recipient
                 value = value.withMinus
+                valueFullFormatted = valueFullFormatted.withMinus
             } else if (isOut || wallet.isMyAddress(jettonTransfer.sender?.address ?: "")) {
                 itemAction = ActionType.Send
                 accountAddress = jettonTransfer.recipient
                 value = value.withMinus
+                valueFullFormatted = valueFullFormatted.withMinus
             } else {
                 itemAction = ActionType.Received
                 accountAddress = jettonTransfer.sender
                 value = value.withPlus
+                valueFullFormatted = valueFullFormatted.withPlus
             }
 
             val rates = ratesRepository.getRates(currency, token)
@@ -716,6 +722,7 @@ class HistoryHelper(
                 },
                 comment = comment,
                 value = value,
+                valueFullFormatted = valueFullFormatted,
                 tokenAddress = token,
                 tokenCode = "",
                 coinIconUrl = jettonTransfer.jetton.image,
@@ -745,17 +752,20 @@ class HistoryHelper(
             val isFromBattery: Boolean
 
             val amount = Coins.of(tonTransfer.amount)
-            var value = CurrencyFormatter.format("TON", amount, 2)
+            var value = CurrencyFormatter.format("TON", amount)
+            var valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             if (isOut || wallet.isMyAddress(tonTransfer.sender.address)) {
                 itemAction = ActionType.Send
                 accountAddress = tonTransfer.recipient
                 value = value.withMinus
+                valueFullFormatted = valueFullFormatted.withMinus
                 isFromBattery = false
             } else {
                 itemAction = ActionType.Received
                 accountAddress = tonTransfer.sender
                 value = value.withPlus
+                valueFullFormatted = valueFullFormatted.withPlus
                 isFromBattery = batteryConfig.gasProxy.contains(accountAddress.address)
             }
 
@@ -778,6 +788,7 @@ class HistoryHelper(
                 subtitle = accountAddress.getNameOrAddress(wallet.testnet, true),
                 comment = comment,
                 value = value,
+                valueFullFormatted = valueFullFormatted,
                 tokenCode = "TON",
                 coinIconUrl = TokenEntity.TON.imageUri.toString(),
                 timestamp = timestamp,
@@ -799,7 +810,8 @@ class HistoryHelper(
             val executor = smartContractExec.executor
 
             val amount = Coins.of(smartContractExec.tonAttached)
-            val value = CurrencyFormatter.format("TON", amount, 2)
+            val value = CurrencyFormatter.format("TON", amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -809,6 +821,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = executor.getNameOrAddress(wallet.testnet, true),
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 date = date,
@@ -881,6 +894,7 @@ class HistoryHelper(
                 subtitle = subtitle,
                 comment = comment,
                 value = "NFT",
+                valueFullFormatted = "NFT",
                 nft = nftItem,
                 tokenCode = "NFT",
                 timestamp = timestamp,
@@ -904,6 +918,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = wallet.address.shortAddress,
                 value = MINUS_SYMBOL,
+                valueFullFormatted = MINUS_SYMBOL,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 date = date,
@@ -920,7 +935,8 @@ class HistoryHelper(
             val depositStake = action.depositStake!!
 
             val amount = Coins.of(depositStake.amount)
-            val value = CurrencyFormatter.format("TON", amount, 2)
+            val value = CurrencyFormatter.format("TON", amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -930,6 +946,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = depositStake.pool.getNameOrAddress(wallet.testnet, true),
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 coinIconUrl = depositStake.implementation.iconURL,
@@ -952,7 +969,8 @@ class HistoryHelper(
 
             val amount = jettonMint.parsedAmount
 
-            val value = CurrencyFormatter.format(jettonMint.jetton.symbol, amount, 2)
+            val value = CurrencyFormatter.format(jettonMint.jetton.symbol, amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull(jettonMint.jetton.symbol, amount, jettonMint.jetton.decimals)
 
             return HistoryItem.Event(
                 index = index,
@@ -961,6 +979,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = jettonMint.jetton.name,
                 value = value.withPlus,
+                valueFullFormatted = valueFullFormatted.withPlus,
                 tokenCode = jettonMint.jetton.symbol,
                 timestamp = timestamp,
                 coinIconUrl = jettonMint.jetton.image,
@@ -979,7 +998,8 @@ class HistoryHelper(
             val withdrawStakeRequest = action.withdrawStakeRequest!!
 
             val amount = Coins.of(withdrawStakeRequest.amount ?: 0L)
-            val value = CurrencyFormatter.format("TON", amount, 2)
+            val value = CurrencyFormatter.format("TON", amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -989,6 +1009,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = withdrawStakeRequest.pool.getNameOrAddress(wallet.testnet, true),
                 value = value,
+                valueFullFormatted = valueFullFormatted,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 coinIconUrl = withdrawStakeRequest.implementation.iconURL,
@@ -1012,6 +1033,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = domainRenew.domain.max24,
                 value = MINUS_SYMBOL,
+                valueFullFormatted = MINUS_SYMBOL,
                 tokenCode = "",
                 timestamp = timestamp,
                 date = date,
@@ -1034,7 +1056,8 @@ class HistoryHelper(
             val amount = Coins.ofNano(auctionBid.amount.value)
             val tokenCode = auctionBid.amount.tokenName
 
-            val value = CurrencyFormatter.format(auctionBid.amount.tokenName, amount, 2)
+            val value = CurrencyFormatter.format(auctionBid.amount.tokenName, amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull(auctionBid.amount.tokenName, amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -1043,6 +1066,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = subtitle,
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = tokenCode,
                 timestamp = timestamp,
                 date = date,
@@ -1055,7 +1079,7 @@ class HistoryHelper(
                 wallet = wallet,
                 actionOutStatus = ActionOutStatus.Send
             )
-        } else if (action.type == TxActionType.Unknown) {
+        } else if (action.type == Action.Type.Unknown) {
             return createUnknown(
                 index,
                 txId,
@@ -1071,7 +1095,8 @@ class HistoryHelper(
             val withdrawStake = action.withdrawStake!!
 
             val amount = Coins.of(withdrawStake.amount)
-            val value = CurrencyFormatter.format("TON", amount, 2)
+            val value = CurrencyFormatter.format("TON", amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -1081,6 +1106,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = withdrawStake.pool.getNameOrAddress(wallet.testnet, true),
                 value = value.withPlus,
+                valueFullFormatted = valueFullFormatted.withPlus,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 coinIconUrl = withdrawStake.implementation.iconURL,
@@ -1102,7 +1128,8 @@ class HistoryHelper(
             }
 
             val amount = Coins.of(nftPurchase.amount.value.toLong())
-            val value = CurrencyFormatter.format(nftPurchase.amount.tokenName, amount, 2)
+            val value = CurrencyFormatter.format(nftPurchase.amount.tokenName, amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull(nftPurchase.amount.tokenName, amount, 9)
 
             val nftItem = if (isScam) null else collectiblesRepository.getNft(
                 accountId = wallet.accountId,
@@ -1120,6 +1147,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = nftPurchase.buyer.getNameOrAddress(wallet.testnet, true),
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 nft = nftItem,
@@ -1141,7 +1169,8 @@ class HistoryHelper(
             }
 
             val amount = jettonBurn.parsedAmount
-            val value = CurrencyFormatter.format(jettonBurn.jetton.symbol, amount, 2)
+            val value = CurrencyFormatter.format(jettonBurn.jetton.symbol, amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull(jettonBurn.jetton.symbol, amount, jettonBurn.jetton.decimals)
 
             return HistoryItem.Event(
                 index = index,
@@ -1150,6 +1179,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = jettonBurn.sender.getNameOrAddress(wallet.testnet, true),
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = jettonBurn.jetton.symbol,
                 timestamp = timestamp,
                 coinIconUrl = jettonBurn.jetton.image,
@@ -1174,6 +1204,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = unsubscribe.beneficiary.getNameOrAddress(wallet.testnet, true),
                 value = MINUS_SYMBOL,
+                valueFullFormatted = MINUS_SYMBOL,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 coinIconUrl = unsubscribe.beneficiary.iconURL ?: "",
@@ -1191,7 +1222,8 @@ class HistoryHelper(
             val subscribe = action.subscribe!!
 
             val amount = Coins.of(subscribe.amount)
-            val value = CurrencyFormatter.format("TON", amount, 2)
+            val value = CurrencyFormatter.format("TON", amount)
+            val valueFullFormatted = CurrencyFormatter.formatFull("TON", amount, 9)
 
             return HistoryItem.Event(
                 index = index,
@@ -1200,6 +1232,7 @@ class HistoryHelper(
                 title = simplePreview.name,
                 subtitle = subscribe.beneficiary.getNameOrAddress(wallet.testnet, true),
                 value = value.withMinus,
+                valueFullFormatted = valueFullFormatted.withMinus,
                 tokenCode = "TON",
                 timestamp = timestamp,
                 coinIconUrl = subscribe.beneficiary.iconURL ?: "",
@@ -1238,6 +1271,7 @@ class HistoryHelper(
             subtitle = context.getString(Localization.unknown_error),
             position = position,
             value = MINUS_SYMBOL,
+            valueFullFormatted = MINUS_SYMBOL,
             tokenCode = "TON",
             timestamp = 0,
             date = "",
@@ -1271,6 +1305,7 @@ class HistoryHelper(
         subtitle = action.simplePreview.description.max24,
         tokenCode = action.simplePreview.name,
         value = action.simplePreview.value ?: MINUS_SYMBOL,
+        valueFullFormatted = action.simplePreview.value ?: MINUS_SYMBOL,
         timestamp = timestamp,
         date = date,
         dateDetails = dateDetails,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/HistoryAdapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/HistoryAdapter.kt
index 8bd03af57..07b2ab464 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/HistoryAdapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/HistoryAdapter.kt
@@ -1,5 +1,6 @@
 package com.tonapps.tonkeeper.core.history.list
 
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.core.history.list.holder.HistoryActionHolder
@@ -9,12 +10,15 @@ import com.tonapps.tonkeeper.core.history.list.holder.HistoryFailedHolder
 import com.tonapps.tonkeeper.core.history.list.holder.HistoryHeaderHolder
 import com.tonapps.tonkeeper.core.history.list.holder.HistoryLoaderHolder
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
 import com.tonapps.uikit.list.BaseListAdapter
 import com.tonapps.uikit.list.BaseListHolder
 import com.tonapps.uikit.list.BaseListItem
 
 open class HistoryAdapter(
-    private val disableOpenAction: Boolean = false
+    private val disableOpenAction: Boolean = false,
+    private val shouldShowFeeToggle: () -> Boolean = { true },
+    private val showFeeMethods: (currentFee: SendFee, targetView: View) -> Unit = { _, _ -> }
 ) : BaseListAdapter() {
 
     init {
@@ -35,7 +39,13 @@ open class HistoryAdapter(
         viewType: Int
     ): BaseListHolder<out BaseListItem> {
         return when (viewType) {
-            HistoryItem.TYPE_ACTION -> HistoryActionHolder(parent, disableOpenAction)
+            HistoryItem.TYPE_ACTION -> HistoryActionHolder(
+                parent,
+                disableOpenAction,
+                shouldShowFeeToggle,
+                showFeeMethods
+            )
+
             HistoryItem.TYPE_HEADER -> HistoryHeaderHolder(parent)
             HistoryItem.TYPE_LOADER -> HistoryLoaderHolder(parent)
             HistoryItem.TYPE_APP -> HistoryAppHolder(parent)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/holder/HistoryActionHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/holder/HistoryActionHolder.kt
index 016c3a27a..c3a3b45c9 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/holder/HistoryActionHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/holder/HistoryActionHolder.kt
@@ -2,17 +2,21 @@ package com.tonapps.tonkeeper.core.history.list.holder
 
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.util.Log
+import android.os.Build
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.style.ImageSpan
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.ColorInt
+import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.net.toUri
 import com.facebook.imagepipeline.common.ResizeOptions
 import com.facebook.imagepipeline.postprocessors.BlurPostProcessor
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.tonapps.extensions.logError
 import com.tonapps.extensions.max24
-import com.tonapps.extensions.short12
 import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
 import com.tonapps.tonkeeper.core.history.ActionType
 import com.tonapps.tonkeeper.core.history.HistoryHelper
@@ -20,13 +24,15 @@ import com.tonapps.tonkeeper.core.history.iconRes
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeper.core.history.nameRes
 import com.tonapps.tonkeeper.koin.historyHelper
-import com.tonapps.tonkeeper.ui.screen.transaction.TransactionScreen
 import com.tonapps.tonkeeper.ui.screen.nft.NftScreen
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.tonkeeper.ui.screen.transaction.TransactionScreen
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.color.accentGreenColor
 import com.tonapps.uikit.color.accentOrangeColor
 import com.tonapps.uikit.color.iconSecondaryColor
 import com.tonapps.uikit.color.stateList
+import com.tonapps.uikit.color.textAccentColor
 import com.tonapps.uikit.color.textPrimaryColor
 import com.tonapps.uikit.color.textSecondaryColor
 import com.tonapps.uikit.color.textTertiaryColor
@@ -44,11 +50,12 @@ import uikit.navigation.Navigation
 import uikit.navigation.Navigation.Companion.navigation
 import uikit.widget.FrescoView
 import uikit.widget.LoaderView
-import androidx.core.net.toUri
 
 class HistoryActionHolder(
     parent: ViewGroup,
     private val disableOpenAction: Boolean,
+    private val shouldShowFeeToggle: () -> Boolean,
+    private val showFeeMethods: (currentFee: SendFee, targetView: View) -> Unit
 ) : HistoryHolder<HistoryItem.Event>(parent, R.layout.view_history_action) {
 
     private val amountColorReceived = context.accentGreenColor
@@ -76,6 +83,7 @@ class HistoryActionHolder(
         drawable
     }
 
+    @RequiresApi(Build.VERSION_CODES.Q)
     override fun onBind(item: HistoryItem.Event) {
         commentView.clearDrawables()
 
@@ -103,6 +111,21 @@ class HistoryActionHolder(
 
         subtitleView.text = item.subtitle
 
+        if (item.txId == "fee" && item.sendFee != null && shouldShowFeeToggle()) {
+            subtitleView.setTextColor(context.textAccentColor)
+            val text = getString(Localization.edit_full)
+            val drawable = context.drawable(UIKitIcon.ic_chevron_right_12, subtitleView.currentTextColor)
+            drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+            val span = ImageSpan(drawable, ImageSpan.ALIGN_CENTER)
+            val spannable = SpannableStringBuilder("$text ")
+            spannable.setSpan(span, spannable.length - 1, spannable.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+
+            subtitleView.text = spannable
+            itemView.setOnClickListener {
+                showFeeMethods(item.sendFee, itemView)
+            }
+        }
+
         dateView.text = item.date
 
         if (item.failed && !item.pending) {
@@ -184,7 +207,13 @@ class HistoryActionHolder(
         } else {
             commentView.text = comment.body.max24
             commentView.setLeftDrawable(null)
-            commentView.setOnClickListener { context.navigation?.add(TransactionScreen.newInstance(item!!)) }
+            commentView.setOnClickListener {
+                context.navigation?.add(
+                    TransactionScreen.newInstance(
+                        item!!
+                    )
+                )
+            }
         }
     }
 
@@ -194,7 +223,9 @@ class HistoryActionHolder(
         senderAddress: String
     ) {
         val scope = lifecycleScope ?: return
-        val flow = context.historyHelper?.requestDecryptComment(context, comment, txId, senderAddress) ?: return
+        val flow =
+            context.historyHelper?.requestDecryptComment(context, comment, txId, senderAddress)
+                ?: return
         flow.catch {
             context.logError(it)
             commentView.reject()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/item/HistoryItem.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/item/HistoryItem.kt
index b78914f01..d1e548d0c 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/item/HistoryItem.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/history/list/item/HistoryItem.kt
@@ -17,6 +17,7 @@ import com.tonapps.extensions.writeEnum
 import com.tonapps.tonkeeper.core.history.ActionOutStatus
 import com.tonapps.tonkeeper.core.history.ActionType
 import com.tonapps.tonkeeper.helper.DateHelper
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
 import com.tonapps.uikit.list.BaseListItem
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.entity.Blockchain
@@ -291,6 +292,8 @@ sealed class HistoryItem(
         val comment: Comment? = null,
         val value: CharSequence,
         val value2: CharSequence = "",
+        val valueFullFormatted: CharSequence = "",
+        val valueFullFormatted2: CharSequence? = null,
         val currency: CharSequence? = null,
         val nft: NftEntity? = null,
         val tokenAddress: String? = null,
@@ -318,6 +321,7 @@ sealed class HistoryItem(
         val spamState: SpamTransactionState = SpamTransactionState.UNKNOWN,
         val actionOutStatus: ActionOutStatus,
         val showNetwork: Boolean = false,
+        val sendFee: SendFee? = null
     ): HistoryItem(TYPE_ACTION) {
 
         val account: Account?
@@ -384,6 +388,8 @@ sealed class HistoryItem(
             comment = parcel.readParcelableCompat(),
             value = parcel.readCharSequenceCompat()!!,
             value2 = parcel.readCharSequenceCompat()!!,
+            valueFullFormatted = parcel.readCharSequenceCompat()!!,
+            valueFullFormatted2 = parcel.readCharSequenceCompat(),
             currency = parcel.readCharSequenceCompat(),
             nft = parcel.readParcelableCompat(),
             tokenCode = parcel.readString(),
@@ -421,6 +427,8 @@ sealed class HistoryItem(
             dest.writeParcelable(comment, flags)
             dest.writeCharSequenceCompat(value)
             dest.writeCharSequenceCompat(value2)
+            dest.writeCharSequenceCompat(valueFullFormatted)
+            dest.writeCharSequenceCompat(valueFullFormatted2)
             dest.writeCharSequenceCompat(currency)
             dest.writeParcelable(nft, flags)
             dest.writeString(tokenCode)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/deeplink/DeepLinkRoute.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/deeplink/DeepLinkRoute.kt
index 1807d3a68..a378ac275 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/deeplink/DeepLinkRoute.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/deeplink/DeepLinkRoute.kt
@@ -107,6 +107,8 @@ sealed class DeepLinkRoute {
         )
     }
 
+    data object DnsRenew: DeepLinkRoute()
+
     data class Transfer(
         val exp: Long?,
         val address: String,
@@ -274,6 +276,9 @@ sealed class DeepLinkRoute {
             val uri = normalize(input)
             val from = input.query("from") ?: "deep-link"
             val domain = uri.hostOrNull ?: return Unknown(uri)
+            if (domain == "dns" && uri.pathOrNull?.startsWith("expiring") == true) {
+                return DnsRenew
+            }
             try {
                 return when (domain) {
                     "backup", "backups" -> Backups
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/ActionSheet.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/ActionSheet.kt
new file mode 100644
index 000000000..647ff1a50
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/ActionSheet.kt
@@ -0,0 +1,39 @@
+package com.tonapps.tonkeeper.extensions
+
+import com.tonapps.extensions.uri
+import com.tonapps.tonkeeper.popup.ActionSheet
+import com.tonapps.tonkeeper.popup.ActionSheet.Item
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.uikit.color.accentGreenColor
+import com.tonapps.uikit.icon.UIKitIcon
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+
+fun ActionSheet.addFeeItem(
+    fee: SendFee,
+    selected: Boolean,
+    onClick: ((Item) -> Unit)?
+) {
+    val id = fee.id.hashCode().toLong()
+    val icon = if (selected) context.drawable(UIKitIcon.ic_done_16) else null
+    if (fee is SendFee.TokenFee) {
+        addItem(
+            id = id,
+            title = fee.symbol,
+            subtitle = "≈ ${fee.formattedAmount} · ${fee.formattedFiat}",
+            imageUri = fee.amount.token.imageUri,
+            icon = icon,
+            onClick = onClick
+        )
+    } else if (fee is SendFee.Battery) {
+        addItem(
+            id = id,
+            title = context.getString(Localization.battery_refill_title),
+            subtitle = "≈ ${fee.formattedCharges(context)}",
+            imageUri = UIKitIcon.ic_flash_24.uri(),
+            imageTintColor = context.accentGreenColor,
+            icon = icon,
+            onClick = onClick
+        )
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/BaseFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/BaseFragment.kt
index 20ae521a9..674a0889c 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/BaseFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/BaseFragment.kt
@@ -5,4 +5,8 @@ import uikit.extensions.hideKeyboard
 
 fun BaseFragment.hideKeyboard() {
     requireActivity().hideKeyboard()
+}
+
+fun BaseFragment.finishDelay(delay: Long = 3000) {
+    postDelayed(delay) { finish() }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/PurchaseRepository.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/PurchaseRepository.kt
index d9ff4ef50..6a573a4fb 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/PurchaseRepository.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/PurchaseRepository.kt
@@ -1,16 +1,14 @@
 package com.tonapps.tonkeeper.extensions
 
-import android.util.Log
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
-import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.purchase.PurchaseRepository
 import com.tonapps.wallet.data.purchase.entity.OnRamp
 import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
@@ -21,29 +19,17 @@ data class OnRampResult(
     val country: String
 )
 
-fun PurchaseRepository.providersFlow(
-    testnet: Boolean,
-    settingsRepository: SettingsRepository,
-    api: API
-): Flow<List<PurchaseMethodEntity>> {
-    return settingsRepository.getNormalizeCountryFlow(api).mapNotNull { country ->
-        get(testnet, country, settingsRepository.getLocale())
-    }.map { (it.first + it.first) }.map { entities ->
-        entities.flatMap { it.items }.distinctBy { it.title }
-    }.flowOn(Dispatchers.IO)
-}
 
 fun PurchaseRepository.onRampDataFlow(
-    settingsRepository: SettingsRepository,
-    api: API
-) = settingsRepository
-    .getNormalizeCountryFlow(api)
+    environment: Environment
+) = environment.countryFlow
     .mapNotNull { country ->
-        getOnRamp(country)?.let { data ->
+        getOnRamp()?.let { data ->
             OnRampResult(data, country)
         }
     }
 
+
 suspend fun PurchaseRepository.getProvidersByCountry(
     wallet: WalletEntity,
     settingsRepository: SettingsRepository,
@@ -52,30 +38,4 @@ suspend fun PurchaseRepository.getProvidersByCountry(
     val methods = get(wallet.testnet, country, settingsRepository.getLocale()) ?: return@withContext emptyList()
     val all = methods.first + methods.second
     all.map { it.items }.flatten().distinctBy { it.title }
-}
-
-fun PurchaseRepository.sendCurrencyFlow(settingsRepository: SettingsRepository): Flow<WalletCurrency> {
-    return sendCurrencyFlow.map {
-        it ?: settingsRepository.currency
-    }
-}
-
-fun PurchaseRepository.onRampFormCurrencyFlow(
-    settingsRepository: SettingsRepository
-): Flow<Pair<WalletCurrency, WalletCurrency>> {
-    return combine(
-        sendCurrencyFlow(settingsRepository),
-        receiveCurrencyFlow
-    ) { sendCurrency, receiveCurrency ->
-        /*if (sendCurrency.fiat && receiveCurrency.fiat) {
-            Pair(sendCurrency, WalletCurrency.TON)
-        } else if (sendCurrency.isUSDT && receiveCurrency.isUSDT) {
-            Pair(settingsRepository.currency, receiveCurrency)
-        } else if (!sendCurrency.fiat && !receiveCurrency.fiat) {
-            Pair(settingsRepository.currency, receiveCurrency)
-        } else {
-            Pair(sendCurrency, receiveCurrency)
-        }*/
-        Pair(sendCurrency, receiveCurrency)
-    }
-}
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt
index b72266799..81e67512e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RawMessageEntity.kt
@@ -1,9 +1,7 @@
 package com.tonapps.tonkeeper.extensions
 
-import android.util.Log
 import com.tonapps.blockchain.ton.TONOpCode
 import com.tonapps.blockchain.ton.TonTransferHelper
-import com.tonapps.blockchain.ton.extensions.isBounceable
 import com.tonapps.blockchain.ton.extensions.loadAddress
 import com.tonapps.blockchain.ton.extensions.loadCoins
 import com.tonapps.blockchain.ton.extensions.loadMaybeAddress
@@ -144,6 +142,7 @@ fun RawMessageEntity.getWalletTransfer(
     excessesAddress: AddrStd? = null,
     newStateInit: CellRef<StateInit>? = null,
     newCustomPayload: Cell? = null,
+    sendMode: Int,
 ): WalletTransfer {
     val payload = getPayload()
     val body = if (excessesAddress != null) {
@@ -165,7 +164,7 @@ fun RawMessageEntity.getWalletTransfer(
     val builder = WalletTransferBuilder()
     builder.destination = address
     builder.messageData = MessageData.Raw(body, newStateInit ?: getStateInitRef())
-    builder.bounceable = addressValue.isBounceable()
+    builder.bounceable = addressTags.isBounceable
     if (newCustomPayload != null) {
         val defCoins = Coins.of(0.5)
         if (defCoins.amount.value > coins.amount.value) {
@@ -176,14 +175,16 @@ fun RawMessageEntity.getWalletTransfer(
     } else {
         builder.coins = coins
     }
+    builder.sendMode = sendMode
     return builder.build()
 }
 
-fun RawMessageEntity.getDefaultWalletTransfer(): WalletTransfer {
+fun RawMessageEntity.getDefaultWalletTransfer(sendMode: Int): WalletTransfer {
     val builder = WalletTransferBuilder()
     builder.destination = address
     builder.messageData = MessageData.Raw(getPayload(), getStateInitRef())
-    builder.bounceable = addressValue.isBounceable()
+    builder.bounceable = addressTags.isBounceable
     builder.coins = coins
+    builder.sendMode = sendMode
     return builder.build()
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RootViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RootViewModel.kt
new file mode 100644
index 000000000..4d8158b16
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/RootViewModel.kt
@@ -0,0 +1,10 @@
+package com.tonapps.tonkeeper.extensions
+
+import android.net.Uri
+import androidx.core.net.toUri
+import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
+
+fun RootViewModel.routeToHistoryTab(from: String) {
+    val uri = "tonkeeper://history?from=$from".toUri()
+    processDeepLink(uri, false, Uri.EMPTY, false, context.packageName)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SendFee.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SendFee.kt
new file mode 100644
index 000000000..c5e219396
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SendFee.kt
@@ -0,0 +1,38 @@
+package com.tonapps.tonkeeper.extensions
+
+import android.content.Context
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.wallet.data.settings.entities.PreferredFeeMethod
+import com.tonapps.wallet.localization.Plurals
+
+val SendFee.id: String
+    get() = when (this) {
+        is SendFee.Battery -> "battery"
+        is SendFee.TokenFee -> amount.token.symbol
+        else -> "unknown"
+    }
+
+val SendFee.TokenFee.symbol: String
+    get() = amount.token.symbol
+
+val SendFee.TokenFee.formattedAmount: CharSequence
+    get() = CurrencyFormatter.format(amount.token.symbol, amount.value)
+
+val SendFee.TokenFee.formattedFiat: CharSequence
+    get() = CurrencyFormatter.formatFiat(fiatCurrency.code, fiatAmount)
+
+fun SendFee.Battery.formattedCharges(context: Context): CharSequence {
+    return context.resources.getQuantityString(
+        Plurals.battery_charges,
+        charges,
+        CurrencyFormatter.format(value = charges.toBigDecimal())
+    )
+}
+
+val SendFee.method: PreferredFeeMethod
+    get() = when (this) {
+        is SendFee.Gasless -> PreferredFeeMethod.GASLESS
+        is SendFee.Battery -> PreferredFeeMethod.BATTERY
+        is SendFee.Ton -> PreferredFeeMethod.TON
+    }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SettingsRepository.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SettingsRepository.kt
index be970cbe8..ed9f11d20 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SettingsRepository.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SettingsRepository.kt
@@ -9,23 +9,6 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import java.util.Locale
 
-fun SettingsRepository.getNormalizeCountryFlow(api: API) = countryFlow.map { country ->
-    val fixedCountry = if (country.equals("AUTO", true) || country.isEmpty()) {
-        api.resolveCountry() ?: getLocale().country
-    } else {
-        country
-    }
-    if (fixedCountry.isNullOrBlank()) "UAE" else fixedCountry
-}.flowOn(Dispatchers.IO)
-
-fun SettingsRepository.getLocaleCountryFlow(api: API) = getNormalizeCountryFlow(api).map {
-    Locale("", it)
-}
-
-suspend fun SettingsRepository.getFixedCountryCode(api: API): String {
-    return getLocaleCountryFlow(api).firstOrNull()?.country ?: country
-}
-
 fun SettingsRepository.isSafeModeEnabled(api: API): Boolean {
     val state = getSafeModeState()
     if (state == SafeModeState.Default) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt
index aaacde589..330e7f662 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/SignRequestEntity.kt
@@ -1,6 +1,6 @@
 package com.tonapps.tonkeeper.extensions
 
-import android.util.Log
+import com.tonapps.blockchain.ton.TonSendMode
 import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
@@ -16,13 +16,19 @@ suspend fun SignRequestEntity.getTransfers(
     compressedTokens: List<AccountTokenEntity>,
     excessesAddress: AddrStd? = null,
     api: API,
-    batteryEnabled: Boolean
+    batteryEnabled: Boolean,
+    tonBalance: com.tonapps.icu.Coins? = null,
 ): List<WalletTransfer> = withContext(Dispatchers.IO) {
     val transferMessages = getTransferMessages(batteryEnabled)
     val transfers = mutableListOf<WalletTransfer>()
     for (message in transferMessages) {
+        val sendMode = if (tonBalance != null && message.coins == tonBalance) {
+            TonSendMode.CARRY_ALL_REMAINING_BALANCE.value + TonSendMode.IGNORE_ERRORS.value
+        } else {
+            TonSendMode.PAY_GAS_SEPARATELY.value + TonSendMode.IGNORE_ERRORS.value
+        }
         if (message.withBattery && batteryEnabled) {
-            transfers.add(message.getDefaultWalletTransfer())
+            transfers.add(message.getDefaultWalletTransfer(sendMode))
         } else {
             val jetton = compressedTokens.firstOrNull {
                 it.address.equalsAddress(message.addressValue) ||
@@ -36,6 +42,7 @@ suspend fun SignRequestEntity.getTransfers(
                 excessesAddress = excessesAddress,
                 newStateInit = jettonCustomPayload?.stateInit,
                 newCustomPayload = jettonCustomPayload?.customPayload,
+                sendMode = sendMode,
             )
             transfers.add(transfer)
         }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/TokenEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/TokenEntity.kt
new file mode 100644
index 000000000..c5250d363
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/extensions/TokenEntity.kt
@@ -0,0 +1,14 @@
+package com.tonapps.tonkeeper.extensions
+
+import com.tonapps.wallet.api.entity.Blockchain
+import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.core.currency.WalletCurrency.Chain
+
+val TokenEntity.asCurrency: WalletCurrency
+    get() = WalletCurrency(
+        code = symbol,
+        title = name,
+        chain = if (blockchain == Blockchain.TRON) Chain.TRON(address, decimals) else Chain.TON(address, decimals),
+        iconUrl = imageUri.toString(),
+    )
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BatteryHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BatteryHelper.kt
new file mode 100644
index 000000000..660f30550
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BatteryHelper.kt
@@ -0,0 +1,80 @@
+package com.tonapps.tonkeeper.helper
+
+import com.tonapps.icu.Coins
+import com.tonapps.tonkeeper.usecase.emulation.Emulated
+import com.tonapps.tonkeeper.usecase.emulation.EmulationUseCase
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.account.entities.MessageBodyEntity
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.battery.BatteryMapper
+import com.tonapps.wallet.data.battery.BatteryRepository
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.settings.SettingsRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+object BatteryHelper {
+
+    suspend fun getBatteryCharges(
+        wallet: WalletEntity,
+        accountRepository: AccountRepository,
+        batteryRepository: BatteryRepository
+    ): Int = withContext(Dispatchers.IO) {
+        accountRepository.requestTonProofToken(wallet)?.let {
+            batteryRepository.getCharges(it, wallet.publicKey, wallet.testnet, true)
+        } ?: 0
+    }
+
+    suspend fun getBalance(
+        wallet: WalletEntity,
+        accountRepository: AccountRepository,
+        batteryRepository: BatteryRepository
+    ): Coins {
+        val tonProof = accountRepository.requestTonProofToken(wallet) ?: return Coins.ZERO
+        val entity = batteryRepository.getBalance(
+            tonProofToken = tonProof,
+            publicKey = wallet.publicKey,
+            testnet = wallet.testnet,
+            ignoreCache = true
+        )
+        return entity.balance
+    }
+
+    suspend fun emulation(
+        wallet: WalletEntity,
+        message: MessageBodyEntity,
+        emulationUseCase: EmulationUseCase,
+        accountRepository: AccountRepository,
+        batteryRepository: BatteryRepository,
+        api: API
+    ): Emulated? {
+        val emulated = emulationUseCase(
+            message = message,
+            useBattery = true,
+            forceRelayer = true,
+            params = true
+        )
+        val chargesBalance = getBatteryCharges(wallet, accountRepository, batteryRepository)
+        val charges = BatteryMapper.calculateChargesAmount(
+            emulated.extra.value.value,
+            api.config.batteryMeanFees
+        )
+        return if (charges > chargesBalance) null else emulated
+    }
+
+    suspend fun isBatteryIsEnabledTx(
+        wallet: WalletEntity,
+        txType: BatteryTransaction,
+        settingsRepository: SettingsRepository,
+        accountRepository: AccountRepository,
+        batteryRepository: BatteryRepository
+    ): Boolean = withContext(Dispatchers.IO) {
+        if (settingsRepository.batteryIsEnabledTx(wallet.accountId, txType)) {
+            getBalance(wallet, accountRepository, batteryRepository).isPositive
+        } else {
+            false
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BrowserHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BrowserHelper.kt
index 6eb7f6c4b..c9a2b9d3e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BrowserHelper.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/BrowserHelper.kt
@@ -23,6 +23,7 @@ import com.tonapps.wallet.data.browser.entities.BrowserAppEntity
 import com.tonapps.wallet.localization.Localization
 import uikit.navigation.Navigation
 import androidx.core.net.toUri
+import com.tonapps.tonkeeper.koin.analytics
 
 object BrowserHelper {
 
@@ -33,10 +34,9 @@ object BrowserHelper {
             } else if (useTG) {
                 openTG(context, url)
             }
-            AnalyticsHelper.trackEventClickDApp(
+            context.analytics?.trackEventClickDApp(
                 url = url.toString(),
                 name = name,
-                installId = context.installId,
                 source = source,
                 country = country
             )
@@ -127,6 +127,17 @@ object BrowserHelper {
         }
     }
 
+    fun openX(activity: Activity, uri: Uri) {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, uri)
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            intent.setPackage("com.twitter.android")
+            activity.startActivity(intent)
+        } catch (e: Throwable) {
+            external(activity, uri)
+        }
+    }
+
     fun external(context: Context, uri: Uri) {
         context.activity?.let {
             external(it, uri)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/DateHelper.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/DateHelper.kt
index 42706c1bd..7bac9d23a 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/DateHelper.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/DateHelper.kt
@@ -3,14 +3,16 @@ package com.tonapps.tonkeeper.helper
 import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
+import com.tonapps.extensions.currentTimeSeconds
 import com.tonapps.tonkeeper.extensions.capitalized
 import com.tonapps.wallet.localization.Localization
-import kotlinx.datetime.Clock
+import kotlinx.datetime.DateTimePeriod
+import kotlin.time.Clock
 import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.minus
-import kotlinx.datetime.toJavaInstant
+import kotlinx.datetime.plus
 import kotlinx.datetime.toLocalDateTime
 import kotlinx.datetime.todayIn
 import java.text.SimpleDateFormat
@@ -20,9 +22,12 @@ import java.util.Date
 import java.util.Locale
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
+import kotlin.time.ExperimentalTime
+import kotlin.time.toJavaInstant
 
 object DateHelper {
 
+    @OptIn(ExperimentalTime::class)
     fun formatTransactionDetailsTime(date: Long, locale: Locale): String {
         if (0 >= date) {
             return ""
@@ -31,6 +36,7 @@ object DateHelper {
         return formatTransactionDetailsTime(instant, locale)
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatTransactionDetailsTime(date: Instant, locale: Locale): String {
         val shortMonth = formatDate(date, "MMM", locale).replace(".", "") + ","
         val month = if (locale.language == "en") shortMonth.capitalized else shortMonth
@@ -44,11 +50,26 @@ object DateHelper {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
+    fun untilDate(timestamp: Long = currentTimeSeconds(), locale: Locale): String {
+        val startInstant = Instant.fromEpochSeconds(timestamp)
+
+        val zone = TimeZone.currentSystemDefault()
+        val oneYearLater = startInstant.plus(
+            DateTimePeriod(years = 1),
+            zone
+        )
+
+        return formatDate(oneYearLater, "dd MMM yyyy", locale)
+    }
+
+    @OptIn(ExperimentalTime::class)
     fun timestampToDateString(timestamp: Long, locale: Locale): String {
         val date = Instant.fromEpochSeconds(timestamp)
         return formatDate(date, "yyyy-MM-dd", locale)
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatTransactionTime(date: Long, locale: Locale): String {
         if (0 >= date) {
             return ""
@@ -57,6 +78,7 @@ object DateHelper {
         return formatTransactionTime(instant, locale)
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatChartTime(epochSeconds: Long, locale: Locale, hasHHmm: Boolean): String {
         if (0 >= epochSeconds) {
             return ""
@@ -73,6 +95,7 @@ object DateHelper {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatTransactionTime(date: Instant, locale: Locale): String {
         val shortMonth = formatDate(date, "MMM", locale).replace(".", "") + ","
         val month = if (locale.language == "en") shortMonth.capitalized else shortMonth
@@ -85,6 +108,7 @@ object DateHelper {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatTransactionsGroupDate(context: Context, timestamp: Long, locale: Locale): String {
         val date = Instant.fromEpochMilliseconds(timestamp * 1000)
         return when {
@@ -96,21 +120,25 @@ object DateHelper {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     fun isToday(date: Instant): Boolean {
         val today = Clock.System.todayIn(TimeZone.currentSystemDefault())
         return date.toLocalDateTime(TimeZone.currentSystemDefault()).date == today
     }
 
+    @OptIn(ExperimentalTime::class)
     fun isYesterday(date: Instant): Boolean {
         val yesterday = Clock.System.todayIn(TimeZone.currentSystemDefault()).minus(1, DateTimeUnit.DAY)
         return date.toLocalDateTime(TimeZone.currentSystemDefault()).date == yesterday
     }
 
+    @OptIn(ExperimentalTime::class)
     fun isThisYear(date: Instant): Boolean {
         val now = Clock.System.now()
         return now.minus(date, DateTimeUnit.YEAR, TimeZone.currentSystemDefault()) < 1
     }
 
+    @OptIn(ExperimentalTime::class)
     fun isThisMonth(date: Instant): Boolean {
         val now = Clock.System.now()
         return now.minus(date, DateTimeUnit.MONTH, TimeZone.currentSystemDefault()) < 1
@@ -123,6 +151,7 @@ object DateHelper {
             .toFormatter(locale)
     }
 
+    @OptIn(ExperimentalTime::class)
     @RequiresApi(Build.VERSION_CODES.O)
     private fun formatModernDate(instant: Instant, formatString: String, locale: Locale): String {
         val formatter = createModernFormatter(formatString, locale)
@@ -135,6 +164,7 @@ object DateHelper {
         return formatter.format(date)
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatDate(instant: Instant, formatString: String, locale: Locale): String {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             return formatModernDate(instant, formatString, locale)
@@ -144,6 +174,7 @@ object DateHelper {
         }
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formattedDate(unixTimestamp: Long, locale: Locale): String {
         if (0 >= unixTimestamp) {
             return ""
@@ -153,6 +184,7 @@ object DateHelper {
         return formatDate(instant, formatString, locale)
     }
 
+    @OptIn(ExperimentalTime::class)
     fun formatCycleEnd(timestamp: Long): String {
         val now = Clock.System.now()
         var estimateInstant = Instant.fromEpochSeconds(timestamp)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/TwinInput.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/TwinInput.kt
new file mode 100644
index 000000000..22366534b
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/helper/TwinInput.kt
@@ -0,0 +1,225 @@
+package com.tonapps.tonkeeper.helper
+
+import android.util.Log
+import com.tonapps.icu.Coins
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.rates.entity.RatesEntity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+
+class TwinInput(
+    private val scope: CoroutineScope
+) {
+
+    companion object {
+        val Type.opposite get() = when (this) {
+            Type.Send -> Type.Receive
+            Type.Receive -> Type.Send
+        }
+    }
+
+    enum class Type {
+        Send, Receive
+    }
+
+    data class Value(
+        val currency: WalletCurrency = WalletCurrency.TON,
+        val value: String = "",
+    ) {
+
+        val coins: Coins by lazy {
+            Coins.of(value, currency.decimals)
+        }
+
+        val fiat: Boolean
+            get() = currency.fiat
+
+        val address: String
+            get() = currency.address
+
+        val symbol: String
+            get() = currency.symbol
+
+        val decimals: Int
+            get() = currency.decimals
+    }
+
+    data class State(
+        val send: Value = Value(),
+        val receive: Value = Value(),
+        val focus: Type = Type.Send
+    ) {
+
+        val sendCurrency: WalletCurrency
+            get() = send.currency
+
+        val receiveCurrency: WalletCurrency
+            get() = receive.currency
+
+        val isEmpty: Boolean
+            get() {
+                if (send.value.isEmpty()) {
+                    return true
+                }
+                return receive.currency.isTONChain && receive.value.isEmpty()
+            }
+
+        val hasTonChain: Boolean
+            get() = send.currency.isTONChain || receive.currency.isTONChain
+
+        val hasTronChain: Boolean
+            get() = send.currency.isTronChain || receive.currency.isTronChain
+
+        fun getCurrency(type: Type = focus): WalletCurrency {
+            return if (type == Type.Send) {
+                send.currency
+            } else {
+                receive.currency
+            }
+        }
+
+        fun hasCurrency(currency: WalletCurrency) = send.currency == currency || receive.currency == currency
+
+        fun convert(
+            rates: RatesEntity,
+            fromType: Type = focus
+        ): Coins {
+            val fromValue = if (fromType == Type.Send) send.coins else receive.coins
+            return convert(rates, fromType, fromValue)
+        }
+
+        fun convert(
+            rates: RatesEntity,
+            fromType: Type = focus,
+            value: Coins
+        ) = if (fromType == Type.Send) {
+            rates.convert(
+                from = send.currency,
+                value = value,
+                to = receive.currency,
+            )
+        } else {
+            rates.convert(
+                from = receive.currency,
+                value = value,
+                to = send.currency,
+            )
+        }
+    }
+
+    data class CurrenciesState(
+        val send: WalletCurrency = WalletCurrency.TON,
+        val receive: WalletCurrency = WalletCurrency.TON
+    ) {
+
+        val fiat: WalletCurrency?
+            get() {
+                if (send.fiat) {
+                    return send
+                } else if (receive.fiat) {
+                    return receive
+                }
+                return null
+            }
+
+        val cryptoTokens: List<WalletCurrency> by lazy {
+            listOf(send, receive).filter { !it.fiat }
+        }
+    }
+
+    private val _stateFlow = MutableStateFlow(State())
+    val stateFlow = _stateFlow.asStateFlow()
+
+    val currenciesStateFlow = stateFlow.map {
+        CurrenciesState(it.send.currency, it.receive.currency)
+    }.distinctUntilChanged().stateIn(scope, SharingStarted.Eagerly, CurrenciesState())
+
+    val state: State
+        get() = _stateFlow.value
+
+    fun createConvertFlow(ratesFlow: Flow<RatesEntity>, forType: Type, reductionFactor: Float = 1f) = combine(
+        ratesFlow,
+        stateFlow.filter { it.focus != forType }.distinctUntilChanged()
+    ) { rates, inputsState ->
+        val converted = inputsState.convert(rates)
+        if (reductionFactor == 0f || reductionFactor == 1f || !converted.isPositive) {
+            converted
+        } else {
+            converted / reductionFactor
+        }
+    }.distinctUntilChanged()
+
+    fun getCurrency(forType: Type = state.focus) = if (forType == Type.Send) {
+        state.send.currency
+    } else {
+        state.receive.currency
+    }
+
+    fun getValue(forType: Type = state.focus) = if (forType == Type.Send) {
+        state.send.value
+    } else {
+        state.receive.value
+    }
+
+    fun switch() {
+        _stateFlow.update {
+            it.copy(
+                send = it.receive,
+                receive = it.send,
+                focus = it.focus.opposite
+            )
+        }
+
+        _stateFlow.update {
+            it.copy(
+                focus = it.focus.opposite
+            )
+        }
+    }
+
+    fun updateValue() {
+        updateValue(state.focus, getValue(state.focus.opposite))
+    }
+
+    fun updateFocus(type: Type) {
+        _stateFlow.update {
+            it.copy(focus = type)
+        }
+    }
+
+    fun updateCurrency(type: Type, currency: WalletCurrency) {
+        _stateFlow.update {
+            if (type == Type.Send) {
+                it.copy(send = it.send.copy(currency = currency))
+            } else {
+                it.copy(receive = it.receive.copy(currency = currency))
+            }
+        }
+    }
+
+    fun updateValue(type: Type, value: String) {
+        _stateFlow.update {
+            var normalizedValue = value.trim()
+            if (normalizedValue == "0") {
+                normalizedValue = ""
+            }
+            if (type == Type.Send) {
+                it.copy(send = it.send.copy(value = normalizedValue))
+            } else {
+                it.copy(receive = it.receive.copy(value = normalizedValue))
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/Extension.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/Extension.kt
index 921743418..906d3a41d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/Extension.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/Extension.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.ViewModelStoreOwner
 import androidx.lifecycle.viewmodel.CreationExtras
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.RemoteConfig
+import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.manager.apk.APKManager
 import com.tonapps.tonkeeper.manager.push.PushManager
@@ -15,11 +16,13 @@ import com.tonapps.tonkeeper.ui.base.ScreenContext
 import com.tonapps.tonkeeper.ui.base.compose.ComposeWalletScreen
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.ConfigEntity
+import com.tonapps.wallet.api.entity.FlagsEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.rn.RNLegacy
 import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.token.TokenRepository
 import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.core.Koin
 import org.koin.core.component.KoinComponent
@@ -84,12 +87,18 @@ val Context.remoteConfig: RemoteConfig?
 val Context.serverConfig: ConfigEntity?
     get() = api?.config
 
+val Context.serverFlags: FlagsEntity?
+    get() = api?.config?.flags
+
 val Context.settingsRepository: SettingsRepository?
     get() = koin?.get<SettingsRepository>()
 
 val Context.ratesRepository: RatesRepository?
     get() = koin?.get<RatesRepository>()
 
+val Context.tokenRepository: TokenRepository?
+    get() = koin?.get<TokenRepository>()
+
 val Context.passcodeManager: PasscodeManager?
     get() = koin?.get<PasscodeManager>()
 
@@ -106,4 +115,7 @@ val Context.apkManager: APKManager?
     get() = koin?.get<APKManager>()
 
 val Context.installId: String
-    get() = settingsRepository?.installId ?: ""
\ No newline at end of file
+    get() = settingsRepository?.installId ?: ""
+
+val Context.analytics: AnalyticsHelper?
+    get() = koin?.get<AnalyticsHelper>()
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
index 8204097c7..ee883b2aa 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/KoinModule.kt
@@ -5,6 +5,7 @@ import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.billing.BillingManager
 import com.tonapps.tonkeeper.client.safemode.SafeModeClient
+import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.manager.assets.AssetsManager
 import com.tonapps.tonkeeper.manager.tx.TransactionManager
 import com.tonapps.tonkeeper.core.history.HistoryHelper
@@ -66,6 +67,7 @@ val koinModel = module {
     singleOf(::APKManager)
     singleOf(::CacheHelper)
     singleOf(::ReferrerClientHelper)
+    singleOf(::AnalyticsHelper)
 
     factoryOf(::SignUseCase)
     factoryOf(::EmulationUseCase)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/viewModelWalletModule.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/viewModelWalletModule.kt
index 462ff3e44..67faebb13 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/viewModelWalletModule.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/koin/viewModelWalletModule.kt
@@ -21,6 +21,7 @@ import com.tonapps.tonkeeper.ui.screen.browser.base.BrowserBaseViewModel
 import com.tonapps.tonkeeper.ui.screen.browser.more.BrowserMoreViewModel
 import com.tonapps.tonkeeper.ui.screen.card.CardViewModel
 import com.tonapps.tonkeeper.ui.screen.collectibles.manage.CollectiblesManageViewModel
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewViewModel
 import com.tonapps.tonkeeper.ui.screen.events.spam.SpamEventsViewModel
 import com.tonapps.tonkeeper.ui.screen.send.contacts.main.SendContactsViewModel
 import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseViewModel
@@ -38,7 +39,10 @@ import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionViewModel
 import com.tonapps.tonkeeper.ui.screen.settings.apps.AppsViewModel
 import com.tonapps.tonkeeper.ui.screen.sign.SignDataViewModel
 import com.tonapps.tonkeeper.ui.screen.staking.withdraw.StakeWithdrawViewModel
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.OmnistonViewModel
+import com.tonapps.tonkeeper.ui.screen.swap.picker.SwapPickerViewModel
 import com.tonapps.tonkeeper.ui.screen.transaction.TransactionViewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.core.module.dsl.viewModelOf
 
 val viewModelWalletModule = module {
@@ -80,4 +84,7 @@ val viewModelWalletModule = module {
     viewModelOf(::OnRampViewModel)
     viewModelOf(::OnRampProviderPickerViewModel)
     viewModelOf(::OnRampPickerViewModel)
+    viewModelOf(::OmnistonViewModel)
+    viewModelOf(::SwapPickerViewModel)
+    viewModelOf(::DNSRenewViewModel)
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/assets/AssetsManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/assets/AssetsManager.kt
index 560c2ff96..76f02cb82 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/assets/AssetsManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/assets/AssetsManager.kt
@@ -4,24 +4,25 @@ import android.content.Context
 import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.icu.Coins
 import com.tonapps.icu.Coins.Companion.sumOf
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.core.entities.AssetsEntity
 import com.tonapps.tonkeeper.core.entities.AssetsEntity.Companion.sort
 import com.tonapps.tonkeeper.core.entities.StakedEntity
 import com.tonapps.tonkeeper.extensions.isSafeModeEnabled
 import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.StakingRepository
 import com.tonapps.wallet.data.staking.entities.StakingEntity
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import com.tonapps.wallet.data.token.entities.TokenRateEntity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -36,7 +37,6 @@ class AssetsManager(
     private val settingsRepository: SettingsRepository,
     private val accountRepository: AccountRepository,
     private val api: API,
-    private val remoteConfig: RemoteConfig,
 ) {
 
     private val cache = TotalBalanceCache(context)
@@ -56,10 +56,42 @@ class AssetsManager(
     ): List<AssetsEntity>? {
         val tokens = getTokens(wallet, currency, refresh)
         var staked = getStaked(wallet, tokens.map { it.token }, currency, refresh)
-        if (!remoteConfig.isEthenaEnabled) {
-            staked = staked.filter { !it.staked.isEthena }
+
+        val filteredTokens = tokens.filter { !it.token.isLiquid && !it.token.isUSDe }.toMutableList()
+        val tokenTsUsde =
+            tokens.firstOrNull { it.token.address.equalsAddress(TokenEntity.TON_TS_USDE) }?.token
+        val tokenUsde =
+            tokens.firstOrNull { it.token.address.equalsAddress(TokenEntity.TON_USDE) }?.token
+        tokenUsde?.let {
+            if (tokenTsUsde != null) {
+                val rates = ratesRepository.getRates(
+                    currency,
+                    listOf(it.address, tokenTsUsde.address)
+                )
+                val stakedUsde = rates.convert(
+                    from = WalletCurrency.TS_USDE_TON_ETHENA,
+                    value = tokenTsUsde.balance.value,
+                    to = WalletCurrency.USDE_TON_ETHENA
+                )
+                val balance =
+                    it.balance.copy(value = it.balance.value + stakedUsde)
+                filteredTokens.add(
+                    AssetsEntity.Token(
+                        token = it.copy(
+                            balance = balance,
+                            fiatRate = TokenRateEntity(
+                                currency = currency,
+                                fiat = rates.convert(it.address, balance.value),
+                                rate = rates.getRate(it.address),
+                                rateDiff24h = rates.getDiff24h(it.address)
+                            )
+                        )
+                    )
+                )
+            } else {
+                filteredTokens.add(AssetsEntity.Token(token = it))
+            }
         }
-        val filteredTokens = if (remoteConfig.isEthenaEnabled) tokens.filter { !it.token.isLiquid } else tokens.filter { !it.token.isTsTON }
         val list = (filteredTokens + staked).sortedBy { it.fiat }.reversed()
         if (list.isEmpty()) {
             return null
@@ -67,13 +99,19 @@ class AssetsManager(
         return list
     }
 
+    suspend fun getTONBalance(
+        wallet: WalletEntity, currency: WalletCurrency = settingsRepository.currency
+    ) = getToken(
+        wallet = wallet, token = "TON", currency = currency
+    )?.balance ?: Coins.ZERO
+
     suspend fun getToken(
-        wallet: WalletEntity,
-        token: String,
-        currency: WalletCurrency = settingsRepository.currency
+        wallet: WalletEntity, token: String, currency: WalletCurrency = settingsRepository.currency
     ): AssetsEntity.Token? {
         val tokens = getTokens(wallet, currency, false)
-        return tokens.firstOrNull { it.token.address.equalsAddress(token) }
+        return tokens.firstOrNull {
+            it.token.address.equalsAddress(token)
+        }
     }
 
     suspend fun getTokens(
@@ -84,10 +122,10 @@ class AssetsManager(
         if (accountIds.isEmpty()) {
             emptyList()
         } else {
-            val deferredTokens = accountIds.map { accountId ->
-                async { getToken(wallet, accountId, currency) }
+            val tokens = getTokens(wallet, currency, false)
+            tokens.filter {
+                accountIds.any { accountId -> it.token.address.equalsAddress(accountId) }
             }
-            deferredTokens.mapNotNull { it.await() }
         }
     }
 
@@ -95,12 +133,15 @@ class AssetsManager(
         wallet: WalletEntity,
         currency: WalletCurrency = settingsRepository.currency,
         refresh: Boolean,
-    ): List<AssetsEntity.Token>  {
+    ): List<AssetsEntity.Token> {
         val safeMode = settingsRepository.isSafeModeEnabled(api)
-        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
-            accountRepository.getTronAddress(wallet.id)
-        } else null
-        val tokens = tokenRepository.get(currency, wallet.accountId, wallet.testnet, refresh, tronAddress) ?: return emptyList()
+        val tronAddress =
+            if (wallet.hasPrivateKey && !wallet.testnet) {
+                accountRepository.getTronAddress(wallet.id)
+            } else null
+        val tokens =
+            tokenRepository.get(currency, wallet.accountId, wallet.testnet, refresh, tronAddress)
+                ?: return emptyList()
         tokens.firstOrNull()?.let {
             if (wallet.initialized != it.balance.initializedAccount) {
                 accountRepository.setInitialized(wallet.accountId, it.balance.initializedAccount)
@@ -125,13 +166,10 @@ class AssetsManager(
     }
 
     private suspend fun getStaking(
-        wallet: WalletEntity,
-        refresh: Boolean
+        wallet: WalletEntity, refresh: Boolean
     ): StakingEntity {
         return stakingRepository.get(
-            accountId = wallet.accountId,
-            testnet = wallet.testnet,
-            ignoreCache = refresh
+            accountId = wallet.accountId, testnet = wallet.testnet, ignoreCache = refresh
         )
     }
 
@@ -153,19 +191,16 @@ class AssetsManager(
     }
 
     fun setCachedTotalBalance(
-        wallet: WalletEntity,
-        currency: WalletCurrency,
-        sorted: Boolean = false,
-        value: Coins
+        wallet: WalletEntity, currency: WalletCurrency, sorted: Boolean = false, value: Coins
     ) {
         cache.set(wallet, currency, sorted, value)
     }
 
     suspend fun getTotalBalance(
-        wallet: WalletEntity,
-        currency: WalletCurrency,
-        sorted: Boolean = false
-    ) = getCachedTotalBalance(wallet, currency, sorted) ?: requestTotalBalance(wallet, currency, sorted)
+        wallet: WalletEntity, currency: WalletCurrency, sorted: Boolean = false
+    ) = getCachedTotalBalance(wallet, currency, sorted) ?: requestTotalBalance(
+        wallet, currency, sorted
+    )
 
     private suspend fun calculateTotalBalance(
         wallet: WalletEntity,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
index 955f2830b..9a5c3d798 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/TonConnectManager.kt
@@ -31,6 +31,7 @@ import com.tonapps.tonkeeper.manager.tonconnect.bridge.model.BridgeMethod
 import com.tonapps.tonkeeper.manager.tonconnect.bridge.model.SignDataRequestPayload
 import com.tonapps.tonkeeper.manager.tonconnect.exceptions.ManifestException
 import com.tonapps.tonkeeper.ui.component.SnackBarView
+import com.tonapps.tonkeeper.ui.screen.tonconnect.TonConnectResponse
 import com.tonapps.tonkeeper.ui.screen.tonconnect.TonConnectSafeModeDialog
 import com.tonapps.tonkeeper.ui.screen.tonconnect.TonConnectScreen
 import com.tonapps.tonkeeper.worker.DAppPushToggleWorker
@@ -317,7 +318,8 @@ class TonConnectManager(
         activity: NavigationActivity,
         tonConnect: TonConnect,
         keyPair: CryptoBox.KeyPair = CryptoBox.keyPair(),
-        wallet: WalletEntity?
+        wallet: WalletEntity?,
+        forceConnect: Boolean = false
     ): JSONObject = withContext(Dispatchers.IO) {
         if (tonConnect.request.items.isEmpty()) {
             return@withContext JsonBuilder.connectEventError(BridgeError.badRequest("Empty value provided in required field \"items\""))
@@ -332,15 +334,24 @@ class TonConnectManager(
                 return@withContext JsonBuilder.connectEventError(BridgeError.badRequest("client error"))
             }
 
-            val screen = TonConnectScreen.newInstance(
-                app = app,
-                proofPayload = tonConnect.proofPayload,
-                returnUri = tonConnect.returnUri,
-                wallet = wallet,
-                fromPackageName = tonConnect.fromPackageName
-            )
-            val bundle = activity.addForResult(screen)
-            val response = screen.contract.parseResult(bundle)
+            val response = if (forceConnect && wallet != null) {
+                TonConnectResponse(
+                    notifications = true,
+                    proof = null,
+                    wallet = wallet,
+                    proofError = null
+                )
+            } else {
+                val screen = TonConnectScreen.newInstance(
+                    app = app,
+                    proofPayload = tonConnect.proofPayload,
+                    returnUri = tonConnect.returnUri,
+                    wallet = wallet,
+                    fromPackageName = tonConnect.fromPackageName
+                )
+                val bundle = activity.addForResult(screen)
+                screen.contract.parseResult(bundle)
+            }
 
             if (wallet != null && !wallet.isTonConnectSupported) {
                 return@withContext JsonBuilder.connectEventError(BridgeError.methodNotSupported("Wallet not supported TonConnect"))
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
index ec9385114..55c8a4624 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tonconnect/bridge/Bridge.kt
@@ -93,7 +93,11 @@ internal class Bridge(private val api: API) {
     ): Boolean = withContext(Dispatchers.IO) {
         try {
             val encryptedMessage = AppConnectEntity.encryptMessage(clientId.hex(), keyPair.privateKey, unencryptedMessage.toByteArray())
-            api.tonconnectSend(hex(keyPair.publicKey), clientId, encryptedMessage.encodeBase64())
+            api.tonconnectSend(
+                publicKeyHex = hex(keyPair.publicKey),
+                clientId = clientId,
+                body = encryptedMessage.encodeBase64()
+            )
             true
         } catch (e: Throwable) {
             DevSettings.tonConnectLog("Failed to send message to $clientId: ${e.bestMessage}")
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tx/TransactionManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tx/TransactionManager.kt
index a80a7aa3d..8024a155a 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tx/TransactionManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/manager/tx/TransactionManager.kt
@@ -3,7 +3,6 @@ package com.tonapps.tonkeeper.manager.tx
 import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.tonkeeper.App
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.worker.WidgetUpdaterWorker
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.SendBlockchainState
@@ -43,7 +42,6 @@ class TransactionManager(
     private val batteryRepository: BatteryRepository,
     private val tokenRepository: TokenRepository,
     private val settingsRepository: SettingsRepository,
-    private val remoteConfig: RemoteConfig,
 ) {
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
@@ -93,7 +91,7 @@ class TransactionManager(
         ) { wallet, _, _ ->
             val tronEnabled = settingsRepository.getTronUsdtEnabled(wallet.id)
             val tronAddress = accountRepository.getTronAddress(wallet.id)
-            if (tronEnabled && tronAddress != null && wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+            if (tronEnabled && tronAddress != null && wallet.hasPrivateKey && !wallet.testnet && !api.config.flags.disableBattery) {
                 Pair(wallet, tronAddress)
             } else {
                 null
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/os/DeviceCountry.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/os/DeviceCountry.kt
new file mode 100644
index 000000000..4b083e4ac
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/os/DeviceCountry.kt
@@ -0,0 +1,82 @@
+package com.tonapps.tonkeeper.os
+
+import android.content.Context
+import android.telephony.TelephonyManager
+import java.util.Locale
+
+object DeviceCountry {
+
+    fun fromLocale(): String? {
+        val country = Locale.getDefault().country
+        if (country.equals("UK", true) || country.equals("GB", true)) {
+            return null
+        }
+        if (country.equals("US", true)) {
+            return null
+        }
+        if (country.equals("ZZ", true)) {
+            return null
+        }
+        return country.uppercase()
+    }
+
+    fun fromNetwork(context: Context) = try {
+        val manager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        manager.networkCountryIso.ifEmpty { null }
+    } catch (ignored: Throwable) {
+        null
+    }
+
+    fun fromSIM(context: Context): String? {
+        return getSimCountry(context) ?: getCountryByMCC(context)
+    }
+
+    private fun getSimCountry(context: Context) = try {
+        val manager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        manager.simCountryIso.ifEmpty { null }
+    } catch (ignored: Throwable) {
+        null
+    }
+
+    // Hack to get country code from MCC (Mobile Country Code)
+    private fun getMCC(context: Context) = try {
+        context.resources.configuration.mcc
+    } catch (e: Exception) {
+        0
+    }
+
+    private fun getCountryByMCC(context: Context): String? {
+        return when (getMCC(context)) {
+            in 310..316 -> "US" // United States
+            in 234..235 -> "GB" // United Kingdom
+            302 -> "CA" // Canada
+            208 -> "FR" // France
+            222 -> "GR" // Greece
+            230 -> "IT" // Italy
+            232 -> "NL" // Netherlands
+            238 -> "PT" // Portugal
+            240 -> "ES" // Spain
+            242 -> "SE" // Sweden
+            244 -> "IE" // Ireland
+            246 -> "FI" // Finland
+            248 -> "DK" // Denmark
+            250 -> "NO" // Norway
+            255 -> "CH" // Switzerland
+            260 -> "BE" // Belgium
+            268 -> "AT" // Austria
+            270 -> "HU" // Hungary
+            276 -> "DE" // Germany
+            278 -> "LV" // Latvia
+            280 -> "LT" // Lithuania
+            282 -> "EE" // Estonia
+            283 -> "PL" // Poland
+            284 -> "CZ" // Czech Republic
+            286 -> "SK" // Slovakia
+            288 -> "SI" // Slovenia
+            292 -> "RO" // Romania
+            293 -> "BG" // Bulgaria
+            294 -> "HR" // Croatia
+            else -> null
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseListWalletScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseListWalletScreen.kt
index 4a4f1ab87..3ca3560b6 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseListWalletScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseListWalletScreen.kt
@@ -7,6 +7,11 @@ import android.widget.FrameLayout
 import androidx.annotation.DrawableRes
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.marginBottom
+import androidx.core.view.marginLeft
+import androidx.core.view.marginRight
+import androidx.core.view.marginTop
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
@@ -71,6 +76,10 @@ abstract class BaseListWalletScreen<C: ScreenContext>(
         collectFlow(listView.topScrolled, headerView::setDivider)
     }
 
+    fun setNestedScrollingEnabled(enabled: Boolean) {
+        listView.isNestedScrollingEnabled = enabled
+    }
+
     fun addViewHeader(view: View, params: FrameLayout.LayoutParams? = null) {
         headerContainer.addView(view, params)
     }
@@ -114,6 +123,12 @@ abstract class BaseListWalletScreen<C: ScreenContext>(
         listView.updatePadding(left, top, right, bottom)
     }
 
+    fun setBottomMargin(margin: Int) {
+        listView.updateLayoutParams<FrameLayout.LayoutParams> {
+            bottomMargin = margin
+        }
+    }
+
     fun setActionIcon(@DrawableRes resId: Int, onClick: (view: View) -> Unit) {
         headerView.setAction(resId)
         headerView.doOnActionClick = onClick
@@ -136,4 +151,15 @@ abstract class BaseListWalletScreen<C: ScreenContext>(
         listView.scrollToPosition(0)
     }
 
+    fun applyListMargin(
+        left: Int = listView.marginLeft,
+        top: Int = listView.marginTop,
+        right: Int = listView.marginRight,
+        bottom: Int = listView.marginBottom
+    ) {
+        listView.updateLayoutParams<FrameLayout.LayoutParams> {
+            setMargins(left, top, right, bottom)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletScreen.kt
index 62a308ad8..8a6fc05c2 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletScreen.kt
@@ -8,10 +8,14 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.core.view.WindowInsetsControllerCompat
 import com.tonapps.tonkeeper.RemoteConfig
+import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.tonkeeper.koin.remoteConfig
 import com.tonapps.tonkeeper.koin.serverConfig
+import com.tonapps.tonkeeper.ui.screen.root.RootActivity
 import com.tonapps.wallet.api.entity.ConfigEntity
 import uikit.base.BaseFragment
+import uikit.extensions.gestureNavigationEnabled
 import uikit.navigation.Navigation
 
 abstract class BaseWalletScreen<C: ScreenContext>(
@@ -29,18 +33,22 @@ abstract class BaseWalletScreen<C: ScreenContext>(
     val remoteConfig: RemoteConfig?
         get() = context?.remoteConfig
 
+    val analytics: AnalyticsHelper?
+        get() = context?.analytics
+
     override val uiContext: Context
         get() = requireContext()
 
+    val rootActivity: RootActivity?
+        get() = activity as? RootActivity
+
     abstract val viewModel: BaseWalletVM
 
     private val isBottomSheet: Boolean
         get() = this is BottomSheet
 
-    val windowInsetsController: WindowInsetsControllerCompat? by lazy {
-        val window = window ?: return@lazy null
-        WindowInsetsControllerCompat(window, window.decorView)
-    }
+    val windowInsetsController: WindowInsetsControllerCompat?
+        get() = rootActivity?.windowInsetsController
 
     private val isAppearanceLightStatusBars: Boolean by lazy {
         windowInsetsController?.isAppearanceLightStatusBars ?: false
@@ -65,7 +73,7 @@ abstract class BaseWalletScreen<C: ScreenContext>(
         savedInstanceState: Bundle?
     ): View? {
         if (isBottomSheet && isAppearanceLightStatusBars) {
-            setAppearanceLight(false)
+            rootActivity?.setAppearanceLight(false)
         }
         viewModel.attachHolder(this)
         return super.onCreateView(inflater, container, savedInstanceState)
@@ -74,15 +82,8 @@ abstract class BaseWalletScreen<C: ScreenContext>(
     override fun onDestroyView() {
         super.onDestroyView()
         if (isBottomSheet && isAppearanceLightStatusBars) {
-            setAppearanceLight(true)
+            rootActivity?.setAppearanceLight(true)
         }
         viewModel.detachHolder()
     }
-
-    fun setAppearanceLight(light: Boolean) {
-        windowInsetsController?.apply {
-            isAppearanceLightStatusBars = light
-            isAppearanceLightNavigationBars = light
-        }
-    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletVM.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletVM.kt
index 195e22cd4..1a2711e7b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletVM.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/BaseWalletVM.kt
@@ -60,13 +60,9 @@ abstract class BaseWalletVM(
         holderRef = WeakReference(holder)
     }
 
-    fun <T> Flow<T>.launch() {
-        this.launchIn(viewModelScope)
-    }
+    fun <T> Flow<T>.launch() = this.launchIn(viewModelScope)
 
-    fun <T> Flow<T>.collectFlow(action: suspend (T) -> Unit) {
-        this.onEach { action(it) }.launch()
-    }
+    fun <T> Flow<T>.collectFlow(action: suspend (T) -> Unit) = this.onEach { action(it) }.launch()
 
     fun detachHolder() {
         holderRef?.clear()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/InjectedTonConnectScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/InjectedTonConnectScreen.kt
index 8f8ece0e2..c2acf71db 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/InjectedTonConnectScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/InjectedTonConnectScreen.kt
@@ -114,7 +114,8 @@ abstract class InjectedTonConnectScreen(@LayoutRes layoutId: Int, wallet: Wallet
 
     suspend fun tonconnect(
         version: Int,
-        request: ConnectRequest
+        request: ConnectRequest,
+        forceConnect: Boolean = false
     ): JSONObject {
         if (version != 2) {
             return JsonBuilder.connectEventError(BridgeError.badRequest("Version $version is not supported"))
@@ -127,7 +128,8 @@ abstract class InjectedTonConnectScreen(@LayoutRes layoutId: Int, wallet: Wallet
         return tonConnectManager.launchConnectFlow(
             activity = activity,
             tonConnect = TonConnect.fromJsInject(request, webView.url?.toUri()),
-            wallet = wallet
+            wallet = wallet,
+            forceConnect = forceConnect,
         )
     }
 
@@ -145,7 +147,7 @@ abstract class InjectedTonConnectScreen(@LayoutRes layoutId: Int, wallet: Wallet
         }
     }
 
-    suspend fun tonconnectSend(array: JSONArray): JSONObject {
+    suspend fun tonconnectSend(array: JSONArray, showLogout: Boolean = true): JSONObject {
         var id = 0L
         try {
             val messages = BridgeEvent.Message.parse(array)
@@ -166,7 +168,9 @@ abstract class InjectedTonConnectScreen(@LayoutRes layoutId: Int, wallet: Wallet
                     val boc = SendTransactionScreen.run(requireContext(), wallet, signRequest)
                     JsonBuilder.responseSendTransaction(id, boc)
                 } catch (e: CancellationException) {
-                    context?.let { tonConnectManager.showLogoutAppBar(wallet, it, uri) }
+                    if (showLogout) {
+                        context?.let { tonConnectManager.showLogoutAppBar(wallet, it, uri) }
+                    }
                     JsonBuilder.responseError(id, BridgeError.userDeclinedTransaction())
                 } catch (e: BridgeException) {
                     JsonBuilder.responseError(id, BridgeError.badRequest(e.bestMessage))
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/QRCameraScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/QRCameraScreen.kt
index 058c946a6..0a933c76b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/QRCameraScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/QRCameraScreen.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.base
 
 import android.content.Context
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.annotation.OptIn
@@ -18,17 +19,33 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import com.google.mlkit.vision.barcode.BarcodeScanner
+import com.tonapps.extensions.filterList
+import com.tonapps.extensions.toUriOrNull
 import com.tonapps.qr.QRImageAnalyzer
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppArgs
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.account.entities.WalletEntity
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.flow.update
+import org.koin.android.ext.android.inject
 import uikit.HapticHelper
 import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.navigation.Navigation.Companion.navigation
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerScreen.kt
index 47f3f5bbc..a9aca6427 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerScreen.kt
@@ -14,8 +14,10 @@ abstract class CurrencyPickerScreen: BasePickerScreen() {
 
     open val currencies = emptyList<WalletCurrency>()
 
+    open val extras: List<String> = emptyList()
+
     override val viewModel: CurrencyPickerViewModel by viewModel {
-        parametersOf(currencies)
+        parametersOf(currencies, extras)
     }
 
     override val adapter = Adapter { item ->
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerViewModel.kt
index cc2bf29eb..8400e47ce 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/CurrencyPickerViewModel.kt
@@ -15,9 +15,18 @@ import kotlinx.coroutines.flow.map
 
 class CurrencyPickerViewModel(
     app: Application,
-    currencies: List<WalletCurrency>
+    currencies: List<WalletCurrency>,
+    extra: List<String>,
 ): BaseWalletVM(app) {
 
+    private data class WithExtra(
+        val currency: WalletCurrency,
+        val extra: String
+    ) {
+
+        fun containsQuery(query: String) = currency.containsQuery(query)
+    }
+
     private val currenciesFlow = flow {
         val list = currencies.ifEmpty {
             WalletCurrency.FIAT.mapNotNull { WalletCurrency.of(it) }
@@ -27,17 +36,26 @@ class CurrencyPickerViewModel(
 
     private val _queryFlow = MutableStateFlow("")
 
-    val uiItemsFlow = combine(currenciesFlow, _queryFlow) { currencies, query ->
+    val uiItemsFlow = combine(currenciesFlow.map { currencies ->
+        if (extra.isEmpty()) {
+            currencies.map { WithExtra(it, "") }
+        } else {
+            currencies.mapIndexed { index, currency ->
+                WithExtra(currency, extra.getOrNull(index) ?: "")
+            }
+        }
+
+    }, _queryFlow) { currencies, query ->
         if (query.isEmpty()) {
             currencies
         } else {
-            currencies.filter { it.title.contains(query, ignoreCase = true) || it.code.contains(query, ignoreCase = true) || it.code.contains(query, ignoreCase = true) }
+            currencies.filter { it.containsQuery(query) }
         }
     }.map { currencies ->
         val uiItems = mutableListOf<Item>()
         for ((index, currency) in currencies.withIndex()) {
             val position = ListCell.getPosition(currencies.size, index)
-            uiItems.add(Item(position, currency))
+            uiItems.add(Item(position, currency.currency, currency.extra))
         }
         uiItems.toList()
     }.flowOn(Dispatchers.IO)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/list/Item.kt
index edd8d3c1a..1205d0c31 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/base/picker/currency/list/Item.kt
@@ -10,13 +10,16 @@ import com.tonapps.wallet.data.core.currency.WalletCurrency
 data class Item(
     val position: ListCell.Position,
     val currency: WalletCurrency,
+    val extra: String,
 ): BaseListItem() {
 
     val code: String
         get() = currency.code
 
     val name: String
-        get() = currency.title
+        get() = extra.ifEmpty {
+            currency.title
+        }
 
     val drawableRes: Int?
         get() = currency.drawableRes
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/PaymentTypeView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/PaymentTypeView.kt
index 3170a281d..bd2613b58 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/PaymentTypeView.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/PaymentTypeView.kt
@@ -1,7 +1,9 @@
 package com.tonapps.tonkeeper.ui.component
 
 import android.content.Context
+import android.net.Uri
 import android.util.AttributeSet
+import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
 import com.tonapps.tonkeeperx.R
@@ -9,7 +11,11 @@ import uikit.extensions.useAttributes
 import uikit.widget.RowLayout
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
+import androidx.core.view.updateLayoutParams
+import com.facebook.drawee.generic.RoundingParams
+import uikit.extensions.dp
 import uikit.extensions.getDimensionPixelSize
+import uikit.widget.FrescoView
 
 class PaymentTypeView @JvmOverloads constructor(
     context: Context,
@@ -17,7 +23,7 @@ class PaymentTypeView @JvmOverloads constructor(
     defStyle: Int = 0,
 ) : RowLayout(context, attrs, defStyle) {
 
-    private val iconView: AppCompatImageView
+    private val iconView: FrescoView
     private val titleView: AppCompatTextView
     private val subtitleView: AppCompatTextView
     private val checkView: AppCompatImageView
@@ -53,6 +59,7 @@ class PaymentTypeView @JvmOverloads constructor(
         inflate(context, R.layout.view_payment_type, this)
         setPadding(context.getDimensionPixelSize(uikit.R.dimen.offsetMedium))
         iconView = findViewById(R.id.icon)
+
         titleView = findViewById(R.id.title)
         subtitleView = findViewById(R.id.subtitle)
         checkView = findViewById(R.id.check)
@@ -68,4 +75,27 @@ class PaymentTypeView @JvmOverloads constructor(
             }
         }
     }
+
+    fun setRounding(rounding: Boolean) {
+        if (rounding) {
+            iconView.setScaleTypeCenterCrop()
+            iconView.hierarchy.roundingParams = RoundingParams.fromCornersRadius(4f.dp)
+            setIconSize(36.dp, 24.dp)
+        } else {
+            iconView.setScaleTypeCenterInside()
+            iconView.hierarchy.roundingParams = RoundingParams.fromCornersRadius(0f)
+            setIconSize(36.dp, 36.dp)
+        }
+    }
+
+    fun setIconSize(width: Int, height: Int) {
+        iconView.updateLayoutParams<ViewGroup.LayoutParams> {
+            this.width = width
+            this.height = height
+        }
+    }
+
+    fun setIcon(uri: Uri) {
+        iconView.setImageURI(uri, this)
+    }
 }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/coin/CoinEditText.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/coin/CoinEditText.kt
index 8ff9b3914..22ee7284e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/coin/CoinEditText.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/coin/CoinEditText.kt
@@ -1,19 +1,25 @@
 package com.tonapps.tonkeeper.ui.component.coin
 
 import android.content.Context
+import android.text.TextPaint
 import android.util.AttributeSet
-import android.util.Log
 import android.util.TypedValue
-import android.view.View
 import androidx.appcompat.R
-import androidx.core.widget.addTextChangedListener
-import androidx.core.widget.doAfterTextChanged
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.ui.component.coin.drawable.SuffixDrawable
 import com.tonapps.tonkeeper.ui.component.coin.format.CoinFormattingConfig
 import com.tonapps.tonkeeper.ui.component.coin.format.CoinFormattingFilter
 import com.tonapps.tonkeeper.ui.component.coin.format.CoinFormattingTextWatcher
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import uikit.extensions.dp
 import uikit.extensions.isVisibleForUser
 import uikit.extensions.replaceAll
@@ -30,23 +36,43 @@ class CoinEditText @JvmOverloads constructor(
     defStyle: Int = R.attr.editTextStyle,
 ) : InputTextView(context, attrs, defStyle) {
 
+    private data class SizeState(
+        val safeAvailableWidth: Float = 0f,
+        val textWidth: Float = 0f,
+        val currentTextSize: Float = 0f
+    )
+
     private val suffixDrawable = SuffixDrawable(context)
+    private val _sizeStateFlow = MutableStateFlow(SizeState())
+    @OptIn(FlowPreview::class)
+    private val sizeStateFlow = _sizeStateFlow.asStateFlow()
+
+    @OptIn(FlowPreview::class)
+    private val textSizeFlow = sizeStateFlow.map { state ->
+        findBestTextSize(state.safeAvailableWidth)
+    }.distinctUntilChanged()
 
     private lateinit var formattingConfig: CoinFormattingConfig
+    private val stepValue = 2f.sp
+    private val minTextSize = 12f.sp
     private val initTextSize: Float by lazy { textSize }
+    private var maxWidthConstraint: Int = 0
     private var initMeasuredHeight: Int = 0
-    private val availableWidth: Float by lazy {
-        val parentView = parent as? View ?: return@lazy 0f
-        val parentWidth = parentView.width - parentView.paddingStart - parentView.paddingEnd
-        val suffixWidth = suffixDrawable.intrinsicWidth + compoundDrawablePadding
-        (parentWidth - suffixWidth) * 0.6f
-    }
-
-    private var isAdjustingTextSize = false
-    private val minTextSize = 12f.sp
     private var notifyUpdateRunnable: Runnable? = null
 
+    private val sizeStepsPx: List<Float> by lazy {
+        val steps = mutableSetOf<Float>()
+        var currentSize = initTextSize
+        while (currentSize >= minTextSize) {
+            steps.add(currentSize)
+            currentSize -= stepValue
+        }
+        steps.add(minTextSize)
+        steps.sortedDescending()
+    }
+
     var doOnValueChange: ((value: Double, byUser: Boolean) -> Unit)? = null
+    var doOnTextChange: ((text: String) -> Unit)? = null
 
     var suffix: String?
         get() = suffixDrawable.text
@@ -57,6 +83,20 @@ class CoinEditText @JvmOverloads constructor(
         }
 
     var valueScale = 0
+    var onTextSizeChange: ((unit: Int, textSize: Float) -> Unit)? = null
+
+    private val textWidth: Float
+        get() {
+            val value = text ?: return 0f
+            return paint.measureText(value, 0, value.length)
+        }
+
+    private val availableWidth: Float
+        get() {
+            val containerWidth = maxWidthConstraint - paddingLeft - paddingRight
+            val suffixWidth = if (suffix.isNullOrEmpty()) 0f else (suffixDrawable.intrinsicWidth + compoundDrawablePadding).toFloat()
+            return (containerWidth - suffixWidth).coerceAtLeast(0f)
+        }
 
     init {
         setMaxLength(18)
@@ -78,6 +118,8 @@ class CoinEditText @JvmOverloads constructor(
         if (isVisibleForUser) {
             val byUser = abs(lengthAfter - lengthBefore) == 1 && isFocused
             notifyUpdateDelay(byUser)
+            doOnTextChange?.invoke(text.toString())
+            checkTextSize()
         }
     }
 
@@ -93,45 +135,36 @@ class CoinEditText @JvmOverloads constructor(
     private fun notifyUpdate(byUser: Boolean) {
         val value = getValue()
         doOnValueChange?.invoke(value, byUser)
-        adjustTextSize()
     }
 
-    private fun adjustTextSize() {
-        if (isAdjustingTextSize) return
-        isAdjustingTextSize = true
-
-        try {
-            val textStr = text.toString()
-            if (textStr.isEmpty()) return
-
-            val maxTextSize = initTextSize
-            val paint = paint
-            val availableWidth = this.availableWidth
-
-            var low = minTextSize
-            var high = maxTextSize
-            var bestSize = low
+    private fun setTextSizePx(newTextSize: Float) {
+        if (textSize != newTextSize) {
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, newTextSize)
+            suffixDrawable.textSize = newTextSize
+            onTextSizeChange?.invoke(TypedValue.COMPLEX_UNIT_PX, newTextSize)
+        }
+    }
 
-            while (low <= high) {
-                val midSize = (low + high) / 2f
-                paint.textSize = midSize
-                val textWidth = paint.measureText(textStr)
+    private fun applyTextSize(newTextSize: Float) {
+        setTextSizePx(newTextSize)
+    }
 
-                if (textWidth <= availableWidth) {
-                    bestSize = midSize
-                    low = midSize + 0.5f
-                } else {
-                    high = midSize - 0.5f
-                }
+    private fun findBestTextSize(safeAvailableWidth: Float): Float {
+        val textValue = text ?: return initTextSize
+        val textPaint = TextPaint(paint)
+        for (stepSize in sizeStepsPx) {
+            textPaint.textSize = stepSize
+            if (textPaint.measureText(textValue, 0, textValue.length) <= safeAvailableWidth) {
+                return stepSize
             }
+        }
+        return minTextSize
+    }
 
-            // Only set the text size if it has changed
-            if (textSize != bestSize) {
-                setTextSize(TypedValue.COMPLEX_UNIT_PX, bestSize)
-                suffixDrawable.textSize = bestSize
-            }
-        } finally {
-            isAdjustingTextSize = false
+    private fun checkTextSize() {
+        val safeAvailableWidth = availableWidth - 24f.dp
+        if (safeAvailableWidth > 0) {
+            _sizeStateFlow.value = SizeState(safeAvailableWidth, textWidth, textSize)
         }
     }
 
@@ -156,18 +189,40 @@ class CoinEditText @JvmOverloads constructor(
         } else {
             editable.replaceAll(value.toString().removeSuffix(".0"))
         }
-        adjustTextSize()
     }
 
-    fun setValue(value: BigDecimal, notifyByUser: Boolean = false) {
-        val string = if (valueScale == 0) value.asString() else value.setScale(valueScale, RoundingMode.DOWN).asString()
-        if (string == null) {
+    fun setValue(
+        value: BigDecimal,
+        notifyByUser: Boolean = false,
+        customValueScale: Int = valueScale
+    ) {
+        val string = if (customValueScale == 0) value.asString() else value.setScale(customValueScale, RoundingMode.HALF_EVEN).asString()
+        if (string.isNullOrBlank() && value != BigDecimal.ZERO) {
+            val newCustomValueScale = CurrencyFormatter.getScale(value)
+            if (newCustomValueScale != customValueScale) {
+                setValue(value, notifyByUser, CurrencyFormatter.getScale(value))
+            }
+            return
+        } else if (string == null) {
             clear()
-            adjustTextSize()
         } else if (string != text?.toString()) {
             text?.clear()
             text?.insert(0, string)
-            adjustTextSize()
+        }
+        if (notifyByUser) {
+            notifyUpdateDelay(true)
+        }
+    }
+
+    fun setValue(
+        value: String?,
+        notifyByUser: Boolean = false,
+    ) {
+        if (value.isNullOrBlank()) {
+            clear()
+        } else if (value != text?.toString()) {
+            text?.clear()
+            text?.insert(0, value)
         }
         if (notifyByUser) {
             notifyUpdateDelay(true)
@@ -188,6 +243,16 @@ class CoinEditText @JvmOverloads constructor(
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val specMode = MeasureSpec.getMode(widthMeasureSpec)
+        val specSize = MeasureSpec.getSize(widthMeasureSpec)
+
+        if (specMode == MeasureSpec.EXACTLY || specMode == MeasureSpec.AT_MOST) {
+            if (specSize > 0) {
+                maxWidthConstraint = specSize
+                checkTextSize()
+            }
+        }
+
         if (initMeasuredHeight > 0) {
             val heightMode = MeasureSpec.getMode(heightMeasureSpec)
             val heightSize = MeasureSpec.getSize(heightMeasureSpec)
@@ -205,12 +270,28 @@ class CoinEditText @JvmOverloads constructor(
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         super.onSizeChanged(w, h, oldw, oldh)
-        adjustTextSize()
+        if (initMeasuredHeight == 0 && h > 0) {
+            initMeasuredHeight = h
+        }
+
+        if (w != oldw) {
+            checkTextSize()
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        val lifecycleOwner = findViewTreeLifecycleOwner()
+        lifecycleOwner?.lifecycleScope?.launch {
+            lifecycleOwner.repeatOnLifecycle(androidx.lifecycle.Lifecycle.State.STARTED) {
+                textSizeFlow.collect(::applyTextSize)
+            }
+        }
     }
 
-    private companion object {
+    companion object {
 
-        private fun BigDecimal.asString(): String? {
+        fun BigDecimal.asString(): String? {
             if (BigDecimal.ZERO == this) {
                 return null
             }
@@ -226,5 +307,18 @@ class CoinEditText @JvmOverloads constructor(
             return string
         }
 
+        fun BigDecimal.asString2(
+            customValueScale: Int = 0,
+        ): String {
+            val string = if (customValueScale == 0) asString() else setScale(customValueScale, RoundingMode.HALF_EVEN).asString()
+            if (string.isNullOrBlank() && this != BigDecimal.ZERO) {
+                val newCustomValueScale = CurrencyFormatter.getScale(this)
+                if (newCustomValueScale != customValueScale) {
+                    return asString2(CurrencyFormatter.getScale(this))
+                }
+            }
+            return string ?: ""
+        }
+
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/token/CurrencyPickerView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/token/CurrencyPickerView.kt
index 8046ec53f..ac5454c90 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/token/CurrencyPickerView.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/component/token/CurrencyPickerView.kt
@@ -84,6 +84,7 @@ open class CurrencyPickerView @JvmOverloads constructor(
     }
 
     private fun applyValue(value: Value) {
+        iconView.setPlaceholder(null)
         iconView.setImageURI(value.icon, null)
         titleView.text = if (value.subtitle.isNullOrBlank()) {
             value.title
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryScreen.kt
index 25463f878..25142c665 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryScreen.kt
@@ -29,7 +29,7 @@ class BatteryScreen(wallet: WalletEntity): BaseHolderWalletScreen<ScreenContext.
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackScreenEvent("battery_open", viewModel.installId, from)
+        analytics?.simpleTrackScreenEvent("battery_open", from)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeViewModel.kt
index c3a0d5e7d..d19628bae 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeViewModel.kt
@@ -3,10 +3,12 @@ package com.tonapps.tonkeeper.ui.screen.battery.recharge
 import android.app.Application
 import android.net.Uri
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.TonAddressTags
 import com.tonapps.blockchain.ton.TonNetwork
 import com.tonapps.blockchain.ton.TonTransferHelper
 import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.blockchain.ton.extensions.isValidTonAddress
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.filterList
 import com.tonapps.extensions.state
@@ -74,6 +76,7 @@ class BatteryRechargeViewModel(
     private val settingsRepository: SettingsRepository,
     private val ratesRepository: RatesRepository,
     private val api: API,
+    private val analytics: AnalyticsHelper
 ) : BaseWalletVM(app) {
 
     private val _tokenFlow = MutableStateFlow<AccountTokenEntity?>(null)
@@ -218,8 +221,7 @@ class BatteryRechargeViewModel(
                         currency = token.symbol, value = remainingBalance
                     ),
                     formattedMinAmount = CurrencyFormatter.format(
-                        currency = token.symbol, value = minAmount,
-                        customScale = token.decimals,
+                        currency = token.symbol, value = minAmount
                     ),
                     isInsufficientBalance = remainingBalance.isNegative,
                     isLessThanMin = isLessThanMin,
@@ -290,9 +292,8 @@ class BatteryRechargeViewModel(
             .distinctUntilChanged()
             .debounce(300L) // wait 300ms before emitting
             .onEach { params ->
-                AnalyticsHelper.simpleTrackEvent(
+                analytics.simpleTrackEvent(
                     "battery_select",
-                    settingsRepository.installId,
                     HashMap(params)
                 )
             }
@@ -548,15 +549,23 @@ class BatteryRechargeViewModel(
     }
 
     private suspend fun getDestinationAccount(
-        address: String, testnet: Boolean
+        userInput: String, testnet: Boolean
     ) = withContext(Dispatchers.IO) {
-        val accountDeferred = async { api.resolveAccount(address, testnet) }
-        val publicKeyDeferred = async { api.safeGetPublicKey(address, testnet) }
+        val addressTags = TonAddressTags.of(userInput)
+        val accountDeferred = async { api.resolveAccount(userInput, testnet) }
+        val publicKeyDeferred = async { api.safeGetPublicKey(userInput, testnet) }
 
         val account = accountDeferred.await() ?: return@withContext SendDestination.NotFound
         val publicKey = publicKeyDeferred.await()
 
-        SendDestination.TonAccount(address, publicKey, account, wallet.testnet)
+        SendDestination.TonAccount(
+            userInput = userInput,
+            isUserInputAddress = userInput.isValidTonAddress(),
+            publicKey = publicKey,
+            account = account,
+            testnet = wallet.testnet,
+            tonAddressTags = addressTags
+        )
     }
 
     fun applyPromo(promo: String) {
@@ -588,8 +597,7 @@ class BatteryRechargeViewModel(
         val promoCode = (promoStateFlow.value as? PromoState.Applied)?.appliedPromo ?: "null"
         val tokenSymbol = _tokenFlow.value?.token?.symbol ?: "null"
         val size = if (_customAmountFlow.value) "custom" else _selectedPackTypeFlow.value?.name?.lowercase() ?: "null"
-        AnalyticsHelper.batterySuccess(
-            settingsRepository.installId,
+        analytics.batterySuccess(
             "crypto",
             promoCode,
             tokenSymbol,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt
index 86fd30a0b..7fa6b7549 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt
@@ -61,7 +61,11 @@ class BatteryRefillViewModel(
     private val settingsRepository: SettingsRepository,
     private val billingManager: BillingManager,
     private val environment: Environment,
+    private val analytics: AnalyticsHelper,
 ) : BaseWalletVM(app) {
+    
+    private val isBatteryDisabled: Boolean
+        get() = api.config.flags.disableBattery
 
     private val _promoFlow = MutableStateFlow<String?>(null)
     private val promoFlow = _promoFlow.asStateFlow()
@@ -93,7 +97,7 @@ class BatteryRefillViewModel(
         uiItems.add(uiItemBattery(batteryBalance, api.config))
         uiItems.add(Item.Space)
 
-        if (BuildConfig.DEBUG || !api.config.batteryPromoDisable) {
+        if (!api.config.batteryPromoDisable && !isBatteryDisabled) {
             uiItems.add(Item.Promo(promoState, promoCode))
             uiItems.add(Item.Space)
         }
@@ -103,7 +107,7 @@ class BatteryRefillViewModel(
             uiItems.add(Item.Space)
         }
 
-        if (environment.isGooglePlayServicesAvailable && !api.config.disableBatteryIapModule) {
+        if (environment.isGooglePlayServicesAvailable && !api.config.disableBatteryIapModule && !isBatteryDisabled) {
             val tonPriceInUsd =
                 ratesRepository.getTONRates(WalletCurrency.USD).getRate(TokenEntity.TON.address)
 
@@ -123,7 +127,7 @@ class BatteryRefillViewModel(
 
         val rechargeMethodsItems = uiItemsRechargeMethods(wallet)
 
-        if (context.remoteConfig?.isBatteryCryptoRechargeDisable == false && rechargeMethodsItems.isNotEmpty()) {
+        if (!isBatteryDisabled && rechargeMethodsItems.isNotEmpty()) {
             uiItems.addAll(uiItemsRechargeMethods(wallet))
             uiItems.add(Item.Space)
         }
@@ -141,7 +145,7 @@ class BatteryRefillViewModel(
         )
 
         uiItems.add(Item.Space)
-        uiItems.add(Item.RestoreIAP)
+        uiItems.add(Item.RestoreIAP(chargeEnabled = !isBatteryDisabled))
 
         uiItems.toList()
     }.flowOn(Dispatchers.IO)
@@ -350,7 +354,7 @@ class BatteryRefillViewModel(
                 )
                 val promoCode = (_promoStateFlow.value as? PromoState.Applied)?.appliedPromo ?: "null"
                 withContext(Dispatchers.Main) {
-                    AnalyticsHelper.batterySuccess(settingsRepository.installId, "fiat", promoCode, "")
+                    analytics.batterySuccess("fiat", promoCode, "")
                 }
                 billingManager.consumeProduct(purchase.purchaseToken)
             }
@@ -365,7 +369,7 @@ class BatteryRefillViewModel(
     fun makePurchase(productId: String, activity: Activity) {
         promoStateFlow.take(1).collectFlow { promoState ->
             val promoCode = (promoState as? PromoState.Applied)?.appliedPromo ?: "null"
-            AnalyticsHelper.simpleTrackEvent("battery_select", settingsRepository.installId, hashMapOf(
+            analytics.simpleTrackEvent("battery_select", hashMapOf(
                 "size" to productId,
                 "promo" to promoCode,
                 "type" to "fiat"
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Adapter.kt
index 3e392a18f..666946d55 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Adapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Adapter.kt
@@ -2,8 +2,6 @@ package com.tonapps.tonkeeper.ui.screen.battery.refill.list
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.AddressHolder
-import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.AmountHolder
 import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.BatteryHolder
 import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.GiftHolder
 import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.IAPPackHolder
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
index 5b9a0c5f0..fd3f3bae7 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
@@ -90,7 +90,7 @@ sealed class Item(type: Int) : BaseListItem(type) {
         val transactions: Map<BatteryTransaction, Int>
     ) : Item(TYPE_IAP)
 
-    data object RestoreIAP : Item(TYPE_RESTORE_IAP)
+    data class RestoreIAP(val chargeEnabled: Boolean) : Item(TYPE_RESTORE_IAP)
 
     data object Space : Item(TYPE_SPACE)
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/IAPRestoreHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/IAPRestoreHolder.kt
index db5ce19a6..6def2fb6d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/IAPRestoreHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/IAPRestoreHolder.kt
@@ -20,9 +20,14 @@ class IAPRestoreHolder(
     private val textView = itemView.findViewById<AppCompatTextView>(R.id.text)
 
     override fun onBind(item: Item.RestoreIAP) {
-        val disclaimerText = context.getString(Localization.battery_disclaimer)
-        val restoreText = context.getString(Localization.restore_purchases)
-        val span = SpannableString("$disclaimerText $restoreText")
+        val disclaimerText = if (item.chargeEnabled) {
+            getString(Localization.battery_disclaimer)
+        } else {
+            getString(Localization.charging_unavailable)
+        }
+        val restoreText = getString(Localization.restore_purchases)
+        val textDivider = if (item.chargeEnabled) " " else "\n"
+        val span = SpannableString("$disclaimerText$textDivider$restoreText")
 
         val clickableSpan = object : ClickableSpan() {
             override fun onClick(widget: View) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/base/BrowserBaseViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/base/BrowserBaseViewModel.kt
index bcc910b12..69f239ca3 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/base/BrowserBaseViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/base/BrowserBaseViewModel.kt
@@ -1,10 +1,9 @@
 package com.tonapps.tonkeeper.ui.screen.browser.base
 
 import android.app.Application
-import android.util.Log
 import androidx.core.view.WindowInsetsCompat
 import com.tonapps.extensions.MutableEffectFlow
-import com.tonapps.tonkeeper.extensions.getFixedCountryCode
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
@@ -20,6 +19,7 @@ class BrowserBaseViewModel(
     private val browserRepository: BrowserRepository,
     private val settingsRepository: SettingsRepository,
     private val api: API,
+    private val environment: Environment
 ): BaseWalletVM(app) {
 
     private val _childBottomScrolled = MutableEffectFlow<Boolean>()
@@ -38,7 +38,7 @@ class BrowserBaseViewModel(
 
     suspend fun hasCategory(category: String): Boolean = withContext(Dispatchers.IO) {
         val categories = browserRepository.loadCategories(
-            country = settingsRepository.getFixedCountryCode(api),
+            country = environment.country,
             testnet = wallet.testnet,
             locale = settingsRepository.getLocale()
         )
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppArgs.kt
index 6e358a30a..64c7a1032 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppArgs.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppArgs.kt
@@ -11,22 +11,24 @@ data class DAppArgs(
     val title: String,
     val url: Uri,
     val source: String,
-    val iconUrl: String
+    val iconUrl: String,
+    val forceConnect: Boolean,
 ): BaseArgs() {
 
     private companion object {
         private const val ARG_TITLE = "title"
         private const val ARG_URL = "url"
         private const val ARG_SOURCE = "source"
-        private const val ARG_SEND_ANALYTICS = "send_analytics"
         private const val ARG_ICON_URL = "icon_url"
+        private const val ARG_FORCE_CONNECT = "force_connect"
     }
 
     constructor(bundle: Bundle) : this(
         title = bundle.getString(ARG_TITLE)!!,
-        url = bundle.getParcelableCompat(ARG_URL)!!,
+        url = bundle.getParcelableCompat<Uri>(ARG_URL)!!,
         source = bundle.getString(ARG_SOURCE) ?: "",
         iconUrl = bundle.getString(ARG_ICON_URL) ?: "",
+        forceConnect = bundle.getBoolean(ARG_FORCE_CONNECT)
     )
 
     override fun toBundle(): Bundle = Bundle().apply {
@@ -34,5 +36,6 @@ data class DAppArgs(
         putParcelable(ARG_URL, url)
         putString(ARG_SOURCE, source)
         putString(ARG_ICON_URL, iconUrl)
+        putBoolean(ARG_FORCE_CONNECT, forceConnect)
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt
index 35108a5eb..7eed22354 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/dapp/DAppScreen.kt
@@ -1,5 +1,6 @@
 package com.tonapps.tonkeeper.ui.screen.browser.dapp
 
+import android.Manifest
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
@@ -7,6 +8,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.view.ViewGroup
+import android.webkit.PermissionRequest
 import android.webkit.WebChromeClient
 import android.webkit.WebResourceRequest
 import androidx.appcompat.widget.AppCompatTextView
@@ -53,7 +55,7 @@ import uikit.drawable.HeaderDrawable
 import uikit.extensions.collectFlow
 import uikit.widget.webview.WebViewFixed
 
-class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragment_dapp, wallet) {
+class DAppScreen(wallet: WalletEntity) : InjectedTonConnectScreen(R.layout.fragment_dapp, wallet) {
 
     override val fragmentName: String = "DAppScreen"
 
@@ -123,6 +125,24 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
             super.openFilePicker(fileChooserParams)
             startActivityForResult(fileChooserParams.createIntent(), REQUEST_CODE_FILE)
         }
+
+        override fun onPermissionRequest(request: PermissionRequest) {
+            super.onPermissionRequest(request)
+            val resources = request.resources
+            val androidPermissions = mutableListOf<String>()
+            resources.forEach { resource ->
+                if (resource == PermissionRequest.RESOURCE_VIDEO_CAPTURE) {
+                    androidPermissions.add(Manifest.permission.CAMERA)
+                } else if (resource == PermissionRequest.RESOURCE_AUDIO_CAPTURE) {
+                    androidPermissions.add(Manifest.permission.RECORD_AUDIO)
+                }
+            }
+            if (hasPermissions(androidPermissions.toTypedArray())) {
+                request.grant(resources)
+            } else if (androidPermissions.isNotEmpty()) {
+                requestPermissions(androidPermissions.toTypedArray(), REQUEST_CODE_PERMISSIONS)
+            }
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -133,12 +153,26 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         }
     }
 
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String?>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == REQUEST_CODE_PERMISSIONS) {
+            val granted =
+                grantResults.all { it == android.content.pm.PackageManager.PERMISSION_GRANTED }
+            if (granted) {
+                webView.reload()
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.trackEventClickDApp(
+        analytics?.trackEventClickDApp(
             url = args.url.toString(),
             name = args.title,
-            installId = installId,
             source = args.source,
             country = viewModel.country
         )
@@ -158,15 +192,31 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
                 val deeplink = DeepLink(url.toUri(), false, null)
                 when (deeplink.route) {
                     is DeepLinkRoute.DApp -> webView.loadUrl(url)
-                    is DeepLinkRoute.Unknown -> BrowserHelper.open(requireActivity(), url)
+                    is DeepLinkRoute.Unknown -> BrowserHelper.open(requireContext(), url)
                     else -> processDeeplink(deeplink, url)
                 }
+            } else if (url.startsWith("https://x.com")) {
+                BrowserHelper.openX(requireActivity(), url.toUri())
+            } else if (url.startsWith("https://t.me")) {
+                BrowserHelper.openTG(requireContext(), url.toUri())
             } else {
-                BrowserHelper.open(requireActivity(), url)
+                openNewDApp(url.toUri())
             }
         }
     }
 
+    private fun openNewDApp(uri: Uri) {
+        navigation?.add(
+            newInstance(
+                wallet = wallet,
+                title = uri.host ?: "unknown",
+                iconUrl = "https://www.google.com/s2/favicons?sz=256&domain=${uri.host}",
+                url = uri,
+                source = args.source
+            )
+        )
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         headerDrawable = HeaderDrawable(requireContext())
@@ -199,8 +249,10 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         webView.addCallback(webViewCallback)
         webView.jsBridge = DAppBridge(
             deviceInfo = deviceInfo.toString(),
-            send = ::tonconnectSend,
-            connect = ::tonconnect,
+            send = { tonconnectSend(it, showLogout = !isForceConnect) },
+            connect = { protocolVersion, request ->
+                tonconnect(protocolVersion, request, forceConnect = isForceConnect)
+            },
             restoreConnection = { viewModel.restoreConnection(currentUrl) },
             disconnect = { viewModel.disconnect() },
             tonapiFetch = ::tonapiFetch,
@@ -218,7 +270,8 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
             headerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = statusInsets.top
             }
-            val bottomInsets = insets.getInsets(WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.navigationBars())
+            val bottomInsets =
+                insets.getInsets(WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.navigationBars())
             refreshView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 bottomMargin = bottomInsets.bottom
             }
@@ -235,6 +288,9 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         }
     }
 
+    private val isForceConnect: Boolean
+        get() = args.forceConnect && webView.url?.toUri()?.host == args.url.host
+
     private fun setDefaultState() {
         menuView.setOnClickListener { openDefaultMenu(it) }
     }
@@ -249,7 +305,11 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         actionSheet.addItem(SHARE_ID, Localization.share, UIKitIcon.ic_share_16)
         actionSheet.addItem(COPY_ID, Localization.copy_link, UIKitIcon.ic_copy_16)
         if (isRequestPinShortcutSupported) {
-            actionSheet.addItem(ADD_HOME_SCREEN_ID, Localization.add_to_home_screen, UIKitIcon.ic_apps_16)
+            actionSheet.addItem(
+                ADD_HOME_SCREEN_ID,
+                Localization.add_to_home_screen,
+                UIKitIcon.ic_apps_16
+            )
         }
         actionSheet.doOnItemClick = { actionClick(it.id) }
         actionSheet.show(view)
@@ -265,7 +325,11 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         actionSheet.addItem(COPY_ID, Localization.copy_link, UIKitIcon.ic_copy_16)
         actionSheet.addItem(DISCONNECT_ID, Localization.disconnect, UIKitIcon.ic_disconnect_16)
         if (isRequestPinShortcutSupported) {
-            actionSheet.addItem(ADD_HOME_SCREEN_ID, Localization.add_to_home_screen, UIKitIcon.ic_apps_16)
+            actionSheet.addItem(
+                ADD_HOME_SCREEN_ID,
+                Localization.add_to_home_screen,
+                UIKitIcon.ic_apps_16
+            )
         }
         actionSheet.doOnItemClick = { actionClick(it.id) }
         actionSheet.show(view)
@@ -276,7 +340,8 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
             try {
                 val app = buildAppEntity()
                 val title = app.name
-                val bitmap = Fresco.getImagePipeline().loadSquare(app.iconUrl.toUri(), 512) ?: throw IllegalArgumentException("Failed to load icon")
+                val bitmap = Fresco.getImagePipeline().loadSquare(app.iconUrl.toUri(), 512)
+                    ?: throw IllegalArgumentException("Failed to load icon")
 
                 val targetIntent = Intent(context, RootActivity::class.java).apply {
                     putExtra("dapp_deeplink", startUri.toString())
@@ -305,6 +370,7 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
                 analyticsSharingCopy("Copy link")
                 requireContext().copyToClipboard(DeepLinkBuilder.dAppShare(currentUrl.toString()))
             }
+
             DISCONNECT_ID -> viewModel.disconnect()
             ADD_HOME_SCREEN_ID -> addToHomeScreen()
         }
@@ -334,8 +400,7 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
 
     private fun analyticsSharingCopy(from: String) {
         val app = buildAppEntity()
-        AnalyticsHelper.dappSharingCopy(
-            installId = viewModel.installId,
+        analytics?.dappSharingCopy(
             name = app.name,
             from = from,
             url = currentUrl.toString()
@@ -383,23 +448,26 @@ class DAppScreen(wallet: WalletEntity): InjectedTonConnectScreen(R.layout.fragme
         private const val ADD_HOME_SCREEN_ID = 6L
 
         private const val REQUEST_CODE_FILE = 1933
+        private const val REQUEST_CODE_PERMISSIONS = 1934
 
         fun newInstance(
             wallet: WalletEntity,
             title: String,
             url: Uri,
             iconUrl: String,
-            source: String
+            source: String,
+            forceConnect: Boolean = false,
         ): DAppScreen {
-            return newInstance(wallet, DAppArgs(title, url, source, iconUrl))
+            return newInstance(wallet, DAppArgs(title, url, source, iconUrl, forceConnect))
         }
 
         fun newInstance(
             wallet: WalletEntity,
             app: AppEntity,
-            source: String
+            source: String,
+            forceConnect: Boolean = false,
         ): DAppScreen {
-            return newInstance(wallet, app.name, app.url, app.iconUrl, source)
+            return newInstance(wallet, app.name, app.url, app.iconUrl, source, forceConnect)
         }
 
         fun newInstance(
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt
index f9d24de11..744fd78fd 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainScreen.kt
@@ -72,7 +72,6 @@ class BrowserMainScreen(wallet: WalletEntity): WalletContextScreen(R.layout.frag
     private lateinit var slideView: SlideBetweenView
     private lateinit var exploreTabView: AppCompatTextView
     private lateinit var connectedTabView: AppCompatTextView
-    private lateinit var countryView: CountryFlagView
     private lateinit var connectedPlaceholder: View
     private lateinit var connectedListView: RecyclerView
     private lateinit var exploreListView: RecyclerView
@@ -92,11 +91,6 @@ class BrowserMainScreen(wallet: WalletEntity): WalletContextScreen(R.layout.frag
         connectedTabView = view.findViewById(R.id.connected_tab)
         connectedTabView.setOnClickListener { clickTab(it as AppCompatTextView) }
 
-        countryView = view.findViewById(R.id.country)
-        countryView.setOnClickListener {
-            navigation?.add(CountryPickerScreen.newInstance(COUNTRY_REQUEST_KEY))
-        }
-
         slideView = view.findViewById(R.id.slide)
 
         connectedPlaceholder = view.findViewById(R.id.connected_placeholder)
@@ -160,7 +154,6 @@ class BrowserMainScreen(wallet: WalletEntity): WalletContextScreen(R.layout.frag
         })
         collectFlow(viewModel.uiConnectedItemsFlow, ::setConnectedList)
         collectFlow(viewModel.uiExploreItemsFlow, exploreAdapter::submitList)
-        collectFlow(viewModel.countryFlow.map { it.country }, countryView::setCountry)
 
         baseViewModel?.insetsRootFlow?.let { insets ->
             collectFlow(insets, ::onApplyWindowInsets)
@@ -169,7 +162,6 @@ class BrowserMainScreen(wallet: WalletEntity): WalletContextScreen(R.layout.frag
         val isDappsDisable = requireContext().remoteConfig?.isDappsDisable == true
 
         exploreTabView.isVisible = !isDappsDisable
-        countryView.isVisible = !isDappsDisable
 
         clickTab(if (isDappsDisable) connectedTabView else exploreTabView, animated = false)
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt
index 920f38cc3..c2bfe6b5a 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/browser/main/BrowserMainViewModel.kt
@@ -3,14 +3,10 @@ package com.tonapps.tonkeeper.ui.screen.browser.main
 import android.app.Application
 import android.graphics.Color
 import android.net.Uri
-import android.util.Log
-import android.view.View
 import androidx.core.net.toUri
 import androidx.lifecycle.viewModelScope
-import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.mapList
-import com.tonapps.tonkeeper.extensions.getFixedCountryCode
-import com.tonapps.tonkeeper.extensions.getLocaleCountryFlow
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.koin.remoteConfig
 import com.tonapps.tonkeeper.manager.tonconnect.TonConnectManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
@@ -22,14 +18,11 @@ import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.browser.BrowserRepository
 import com.tonapps.wallet.data.browser.entities.BrowserAppEntity
 import com.tonapps.wallet.data.browser.entities.BrowserDataEntity
-import com.tonapps.wallet.data.dapps.entities.AppConnectEntity
 import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 
 class BrowserMainViewModel(
@@ -39,11 +32,10 @@ class BrowserMainViewModel(
     private val api: API,
     private val tonConnectManager: TonConnectManager,
     private val browserRepository: BrowserRepository,
-    private val settingsRepository: SettingsRepository
+    private val settingsRepository: SettingsRepository,
+    private val environment: Environment
 ): BaseWalletVM(app) {
 
-    val countryFlow = settings.getLocaleCountryFlow(api)
-
     val installId: String
         get() = settings.installId
 
@@ -59,7 +51,7 @@ class BrowserMainViewModel(
 
         if (!isDappsDisable) {
             viewModelScope.launch(Dispatchers.IO) {
-                val code = settingsRepository.getFixedCountryCode(api)
+                val code = environment.country
                 val locale = settingsRepository.getLocale()
                 _uiExploreItemsFlow.value = emptyList()
                 browserRepository.load(code, wallet.testnet, locale)?.let { setData(it) }
@@ -91,7 +83,7 @@ class BrowserMainViewModel(
     private fun setData(data: BrowserDataEntity) {
         val items = mutableListOf<ExploreItem>()
         if (data.apps.isNotEmpty()) {
-            items.add(ExploreItem.Banners(data.apps, api.config.featuredPlayInterval, wallet, settingsRepository.country))
+            items.add(ExploreItem.Banners(data.apps, api.config.featuredPlayInterval, wallet, environment.country))
         }
 
         var adsItem: ExploreItem.Ads? = null
@@ -112,10 +104,14 @@ class BrowserMainViewModel(
             }
 
             val apps = mutableListOf<BrowserAppEntity>()
-            for (chunk in category.apps.chunked(4)) {
-                if (chunk.size >= 3) {
-                    apps.addAll(chunk)
+            if (category.apps.size > 4) {
+                for (chunk in category.apps.chunked(4)) {
+                    if (chunk.size >= 3) {
+                        apps.addAll(chunk)
+                    }
                 }
+            } else {
+                apps.addAll(category.apps)
             }
 
             for (app in apps.take(8)) {
@@ -123,7 +119,7 @@ class BrowserMainViewModel(
                     app = app,
                     wallet = wallet,
                     singleLine = !isDigitalNomads,
-                    country = settingsRepository.country
+                    country = environment.country
                 ))
             }
         }
@@ -140,7 +136,7 @@ class BrowserMainViewModel(
                     app = app,
                     wallet = wallet,
                     singleLine = false,
-                    country = settingsRepository.country
+                    country = environment.country
                 ))
             }
             items.addAll(5, debugItems)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/camera/CameraScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/camera/CameraScreen.kt
index ab591cd27..11d898f04 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/camera/CameraScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/camera/CameraScreen.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.camera
 
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.activity.result.PickVisualMediaRequest
@@ -13,37 +14,52 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.mlkit.vision.common.InputImage
 import com.tonapps.blockchain.ton.extensions.isValidTonAddress
 import com.tonapps.blockchain.tron.isValidTronAddress
+import com.tonapps.extensions.filterList
 import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.deeplink.DeepLink
 import com.tonapps.tonkeeper.deeplink.DeepLinkRoute
 import com.tonapps.tonkeeper.extensions.toast
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.tonkeeper.ui.base.QRCameraScreen
 import com.tonapps.tonkeeper.ui.component.CameraFlashIconView
 import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.color.constantWhiteColor
 import com.tonapps.uikit.color.stateList
+import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.Blockchain
+import com.tonapps.wallet.api.entity.QRScannerExtendsEntity
+import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import uikit.base.BaseFragment
 import uikit.extensions.collectFlow
 import uikit.extensions.pinToBottomInsets
 import uikit.extensions.withAlpha
 import uikit.navigation.Navigation.Companion.navigation
+import kotlin.getValue
 
 class CameraScreen : QRCameraScreen(R.layout.fragment_camera), BaseFragment.BottomSheet {
 
     override val fragmentName: String = "CameraScreen"
 
+    private val accountRepository: AccountRepository by inject()
+    private val api: API by inject()
+    private val qrScannerExtends: List<QRScannerExtendsEntity>
+        get() = api.config.qrScannerExtends.filter { it.version == 1 }
+
     private val mode: CameraMode by lazy { requireArguments().getParcelableCompat(ARG_MODE)!! }
     private val chains: List<Blockchain> by lazy {
        requireArguments().getStringArrayList(ARG_CHAINS)!!.map { Blockchain.valueOf(it) }
@@ -61,7 +77,7 @@ class CameraScreen : QRCameraScreen(R.layout.fragment_camera), BaseFragment.Bott
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("scan_open", rootViewModel.installId)
+        context?.analytics?.simpleTrackEvent("scan_open")
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -146,7 +162,14 @@ class CameraScreen : QRCameraScreen(R.layout.fragment_camera), BaseFragment.Bott
     }
 
     private fun createUri(value: String): Uri? {
-        return value.toUriOrNull() ?: createTransferUri(value)
+        var uri = value.toUriOrNull() ?: createTransferUri(value)
+        if (uri == null) {
+            uri = qrScannerExtends.firstNotNullOfOrNull {
+                val url = it.buildUrl(value) ?: return@firstNotNullOfOrNull null
+                "tonkeeper://dapp/$url".toUriOrNull()
+            }
+        }
+        return uri
     }
 
     private fun createTransferUri(value: String): Uri? {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesScreen.kt
index dfa6b926f..78b5d75a2 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesScreen.kt
@@ -73,11 +73,14 @@ class CollectiblesScreen(wallet: WalletEntity): MainScreen.Child(R.layout.fragme
                     headerView.setSubtitle(Localization.updating)
                 }
                 is UiListState.Empty -> {
-                    removeActionIcons()
+                    if (viewModel.hasNfts) {
+                        applyActionIcons()
+                    } else {
+                        removeActionIcons()
+                    }
                     refreshView.isRefreshing = false
                     setEmptyState()
                     headerView.setSubtitle(null)
-                    headerView.setAction(0)
                 }
                 is UiListState.Items -> {
                     applyActionIcons()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesViewModel.kt
index b52b1eafd..19038a910 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/CollectiblesViewModel.kt
@@ -1,7 +1,9 @@
 package com.tonapps.tonkeeper.ui.screen.collectibles.main
 
 import android.app.Application
+import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.extensions.toRawAddress
 import com.tonapps.extensions.flattenFirst
 import com.tonapps.network.NetworkMonitor
 import com.tonapps.tonkeeper.extensions.isSafeModeEnabled
@@ -13,6 +15,7 @@ import com.tonapps.tonkeeper.ui.screen.collectibles.main.list.Item
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.collectibles.CollectiblesRepository
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -43,20 +46,36 @@ class CollectiblesViewModel(
     val installId: String
         get() = settingsRepository.installId
 
+    private val expiringDomainsFlow = flow {
+        emit(collectiblesRepository.getDnsSoonExpiring(
+            accountId = wallet.accountId,
+            testnet = wallet.testnet
+        ).associateBy { it.addressRaw })
+    }
+
+    private val triggerFlow = combine(
+        settingsRepository.tokenPrefsChangedFlow,
+        settingsRepository.safeModeStateFlow,
+        ltFlow
+    ) { _, _, _ -> }
+
     val uiListStateFlow = combine(
         networkMonitor.isOnlineFlow,
         settingsRepository.hiddenBalancesFlow,
-        settingsRepository.tokenPrefsChangedFlow,
-        settingsRepository.safeModeStateFlow,
-        ltFlow,
-    ) { isOnline, hiddenBalances, _, _, _ ->
+        triggerFlow,
+        expiringDomainsFlow
+    ) { isOnline, hiddenBalances, _, expiringDomains ->
         stateFlow(
             wallet = wallet,
             hiddenBalances = hiddenBalances,
-            isOnline = isOnline
+            isOnline = isOnline,
+            expiringDomains = expiringDomains
         )
     }.stateIn(viewModelScope, SharingStarted.Eagerly, null).filterNotNull().flattenFirst()
 
+    var hasNfts = false
+        private set
+
     init {
         transactionManager.eventsFlow(wallet).collectFlow {
             _ltFlow.value = it.lt
@@ -66,17 +85,20 @@ class CollectiblesViewModel(
     private fun stateFlow(
         wallet: WalletEntity,
         hiddenBalances: Boolean,
-        isOnline: Boolean
+        isOnline: Boolean,
+        expiringDomains: Map<String, DnsExpiringEntity>
     ): Flow<UiListState> = flow {
         emit(UiListState.Loading)
-        emitAll(itemsFlow(wallet, hiddenBalances, isOnline))
+        emitAll(itemsFlow(wallet, hiddenBalances, isOnline, expiringDomains))
     }
 
     private fun itemsFlow(
         wallet: WalletEntity,
         hiddenBalances: Boolean,
         isOnline: Boolean,
+        expiringDomains: Map<String, DnsExpiringEntity>
     ): Flow<UiListState> = collectiblesRepository.getFlow(wallet.address, wallet.testnet, isOnline).map { result ->
+        hasNfts = result.list.isNotEmpty()
         val safeMode = settingsRepository.isSafeModeEnabled(api)
         val uiItems = mutableListOf<Item>()
         for (nft in result.list) {
@@ -94,7 +116,13 @@ class CollectiblesViewModel(
             if (nftPref.isHidden) {
                 continue
             }
-            uiItems.add(Item.Nft(wallet, nft.with(nftPref), hiddenBalances))
+            val expiringDomain = expiringDomains[nft.address.toRawAddress()]
+            uiItems.add(Item.Nft(
+                wallet = wallet,
+                entity = nft.with(nftPref),
+                hiddenBalance = hiddenBalances,
+                expiringDomainSoon = expiringDomain != null
+            ))
         }
 
         if (uiItems.isEmpty() && !result.cache) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/Item.kt
index 9ae81bea4..c30d9f521 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/Item.kt
@@ -16,7 +16,8 @@ sealed class Item(type: Int): BaseListItem(type) {
     data class Nft(
         val wallet: WalletEntity,
         val entity: NftEntity,
-        val hiddenBalance: Boolean
+        val hiddenBalance: Boolean,
+        val expiringDomainSoon: Boolean
     ): Item(TYPE_NFT) {
 
         val nftAddress: String
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/holder/NftHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/holder/NftHolder.kt
index d36a5ed90..afa8608ef 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/holder/NftHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/collectibles/main/list/holder/NftHolder.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.collectibles.main.list.holder
 
 import android.graphics.drawable.RippleDrawable
 import android.net.Uri
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatImageView
@@ -33,6 +34,7 @@ class NftHolder(parent: ViewGroup): Holder<Item.Nft>(parent, R.layout.view_colle
     private val titleView = findViewById<AppCompatTextView>(R.id.title)
     private val collectionView = findViewById<AppCompatTextView>(R.id.collection)
     private val saleBadgeView = findViewById<AppCompatImageView>(R.id.sale_badge)
+    private val fireBadgeView = findViewById<AppCompatImageView>(R.id.fire_badge)
 
     init {
         itemView.foreground = RippleDrawable(context.backgroundHighlightedColor.stateList, null, null)
@@ -45,6 +47,7 @@ class NftHolder(parent: ViewGroup): Holder<Item.Nft>(parent, R.layout.view_colle
         itemView.setOnClickListener {
             Navigation.from(context)?.add(NftScreen.newInstance(item.wallet, item.entity))
         }
+        fireBadgeView.visibility = if (item.expiringDomainSoon) View.VISIBLE else View.GONE
         loadImage(item.imageURI, item.hiddenBalance)
         if (item.hiddenBalance) {
             titleView.text = HIDDEN_BALANCE
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/country/CountryPickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/country/CountryPickerViewModel.kt
index 4f9239b83..65455bb36 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/country/CountryPickerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/country/CountryPickerViewModel.kt
@@ -2,9 +2,9 @@ package com.tonapps.tonkeeper.ui.screen.country
 
 import android.app.Application
 import androidx.lifecycle.viewModelScope
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.extensions.countryEmoji
 import com.tonapps.tonkeeper.extensions.countryName
-import com.tonapps.tonkeeper.extensions.getNormalizeCountryFlow
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.country.list.Item
 import com.tonapps.uikit.flag.getFlagDrawable
@@ -20,14 +20,13 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import uikit.extensions.asCircle
-import uikit.extensions.drawable
 import java.util.Locale
 
 class CountryPickerViewModel(
     app: Application,
     private val settingsRepository: SettingsRepository,
     private val api: API,
+    private val environment: Environment,
 ): BaseWalletVM(app) {
 
     private data class Country(
@@ -54,7 +53,7 @@ class CountryPickerViewModel(
         codes.map { Country(it) }
     }
 
-    private val countryFlow = settingsRepository.getNormalizeCountryFlow(api)
+    private val countryFlow = environment.countryFlow
 
     private val _searchQueryFlow = MutableStateFlow("")
     private val searchQueryFlow = _searchQueryFlow.asSharedFlow()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevScreen.kt
index c4ddc0935..4fd462670 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevScreen.kt
@@ -3,25 +3,34 @@ package com.tonapps.tonkeeper.ui.screen.dev
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.EditText
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.tonapps.extensions.deviceCountry
 import com.tonapps.extensions.locale
 import com.tonapps.security.Security
+import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.core.DevSettings
 import com.tonapps.tonkeeper.extensions.copyToClipboard
 import com.tonapps.tonkeeper.extensions.showToast
+import com.tonapps.tonkeeper.extensions.toast
+import com.tonapps.tonkeeper.manager.push.FirebasePush
 import com.tonapps.tonkeeper.ui.base.BaseWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
 import com.tonapps.tonkeeper.ui.screen.dev.list.launcher.LauncherAdapter
 import com.tonapps.tonkeeper.view.TransactionDetailView
+import com.tonapps.tonkeeperx.BuildConfig
 import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentRedColor
 import com.tonapps.uikit.list.LinearLayoutManager
 import com.tonapps.uikit.list.ListCell
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import uikit.base.BaseFragment
 import uikit.dialog.alert.AlertDialog
+import uikit.extensions.collectFlow
 import uikit.widget.HeaderView
 import uikit.widget.item.ItemSwitchView
 
@@ -41,6 +50,9 @@ class DevScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_dev, Scr
     private lateinit var importPasscodeView: View
     private lateinit var importDAppsView: View
     private lateinit var systemFontSizeView: ItemSwitchView
+    private lateinit var debugCountryInput: EditText
+    private lateinit var debugCountryTextView: AppCompatTextView
+    private lateinit var dnsAllView: ItemSwitchView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -54,6 +66,15 @@ class DevScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_dev, Scr
         iconsView.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL)
         iconsView.adapter = LauncherAdapter()
 
+        dnsAllView = view.findViewById(R.id.dns_all)
+        dnsAllView.setChecked(DevSettings.dnsAll, false)
+        dnsAllView.doOnCheckedChanged = { isChecked, byUser ->
+            if (byUser) {
+                DevSettings.dnsAll = isChecked
+                toastAfterChange()
+            }
+        }
+
         blurView = view.findViewById(R.id.blur)
         blurView.setChecked(DevSettings.blurEnabled, false)
         blurView.doOnCheckedChanged = { isChecked, byUser ->
@@ -94,6 +115,23 @@ class DevScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_dev, Scr
         logView = view.findViewById(R.id.log)
         logDataView = view.findViewById(R.id.log_data)
 
+        debugCountryTextView = view.findViewById(R.id.debug_country_list)
+
+        collectFlow(viewModel.debugCountryFlow, debugCountryTextView::setText)
+
+        debugCountryInput = view.findViewById(R.id.debug_country_input)
+        debugCountryInput.setText(DevSettings.country)
+        debugCountryInput.doOnTextChanged { text, start, before, count ->
+            val country = text.toString().trim().ifEmpty { null }
+            viewModel.setCountry(country)
+            if (country == null || country.length == 2) {
+                toastAfterChange()
+            }
+        }
+        if (!BuildConfig.DEBUG) {
+            debugCountryInput.visibility = View.GONE
+        }
+
         view.findViewById<Button>(R.id.log_close).setOnClickListener {
             logView.visibility = View.GONE
         }
@@ -108,9 +146,25 @@ class DevScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_dev, Scr
             true
         }
 
+        view.findViewById<View>(R.id.copy_firebase_push).setOnClickListener {
+            copyFirebasePushToken()
+        }
+
         logCopy = view.findViewById(R.id.log_copy)
     }
 
+    private fun copyFirebasePushToken() {
+        lifecycleScope.launch {
+            val token = FirebasePush.requestToken()
+            if (token.isNullOrBlank()) {
+                navigation?.toast("Failed to get Firebase push token", requireContext().accentRedColor)
+            } else {
+                requireContext().copyToClipboard(token, true)
+                navigation?.toast("Firebase push token copied to clipboard")
+            }
+        }
+    }
+
     private fun toastAfterChange() {
         requireContext().showToast("Restart app to apply changes")
     }
@@ -165,7 +219,6 @@ class DevScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_dev, Scr
         list.add("Device strongbox: ${booleanToYesOrNo(Security.isSupportStrongBox(requireContext()))}")
         list.add("ADB enabled: ${booleanToYesOrNo(Security.isAdbEnabled(requireContext()))}")
         list.add("Package name: ${requireContext().packageName}")
-        list.add("Device country: ${requireContext().deviceCountry}")
         return list
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevViewModel.kt
index 204c053fb..9e823ce7c 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dev/DevViewModel.kt
@@ -5,13 +5,17 @@ import android.widget.Toast
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.extensions.bestMessage
+import com.tonapps.tonkeeper.Environment
+import com.tonapps.tonkeeper.core.DevSettings
 import com.tonapps.tonkeeper.extensions.requestVault
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.card.CardScreen
+import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.dapps.DAppsRepository
 import com.tonapps.wallet.data.rn.RNLegacy
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
@@ -20,14 +24,28 @@ import org.json.JSONArray
 import org.json.JSONObject
 import org.ton.mnemonic.Mnemonic
 import uikit.extensions.activity
+import java.util.Locale
 
 class DevViewModel(
     app: Application,
     private val rnLegacy: RNLegacy,
     private val accountRepository: AccountRepository,
     private val dAppsRepository: DAppsRepository,
+    private val environment: Environment,
+    private val api: API,
 ): BaseWalletVM(app) {
 
+    val debugCountryFlow = environment.countryDataFlow.map {
+        val lines = mutableListOf<String>()
+        lines.add("Store: ${it.fromStore ?: "unknown"}")
+        lines.add("SIM: ${it.bySimCard ?: "unknown"}")
+        lines.add("Network: ${it.byNetwork ?: "unknown"}")
+        lines.add("IP: ${it.byIPAddress ?: "unknown"}")
+        lines.add("Smart Locale: ${it.byLocale ?: "unknown"}")
+        lines.add("Debug: ${it.debug ?: "unknown"}")
+        lines.joinToString("\n")
+    }
+
     fun getLegacyStorage(callback: (result: String) -> Unit) {
         viewModelScope.launch(Dispatchers.IO) {
             var value = rnLegacy.getAllKeyValuesForDebug().toString()
@@ -47,6 +65,14 @@ class DevViewModel(
         }
     }
 
+    fun setCountry(country: String?) {
+        DevSettings.country = country?.uppercase()
+        environment.setDebugCountry(DevSettings.country)
+        viewModelScope.launch {
+            api.refreshConfig(false)
+        }
+    }
+
     private fun maskValues(input: JSONObject): JSONObject {
         val output = JSONObject()
         for (key in input.keys()) {
@@ -87,7 +113,6 @@ class DevViewModel(
         return builder.toString()
     }
 
-
     fun openCard() {
         accountRepository.selectedWalletFlow.take(1).onEach {
             openScreen(CardScreen.newInstance(it))
@@ -161,7 +186,7 @@ class DevViewModel(
                     }
                     val activity = context.activity ?: throw IllegalStateException("Activity not found")
                     val vaultState = rnLegacy.requestVault(activity)
-                    if (vaultState.keys.isEmpty) {
+                    if (vaultState.keys.isEmpty()) {
                         lines.add("No keys in vault")
                     } else {
                         for ((walletId, decryptedData) in vaultState.keys) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/DeleteMe.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/DeleteMe.kt
new file mode 100644
index 000000000..491062776
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/DeleteMe.kt
@@ -0,0 +1 @@
+package com.tonapps.tonkeeper.ui.screen.dns
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSOnSaleScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSOnSaleScreen.kt
new file mode 100644
index 000000000..e338ce5b4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSOnSaleScreen.kt
@@ -0,0 +1,25 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew
+
+import android.os.Bundle
+import android.view.View
+import com.tonapps.tonkeeperx.R
+import uikit.base.BaseFragment
+import uikit.extensions.applyNavBottomPadding
+import uikit.extensions.getDimensionPixelSize
+
+class DNSOnSaleScreen: BaseFragment(R.layout.dialog_dns_onsale), BaseFragment.Modal {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.findViewById<View>(R.id.close).setOnClickListener { finish() }
+        view.findViewById<View>(R.id.ton).setOnClickListener { finish() }
+
+        view.findViewById<View>(R.id.container)
+            .applyNavBottomPadding(requireContext().getDimensionPixelSize(uikit.R.dimen.offsetMedium))
+    }
+
+    companion object {
+
+        fun newInstance() = DNSOnSaleScreen()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewScreen.kt
new file mode 100644
index 000000000..5670e9fb2
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewScreen.kt
@@ -0,0 +1,92 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import com.tonapps.blockchain.ton.contract.WalletVersion
+import com.tonapps.extensions.locale
+import com.tonapps.tonkeeper.helper.DateHelper
+import com.tonapps.tonkeeper.koin.walletViewModel
+import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
+import com.tonapps.tonkeeper.ui.base.ScreenContext
+import com.tonapps.tonkeeper.ui.screen.dns.renew.list.Adapter
+import com.tonapps.tonkeeper.ui.screen.dns.renew.list.Item
+import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
+import com.tonapps.wallet.localization.Localization
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.core.parameter.parametersOf
+import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.dp
+import uikit.extensions.pinToBottomInsets
+
+class DNSRenewScreen(wallet: WalletEntity): BaseListWalletScreen<ScreenContext.Wallet>(ScreenContext.Wallet(wallet)), BaseFragment.BottomSheet {
+
+    private val rootViewModel: RootViewModel by activityViewModel()
+
+    override val viewModel: DNSRenewViewModel by walletViewModel {
+        parametersOf(requireArguments().getParcelableArrayList<DnsExpiringEntity>(ARG_ITEMS)!!)
+    }
+
+    private val adapter = Adapter()
+
+    private lateinit var actionButton: Button
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(viewModel.uiItemsFlow, ::submitList)
+    }
+
+    private fun submitList(items: List<Item>) {
+        adapter.submitList(items)
+        if (items.isEmpty()) {
+            finish()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setTitle(getString(Localization.renew_dns_title))
+        setAdapter(adapter)
+        setNestedScrollingEnabled(true)
+
+        actionButton = view.findViewById<Button>(R.id.action)
+
+        collectFlow(viewModel.showRenewAllButtonFlow, ::applyRenewAllButtonState)
+    }
+
+    private fun applyRenewAllButtonState(show: Boolean) {
+        if (show) {
+            setBottomMargin(72.dp)
+            actionButton.visibility = View.VISIBLE
+            actionButton.text = requireContext().getString(Localization.renew_dns_until, DateHelper.untilDate(
+                locale = requireContext().locale
+            ))
+            actionButton.pinToBottomInsets()
+            actionButton.setOnClickListener { renewAll() }
+        } else {
+            actionButton.visibility = View.GONE
+            setBottomMargin(0)
+        }
+    }
+
+    private fun renewAll() {
+        viewModel.renewAll {
+            finish()
+        }
+    }
+
+    companion object {
+
+        private const val ARG_ITEMS = "items"
+
+        fun newInstance(wallet: WalletEntity, items: List<DnsExpiringEntity>): DNSRenewScreen {
+            val screen = DNSRenewScreen(wallet)
+            screen.putParcelableListArg(ARG_ITEMS, items)
+            return screen
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewViewModel.kt
new file mode 100644
index 000000000..b1ff3d2a6
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/DNSRenewViewModel.kt
@@ -0,0 +1,138 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew
+
+import android.app.Application
+import android.net.Uri
+import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.TONOpCode
+import com.tonapps.blockchain.ton.extensions.base64
+import com.tonapps.blockchain.ton.extensions.storeOpCode
+import com.tonapps.blockchain.ton.extensions.storeQueryId
+import com.tonapps.extensions.currentTimeSeconds
+import com.tonapps.extensions.filterList
+import com.tonapps.icu.Coins
+import com.tonapps.tonkeeper.core.entities.TransferEntity
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.dns.renew.list.Item
+import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.CollectiblesRepository
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
+import com.tonapps.wallet.data.core.entity.RawMessageEntity
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.launch
+import org.ton.cell.CellBuilder
+import uikit.extensions.collectFlow
+
+class DNSRenewViewModel(
+    app: Application,
+    private val wallet: WalletEntity,
+    private val entities: List<DnsExpiringEntity>,
+    private val collectiblesRepository: CollectiblesRepository,
+    private val accountRepository: AccountRepository
+) : BaseWalletVM(app) {
+
+    private val dnsExpiringFlow = flow {
+        emit(collectiblesRepository.getDnsExpiring(wallet.accountId, wallet.testnet, 366))
+    }.stateIn(viewModelScope, SharingStarted.Eagerly, entities)
+
+    val uiItemsFlow = dnsExpiringFlow.map {
+        val items = collectiblesRepository.getDnsExpiring(wallet.accountId, wallet.testnet, 366)
+        val uiItems = items.mapIndexed { index, dnsExpiringEntity ->
+            Item(
+                position = ListCell.getPosition(items.size, index),
+                wallet = wallet,
+                entity = dnsExpiringEntity
+            )
+        }
+        uiItems
+    }
+
+    val showRenewAllButtonFlow = dnsExpiringFlow.map {
+        if (wallet.isWatchOnly || it.isEmpty()) {
+            false
+        } else {
+            wallet.maxMessages >= it.size
+        }
+    }
+
+    fun renewAll(successCallback: () -> Unit) {
+        viewModelScope.launch {
+            val items = dnsExpiringFlow.value.filter { !it.inSale }
+            if (items.isEmpty()) {
+                openScreen(DNSOnSaleScreen.newInstance())
+            } else {
+                val seqNo = accountRepository.getSeqno(wallet)
+                val signRequests = createSignRequest(wallet, items, seqNo)
+                if (sign(signRequests)) {
+                    successCallback()
+                }
+            }
+        }
+    }
+
+    private suspend fun sign(signRequests: List<SignRequestEntity>): Boolean {
+        for (signRequest in signRequests) {
+            try {
+                SendTransactionScreen.run(context, wallet, signRequest)
+            } catch (e: Throwable) {
+                return false
+            }
+        }
+        return true
+    }
+
+    companion object {
+
+        fun createSignRequest(
+            wallet: WalletEntity,
+            entities: List<DnsExpiringEntity>,
+            seqNo: Int
+        ): List<SignRequestEntity> {
+            val messagesChunks = entities.mapNotNull(::createMessage).chunked(wallet.maxMessages)
+            val requests = mutableListOf<SignRequestEntity>()
+            for ((index, messages) in messagesChunks.withIndex()) {
+                val request = SignRequestEntity.Builder()
+                    .setValidUntil(currentTimeSeconds() + 10 * 60)
+                    .setTestnet(wallet.testnet)
+                    .setFrom(wallet.contract.address)
+                    .addMessages(messages)
+                    .setSeqNo(seqNo + index)
+                    .build(Uri.EMPTY)
+                requests.add(request)
+            }
+
+            return requests
+        }
+
+        private fun createMessage(entity: DnsExpiringEntity): RawMessageEntity? {
+            val dns = entity.dnsItem ?: return null
+            return createMessage(dns.address)
+        }
+
+        fun createMessage(address: String): RawMessageEntity {
+            val payload = CellBuilder.createCell {
+                storeOpCode(TONOpCode.CHANGE_DNS_RECORD)
+                storeQueryId(TransferEntity.newWalletQueryId())
+                storeUInt(0, 256)
+            }
+
+            return RawMessageEntity.of(
+                amount = Coins.of("0.02").toLong(),
+                address = address,
+                payload = payload,
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Adapter.kt
new file mode 100644
index 000000000..c14b6f179
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Adapter.kt
@@ -0,0 +1,14 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew.list
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.dns.renew.list.holder.Holder
+import com.tonapps.uikit.list.BaseListAdapter
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.uikit.list.BaseListItem
+
+class Adapter: BaseListAdapter() {
+
+    override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
+        return Holder(parent)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Item.kt
new file mode 100644
index 000000000..421fe9668
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/Item.kt
@@ -0,0 +1,35 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew.list
+
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
+import com.tonapps.wallet.data.collectibles.entities.NftEntity
+
+data class Item(
+    val position: ListCell.Position,
+    val wallet: WalletEntity,
+    val entity: DnsExpiringEntity,
+): BaseListItem() {
+
+    val name: String
+        get() = entity.name
+
+    val nft: NftEntity?
+        get() = entity.dnsItem
+
+    val inSale: Boolean
+        get() = entity.inSale
+
+    val daysUntilExpiration: Int by lazy {
+        val currentTime = System.currentTimeMillis() / 1000
+        val remainingSeconds = entity.expiringAt - currentTime
+
+        if (remainingSeconds <= 0) {
+            0
+        } else {
+            (remainingSeconds / (24 * 60 * 60)).toInt()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/holder/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/holder/Holder.kt
new file mode 100644
index 000000000..a08883bb4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/dns/renew/list/holder/Holder.kt
@@ -0,0 +1,49 @@
+package com.tonapps.tonkeeper.ui.screen.dns.renew.list.holder
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.extensions.max12
+import com.tonapps.extensions.short12
+import com.tonapps.tonkeeper.ui.screen.dns.renew.list.Item
+import com.tonapps.tonkeeper.ui.screen.nft.NftScreen
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.UIKitColor
+import com.tonapps.uikit.color.resolveColor
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.entities.NftEntity
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.extensions.withDefaultBadge
+import uikit.navigation.Navigation
+
+class Holder(parent: ViewGroup): BaseListHolder<Item>(parent, R.layout.view_domain_renew) {
+
+    private val navigation = Navigation.from(context)
+    private val nameView = findViewById<AppCompatTextView>(R.id.name)
+    private val detailsView = findViewById<AppCompatTextView>(R.id.details)
+
+    override fun onBind(item: Item) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener {
+            item.nft?.let { openNft(item.wallet, it) }
+        }
+        nameView.text = if (item.inSale) {
+            item.name.max12.withDefaultBadge(context, Localization.on_sale)
+        } else {
+            item.name
+        }
+
+        detailsView.text = context.getString(Localization.renew_dns_expires, item.daysUntilExpiration)
+        if (7 >= item.daysUntilExpiration) {
+            detailsView.setTextColor(context.resolveColor(UIKitColor.accentRedColor))
+        } else {
+            detailsView.setTextColor(context.resolveColor(UIKitColor.textSecondaryColor))
+        }
+    }
+
+    private fun openNft(wallet: WalletEntity, nft: NftEntity) {
+        navigation?.add(NftScreen.newInstance(wallet, nft))
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsScreen.kt
index 7175a8569..622008f45 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsScreen.kt
@@ -33,6 +33,8 @@ import com.tonapps.uikit.list.ListPaginationListener
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.take
 import uikit.drawable.BarDrawable
 import uikit.drawable.HeaderDrawable
 import uikit.extensions.collectFlow
@@ -154,9 +156,10 @@ class EventsScreen(wallet: WalletEntity) : MainScreen.Child(R.layout.fragment_ma
     }
 
     private fun scrollToFirst() {
-        listView.postDelayed({
+        listView.scrollToPosition(0)
+        collectFlow(viewModel.uiStateFlow.take(1)) {
             listView.scrollToPosition(0)
-        }, 120)
+        }
     }
 
     private fun setLoading(loading: Boolean) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsViewModel.kt
index 54e13b0b0..eab600bbc 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/EventsViewModel.kt
@@ -1,11 +1,9 @@
 package com.tonapps.tonkeeper.ui.screen.events.main
 
 import android.app.Application
-import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.mapList
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.api.AccountEventWrap
 import com.tonapps.tonkeeper.core.history.ActionOptions
 import com.tonapps.tonkeeper.core.history.ActionOutStatus
@@ -59,7 +57,6 @@ class EventsViewModel(
     private val accountRepository: AccountRepository,
     private val api: API,
     private val cacheHelper: CacheHelper,
-    private val remoteConfig: RemoteConfig,
 ) : BaseWalletVM(app) {
 
     private var autoRefreshJob: Job? = null
@@ -67,7 +64,7 @@ class EventsViewModel(
     private val _triggerFlow = MutableEffectFlow<Unit>()
     private val _loadingTriggerFlow = MutableEffectFlow<Unit>()
 
-    private val _selectedFilter = MutableStateFlow<FilterItem?>(null)
+    private val _selectedFilter = MutableStateFlow<FilterItem>(FilterItem.All(true))
     private val selectedFilter = _selectedFilter.asStateFlow()
 
     private val dAppsNotificationsFlow =
@@ -78,10 +75,11 @@ class EventsViewModel(
     val uiFilterItemsFlow: Flow<List<FilterItem>> =
         combine(selectedFilter, dAppsNotificationsFlow) { selected, notifications ->
             val uiFilterItems = mutableListOf<FilterItem>()
-            uiFilterItems.add(FilterItem.Send(selected?.type == FilterItem.TYPE_SEND))
-            uiFilterItems.add(FilterItem.Receive(selected?.type == FilterItem.TYPE_RECEIVE))
+            uiFilterItems.add(FilterItem.All(selected.type == FilterItem.TYPE_ALL))
+            uiFilterItems.add(FilterItem.Send(selected.type == FilterItem.TYPE_SEND))
+            uiFilterItems.add(FilterItem.Receive(selected.type == FilterItem.TYPE_RECEIVE))
             if (notifications.isNotEmpty()) {
-                uiFilterItems.add(FilterItem.Dapps(selected?.type == FilterItem.TYPE_DAPPS))
+                uiFilterItems.add(FilterItem.Dapps(selected.type == FilterItem.TYPE_DAPPS))
             }
             uiFilterItems.add(FilterItem.Spam())
             uiFilterItems.toList()
@@ -175,6 +173,9 @@ class EventsViewModel(
         })
     }
 
+    private val tronEnabled: Boolean
+        get() = settingsRepository.getTronUsdtEnabled(wallet.id)
+
     init {
         with(settingsRepository) {
             tokenPrefsChangedFlow.drop(1).collectFlow { initialLoad() }
@@ -239,8 +240,8 @@ class EventsViewModel(
     }
 
     fun clickFilter(filter: FilterItem) {
-        if (_selectedFilter.value?.id == filter.id) {
-            _selectedFilter.value = null
+        if (_selectedFilter.value.id == filter.id) {
+            _selectedFilter.value = FilterItem.All(true)
         } else {
             _selectedFilter.value = filter
         }
@@ -285,7 +286,7 @@ class EventsViewModel(
 
             setLoading(loading = true, trigger = true)
 
-            val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+            val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && tronEnabled) {
                 accountRepository.getTronAddress(wallet.id)
             } else null
             val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: ""
@@ -348,7 +349,7 @@ class EventsViewModel(
     }
 
     private suspend fun loadMoreTron() {
-        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && tronEnabled) {
             accountRepository.getTronAddress(wallet.id)
         } else null
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FilterItem.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FilterItem.kt
index 58cdcd68e..a7c581e92 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FilterItem.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FilterItem.kt
@@ -16,18 +16,23 @@ sealed class FilterItem(
 ): BaseListItem(type) {
 
     companion object {
+
+        const val TYPE_ALL = 0
         const val TYPE_SEND = 1
         const val TYPE_RECEIVE = 2
         const val TYPE_APP = 3
         const val TYPE_SPAM = 4
         const val TYPE_DAPPS = 5
 
+        const val ALL_ID = "all"
         const val SEND_ID = "send"
         const val RECEIVE_ID = "receive"
         const val SPAM_ID = "spam"
         const val DAPPS_ID = "dapps"
     }
 
+    data class All(override val selected: Boolean) : FilterItem(TYPE_ALL, selected, ALL_ID, Localization.all)
+
     data class Send(override val selected: Boolean) : FilterItem(TYPE_SEND, selected, SEND_ID, Localization.sent)
 
     data class Receive(override val selected: Boolean) : FilterItem(TYPE_RECEIVE, selected, RECEIVE_ID, Localization.received)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FiltersAdapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FiltersAdapter.kt
index fdffea0d9..92023cd37 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FiltersAdapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/FiltersAdapter.kt
@@ -11,7 +11,7 @@ class FiltersAdapter(private val onClick: (item: FilterItem) -> Unit): BaseListA
 
     override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
         return when(viewType) {
-            FilterItem.TYPE_SEND, FilterItem.TYPE_RECEIVE, FilterItem.TYPE_SPAM, FilterItem.TYPE_DAPPS -> FilterHolder(parent, onClick)
+            FilterItem.TYPE_ALL, FilterItem.TYPE_SEND, FilterItem.TYPE_RECEIVE, FilterItem.TYPE_SPAM, FilterItem.TYPE_DAPPS -> FilterHolder(parent, onClick)
             FilterItem.TYPE_APP -> AppHolder(parent, onClick)
             else -> throw IllegalArgumentException("Unknown viewType: $viewType")
         }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/holder/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/holder/Holder.kt
index d5c51ccc5..2e536a354 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/holder/Holder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/main/filters/holder/Holder.kt
@@ -8,6 +8,7 @@ import com.tonapps.uikit.color.buttonPrimaryBackgroundColor
 import com.tonapps.uikit.color.buttonPrimaryForegroundColor
 import com.tonapps.uikit.color.buttonSecondaryBackgroundColor
 import com.tonapps.uikit.color.buttonSecondaryForegroundColor
+import com.tonapps.uikit.color.buttonTertiaryBackgroundColor
 import com.tonapps.uikit.color.stateList
 import com.tonapps.uikit.list.BaseListHolder
 
@@ -19,7 +20,7 @@ abstract class Holder<I: FilterItem>(
 
     fun setSelected(selected: Boolean) {
         val textColor = if (selected) context.buttonPrimaryForegroundColor else context.buttonSecondaryForegroundColor
-        val color = if (selected) context.buttonPrimaryBackgroundColor else context.buttonSecondaryBackgroundColor
+        val color = if (selected) context.buttonTertiaryBackgroundColor else context.buttonSecondaryBackgroundColor
         itemView.backgroundTintList = color.stateList
         titleView.setTextColor(textColor)
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/spam/SpamEventsViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/spam/SpamEventsViewModel.kt
index 19ebf988c..86ea044b1 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/spam/SpamEventsViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/events/spam/SpamEventsViewModel.kt
@@ -2,7 +2,6 @@ package com.tonapps.tonkeeper.ui.screen.events.spam
 
 import android.app.Application
 import androidx.lifecycle.viewModelScope
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.core.history.ActionOptions
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
@@ -33,7 +32,6 @@ class SpamEventsViewModel(
     private val historyHelper: HistoryHelper,
     private val settingsRepository: SettingsRepository,
     private val accountRepository: AccountRepository,
-    private val remoteConfig: RemoteConfig,
 ) : BaseWalletVM(app) {
 
     private val _eventsFlow = MutableStateFlow<List<AccountEvent>?>(null)
@@ -90,6 +88,9 @@ class SpamEventsViewModel(
     }.flowOn(Dispatchers.Main)
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), SpamUiState())
 
+    private val tronEnabled: Boolean
+        get() = settingsRepository.getTronUsdtEnabled(wallet.id)
+
     init {
         viewModelScope.launch(Dispatchers.IO) {
             init()
@@ -103,7 +104,7 @@ class SpamEventsViewModel(
     private suspend fun init() {
         _eventsFlow.value = getLocalSpam()
 
-        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && tronEnabled) {
             accountRepository.getTronAddress(wallet.id)
         } else null
         _tronEventsFlow.value =
@@ -141,7 +142,7 @@ class SpamEventsViewModel(
     }
 
     private suspend fun loadMoreTron() {
-        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && tronEnabled) {
             accountRepository.getTronAddress(wallet.id)
         } else null
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
index b4e0ee3a8..c8c2ebda8 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitViewModel.kt
@@ -3,10 +3,8 @@ package com.tonapps.tonkeeper.ui.screen.init
 import android.app.Application
 import android.content.Context
 import android.graphics.Color
-import android.util.Log
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tonapps.blockchain.MnemonicHelper
 import com.tonapps.blockchain.ton.AndroidSecureRandom
 import com.tonapps.blockchain.ton.EntropyHelper
@@ -23,10 +21,9 @@ import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.logError
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
-import com.tonapps.tonkeeper.RemoteConfig
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.extensions.fixW5Title
-import com.tonapps.tonkeeper.extensions.toast
 import com.tonapps.tonkeeper.manager.push.PushManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.init.list.AccountItem
@@ -41,9 +38,7 @@ import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.WalletColor
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.backup.BackupRepository
-import com.tonapps.wallet.data.backup.entities.BackupEntity
 import com.tonapps.wallet.data.passcode.PasscodeManager
-import com.tonapps.wallet.data.passcode.dialog.PasscodeDialog
 import com.tonapps.wallet.data.rn.RNLegacy
 import com.tonapps.wallet.data.settings.SafeModeState
 import com.tonapps.wallet.data.settings.SettingsRepository
@@ -62,17 +57,13 @@ import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.ton.api.pk.PrivateKeyEd25519
 import org.ton.block.AddrStd
 import org.ton.mnemonic.Mnemonic
-import uikit.navigation.Navigation
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
-import kotlin.properties.Delegates
 
 @OptIn(FlowPreview::class)
 class InitViewModel(
@@ -84,9 +75,10 @@ class InitViewModel(
     private val backupRepository: BackupRepository,
     private val rnLegacy: RNLegacy,
     private val settingsRepository: SettingsRepository,
-    private val remoteConfig: RemoteConfig,
+    private val environment: Environment,
+    private val analytics: AnalyticsHelper,
     savedStateHandle: SavedStateHandle
-): BaseWalletVM(app) {
+) : BaseWalletVM(app) {
 
     private val entropyHelper: EntropyHelper by lazy {
         EntropyHelper(context)
@@ -129,7 +121,8 @@ class InitViewModel(
     private val _accountsFlow = MutableEffectFlow<List<AccountItem>?>()
     val accountsFlow = _accountsFlow.asSharedFlow().filterNotNull()
 
-    val labelFlow = savedState.labelFlow.stateIn(viewModelScope, SharingStarted.Lazily, null).filterNotNull()
+    val labelFlow =
+        savedState.labelFlow.stateIn(viewModelScope, SharingStarted.Lazily, null).filterNotNull()
 
     private val isPinSet = AtomicBoolean(false)
 
@@ -174,7 +167,15 @@ class InitViewModel(
             InitArgs.Type.Signer, InitArgs.Type.SignerQR -> resolveWallets(savedState.publicKey!!)
             InitArgs.Type.Ledger -> routeTo(InitRoute.SelectAccount)
             InitArgs.Type.Keystone -> routeTo(InitRoute.LabelAccount)
-            InitArgs.Type.New -> { routeTo(if (requestSetPinCode) InitRoute.CreatePasscode else InitRoute.Push) }
+            InitArgs.Type.New -> {
+                if (requestSetPinCode) {
+                    routeTo(InitRoute.CreatePasscode)
+                } else if (environment.isGooglePlayServicesAvailable) {
+                    routeTo(InitRoute.Push)
+                } else {
+                    routeTo(InitRoute.LabelAccount)
+                }
+            }
         }
     }
 
@@ -231,7 +232,7 @@ class InitViewModel(
         if (!valid) {
             routePopBackStack()
         } else {
-            routeTo(InitRoute.Push)
+            routeTo(if (environment.isGooglePlayServicesAvailable) InitRoute.Push else InitRoute.LabelAccount)
         }
     }
 
@@ -243,66 +244,78 @@ class InitViewModel(
         return false
     }
 
-    private suspend fun resolveWallets(mnemonic: List<String>): Boolean = withContext(Dispatchers.IO) {
-        try {
-            val privateKey = MnemonicHelper.privateKey(mnemonic)
-            val publicKey = privateKey.publicKey()
-            resolveWallets(InitModelState.PublicKey(publicKey = publicKey))
-            true
-        } catch (e: Throwable) {
-            false
-        }
-    }
-
-    private suspend fun resolveWallets(publicKey: InitModelState.PublicKey) = withContext(Dispatchers.IO) {
-        val accounts = if (publicKey.new) {
-            mutableListOf()
-        } else {
-            api.resolvePublicKey(publicKey.publicKey, testnet).filter {
-                it.walletVersion != WalletVersion.UNKNOWN
-            }.sortedByDescending { it.walletVersion.index }.toMutableList()
+    private suspend fun resolveWallets(mnemonic: List<String>): Boolean =
+        withContext(Dispatchers.IO) {
+            try {
+                val privateKey = MnemonicHelper.privateKey(mnemonic)
+                val publicKey = privateKey.publicKey()
+                resolveWallets(InitModelState.PublicKey(publicKey = publicKey))
+                true
+            } catch (e: Throwable) {
+                false
+            }
         }
 
-        if (accounts.count { it.walletVersion == WalletVersion.V5R1 } == 0) {
-            val contract = WalletV5R1Contract(publicKey.publicKey, tonNetwork)
-            val query = contract.address.toAccountId()
-            if (publicKey.new) {
-                accounts.add(0, AccountDetailsEntity(contract, testnet, new = true, initialized = false))
+    private suspend fun resolveWallets(publicKey: InitModelState.PublicKey) =
+        withContext(Dispatchers.IO) {
+            val accounts = if (publicKey.new) {
+                mutableListOf()
             } else {
-                val apiAccount = api.resolveAccount(query, testnet)
-                val account = if (apiAccount == null) {
-                    AccountDetailsEntity(contract, testnet = testnet, new = true, initialized = false)
+                api.resolvePublicKey(publicKey.publicKey, testnet).filter {
+                    it.walletVersion != WalletVersion.UNKNOWN
+                }.sortedByDescending { it.walletVersion.index }.toMutableList()
+            }
+
+            if (accounts.count { it.walletVersion == WalletVersion.V5R1 } == 0) {
+                val contract = WalletV5R1Contract(publicKey.publicKey, tonNetwork)
+                val query = contract.address.toAccountId()
+                if (publicKey.new) {
+                    accounts.add(
+                        0,
+                        AccountDetailsEntity(contract, testnet, new = true, initialized = false)
+                    )
                 } else {
-                    AccountDetailsEntity(query, apiAccount.copy(
-                        interfaces = listOf("wallet_v5r1")
-                    ), testnet, false)
+                    val apiAccount = api.resolveAccount(query, testnet)
+                    val account = if (apiAccount == null) {
+                        AccountDetailsEntity(
+                            contract,
+                            testnet = testnet,
+                            new = true,
+                            initialized = false
+                        )
+                    } else {
+                        AccountDetailsEntity(
+                            query, apiAccount.copy(
+                                interfaces = listOf("wallet_v5r1")
+                            ), testnet, false
+                        )
+                    }
+                    accounts.add(0, account)
                 }
-                accounts.add(0, account)
             }
-        }
-
-        val list = accounts.mapIndexed { index, account ->
-            getAccountItem(account, ListCell.getPosition(accounts.size, index))
-        }
 
-        val items = mutableListOf<AccountItem>()
-        for (account in list) {
-            items.add(account)
-        }
-        setAccounts(items.toList())
+            val list = accounts.mapIndexed { index, account ->
+                getAccountItem(account, ListCell.getPosition(accounts.size, index))
+            }
 
-        if (items.size > 1) {
-            routeTo(InitRoute.SelectAccount)
-        } else if (requestSetPinCode) {
-            val accountName = items.first().name
-            if (!accountName.isNullOrBlank()) {
-                setLabelName(accountName)
+            val items = mutableListOf<AccountItem>()
+            for (account in list) {
+                items.add(account)
+            }
+            setAccounts(items.toList())
+
+            if (items.size > 1) {
+                routeTo(InitRoute.SelectAccount)
+            } else if (requestSetPinCode) {
+                val accountName = items.first().name
+                if (!accountName.isNullOrBlank()) {
+                    setLabelName(accountName)
+                }
+                routeTo(InitRoute.CreatePasscode)
+            } else {
+                routeTo(if (environment.isGooglePlayServicesAvailable) InitRoute.Push else InitRoute.LabelAccount)
             }
-            routeTo(InitRoute.CreatePasscode)
-        } else {
-            routeTo(InitRoute.Push)
         }
-    }
 
     private fun applyAccountName() {
         viewModelScope.launch {
@@ -372,7 +385,7 @@ class InitViewModel(
         val count = getWalletsCount()
         return if (count == 0 && type == InitArgs.Type.New) {
             getString(Localization.app_name)
-        } else  {
+        } else {
             getString(Localization.wallet)
         }
     }
@@ -435,10 +448,12 @@ class InitViewModel(
         val oldLabel = getLabel()
         val emoji = Emoji.getEmojiFromPrefix(name) ?: oldLabel.emoji
 
-        setLabel(oldLabel.copy(
-            accountName = name.replace(emoji.toString(), "").trim(),
-            emoji = emoji
-        ))
+        setLabel(
+            oldLabel.copy(
+                accountName = name.replace(emoji.toString(), "").trim(),
+                emoji = emoji
+            )
+        )
     }
 
     fun nextStep(context: Context, from: InitRoute) {
@@ -447,10 +462,10 @@ class InitViewModel(
         } else if (from == InitRoute.LabelAccount) {
             execute(context)
         } else if (from == InitRoute.WatchAccount) {
-            routeTo(InitRoute.Push)
+            routeTo(if (environment.isGooglePlayServicesAvailable) InitRoute.Push else InitRoute.LabelAccount)
         } else if (from == InitRoute.SelectAccount && !requestSetPinCode) {
             applyAccountName()
-            routeTo(InitRoute.Push)
+            routeTo(if (environment.isGooglePlayServicesAvailable) InitRoute.Push else InitRoute.LabelAccount)
         } else if (requestSetPinCode) {
             applyAccountName()
             routeTo(InitRoute.CreatePasscode)
@@ -480,7 +495,12 @@ class InitViewModel(
                 when (type) {
                     InitArgs.Type.Watch -> wallets.add(saveWatchWallet())
                     InitArgs.Type.New -> wallets.add(newWallet(context))
-                    InitArgs.Type.Import, InitArgs.Type.Testnet -> wallets.addAll(importWallet(context))
+                    InitArgs.Type.Import, InitArgs.Type.Testnet -> wallets.addAll(
+                        importWallet(
+                            context
+                        )
+                    )
+
                     InitArgs.Type.Signer -> wallets.addAll(signerWallets(false))
                     InitArgs.Type.SignerQR -> wallets.addAll(signerWallets(true))
                     InitArgs.Type.Ledger -> wallets.addAll(ledgerWallets())
@@ -561,44 +581,57 @@ class InitViewModel(
 
         val wallet = accountRepository.addNewWallet(walletId, label, mnemonic)
 
-        AnalyticsHelper.simpleTrackEvent("wallet_generate", installId, hashMapOf("wallet_type" to wallet.version.title))
+        analytics.simpleTrackEvent(
+            "wallet_generate",
+            hashMapOf("wallet_type" to wallet.version.title)
+        )
         return wallet
     }
 
-    private suspend fun importWallet(context: Context): List<WalletEntity> = withContext(Dispatchers.IO) {
-        val accounts = getSelectedAccounts()
-        if (accounts.isEmpty()) {
-            throw IllegalStateException("Wallet versions are not set")
-        }
-
-        val mnemonic = savedState.mnemonic ?: throw IllegalStateException("Mnemonic is not set")
-        if (!TonMnemonic.isValid(mnemonic)) {
-            throw IllegalStateException("Invalid mnemonic")
-        }
+    private suspend fun importWallet(context: Context): List<WalletEntity> =
+        withContext(Dispatchers.IO) {
+            val accounts = getSelectedAccounts()
+            if (accounts.isEmpty()) {
+                throw IllegalStateException("Wallet versions are not set")
+            }
 
-        val ids = accounts.map { AccountRepository.newWalletId() }
-        saveMnemonic(context, ids, mnemonic)
+            val mnemonic = savedState.mnemonic ?: throw IllegalStateException("Mnemonic is not set")
+            if (!TonMnemonic.isValid(mnemonic)) {
+                throw IllegalStateException("Invalid mnemonic")
+            }
 
-        val label = buildNewLabel(accounts.map {
-            SimpleAccount(
-                name = it.name,
-                version = it.walletVersion
-            )
-        })
+            val ids = accounts.map { AccountRepository.newWalletId() }
+            saveMnemonic(context, ids, mnemonic)
+
+            val label = buildNewLabel(accounts.map {
+                SimpleAccount(
+                    name = it.name,
+                    version = it.walletVersion
+                )
+            })
+
+            accounts.map {
+                analytics.simpleTrackEvent(
+                    "wallet_import",
+                    hashMapOf("wallet_type" to it.walletVersion.title)
+                )
+            }
 
-        accounts.map {
-            AnalyticsHelper.simpleTrackEvent("wallet_import", installId, hashMapOf("wallet_type" to it.walletVersion.title))
-        }
+            val wallets = accountRepository.importWallet(
+                ids,
+                label,
+                mnemonic,
+                accounts.map { it.walletVersion },
+                testnet,
+                accounts.map { it.initialized })
 
-        val wallets = accountRepository.importWallet(ids, label, mnemonic, accounts.map { it.walletVersion }, testnet, accounts.map { it.initialized })
+            if (!testnet) {
+                checkTronBalance(wallets)
+            }
 
-        if (!testnet && !remoteConfig.isTronDisabled) {
-            checkTronBalance(wallets)
+            wallets
         }
 
-        wallets
-    }
-
     private suspend fun checkTronBalance(wallets: List<WalletEntity>) {
         val wallet = wallets.first()
         val tronAddress = accountRepository.getTronAddress(wallet.id) ?: return
@@ -608,19 +641,23 @@ class InitViewModel(
             wallets.forEach {
                 settingsRepository.setTokenHidden(it.id, TokenEntity.TRON_USDT.address, false)
                 settingsRepository.setTokenPinned(it.id, TokenEntity.TRON_USDT.address, true)
-                settingsRepository.setTokensSort(wallet.id, listOf(TokenEntity.USDT.address, TokenEntity.TRON_USDT.address))
+                settingsRepository.setTokensSort(
+                    wallet.id,
+                    listOf(TokenEntity.USDT.address, TokenEntity.TRON_USDT.address, TokenEntity.USDE.address)
+                )
             }
         }
     }
 
     private suspend fun ledgerWallets(): List<WalletEntity> {
-        val ledgerConnectData = savedState.ledgerConnectData ?: throw IllegalStateException("Ledger connect data is not set")
+        val ledgerConnectData = savedState.ledgerConnectData
+            ?: throw IllegalStateException("Ledger connect data is not set")
 
         val accounts = getSelectedAccounts()
 
         val ledgerAccounts = accounts.map { selectedAccount ->
-            ledgerConnectData.accounts.find {
-                account -> account.path.index == selectedAccount.ledgerIndex
+            ledgerConnectData.accounts.find { account ->
+                account.path.index == selectedAccount.ledgerIndex
             } ?: throw IllegalStateException("Ledger account is not found")
         }
 
@@ -649,20 +686,33 @@ class InitViewModel(
             )
         })
 
-        return accountRepository.pairSigner(label, publicKey.publicKey, accounts.map { it.walletVersion }, qr, accounts.map { it.initialized })
+        return accountRepository.pairSigner(
+            label,
+            publicKey.publicKey,
+            accounts.map { it.walletVersion },
+            qr,
+            accounts.map { it.initialized })
     }
 
     private suspend fun keystoneWallet(): List<WalletEntity> {
         val publicKey = savedState.publicKey ?: throw IllegalStateException("Public key is not set")
         val keystone = savedState.keystone ?: throw IllegalStateException("Keystone is not set")
 
-        val label = buildNewLabel(SimpleAccount(
-            version = WalletVersion.V4R2
-        ))
+        val label = buildNewLabel(
+            SimpleAccount(
+                version = WalletVersion.V4R2
+            )
+        )
 
-        val contact = BaseWalletContract.create(publicKey.publicKey, WalletVersion.V4R2.title, tonNetwork.value)
-        val account = api.resolveAccount(contact.address.toWalletAddress(testnet = testnet), testnet)
-        val initialized = account != null && (account.status == AccountStatus.active || account.status == AccountStatus.frozen)
+        val contact = BaseWalletContract.create(
+            publicKey.publicKey,
+            WalletVersion.V4R2.title,
+            tonNetwork.value
+        )
+        val account =
+            api.resolveAccount(contact.address.toWalletAddress(testnet = testnet), testnet)
+        val initialized =
+            account != null && (account.status == AccountStatus.active || account.status == AccountStatus.frozen)
 
         return accountRepository.pairKeystone(label, publicKey.publicKey, keystone, initialized)
     }
@@ -676,7 +726,8 @@ class InitViewModel(
             return@withContext
         }
         if (passcodeManager.hasPinCode()) {
-            val isValid = passcodeManager.confirmation(context, context.getString(Localization.app_name))
+            val isValid =
+                passcodeManager.confirmation(context, context.getString(Localization.app_name))
             if (!isValid) {
                 throw IllegalStateException("wrong passcode")
             }
@@ -704,7 +755,7 @@ class InitViewModel(
         val version: WalletVersion
     ) {
 
-        constructor(account: AccountDetailsEntity): this(
+        constructor(account: AccountDetailsEntity) : this(
             name = account.name,
             version = account.walletVersion
         )
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
index 88f217b5d..f7d80f9d0 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainScreen.kt
@@ -1,7 +1,6 @@
 package com.tonapps.tonkeeper.ui.screen.main
 
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
@@ -12,6 +11,8 @@ import com.tonapps.extensions.query
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.extensions.isLightTheme
 import com.tonapps.tonkeeper.extensions.removeAllFragments
+import com.tonapps.tonkeeper.koin.serverConfig
+import com.tonapps.tonkeeper.koin.serverFlags
 import com.tonapps.tonkeeper.ui.base.BaseWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen
@@ -149,7 +150,11 @@ class MainScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_main, S
         }.launchIn(lifecycleScope)
 
         collectFlow(rootViewModel.eventFlow.filterIsInstance<RootEvent.Swap>()) {
-            navigation?.add(SwapScreen.newInstance(it.wallet, it.uri, it.address, it.from, it.to))
+            navigation?.add(SwapScreen.newInstance(
+                wallet = it.wallet,
+                nativeSwap = context?.serverFlags?.disableNativeSwap != true,
+                uri = it.uri
+            ))
         }
         collectFlow(viewModel.selectedWalletFlow) { wallet ->
             applyWallet(wallet)
@@ -185,7 +190,7 @@ class MainScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_main, S
         bottomTabsView.doOnClick = { itemId ->
             setFragment(itemId, wallet, "wallet",null, false)
             if (itemId == R.id.browser) {
-                AnalyticsHelper.simpleTrackEvent("browser_click", rootViewModel.installId)
+                analytics?.simpleTrackEvent("browser_click")
             }
         }
     }
@@ -251,16 +256,16 @@ class MainScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_main, S
         transaction.runOnCommit {
             checkBottomDivider(fragment)
             if (fragment is BrowserBaseScreen) {
-                AnalyticsHelper.simpleTrackScreenEvent("browser_open", rootViewModel.installId, from)
+                analytics?.simpleTrackScreenEvent("browser_open", from)
                 if (!extra.isNullOrBlank()) {
                     fragment.openCategory(extra)
                 }
             } else if (fragment is EventsScreen) {
-                AnalyticsHelper.simpleTrackScreenEvent("history_open", rootViewModel.installId, from)
+                analytics?.simpleTrackScreenEvent("history_open", from)
             } else if (fragment is CollectiblesScreen) {
-                AnalyticsHelper.simpleTrackScreenEvent("collectibles_open", rootViewModel.installId, from)
+                analytics?.simpleTrackScreenEvent("collectibles_open", from)
             } else if (fragment is WalletScreen) {
-                AnalyticsHelper.simpleTrackEvent("wallet_open", rootViewModel.installId, hashMapOf(
+                analytics?.simpleTrackEvent("wallet_open", hashMapOf(
                     "from" to from,
                     "wallet_type" to fragment.wallet.version.title
                 ))
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainViewModel.kt
index 301272c29..b5815c29e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/main/MainViewModel.kt
@@ -1,18 +1,13 @@
 package com.tonapps.tonkeeper.ui.screen.main
 
 import android.app.Application
-import android.util.Log
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.tonapps.extensions.MutableEffectFlow
-import com.tonapps.extensions.locale
-import com.tonapps.tonkeeper.extensions.getFixedCountryCode
-import com.tonapps.tonkeeper.extensions.getLocaleCountryFlow
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.AccountRepository
-import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.browser.BrowserRepository
 import com.tonapps.wallet.data.collectibles.CollectiblesRepository
@@ -20,13 +15,8 @@ import com.tonapps.wallet.data.events.EventsRepository
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
-import uikit.extensions.collectFlow
 
 class MainViewModel(
     app: Application,
@@ -36,6 +26,7 @@ class MainViewModel(
     private val settingsRepository: SettingsRepository,
     private val collectiblesRepository: CollectiblesRepository,
     private val eventsRepository: EventsRepository,
+    private val environment: Environment,
 ) : BaseWalletVM(app) {
 
     private var currentWallet: WalletEntity? = null
@@ -73,7 +64,7 @@ class MainViewModel(
     }
 
     private suspend fun prefetchBrowser(wallet: WalletEntity) {
-        val country = settingsRepository.getFixedCountryCode(api)
+        val country = environment.country
 
         browserRepository.load(
             country = country,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftScreen.kt
index f8fd4fad9..2e6798662 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftScreen.kt
@@ -13,11 +13,14 @@ import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.net.toUri
 import androidx.core.widget.NestedScrollView
+import androidx.lifecycle.lifecycleScope
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.request.ImageRequest
 import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.extensions.currentTimeSeconds
 import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.extensions.locale
 import com.tonapps.extensions.short4
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.tonkeeper.core.AnalyticsHelper
@@ -25,6 +28,7 @@ import com.tonapps.tonkeeper.extensions.copyWithToast
 import com.tonapps.tonkeeper.extensions.isLightTheme
 import com.tonapps.tonkeeper.extensions.toast
 import com.tonapps.tonkeeper.extensions.toastLoading
+import com.tonapps.tonkeeper.helper.DateHelper
 import com.tonapps.tonkeeper.koin.serverConfig
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.popup.ActionSheet
@@ -32,18 +36,25 @@ import com.tonapps.tonkeeper.ui.base.WalletContextScreen
 import com.tonapps.tonkeeper.ui.component.LottieView
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppArgs
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewScreen
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewViewModel
 import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
 import com.tonapps.tonkeeper.ui.screen.send.main.SendScreen
+import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
 import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.UIKitColor
 import com.tonapps.uikit.color.accentBlueColor
 import com.tonapps.uikit.color.accentOrangeColor
 import com.tonapps.uikit.color.accentRedColor
+import com.tonapps.uikit.color.resolveColor
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.collectibles.entities.NftEntity
 import com.tonapps.wallet.data.core.Trust
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import org.koin.core.parameter.parametersOf
 import uikit.base.BaseFragment
@@ -81,12 +92,13 @@ class NftScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_nft
     private lateinit var headerView: HeaderView
     private lateinit var spamView: View
     private lateinit var previewView: FrameLayout
+    private lateinit var domainExpirationView: AppCompatTextView
 
     private var lottieView: LottieView? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("collectibles_select", rootViewModel.installId)
+        analytics?.simpleTrackEvent("collectibles_select")
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -104,6 +116,7 @@ class NftScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_nft
         spamView = view.findViewById(R.id.spam)
 
         previewView = view.findViewById(R.id.preview)
+        domainExpirationView = view.findViewById(R.id.domain_expiration)
 
         view.findViewById<Button>(R.id.report_spam).setOnClickListener { reportSpam(true) }
         view.findViewById<Button>(R.id.not_spam).setOnClickListener { reportSpam(false) }
@@ -146,34 +159,16 @@ class NftScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_nft
             ))
         }
 
-        val domainLinkButton = view.findViewById<Button>(R.id.domain_link)
         val domainRenewButton = view.findViewById<Button>(R.id.domain_renew)
 
-        if (nftEntity.isDomain && nftEntity.metadata.buttons.isEmpty()) {
-            val url = "https://dns.tonkeeper.com/manage?v=${nftEntity.userFriendlyAddress}".toUri()
-            val dAppArgs = DAppArgs(
-                title = url.host ?: nftEntity.name,
-                url = url,
-                iconUrl = "",
-                source = "nft"
-            )
-            domainLinkButton.setOnClickListener {
-                navigation?.add(DAppScreen.newInstance(wallet, dAppArgs))
-                finish()
-            }
-            if (nftEntity.isTelegramUsername) {
-                domainLinkButton.setBackgroundResource(uikit.R.drawable.bg_button_secondary)
-                domainLinkButton.setTextColor(getColor(uikit.R.color.button_secondary_foreground_selector))
-                domainRenewButton.visibility = View.GONE
-            } else {
-                domainRenewButton.visibility = View.VISIBLE
-                domainRenewButton.setOnClickListener {
-                    navigation?.add(DAppScreen.newInstance(wallet, dAppArgs))
-                    finish()
-                }
-            }
+        if (nftEntity.isDomain && !nftEntity.isTelegramUsername) {
+            domainRenewButton.visibility = View.VISIBLE
+            domainRenewButton.text = getString(Localization.renew_signel_dns_until, DateHelper.untilDate(
+                locale = requireContext().locale
+            ))
+            domainRenewButton.setOnClickListener { viewModel.renewDomain() }
+            domainRenewButton.isEnabled = !nftEntity.inSale
         } else {
-            domainLinkButton.visibility = View.GONE
             domainRenewButton.visibility = View.GONE
         }
 
@@ -214,7 +209,6 @@ class NftScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_nft
 
         if (!wallet.isTonConnectSupported) {
             buttonsContainer.visibility = View.GONE
-            domainLinkButton.visibility = View.GONE
             domainRenewButton.visibility = View.GONE
             transferButton.visibility = View.GONE
         }
@@ -229,6 +223,15 @@ class NftScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_nft
                 ViewGroup.LayoutParams.WRAP_CONTENT
             ))
         }
+        collectFlow(viewModel.expiresFlow) { entity ->
+            domainExpirationView.visibility = View.VISIBLE
+            domainExpirationView.text = getString(Localization.renew_dns_expires, entity.daysUntilExpiration)
+            if (30 >= entity.daysUntilExpiration) {
+                domainExpirationView.setTextColor(requireContext().resolveColor(UIKitColor.accentRedColor))
+            } else {
+                domainExpirationView.setTextColor(requireContext().resolveColor(UIKitColor.textSecondaryColor))
+            }
+        }
     }
 
     private fun setTrust(trust: Trust) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftViewModel.kt
index 19c6d39d6..08ef6067f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/nft/NftViewModel.kt
@@ -1,17 +1,31 @@
 package com.tonapps.tonkeeper.ui.screen.nft
 
 import android.app.Application
+import android.net.Uri
+import android.util.Log
 import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.extensions.currentTimeSeconds
+import com.tonapps.tonkeeper.extensions.toast
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewViewModel
+import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.CollectiblesRepository
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.collectibles.entities.NftEntity
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.settings.entities.TokenPrefsEntity
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import uikit.extensions.activity
+import uikit.navigation.Navigation.Companion.navigation
 
 class NftViewModel(
     app: Application,
@@ -19,12 +33,45 @@ class NftViewModel(
     private val nft: NftEntity,
     private val settingsRepository: SettingsRepository,
     private val api: API,
+    private val collectiblesRepository: CollectiblesRepository,
 ): BaseWalletVM(app) {
 
     val burnAddress: String by lazy {
         api.getBurnAddress()
     }
 
+    val expiresFlow = flow {
+        if (nft.isDomain && !nft.isTelegramUsername && !wallet.isWatchOnly) {
+            collectiblesRepository.getDnsNftExpiring(
+                accountId = wallet.accountId,
+                testnet = wallet.testnet,
+                nftAddress = nft.address
+            )?.let { emit(it) }
+        }
+    }
+
+    fun renewDomain() {
+        val request = SignRequestEntity.Builder()
+            .setValidUntil(currentTimeSeconds() + 10 * 60)
+            .setTestnet(wallet.testnet)
+            .addMessage(DNSRenewViewModel.createMessage(nft.address))
+            .setFrom(wallet.contract.address)
+            .build(Uri.EMPTY)
+
+        viewModelScope.launch {
+            try {
+                SendTransactionScreen.run(context, wallet, request)
+                toast(Localization.renew_dns_done)
+                getNft()?.let {
+                    context.activity?.addScreenDelay(NftScreen.newInstance(wallet, it))
+                }
+                finish()
+            } catch (ignored: Throwable) { }
+        }
+    }
+
+    private fun getNft() = collectiblesRepository.getNft(wallet.id, wallet.testnet, nft.address)
+
     fun reportSpam(spam: Boolean, callback: () -> Unit) {
         viewModelScope.launch(Dispatchers.IO) {
             val state = if (spam) TokenPrefsEntity.State.SPAM else TokenPrefsEntity.State.TRUST
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/BaseOnRampScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/BaseOnRampScreen.kt
new file mode 100644
index 000000000..50905775d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/BaseOnRampScreen.kt
@@ -0,0 +1,225 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main
+
+import android.os.Bundle
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.lifecycle.lifecycleScope
+import com.tonapps.extensions.toUriOrNull
+import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.extensions.hideKeyboard
+import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.koin.walletViewModel
+import com.tonapps.tonkeeper.ui.base.WalletContextScreen
+import com.tonapps.tonkeeper.ui.screen.onramp.main.entities.ProviderEntity
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.UiState
+import com.tonapps.tonkeeper.ui.screen.onramp.main.view.ReviewInputView
+import com.tonapps.tonkeeper.ui.screen.onramp.picker.provider.OnRampProviderPickerScreen
+import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseConfirmDialog
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.icon.UIKitIcon
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.purchase.entity.OnRamp
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.doKeyboardAnimation
+import uikit.widget.HeaderView
+import uikit.widget.LoadableButton
+import uikit.widget.SlideBetweenView
+
+open class BaseOnRampScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_onramp, wallet), BaseFragment.BottomSheet {
+
+    private val confirmDialog: PurchaseConfirmDialog by lazy {
+        PurchaseConfirmDialog(requireContext())
+    }
+
+    override val viewModel: OnRampViewModel by walletViewModel()
+
+    lateinit var slidesView: SlideBetweenView
+    lateinit var reviewReceive: ReviewInputView
+    lateinit var reviewSend: ReviewInputView
+
+    private lateinit var headerView: HeaderView
+    private lateinit var nextContainerView: ViewGroup
+    lateinit var button: LoadableButton
+    private lateinit var pairNotAvailableView: AppCompatTextView
+    private lateinit var providerContainerView: ViewGroup
+    private lateinit var providerTitleView: AppCompatTextView
+    lateinit var minMaxView: AppCompatTextView
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        slidesView = view.findViewById(R.id.slides)
+
+        headerView = view.findViewById(R.id.header)
+        headerView.doOnActionClick = { finish() }
+
+        reviewReceive = view.findViewById(R.id.review_receive)
+
+        nextContainerView = view.findViewById(R.id.next_container)
+
+        button = view.findViewById(R.id.next_button)
+
+        minMaxView = view.findViewById(R.id.min_max)
+        pairNotAvailableView = view.findViewById(R.id.pair_not_available)
+        providerContainerView = view.findViewById(R.id.provider_container)
+
+        providerTitleView = view.findViewById(R.id.provider_title)
+        providerTitleView.text = getString(Localization.provider)
+
+        view.doKeyboardAnimation { offset, progress, isShowing ->
+            onKeyboardAnimation(offset, progress, isShowing)
+        }
+
+        collectFlow(viewModel.openWidgetFlow, ::openWidget)
+        collectFlow(viewModel.allowedPairFlow, ::applyAllowedPair)
+        collectFlow(viewModel.stepFlow, ::applyStep)
+        collectFlow(viewModel.buttonUiStateFlow, button::applyUiState)
+        collectFlow(viewModel.selectedProviderUiStateFlow, ::applySelectedProvider)
+        collectFlow(viewModel.minAmountFlow.map { it?.formatted }) {
+            if (it == null) {
+                minMaxView.visibility = View.GONE
+            } else {
+                minMaxView.visibility = View.VISIBLE
+                minMaxView.text = getString(Localization.min_amount, it)
+            }
+        }
+
+    }
+
+    override fun finish() {
+        super.finish()
+        hideKeyboard()
+    }
+
+    override fun onDragging() {
+        super.onDragging()
+        hideKeyboard()
+    }
+
+    private fun applyStep(step: UiState.Step) {
+        if (step == UiState.Step.Input) {
+            inputsUiState()
+            slidesView.prev()
+        } else if (step == UiState.Step.Confirm) {
+            confirmUiState()
+            slidesView.next()
+        }
+    }
+
+    private fun applySelectedProvider(state: UiState.SelectedProvider) {
+        reviewSend.setValue(state.sendFormat)
+        reviewReceive.setValue(state.receiveFormat)
+        providerTitleView.text = state.getPreviewText(requireContext())
+        providerContainerView.setOnClickListener { openProviderPicker(state) }
+        button.setOnClickListener {
+            if (slidesView.isFirst) {
+                requestAvailableProviders()
+            } else {
+                openWidget(state.selectedProvider)
+            }
+        }
+    }
+
+    private fun applyAllowedPair(allowedPair: OnRamp.AllowedPair?) {
+        pairNotAvailableView.visibility = if (allowedPair == null) View.VISIBLE else View.GONE
+    }
+
+    private fun openProviderPicker(state: UiState.SelectedProvider) {
+        hideKeyboard()
+        lifecycleScope.launch {
+            runCatching {
+                OnRampProviderPickerScreen.run(requireContext(), wallet, state)
+            }.onSuccess(viewModel::setSelectedProviderId)
+        }
+    }
+
+    open fun onKeyboardAnimation(offset: Int, progress: Float, isShowing: Boolean) {
+        nextContainerView.translationY = -offset.toFloat()
+    }
+
+    private fun inputsUiState() {
+        headerInputs()
+        providerContainerView.visibility = View.GONE
+        minMaxView.visibility = View.VISIBLE
+        button.setOnClickListener { requestAvailableProviders() }
+    }
+
+    private fun confirmUiState() {
+        providerContainerView.visibility = View.VISIBLE
+        minMaxView.visibility = View.GONE
+        headerConfirm()
+        hideKeyboard()
+    }
+
+    private fun headerInputs() {
+        headerView.setIcon(0)
+        headerView.doOnCloseClick = null
+    }
+
+    private fun headerConfirm() {
+        headerView.setIcon(UIKitIcon.ic_chevron_left_16)
+        headerView.doOnCloseClick = { viewModel.reset() }
+    }
+
+    override fun onBackPressed(): Boolean {
+        if (slidesView.isFirst) {
+            return super.onBackPressed()
+        } else {
+            viewModel.reset()
+            return false
+        }
+    }
+
+    fun requestAvailableProviders() {
+        hideKeyboard()
+        viewModel.requestAvailableProviders()
+
+        analytics?.onRampEnterAmount(
+            type = viewModel.purchaseType,
+            sellAsset = viewModel.fromForAnalytics,
+            buyAsset = viewModel.toForAnalytics,
+            countryCode = viewModel.country
+        )
+    }
+
+    private fun openWidget(provider: ProviderEntity?) {
+        if (provider == null) {
+            viewModel.reset()
+            return
+        }
+        if (viewModel.isPurchaseOpenConfirm(provider.id)) {
+            confirmDialog.show(provider) { showAgain ->
+                openWebView(provider.widgetUrl, provider.id)
+                if (!showAgain) {
+                    viewModel.disableConfirmDialog(screenContext.wallet, provider.id)
+                }
+            }
+        } else {
+            openWebView(provider.widgetUrl, provider.id)
+        }
+    }
+
+    private fun openWebView(url: String, selectedProvider: String) {
+        button.isLoading = true
+        BrowserHelper.open(requireContext(), url)
+        lifecycleScope.launch {
+            delay(3000)
+            button.isLoading = false
+        }
+
+        analytics?.onRampOpenWebview(
+            type = viewModel.purchaseType,
+            sellAsset = viewModel.fromForAnalytics,
+            buyAsset = viewModel.toForAnalytics,
+            countryCode = viewModel.country,
+            paymentMethod = viewModel.paymentMethod,
+            providerName = selectedProvider,
+            providerDomain = url.toUriOrNull()?.host ?: "unknown"
+        )
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampMerchant.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampMerchant.kt
deleted file mode 100644
index d44bab088..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampMerchant.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main
-
-import com.tonapps.wallet.api.entity.OnRampMerchantEntity
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
-
-data class OnRampMerchant(
-    val provider: PurchaseMethodEntity,
-    val entity: OnRampMerchantEntity,
-) {
-
-    val id: String
-        get() = provider.id
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampScreen.kt
index 2476f6941..c2e1fd24f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampScreen.kt
@@ -2,220 +2,183 @@ package com.tonapps.tonkeeper.ui.screen.onramp.main
 
 import android.content.Context
 import android.os.Bundle
-import android.text.SpannableStringBuilder
 import android.util.Log
 import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.text.color
-import androidx.lifecycle.lifecycleScope
-import com.tonapps.tonkeeper.extensions.hideKeyboard
-import com.tonapps.tonkeeper.koin.walletViewModel
-import com.tonapps.tonkeeper.ui.base.WalletContextScreen
-import com.tonapps.tonkeeper.ui.component.CountryFlagView
+import androidx.core.view.allViews
 import com.tonapps.tonkeeper.ui.component.PaymentTypeView
-import com.tonapps.tonkeeper.ui.screen.country.CountryPickerScreen
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.CurrencyInputState
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampConfirmState
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampCurrencyInputs
 import com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
-import com.tonapps.tonkeeper.ui.screen.onramp.main.view.ReviewInputView
-import com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.OnRampPickerScreen
-import com.tonapps.tonkeeper.ui.screen.onramp.picker.provider.OnRampProviderPickerScreen
 import com.tonapps.tonkeeperx.R
-import com.tonapps.uikit.color.textSecondaryColor
 import com.tonapps.wallet.data.account.entities.WalletEntity
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
-import com.tonapps.wallet.localization.Localization
-import kotlinx.coroutines.launch
 import uikit.base.BaseFragment
 import uikit.extensions.collectFlow
-import uikit.extensions.doKeyboardAnimation
-import uikit.widget.HeaderView
-import uikit.widget.LoadableButton
-import uikit.widget.SlideBetweenView
-import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import androidx.core.widget.NestedScrollView
 import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.helper.TwinInput
 import com.tonapps.tonkeeper.koin.remoteConfig
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampBalanceState
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampPaymentMethodState
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.UiState
 import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseScreen
 import com.tonapps.uikit.list.ListCell
-import kotlinx.coroutines.flow.filter
+import uikit.extensions.bottomBarsOffset
+import uikit.extensions.dp
 import uikit.extensions.drawable
+import uikit.extensions.reject
+import uikit.extensions.rotate180Animation
+import uikit.widget.ColumnLayout
 
-class OnRampScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_onramp, wallet), BaseFragment.BottomSheet {
+class OnRampScreen(wallet: WalletEntity): BaseOnRampScreen(wallet) {
 
     private val source: String by lazy {
         requireArguments().getString(ARG_SOURCE) ?: ""
     }
 
-    private var checkButtonRunnable: Runnable? = null
-
-    override val viewModel: OnRampViewModel by walletViewModel()
-
-    private lateinit var slidesView: SlideBetweenView
-    private lateinit var headerView: HeaderView
-    private lateinit var countryView: CountryFlagView
     private lateinit var sellInput: CurrencyInputView
     private lateinit var buyInput: CurrencyInputView
-    private lateinit var button: LoadableButton
-    private lateinit var switchView: View
     private lateinit var priceView: AppCompatTextView
-    private lateinit var reviewSend: ReviewInputView
-    private lateinit var reviewReceive: ReviewInputView
-    private lateinit var pairNotAvailableView: AppCompatTextView
-    private lateinit var providerTitleView: AppCompatTextView
-    private lateinit var paymentView: View
-    private lateinit var paymentTypeViews: List<PaymentTypeView>
+    private lateinit var priceReversedView: AppCompatTextView
+    private lateinit var paymentView: ColumnLayout
+    private lateinit var confirmPageView: NestedScrollView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.onRampOpen(viewModel.installId, source)
+        analytics?.onRampOpen(source)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        slidesView = view.findViewById(R.id.slides)
-        slidesView.doOnChange = { index ->
-            if (index == 0) {
-                viewModel.resetConfirm()
-            }
-            checkButtonDelay()
-        }
-
-        headerView = view.findViewById(R.id.header)
-        headerView.doOnCloseClick = { prev() }
-        headerView.doOnActionClick = { finish() }
-
-        countryView = view.findViewById(R.id.country)
-        countryView.setOnClickListener { pickCountry() }
+        confirmPageView = view.findViewById(R.id.confirm_page)
 
         sellInput = view.findViewById(R.id.sell_input)
         sellInput.focusWithKeyboard()
-        sellInput.doOnValueChange = { value, byUser ->
-            if (byUser) {
-                viewModel.setFromAmount(value)
+        sellInput.doOnTextChange = viewModel::updateSendInput
+        sellInput.doOnCurrencyClick = { viewModel.pickCurrency(TwinInput.Type.Send) }
+        sellInput.doOnFocusChange = { hasFocus ->
+            if (hasFocus) {
+                viewModel.updateFocusInput(TwinInput.Type.Send)
             }
-            checkButtonDelay()
         }
-        sellInput.doOnCurrencyClick = { openCurrencyPicker(true) }
 
         buyInput = view.findViewById(R.id.buy_input)
         buyInput.setValueScale(3)
         buyInput.setPrefix(CurrencyInputView.EQUALS_SIGN_PREFIX)
-        buyInput.doOnValueChange = { value, byUser ->
-            if (byUser) {
-                viewModel.setToAmount(value)
+        buyInput.doOnTextChange = viewModel::updateReceiveInput
+        buyInput.doOnCurrencyClick = { viewModel.pickCurrency(TwinInput.Type.Receive) }
+        buyInput.doOnFocusChange = { hasFocus ->
+            if (hasFocus) {
+                viewModel.updateFocusInput(TwinInput.Type.Receive)
             }
-            checkButtonDelay()
         }
-        buyInput.doOnCurrencyClick = { openCurrencyPicker(false) }
 
         priceView = view.findViewById(R.id.price)
+        priceReversedView = view.findViewById(R.id.price_reversed)
 
         reviewSend = view.findViewById(R.id.review_send)
-        reviewReceive = view.findViewById(R.id.review_receive)
+        reviewSend.setOnClickListener {
+            viewModel.reset()
+            sellInput.focusWithKeyboard()
+        }
 
-        switchView = view.findViewById(R.id.switch_button)
-        switchView.setOnClickListener { switch() }
+        reviewReceive.setOnClickListener {
+            viewModel.reset()
+            buyInput.focusWithKeyboard()
+        }
+
+        view.findViewById<View>(R.id.switch_button).setOnClickListener(::switch)
 
         paymentView = view.findViewById(R.id.payment)
 
-        button = view.findViewById(R.id.next_button)
-        button.setOnClickListener {
-            if (slidesView.isFirst) {
-                next()
+        sellInput.doOnEditorAction = { actionId ->
+            if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
+                if (sellInput.isEmpty) {
+                    buyInput.focusWithKeyboard()
+                } else if (button.isEnabled) {
+                    requestAvailableProviders()
+                } else {
+                    minMaxView.reject()
+                }
+                true
             } else {
-                viewModel.openWeb()
+                false
             }
         }
 
-        paymentTypeViews = paymentTypesViewIds.map { view.findViewById(it) }
-        for (paymentTypeView in paymentTypeViews) {
-            paymentTypeView.setOnClickListener {
-                if (viewModel.setPaymentMethod(paymentTypeView.tag.toString()) && !slidesView.isFirst) {
-                    viewModel.calculate()
+        buyInput.doOnEditorAction = { actionId ->
+            if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
+                if (buyInput.isEmpty) {
+                    sellInput.focusWithKeyboard()
+                } else if (button.isEnabled) {
+                    requestAvailableProviders()
+                } else {
+                    minMaxView.reject()
                 }
+                true
+            } else {
+                false
             }
         }
 
-        view.findViewById<View>(R.id.edit).setOnClickListener { prev() }
-
-        pairNotAvailableView = view.findViewById(R.id.pair_not_available)
-        providerTitleView = view.findViewById(R.id.provider_title)
+        collectFlow(viewModel.sendOutputCurrencyFlow, sellInput::setCurrency)
+        collectFlow(viewModel.sendOutputValueFlow, sellInput::setValue)
 
-        val nextContainerView = view.findViewById<View>(R.id.next_container)
-
-        view.doKeyboardAnimation { offset, _, _ ->
-            nextContainerView.translationY = -offset.toFloat()
+        collectFlow(viewModel.receiveOutputCurrencyFlow, buyInput::setCurrency)
+        collectFlow(viewModel.receiveOutputValueFlow, buyInput::setValue)
+        collectFlow(viewModel.sendValueFlow) {
+            sellInput.setValue(it, true)
         }
 
-        collectFlow(viewModel.currencyInputStateFlow, ::applyCurrencyInputs)
-        collectFlow(viewModel.confirmStateFlow, ::applyConfirmState)
-
-        collectFlow(viewModel.inputValuesFlow) { (sell, buy) ->
-            buyInput.setValue(buy)
-            sellInput.setValue(sell)
+        collectFlow(viewModel.inputPrefixFlow, ::applyPrefix)
+        collectFlow(viewModel.rateFormattedFlow, ::applyRateFormatted)
+        collectFlow(viewModel.balanceUiStateFlow, ::applyBalanceState)
+        collectFlow(viewModel.paymentMethodUiStateFlow, ::applyPaymentMethodState)
+        collectFlow(viewModel.requestFocusFlow) { inputType ->
+            when (inputType) {
+                TwinInput.Type.Send -> sellInput.focusWithKeyboard()
+                TwinInput.Type.Receive -> buyInput.focusWithKeyboard()
+            }
         }
 
-        collectFlow(viewModel.balanceFlow, ::applyBalanceState)
-
-        checkButtonDelay()
-    }
-
-    private fun openCurrencyPicker(send: Boolean) {
-        hideKeyboard()
-        navigation?.add(OnRampPickerScreen.newInstance(wallet, send))
-    }
-
-    private fun checkButtonDelay() {
-        checkButtonRunnable?.let {
-            slidesView.removeCallbacks(it)
+        view.findViewById<View>(R.id.edit).setOnClickListener {
+            viewModel.reset()
+            sellInput.focusWithKeyboard()
         }
-        checkButtonRunnable = Runnable { checkButton() }
-        slidesView.postDelayed(checkButtonRunnable!!, 80)
     }
 
-    private fun checkButton() {
-        if (slidesView.isFirst) {
-            button.isLoading = false
-            button.isEnabled = viewModel.isFirstButtonEnabled
+    private fun applyPrefix(inputType: TwinInput.Type) {
+        if (inputType == TwinInput.Type.Send) {
+            sellInput.setPrefix(CurrencyInputView.EQUALS_SIGN_PREFIX)
+            buyInput.setPrefix(null)
         } else {
-            button.isEnabled = viewModel.isSecondButtonEnabled
+            sellInput.setPrefix(null)
+            buyInput.setPrefix(CurrencyInputView.EQUALS_SIGN_PREFIX)
         }
     }
 
-    private fun next() {
-        hideKeyboard()
-        slidesView.next(true)
-        countryView.visibility = View.GONE
-        viewModel.calculate()
-
-        AnalyticsHelper.onRampEnterAmount(
-            installId = viewModel.installId,
-            type = viewModel.currencyInputState.purchaseType,
-            sellAsset = viewModel.currencyInputState.fromForAnalytics,
-            buyAsset = viewModel.currencyInputState.toForAnalytics,
-            countryCode = viewModel.currencyInputState.country
-        )
+    private fun switch(view: View) {
+        view.rotate180Animation()
+        viewModel.switch()
     }
 
-    private fun prev() {
-        if (!slidesView.isFirst) {
-            slidesView.prev(true)
-            countryView.visibility = View.VISIBLE
+    private fun applyRateFormatted(state: UiState.RateFormatted) {
+        if (state.from.isNullOrBlank()) {
+            priceView.visibility = View.GONE
+        } else {
+            priceView.visibility = View.VISIBLE
+            priceView.text = state.from
         }
-    }
 
-    override fun onBackPressed(): Boolean {
-        if (slidesView.isFirst) {
-            return super.onBackPressed()
+        if (state.to.isNullOrBlank()) {
+            priceReversedView.visibility = View.GONE
         } else {
-            prev()
-            return false
+            priceReversedView.visibility = View.VISIBLE
+            priceReversedView.text = state.to
         }
     }
 
-    private fun applyBalanceState(state: OnRampBalanceState) {
+    private fun applyBalanceState(state: UiState.Balance) {
         if (state.insufficientBalance) {
             sellInput.setInsufficientBalance()
         } else {
@@ -223,122 +186,63 @@ class OnRampScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_
         }
     }
 
-    private fun applyCurrencyInputs(inputs: OnRampCurrencyInputs) {
-        applyRateFormat(inputs.rateFormat)
-        countryView.setCountry(inputs.country)
-        setCurrency(sellInput, inputs.sell)
-        setCurrency(buyInput, inputs.buy)
-        applyProvider(inputs.selectedProvider, inputs.providers)
-        applyPaymentMethods(inputs.inputMerchantMethods, inputs.paymentType)
-
-        checkButtonDelay()
-    }
-
-    private fun applyRateFormat(value: CharSequence?) {
-        if (value.isNullOrBlank()) {
-            priceView.visibility = View.GONE
-        } else {
-            priceView.visibility = View.VISIBLE
-            priceView.text = value
+    private fun createPaymentTypeView(method: OnRampPaymentMethodState.Method): PaymentTypeView {
+        val view = PaymentTypeView(requireContext())
+        view.title = method.title
+        view.subtitle = method.subtitle
+        view.setIcon(method.icon)
+        view.tag = method.type
+        view.setOnClickListener {
+            viewModel.setSelectedPaymentMethod(method.type)
         }
+        view.setRounding(method.country.equals("ru", true) || !method.isCard)
+        return view
     }
 
-    private fun applyConfirmState(state: OnRampConfirmState) {
-        button.isLoading = state.loading
-        reviewSend.setValue(state.toFormat)
-        reviewReceive.setValue(state.fromFormat)
-        checkButtonDelay()
-    }
-
-    private fun applyPaymentMethods(list: List<String>, selected: String?) {
-        if (list.isEmpty()) {
+    private fun createPaymentMethodViews(methods: List<OnRampPaymentMethodState.Method>) {
+        if (methods.isEmpty()) {
             paymentView.visibility = View.GONE
-            return
-        }
-        paymentView.visibility = View.VISIBLE
-        hidePaymentMethodViews()
-        list.forEach { showPaymentMethod(it) }
-        val views = paymentTypeViews.filter { it.isVisible }
-        for ((index, view) in views.withIndex()) {
-            val position = ListCell.getPosition(views.size, index)
-            view.background = position.drawable(requireContext())
-            view.isChecked = selected.equals(view.tag.toString(), ignoreCase = true)
-        }
-    }
-
-    private fun hidePaymentMethodViews() {
-        paymentTypeViews.forEach { it.visibility = View.GONE }
-    }
-
-    private fun showPaymentMethod(id: String) {
-        for (paymentTypeView in paymentTypeViews) {
-            val type = paymentTypeView.tag.toString()
-            if (type.equals(id, ignoreCase = true)) {
-                paymentTypeView.visibility = View.VISIBLE
+            confirmPageView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                bottomMargin = 0
             }
-        }
-    }
-
-    private fun applyProvider(provider: PurchaseMethodEntity?, supportedProviders: List<PurchaseMethodEntity>) {
-        if (provider == null || supportedProviders.isEmpty()) {
-            pairNotAvailableView.visibility = View.VISIBLE
-            providerTitleView.visibility = View.GONE
             return
+        } else {
+            paymentView.visibility = View.VISIBLE
         }
-        pairNotAvailableView.visibility = View.GONE
-        providerTitleView.visibility = View.VISIBLE
-        providerTitleView.text = createProviderText(provider.title)
-        providerTitleView.setOnClickListener { pickProvider(provider, supportedProviders) }
-    }
 
-    private fun createProviderText(title: String): CharSequence {
-        val prefix = getString(Localization.provider)
-        val builder = SpannableStringBuilder(prefix)
-        builder.append(" ")
-        builder.color(requireContext().textSecondaryColor) {
-            append(title)
+        if (paymentView.childCount > 1) {
+            paymentView.removeViews(1, paymentView.childCount - 1)
         }
-        return builder
-    }
 
-    private fun pickProvider(provider: PurchaseMethodEntity, supportedProviders: List<PurchaseMethodEntity>) {
-        hideKeyboard()
-
-        lifecycleScope.launch {
-            try {
-                val newProvider = OnRampProviderPickerScreen.run(requireContext(), wallet, provider, supportedProviders)
-                if (viewModel.setProviderId(newProvider.id) && !slidesView.isFirst) {
-                    viewModel.calculate()
-                }
-            } catch (ignored: Throwable) { }
+        for ((index, method) in methods.withIndex()) {
+            val position = ListCell.getPosition(methods.size, index)
+            val view = createPaymentTypeView(method)
+            view.background = position.drawable(requireContext())
+            if (method.subtitle != null) {
+                paymentView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 76.dp))
+            } else {
+                paymentView.addView(view, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 56.dp))
+            }
         }
-    }
 
-    private fun setCurrency(view: CurrencyInputView, currency: CurrencyInputState) {
-        view.setDecimals(currency.decimals)
-        when (currency) {
-            is CurrencyInputState.TONAsset -> view.setToken(currency.token)
-            is CurrencyInputState.Fiat -> view.setCurrency(currency.currency)
-            is CurrencyInputState.Crypto -> view.setCurrency(currency.currency)
+        confirmPageView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            bottomMargin = confirmPageView.bottomBarsOffset
         }
     }
 
-    private fun pickCountry() {
-        hideKeyboard()
-        navigation?.add(CountryPickerScreen.newInstance())
-    }
-
-    private fun switch() {
-        viewModel.switch()
-        switchView.animate().rotationBy(180f).start()
+    private fun applyPaymentMethodState(state: OnRampPaymentMethodState) {
+        createPaymentMethodViews(state.methods)
+        for (view in paymentView.allViews) {
+            if (view is PaymentTypeView) {
+                view.isChecked = view.tag.equals(state.selectedType)
+            }
+        }
     }
 
     companion object {
 
         private const val ARG_SOURCE = "source"
 
-        private val paymentTypesViewIds = arrayOf(R.id.payment_cards, R.id.payment_google_pay, R.id.payment_revolut, R.id.payment_paypal)
-
         fun newInstance(context: Context, wallet: WalletEntity, source: String): BaseFragment {
             return if (context.remoteConfig?.nativeOnrmapEnabled == true) {
                 OnRampScreen(wallet).apply {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampSettings.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampSettings.kt
new file mode 100644
index 000000000..64196a39d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampSettings.kt
@@ -0,0 +1,31 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main
+
+import android.content.Context
+import com.tonapps.extensions.getParcelable
+import com.tonapps.extensions.prefs
+import com.tonapps.extensions.putParcelable
+import com.tonapps.extensions.putString
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+class OnRampSettings(context: Context) {
+
+    private companion object {
+        private const val FROM_CURRENCY_KEY = "from_currency"
+        private const val TO_CURRENCY_KEY = "to_currency"
+        private const val PAYMENT_METHOD_KEY = "payment_method"
+    }
+
+    private val prefs = context.prefs("onrmap_screen")
+
+    fun setFromCurrency(currency: WalletCurrency) = prefs.putParcelable(FROM_CURRENCY_KEY, currency)
+
+    fun getFromCurrency(): WalletCurrency? = prefs.getParcelable(FROM_CURRENCY_KEY)
+
+    fun setToCurrency(currency: WalletCurrency) = prefs.putParcelable(TO_CURRENCY_KEY, currency)
+
+    fun getToCurrency(): WalletCurrency? = prefs.getParcelable(TO_CURRENCY_KEY)
+
+    fun setPaymentMethod(method: String) = prefs.putString(PAYMENT_METHOD_KEY, method)
+
+    fun getPaymentMethod(): String? = prefs.getString(PAYMENT_METHOD_KEY, null)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampUtils.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampUtils.kt
new file mode 100644
index 000000000..4e7dd2db8
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampUtils.kt
@@ -0,0 +1,26 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main
+
+import android.content.Context
+import android.text.SpannableStringBuilder
+import androidx.core.text.color
+import com.tonapps.uikit.color.textSecondaryColor
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.localization.Localization
+
+object OnRampUtils {
+
+    fun createProviderTitle(context: Context, title: String): CharSequence {
+        return SpannableStringBuilder(context.getString(Localization.provider))
+            .append(" ")
+            .color(context.textSecondaryColor) {
+                append(title)
+            }
+    }
+
+    fun fixSymbol(value: String): String {
+        if (value.equals("USD₮", ignoreCase = true)) {
+            return "USDT"
+        }
+        return value
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampViewModel.kt
index b092fcd3b..b50b9f69e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/OnRampViewModel.kt
@@ -3,56 +3,58 @@ package com.tonapps.tonkeeper.ui.screen.onramp.main
 import android.app.Application
 import android.util.Log
 import androidx.lifecycle.viewModelScope
-import com.tonapps.blockchain.ton.extensions.equalsAddress
-import com.tonapps.extensions.toUriOrNull
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.extensions.singleValue
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
-import com.tonapps.tonkeeper.core.AnalyticsHelper
-import com.tonapps.tonkeeper.extensions.getNormalizeCountryFlow
+import com.tonapps.tonkeeper.Environment
+import com.tonapps.tonkeeper.billing.BillingManager
 import com.tonapps.tonkeeper.extensions.getProvidersByCountry
 import com.tonapps.tonkeeper.extensions.onRampDataFlow
-import com.tonapps.tonkeeper.extensions.onRampFormCurrencyFlow
-import com.tonapps.tonkeeper.extensions.providersFlow
-import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.helper.TwinInput
+import com.tonapps.tonkeeper.helper.TwinInput.Companion.opposite
 import com.tonapps.tonkeeper.manager.assets.AssetsManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.CurrencyInputState
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampBalanceState
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampConfirmState
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampCurrencyInputs
-import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampInputsState
+import com.tonapps.tonkeeper.ui.screen.onramp.main.entities.ProviderEntity
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.OnRampPaymentMethodState
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.UiState
+import com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.OnRampPickerScreen
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.BalanceEntity
 import com.tonapps.wallet.api.entity.OnRampArgsEntity
 import com.tonapps.wallet.api.entity.OnRampMerchantEntity
-import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.core.currency.CurrencyCountries
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.purchase.PurchaseRepository
-import com.tonapps.wallet.data.purchase.entity.OnRamp.AllowedPair
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
+import com.tonapps.wallet.data.purchase.entity.MerchantEntity
+import com.tonapps.wallet.data.purchase.entity.OnRamp
 import com.tonapps.wallet.data.rates.RatesRepository
-import com.tonapps.wallet.data.rates.entity.RatesEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
-import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.lastOrNull
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.single
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.math.BigDecimal
+import kotlinx.io.IOException
+import uikit.UiButtonState
+import uikit.extensions.collectFlow
 
 class OnRampViewModel(
     app: Application,
@@ -61,329 +63,403 @@ class OnRampViewModel(
     private val ratesRepository: RatesRepository,
     private val assetsManager: AssetsManager,
     private val purchaseRepository: PurchaseRepository,
-    private val tokenRepository: TokenRepository,
     private val api: API,
-    private val accountRepository: AccountRepository
+    private val accountRepository: AccountRepository,
+    private val environment: Environment,
 ): BaseWalletVM(app) {
 
-    private var requestWebViewLinkJob: Job? = null
-    private val formCurrencyFlow = purchaseRepository.onRampFormCurrencyFlow(settingsRepository)
-
-    private val onRampResultFlow = purchaseRepository
-        .onRampDataFlow(settingsRepository, api)
-
     val installId: String
         get() = settingsRepository.installId
 
-    private val _currencyInputStateFlow = MutableStateFlow(OnRampCurrencyInputs())
+    private val settings = OnRampSettings(app)
+
+    private val _sendValueFlow = MutableEffectFlow<Coins>()
+    val sendValueFlow = _sendValueFlow.asSharedFlow().filterNotNull()
+
+    private val _openWidgetFlow = MutableEffectFlow<ProviderEntity>()
+    val openWidgetFlow = _openWidgetFlow.asSharedFlow().filterNotNull()
 
-    @OptIn(FlowPreview::class)
-    val currencyInputStateFlow = _currencyInputStateFlow.asStateFlow().debounce(100)
-    val currencyInputState: OnRampCurrencyInputs
-        get() = _currencyInputStateFlow.value
+    private val _requestFocusFlow = MutableEffectFlow<TwinInput.Type?>()
+    val requestFocusFlow = _requestFocusFlow.asSharedFlow().filterNotNull()
 
-    private val _rawValuesFlow = MutableStateFlow(Pair(0.0, 0.0))
-    private val rawValuesFlow = _rawValuesFlow.asStateFlow()
-    private val rawValues: Pair<Double, Double>
-        get() = _rawValuesFlow.value
+    private var observeInputButtonEnabledJob: Job? = null
+    private var requestAvailableProvidersJob: Job? = null
 
-    private val _inputValuesFlow = MutableStateFlow(OnRampInputsState())
-    val inputValuesFlow = _inputValuesFlow.asStateFlow()
-    private val inputValues: OnRampInputsState
-        get() = _inputValuesFlow.value
+    private val _selectedProviderIdFlow = MutableStateFlow<String?>(null)
+    private val selectedProviderIdFlow = _selectedProviderIdFlow.asStateFlow()
 
-    private val _confirmStateFlow = MutableStateFlow(OnRampConfirmState())
-    val confirmStateFlow = _confirmStateFlow.asStateFlow()
+    private val _availableProvidersFlow = MutableStateFlow(OnRampMerchantEntity.Data())
+    private val availableProvidersFlow = _availableProvidersFlow.asStateFlow().filterNotNull()
 
-    private val confirmState: OnRampConfirmState
-        get() = _confirmStateFlow.value
+    private val _selectedPaymentMethodFlow = MutableStateFlow(settings.getPaymentMethod())
+    private val selectedPaymentMethodFlow = _selectedPaymentMethodFlow.asStateFlow()
 
-    val balanceFlow = combine(inputValuesFlow, currencyInputStateFlow) { (from, to), state ->
-        val balance = if (state.sell is CurrencyInputState.TONAsset) getBalanceToken(state.sell) else null
-        val remainingFormat = createRemainingFormat(balance, from)
+    private val _stepFlow = MutableStateFlow(UiState.Step.Input)
+    val stepFlow = _stepFlow.asStateFlow()
 
-        OnRampBalanceState(
-            balance = balance,
+    private val onRampDataFlow = purchaseRepository.onRampDataFlow(environment)
+
+    private val paymentMerchantsFlow = environment.countryFlow.map { purchaseRepository.getPaymentMethods() }
+
+    private val paymentMethodsFlow = paymentMerchantsFlow.map { merchants ->
+        merchants.map { it.methods }.flatten().distinctBy { it.type }.filter { it.type != "apple_pay" }
+    }.map { methods ->
+        methods.ifEmpty {
+            // If Zakhar breaks again
+            listOf(OnRamp.Method("https://tonkeeper.com/assets/onramp/payment_methods/card.png", "card"))
+        }
+    }
+
+    private val merchantsFlow = flow {
+        emit(purchaseRepository.getMerchants())
+    }
+
+    val country: String
+        get() = environment.country
+
+    val providersFlow = combine(
+        availableProvidersFlow,
+        merchantsFlow.map { list ->
+            list.associateBy { it.id }
+        }
+    ) { availableProviders, merchants ->
+        (availableProviders.items + availableProviders.suggested).mapNotNull { widget ->
+            merchants[widget.merchant]?.let { ProviderEntity(widget, it) }
+        }
+    }.flowOn(Dispatchers.IO)
+
+    private val twinInput = TwinInput(viewModelScope)
+
+    val inputPrefixFlow = twinInput.stateFlow.map { it.focus.opposite }.distinctUntilChanged()
+    val sendOutputCurrencyFlow = twinInput.stateFlow.map { it.sendCurrency }.distinctUntilChanged()
+    val receiveOutputCurrencyFlow = twinInput.stateFlow.map { it.receiveCurrency }.distinctUntilChanged()
+
+    val allowedPairFlow = combine(
+        twinInput.currenciesStateFlow,
+        onRampDataFlow.map { it.data }.distinctUntilChanged()
+    ) { (send, receive), data ->
+        data.findValidPairs(send.symbol, receive.symbol).pair
+    }.distinctUntilChanged()
+
+    val ratesFlow = twinInput.currenciesStateFlow.map { inputCurrencies ->
+        val fiatCurrency = inputCurrencies.fiat ?: settingsRepository.currency
+        val tokens = inputCurrencies.cryptoTokens.filter { it.isTONChain }.map { it.address }
+        ratesRepository.getRates(fiatCurrency, tokens)
+    }.distinctUntilChanged()
+
+    val minAmountFlow = combine(
+        twinInput.stateFlow.map { it.send }.distinctUntilChanged(),
+        allowedPairFlow.map { it?.min }.distinctUntilChanged()
+    ) { sendValue, minAmount ->
+        val coins = minAmount?.let {
+            Coins.of(it, sendValue.decimals)
+        } ?: return@combine null
+        if (!coins.isPositive) {
+            return@combine null
+        }
+        if (sendValue.coins >= coins || sendValue.coins.isZero) {
+            return@combine null
+        }
+        val formatted = CurrencyFormatter.format(sendValue.symbol, coins, replaceSymbol = false)
+        UiState.MinAmount(coins, formatted)
+    }
+
+    val rateFormattedFlow = combine(
+        twinInput.currenciesStateFlow,
+        ratesFlow
+    ) { inputCurrencies, rates ->
+        if (rates.isEmpty) {
+            return@combine UiState.RateFormatted(null, null)
+        }
+        val value = Coins.ONE
+        val firstLinePrefix = CurrencyFormatter.format(inputCurrencies.send.symbol, value, replaceSymbol = false)
+        val firstRate = rates.convert(inputCurrencies.send, value, inputCurrencies.receive)
+        val firstLineSuffix = CurrencyFormatter.format(inputCurrencies.receive.symbol, firstRate, replaceSymbol = false)
+        val firstLine = "$firstLinePrefix ≈ $firstLineSuffix"
+
+        val secondLinePrefix = CurrencyFormatter.format(inputCurrencies.receive.symbol, value, replaceSymbol = false)
+        val secondRate = rates.convert(inputCurrencies.receive, value, inputCurrencies.send)
+        val secondLineSuffix = CurrencyFormatter.format(inputCurrencies.send.symbol, secondRate, replaceSymbol = false)
+        val secondLine = "$secondLinePrefix ≈ $secondLineSuffix"
+        UiState.RateFormatted(firstLine, secondLine)
+    }.distinctUntilChanged()
+
+    private val reductionFactor = 1.03f
+    val sendOutputValueFlow = twinInput.createConvertFlow(ratesFlow, TwinInput.Type.Send, reductionFactor)
+    val receiveOutputValueFlow = twinInput.createConvertFlow(ratesFlow, TwinInput.Type.Receive, reductionFactor)
+
+    val balanceUiStateFlow = twinInput.stateFlow.map { it.send }.distinctUntilChanged().map { sendInput ->
+        val token = if (sendInput.currency.fiat) null else assetsManager.getToken(wallet, sendInput.currency.address)
+        val balance = token?.token?.balance
+        val remainingFormat = createRemainingFormat(balance, sendInput.coins)
+        UiState.Balance(
+            balance = token?.token?.balance,
             insufficientBalance = remainingFormat.second,
             remainingFormat = remainingFormat.first
         )
+    }.flowOn(Dispatchers.IO)
+
+    val selectedProviderUiStateFlow = combine(
+        providersFlow,
+        selectedProviderIdFlow
+    ) { providers, selectedProviderId ->
+        UiState.SelectedProvider(
+            send = twinInput.state.sendCurrency,
+            receive = twinInput.state.receiveCurrency,
+            providers = providers,
+            selectedProviderId = selectedProviderId,
+            sendAmount = twinInput.state.send.coins
+        )
     }
 
-    val isFirstButtonEnabled: Boolean
-        get() {
-            if (currencyInputState.allowedPair == null) {
-                return false
-            }
-            return (rawValues.first > 0 || rawValues.second > 0)
+    private val _inputButtonUiStateFlow = MutableStateFlow<UiButtonState>(UiButtonState.Default(false))
+    private val inputButtonUiStateFlow = _inputButtonUiStateFlow.asStateFlow()
+
+    private val _confirmButtonUiStateFlow = MutableStateFlow<UiButtonState>(UiButtonState.Default(true))
+    val confirmButtonUiStateFlow = _confirmButtonUiStateFlow.asStateFlow()
+
+    val buttonUiStateFlow = combine(
+        stepFlow,
+        inputButtonUiStateFlow,
+        confirmButtonUiStateFlow,
+    ) { step, inputButton, confirmButton ->
+        if (step == UiState.Step.Input) {
+            inputButton
+        } else {
+            confirmButton
+        }
+    }.distinctUntilChanged()
+
+    val paymentMethodUiStateFlow = combine(
+        selectedPaymentMethodFlow,
+        paymentMethodsFlow,
+        environment.countryFlow,
+        twinInput.stateFlow.map { it.receiveCurrency }.filterNotNull()
+    ) { selectedType, methods, country, receiveCurrency ->
+        if (receiveCurrency.fiat) {
+            OnRampPaymentMethodState(
+                selectedType = selectedType,
+                methods = emptyList()
+            )
+        } else {
+            OnRampPaymentMethodState(
+                selectedType = selectedType,
+                methods = methods.map {
+                    OnRampPaymentMethodState.createMethod(context, it, country)
+                }.sortedBy { method ->
+                    val index = OnRampPaymentMethodState.sortKeys.indexOf(method.type)
+                    if (index == -1) Int.MAX_VALUE else index
+                }
+            )
         }
+    }.distinctUntilChanged()
 
-    val isSecondButtonEnabled: Boolean
-        get() {
-            if (!isFirstButtonEnabled) {
-                return false
-            }
-            return !confirmState.unavailable
+    val purchaseType: String
+        get() = if (twinInput.state.sendCurrency.fiat) "buy" else "sell"
+
+    var network: String = "native"
+
+    val from: String
+        get() = OnRampUtils.fixSymbol(twinInput.state.sendCurrency.symbol)
+
+    val to: String
+        get() = OnRampUtils.fixSymbol(twinInput.state.receiveCurrency.symbol)
+
+    val fromForAnalytics: String
+        get() = if (twinInput.state.sendCurrency.fiat) {
+            "fiat"
+        } else {
+            "crypto_$from"
+        }
+
+    val toForAnalytics: String
+        get() = if (twinInput.state.receiveCurrency.fiat) {
+            "fiat"
+        } else {
+            "crypto_$to"
         }
 
+    val paymentMethod: String
+        get() = _selectedPaymentMethodFlow.value ?: "unknown"
+
     init {
-        settingsRepository.countryFlow.collectFlow(::setCountry)
+        applyDefaultCurrencies()
+        applyNetworkObserver()
+        applyOverValueObserver()
+        applyDefaultAmountObserver()
+        startObserveInputButtonEnabled()
+
         combine(
-            formCurrencyFlow,
-            onRampResultFlow,
-        ) { (send, receive), onRampResult ->
-            val onRampData = onRampResult.data
-            val providers = purchaseRepository.getProvidersByCountry(wallet, settingsRepository, onRampResult.country)
-            val sendInputState = createCurrencyInputState(send)
-            val receiveInputState = createCurrencyInputState(receive)
-            val rates = requestRates(sendInputState, receiveInputState)
-            val allowedPair = if (send.fiat && receive.fiat) null else onRampData.isValidPair(OnRampCurrencyInputs.fixSymbol(send.code), OnRampCurrencyInputs.fixSymbol(receive.code))
-            val allowedProviderIds = allowedPair?.merchants?.map { it.slug } ?: emptyList()
-            val selectedProviderId = allowedProviderIds.firstOrNull()
-            _currencyInputStateFlow.value = OnRampCurrencyInputs(
-                country = onRampResult.country,
-                sell = sendInputState,
-                buy = receiveInputState,
-                providers = providers.filter { allowedProviderIds.contains(it.id) },
-                rates = rates,
-                selectedProviderId = selectedProviderId,
-                allowedPair = allowedPair,
-                merchants = onRampData.merchants.filter { allowedProviderIds.contains(it.slug) },
-                availableFiatSlugs = onRampData.availableFiatSlugs,
-            )
+            _selectedPaymentMethodFlow.filter { it == null },
+            paymentMethodsFlow.filter { it.isNotEmpty() }
+        ) { _, methods ->
+            val hasCard = methods.any { it.type.equals(OnRampPaymentMethodState.CARD_TYPE, true) }
+            if (hasCard) {
+                setSelectedPaymentMethod(OnRampPaymentMethodState.CARD_TYPE)
+            } else {
+                setSelectedPaymentMethod(methods.first().type)
+            }
         }.launch()
+    }
 
-        combine(currencyInputStateFlow, rawValuesFlow) { state, values ->
-            if (state.allowedPair == null) {
-                _inputValuesFlow.value = OnRampInputsState(
-                    from = Coins.of(values.first, state.sellDecimals),
-                    to = Coins.of(values.second, state.buyDecimals)
-                )
-            } else if (values.second == 0.0) {
-                val coins = Coins.of(values.first, state.sellDecimals)
-                if (state.sell.isUSD && state.buy.isUSDT) {
-                    _inputValuesFlow.value = OnRampInputsState(
-                        from = coins,
-                        to = coins
-                    )
-                } else {
-                    _inputValuesFlow.value = OnRampInputsState(
-                        from = coins,
-                        to = state.rateConvert(coins, false)
-                    )
-                }
-            } else {
-                val coins = Coins.of(values.second, state.buyDecimals)
-                if (state.sell.isUSD && state.buy.isUSDT) {
-                    _inputValuesFlow.value = OnRampInputsState(
-                        from = coins,
-                        to = coins
-                    )
+    private fun applyOverValueObserver() {
+        combine(
+            providersFlow.filter { it.isNotEmpty() }.distinctUntilChanged(),
+            selectedProviderIdFlow.filterNotNull().distinctUntilChanged()
+        ) { providers, selectedProviderId ->
+            providers.find { it.id == selectedProviderId }
+        }.filter { provider ->
+            provider != null && provider.minAmount > 0
+        }.filterNotNull().onEach { provider ->
+            val minValue = Coins.of(provider.minAmount, twinInput.state.send.decimals)
+            if (twinInput.state.send.fiat && minValue > twinInput.state.send.coins) {
+                forceProvider(provider.id, minValue)
+            } else if (!twinInput.state.send.fiat) {
+                val balance = balanceUiStateFlow.singleValue()?.balance?.value
+                if (balance != null && minValue > balance) {
+                    toast(Localization.insufficient_balance_title)
                 } else {
-                    _inputValuesFlow.value = OnRampInputsState(
-                        from = state.rateConvert(coins, true),
-                        to = coins
-                    )
+                    forceProvider(provider.id, minValue)
                 }
             }
-        }.flowOn(Dispatchers.IO).launch()
+        }.launch()
+    }
 
+    private fun forceProvider(id: String, value: Coins) {
+        forceSendValue(value)
+        setSelectedProviderId(id)
+        requestAvailableProviders()
+    }
+
+    private fun applyDefaultAmountObserver() {
         combine(
-            currencyInputStateFlow,
-            inputValuesFlow
-        ) { inputs, values ->
-            val toFormat = CurrencyFormatter.format(inputs.from, values.from, replaceSymbol = false)
-            val fromFormat = CurrencyFormatter.format(inputs.to, values.to, replaceSymbol = false)
-
-            _confirmStateFlow.update {
-                it.copy(
-                    fromFormat = fromFormat,
-                    toFormat = toFormat
-                )
+            allowedPairFlow.map {
+                com.tonapps.wallet.data.purchase.OnRampUtils.smartRoundUp(it?.min ?: 0.0)
+            }.distinctUntilChanged(),
+            balanceUiStateFlow.map { it.balance?.value },
+        ) { minAmount, tokenBalance ->
+            val min = Coins.of(minAmount, twinInput.state.send.decimals)
+            val currentValue = twinInput.state.send.coins
+            if (twinInput.state.send.currency.fiat && (currentValue.isZero || min > currentValue)) {
+                min
+            } else if (tokenBalance != null && tokenBalance >= min) {
+                min
+            } else {
+                null
             }
-        }.launch()
+        }.filterNotNull().distinctUntilChanged().onEach(::forceSendValue).launch()
     }
 
-    private suspend fun createCurrencyInputState(currency: WalletCurrency = WalletCurrency.USD): CurrencyInputState {
-        if (currency.fiat) {
-            return CurrencyInputState.Fiat(currency)
-        }
-        val chain = currency.chain
-        if (chain is WalletCurrency.Chain.TON) {
-            val token = tokenRepository.getToken(
-                accountId = wallet.accountId,
-                testnet = wallet.testnet,
-                tokenAddress = chain.address
-            ) ?: return createCurrencyInputState()
-
-            return CurrencyInputState.TONAsset(token)
-        } else {
-            return CurrencyInputState.Crypto(currency)
-        }
+    private fun forceSendValue(coins: Coins) {
+        twinInput.updateValue(TwinInput.Type.Send, Coins.string(coins))
+        _sendValueFlow.tryEmit(coins)
     }
 
-    fun calculate() {
-        _confirmStateFlow.update {
-            it.copy(
-                loading = true,
-                unavailable = false,
-            )
-        }
-        requestWebViewLink()
+    private fun applyNetworkObserver() {
+        combine(
+            twinInput.stateFlow,
+            onRampDataFlow.map { it.data }
+        ) { state, data ->
+            network = data.resolveNetwork(true, state.sendCurrency) ?: data.resolveNetwork(false, state.receiveCurrency) ?: "native"
+        }.launch()
     }
 
-    private suspend fun requestWebViewLinkArg(): OnRampArgsEntity {
-        var walletAddress = ""
-        if (currencyInputState.isTON) {
-            walletAddress = wallet.address
-        } else if (currencyInputState.isTron) {
-            walletAddress = accountRepository.getTronAddress(wallet.id) ?: ""
+    fun updateFocusInput(type: TwinInput.Type) {
+        twinInput.updateFocus(type)
+    }
+
+    fun updateSendCurrency(currency: WalletCurrency, saveSettings: Boolean = true) {
+        twinInput.updateCurrency(TwinInput.Type.Send, currency)
+        if (saveSettings) {
+            settings.setFromCurrency(currency)
         }
-        val args = OnRampArgsEntity(
-            from = currencyInputState.from,
-            to = currencyInputState.to,
-            network = currencyInputState.type,
-            wallet = walletAddress,
-            purchaseType = currencyInputState.purchaseType,
-            amount = inputValues.from,
-            country = currencyInputState.country,
-            paymentMethod = currencyInputState.paymentType
-        )
+    }
 
-        return args
+    fun updateSendInput(amount: String) {
+        twinInput.updateValue(TwinInput.Type.Send, amount)
     }
 
-    private fun requestWebViewLink() {
-        requestWebViewLinkJob?.cancel()
-        requestWebViewLinkJob = viewModelScope.launch {
-            val arg = requestWebViewLinkArg()
-            val items = api.calculateOnRamp(arg)
-            val selectedProvider = currencyInputState.selectedProvider
-            if (selectedProvider == null) {
-                setConfirmUnavailable()
-                return@launch
-            }
-            val sortMerchants = items.map { it.merchant }
-            val item = items.firstOrNull {
-                it.merchant.equals(selectedProvider.id, ignoreCase = true)
-            } ?: items.firstOrNull()
-
-            if (item == null) {
-                setConfirmUnavailable()
-                return@launch
-            }
+    fun updateReceiveInput(amount: String) {
+        twinInput.updateValue(TwinInput.Type.Receive, amount)
+    }
 
-            _currencyInputStateFlow.update { state ->
-                state.copy(
-                    selectedProviderId = item.merchant
-                )
-            }
+    fun updateReceiveCurrency(currency: WalletCurrency) {
+        twinInput.updateCurrency(TwinInput.Type.Receive, currency)
+        settings.setToCurrency(currency)
+    }
 
-            val coins = Coins.of(item.amount)
+    fun switch() {
+        twinInput.switch()
+        settings.setToCurrency(twinInput.state.receiveCurrency)
+        settings.setFromCurrency(twinInput.state.sendCurrency)
+    }
 
-            _confirmStateFlow.update {
-                it.copy(
-                    loading = false,
-                    unavailable = false,
-                    fromFormat = CurrencyFormatter.format(currencyInputState.to, coins, replaceSymbol = false),
-                    webViewLink = item.widgetUrl
-                )
-            }
+    fun reset() {
+        cancelRequestAvailableProviders()
+        startObserveInputButtonEnabled()
+        _stepFlow.value = UiState.Step.Input
+    }
 
-            if (sortMerchants.size > 1) {
-                _currencyInputStateFlow.update { state ->
-                    val providers = state.providers
-                        .filter { provider ->
-                            sortMerchants.any { it.equals(provider.id, ignoreCase = true) }
-                        }
-                        .sortedBy { provider ->
-                            sortMerchants.indexOfFirst { it.equals(provider.id, ignoreCase = true) }
-                        }
-
-                    val selectedProviderId = if (providers.any {
-                        it.id.equals(state.selectedProviderId, ignoreCase = true)
-                    }) {
-                        state.selectedProviderId
-                    } else {
-                        providers.firstOrNull()?.id
-                    }
-
-                    state.copy(
-                        providers = providers,
-                        selectedProviderId = selectedProviderId
-                    )
-                }
+    private fun startObserveInputButtonEnabled() {
+        cancelObserveInputButtonEnabled()
+        observeInputButtonEnabledJob = combine(
+            balanceUiStateFlow,
+            allowedPairFlow,
+            twinInput.stateFlow,
+            minAmountFlow.map { it?.amount ?: Coins.ZERO }.distinctUntilChanged(),
+        ) { balance, pair, inputs, minAmount ->
+            if (inputs.isEmpty || pair == null) {
+                UiButtonState.Default(false)
+            } else if (minAmount > inputs.send.coins) {
+                UiButtonState.Default(false)
+            } else if (inputs.sendCurrency.isTONChain || inputs.sendCurrency.isTronChain) {
+                UiButtonState.Default(balance.balance != null && balance.balance.value.isPositive && !balance.insufficientBalance)
+            } else {
+                UiButtonState.Default(true)
             }
+        }.distinctUntilChanged().collectFlow {
+            _inputButtonUiStateFlow.value = it
         }
     }
 
-    private fun setConfirmUnavailable() {
-        _confirmStateFlow.update {
-            it.copy(
-                loading = false,
-                unavailable = true
-            )
-        }
+    private fun cancelObserveInputButtonEnabled() {
+        observeInputButtonEnabledJob?.cancel()
+        observeInputButtonEnabledJob = null
     }
 
-    fun resetConfirm() {
-        _confirmStateFlow.update {
-            it.copy(
-                loading = false,
-                unavailable = false,
-            )
-        }
-
-        requestWebViewLinkJob?.cancel()
-        requestWebViewLinkJob = null
+    private fun currencyByCountry(): WalletCurrency {
+        val code = CurrencyCountries.getCurrencyCode(environment.country)
+        return WalletCurrency.ofOrDefault(code)
     }
 
-    fun openWeb() {
-        val confirmState = confirmStateFlow.value
-        val webViewLink = confirmState.webViewLink?.toUriOrNull() ?: return
-        BrowserHelper.open(context, webViewLink)
-
-        AnalyticsHelper.onRampOpenWebview(
-            installId = installId,
-            type = currencyInputState.purchaseType,
-            sellAsset = currencyInputState.fromForAnalytics,
-            buyAsset = currencyInputState.toForAnalytics,
-            countryCode = currencyInputState.country,
-            paymentMethod = currencyInputState.paymentType ?: "unknown",
-            providerName = currencyInputState.selectedProvider?.title ?: "unknown",
-            providerDomain = webViewLink.host ?: "unknown"
-        )
+    private fun applyDefaultCurrencies() {
+        val fromCurrency = settings.getFromCurrency()
+        updateSendCurrency(fromCurrency ?: currencyByCountry(), fromCurrency != null)
+        updateReceiveCurrency(settings.getToCurrency() ?: WalletCurrency.TON)
     }
 
-    fun setProviderId(providerId: String): Boolean {
-        if (providerId.equals(currencyInputState.selectedProviderId, ignoreCase = true)) {
-            return false
-        }
-        _currencyInputStateFlow.update {
-            it.copy(
-                selectedProviderId = providerId,
-            )
-        }
-        return true
-    }
-
-    fun setPaymentMethod(id: String): Boolean {
-        if (currencyInputState.paymentType.equals(id, ignoreCase = true)) {
-            return false
-        }
-        _currencyInputStateFlow.update {
-            it.copy(
-                paymentType = id,
+    fun pickCurrency(forType: TwinInput.Type) = viewModelScope.launch {
+        runCatching {
+            OnRampPickerScreen.run(
+                context = context,
+                wallet = wallet,
+                currency = twinInput.getCurrency(forType),
+                send = forType == TwinInput.Type.Send
             )
+        }.onSuccess { currency ->
+            if (currency == twinInput.state.getCurrency(forType)) {
+                return@onSuccess
+            } else if (twinInput.state.hasCurrency(currency)) {
+                _requestFocusFlow.tryEmit(forType)
+                switch()
+            } else if (forType == TwinInput.Type.Send) {
+                _requestFocusFlow.emit(twinInput.state.focus)
+                updateSendCurrency(currency)
+            } else if (forType == TwinInput.Type.Receive) {
+                _requestFocusFlow.emit(twinInput.state.focus)
+                updateReceiveCurrency(currency)
+            }
         }
-        return true
-    }
-
-    private suspend fun getBalanceToken(currency: CurrencyInputState.TONAsset): BalanceEntity? {
-        val tokens = assetsManager.getTokens(wallet, settingsRepository.currency, false)
-        val token = tokens.firstOrNull {
-            it.address.equalsAddress(currency.address)
-        } ?: return null
-        return token.token.balance
     }
 
     private fun createRemainingFormat(balance: BalanceEntity?, value: Coins): Pair<CharSequence?, Boolean> {
@@ -398,49 +474,99 @@ class OnRampViewModel(
         return Pair(format, remaining.isNegative)
     }
 
-    private suspend fun requestRates(
-        send: CurrencyInputState,
-        receive: CurrencyInputState
-    ): RatesEntity = withContext(Dispatchers.IO) {
-        val walletCurrency = CurrencyInputState.findWalletCurrency(send, receive) ?: settingsRepository.currency
-        val token = CurrencyInputState.findToken(send, receive) ?: TokenEntity.TON
-        ratesRepository.getRates(walletCurrency, token.address)
+    private suspend fun requestWebViewLinkArg(paymentMethod: String?): OnRampArgsEntity {
+        var walletAddress = ""
+        if (twinInput.state.hasTonChain) {
+            walletAddress = wallet.address
+        } else if (twinInput.state.hasTronChain) {
+            walletAddress = accountRepository.getTronAddress(wallet.id) ?: ""
+        }
+
+        return OnRampArgsEntity(
+            from = from,
+            to = to,
+            network = network,
+            wallet = walletAddress.trim(),
+            purchaseType = purchaseType,
+            amount = twinInput.state.send.coins,
+            paymentMethod = paymentMethod
+        )
+    }
+
+    private fun cancelRequestAvailableProviders() {
+        requestAvailableProvidersJob?.cancel()
+        requestAvailableProvidersJob = null
     }
 
-    fun setFromAmount(value: Double) {
-        _rawValuesFlow.update {
-            it.copy(value, 0.0)
+    private fun setLoading(loading: Boolean) {
+        if (_stepFlow.value == UiState.Step.Input && loading) {
+            _inputButtonUiStateFlow.value = UiButtonState.Loading
+        } else if (_stepFlow.value == UiState.Step.Confirm && loading) {
+            _confirmButtonUiStateFlow.value = UiButtonState.Loading
+        } else if (_stepFlow.value == UiState.Step.Confirm) {
+            _confirmButtonUiStateFlow.value = UiButtonState.Default(true)
         }
     }
 
-    fun setToAmount(value: Double) {
-        _rawValuesFlow.update {
-            it.copy(0.0, value)
+    fun requestAvailableProviders(selectedPaymentMethod: String? = _selectedPaymentMethodFlow.value) {
+        if (twinInput.state.isEmpty) {
+            return
+        }
+
+        cancelRequestAvailableProviders()
+        cancelObserveInputButtonEnabled()
+        setLoading(true)
+
+        requestAvailableProvidersJob = collectFlow(
+            paymentMethodsFlow.take(1)
+        ) { paymentMethods ->
+            try {
+                if (paymentMethods.isEmpty()) {
+                    throw IOException("No payment methods available")
+                }
+                val args = requestWebViewLinkArg(selectedPaymentMethod)
+                val availableProviders = api.calculateOnRamp(args)
+                if (availableProviders.isEmpty) {
+                    throw IOException("No providers available for the selected payment method")
+                } else if (paymentMethods.size == 1 && availableProviders.size == 1) {
+                    val provider = availableProviders.items.first()
+                    val merchants = purchaseRepository.getMerchants()
+                    val method = merchants.find { it.id == provider.merchant } ?: throw IOException("No merchant found for provider: ${provider.merchant}")
+                    _openWidgetFlow.tryEmit(ProviderEntity(
+                        widget = provider,
+                        details = method
+                    ))
+                } else {
+                    _availableProvidersFlow.value = availableProviders
+                    _stepFlow.value = UiState.Step.Confirm
+                    setLoading(false)
+                }
+            } catch (ignored: CancellationException) { } catch (e: Exception) {
+                toast(Localization.unknown_error)
+                reset()
+            }
         }
     }
 
-    fun switch() {
-        val currentSend = purchaseRepository.sendCurrency ?: WalletCurrency.TON
-        val currentReceive = purchaseRepository.receiveCurrency
+    fun setSelectedProviderId(id: String?) {
+        _selectedProviderIdFlow.value = id
+    }
 
-        purchaseRepository.sendCurrency = currentReceive
-        purchaseRepository.receiveCurrency = currentSend
+    fun isPurchaseOpenConfirm(providerId: String) = settingsRepository.isPurchaseOpenConfirm(wallet.id, providerId)
 
-        _inputValuesFlow.update {
-            it.copy(
-                from = it.to,
-                to = it.from
-            )
-        }
+    fun disableConfirmDialog(wallet: WalletEntity, providerId: String) {
+        settingsRepository.disablePurchaseOpenConfirm(wallet.id, providerId)
     }
 
-    fun setCountry(country: String) {
-        _currencyInputStateFlow.update {
-            it.copy(country = country)
-        }
+    fun setSelectedPaymentMethod(type: String) {
+        _selectedPaymentMethodFlow.value = type
+        requestAvailableProviders(type)
+        settings.setPaymentMethod(type)
     }
 
-    private companion object {
-        private val epsilon = BigDecimal("0.0009")
+    override fun onCleared() {
+        super.onCleared()
+        cancelRequestAvailableProviders()
+        cancelObserveInputButtonEnabled()
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/entities/ProviderEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/entities/ProviderEntity.kt
new file mode 100644
index 000000000..a8a9777fa
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/entities/ProviderEntity.kt
@@ -0,0 +1,35 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main.entities
+
+import android.os.Parcelable
+import com.tonapps.icu.Coins
+import com.tonapps.wallet.api.entity.OnRampMerchantEntity
+import com.tonapps.wallet.data.purchase.entity.MerchantEntity
+import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ProviderEntity(
+    val id: String,
+    val receive: Double,
+    val title: String,
+    val iconUrl: String,
+    val widgetUrl: String,
+    val buttons: List<MerchantEntity.Button>,
+    val description: String? = null,
+    val minAmount: Double
+): Parcelable {
+
+    constructor(
+        widget: OnRampMerchantEntity,
+        details: MerchantEntity
+    ) : this(
+        id = details.id,
+        receive = widget.amount,
+        title = details.title,
+        iconUrl = details.image,
+        widgetUrl = widget.widgetUrl,
+        buttons = details.buttons,
+        description = details.description,
+        minAmount = widget.minAmount
+    )
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/CurrencyInputState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/CurrencyInputState.kt
deleted file mode 100644
index 44887bc0a..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/CurrencyInputState.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-import com.tonapps.tonkeeper.core.entities.AssetsEntity
-import com.tonapps.wallet.api.entity.TokenEntity
-import com.tonapps.wallet.data.core.currency.WalletCurrency
-
-sealed class CurrencyInputState(
-    val decimals: Int,
-    val address: String,
-    val symbol: String,
-    val fiat: Boolean,
-    val chain: String,
-    val network: String,
-) {
-    data class Fiat(
-        val currency: WalletCurrency
-    ) : CurrencyInputState(currency.decimals, currency.code, currency.code, currency.fiat, currency.chain.name, "fiat")
-
-    data class TONAsset(
-        val token: TokenEntity,
-    ) : CurrencyInputState(token.decimals, token.address, token.symbol, false, "TON", if (token.isTon) "native" else "jetton")
-
-    data class Crypto(
-        val currency: WalletCurrency
-    ) : CurrencyInputState(currency.decimals, currency.code, currency.code, currency.fiat, currency.chain.name, "crypto")
-
-    val isUSD: Boolean
-        get() = fiat && symbol.equals("USD", ignoreCase = true)
-
-    val isUSDT: Boolean
-        get() = !fiat && OnRampCurrencyInputs.fixSymbol(symbol).equals("USDT", ignoreCase = true)
-
-    val type: String
-        get() {
-            if (fiat) {
-                return "fiat"
-            } else if (symbol.equals("TON", ignoreCase = true)) {
-                return "native"
-            }
-            return when (chain.lowercase()) {
-                "etc", "erc-20" -> "erc-20"
-                "ton", "jetton" -> "jetton"
-                "tron", "trc-20" -> "trc-20"
-                "sol", "spl" -> "spl"
-                "bnb", "bep-20" -> "bep-20"
-                "avalanche" -> "avalanche"
-                "arbitrum" -> "arbitrum"
-                else -> "native"
-            }
-        }
-
-    val isTON: Boolean
-        get() = !fiat && (symbol.equals("TON", ignoreCase = true) || type.equals("jetton", ignoreCase = true))
-
-    val isTron: Boolean
-        get() = !fiat && (symbol.equals("TRON", ignoreCase = true) || type.equals("trc-20", ignoreCase = true))
-
-    companion object {
-
-        fun of(assets: AssetsEntity): CurrencyInputState {
-            return when (assets) {
-                is AssetsEntity.Token -> TONAsset(assets.token.token)
-                is AssetsEntity.Currency -> Fiat(assets.currency)
-                else -> throw IllegalArgumentException("Unknown assets type: ${assets::class.java}")
-            }
-        }
-
-        fun findWalletCurrency(vararg states: CurrencyInputState): WalletCurrency? {
-            for (state in states) {
-                if (state is Fiat) {
-                    return state.currency
-                }
-            }
-            return null
-        }
-
-        fun findToken(vararg states: CurrencyInputState): TokenEntity? {
-            for (state in states) {
-                if (state is TONAsset) {
-                    return state.token
-                }
-            }
-            return null
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/InputState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/InputState.kt
deleted file mode 100644
index 3b40d06a1..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/InputState.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-import com.tonapps.icu.Coins
-import com.tonapps.wallet.api.entity.TokenEntity
-import com.tonapps.wallet.data.core.currency.WalletCurrency
-
-data class InputState(
-    val currency: CurrencyInputState,
-    val value: Coins
-) {
-
-    val decimals: Int
-        get() = currency.decimals
-
-    val symbol: String
-        get() = currency.symbol
-
-    val address: String
-        get() = currency.address
-
-    val fiat: Boolean
-        get() = currency.fiat
-
-    companion object {
-
-        fun create(fiat: WalletCurrency): InputState {
-            val currency = CurrencyInputState.Fiat(fiat)
-            return InputState(currency, Coins.ZERO)
-        }
-
-        fun create(token: TokenEntity = TokenEntity.TON): InputState {
-            val currency = CurrencyInputState.TONAsset(token)
-            return InputState(currency, Coins.ZERO)
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampBalanceState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampBalanceState.kt
deleted file mode 100644
index 907c67d34..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampBalanceState.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-import com.tonapps.wallet.api.entity.BalanceEntity
-
-data class OnRampBalanceState(
-    val balance: BalanceEntity? = null,
-    val insufficientBalance: Boolean = false,
-    val remainingFormat: CharSequence? = null
-)
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampConfirmState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampConfirmState.kt
deleted file mode 100644
index 4f37a83a8..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampConfirmState.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-data class OnRampConfirmState(
-    val fromFormat: CharSequence = "",
-    val toFormat: CharSequence = "",
-    val loading: Boolean = false,
-    val unavailable: Boolean = false,
-    val webViewLink: String? = null
-)
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampCurrencyInputs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampCurrencyInputs.kt
deleted file mode 100644
index 2ff459434..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampCurrencyInputs.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-import com.tonapps.icu.Coins
-import com.tonapps.icu.CurrencyFormatter
-import com.tonapps.wallet.api.entity.BalanceEntity
-import com.tonapps.wallet.api.entity.TokenEntity
-import com.tonapps.wallet.data.core.currency.WalletCurrency
-import com.tonapps.wallet.data.purchase.entity.OnRamp
-import com.tonapps.wallet.data.purchase.entity.OnRamp.AllowedPair
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
-import com.tonapps.wallet.data.rates.entity.RatesEntity
-
-data class OnRampCurrencyInputs(
-    val country: String = "UAE",
-    val sell: CurrencyInputState = CurrencyInputState.Fiat(WalletCurrency.USD),
-    val buy: CurrencyInputState = CurrencyInputState.Fiat(WalletCurrency.TON),
-    val providers: List<PurchaseMethodEntity> = emptyList(),
-    val rates: RatesEntity = RatesEntity.empty(WalletCurrency.TON),
-    val switch: Boolean = false,
-    val selectedProviderId: String? = null,
-    val allowedPair: AllowedPair? = null,
-    val merchants: List<OnRamp.Merchant> = emptyList(),
-    val paymentType: String? = null,
-    val availableFiatSlugs: List<String> = emptyList()
-) {
-
-    companion object {
-
-        private val supportedMethods = listOf("card", "google_pay", "revolut_pay", "paypal")
-
-        fun fixSymbol(value: String): String {
-            if (value.equals("USD₮", ignoreCase = true)) {
-                return "USDT"
-            }
-            return value
-        }
-
-        private fun fixMethods(values: List<String>): List<String> {
-            return values.filter { supportedMethods.contains(it)  }
-        }
-    }
-
-    val sellDecimals: Int
-        get() = sell.decimals
-
-    val buyDecimals: Int
-        get() = buy.decimals
-
-    val from: String
-        get() = fixSymbol(sell.symbol)
-
-    val to: String
-        get() = fixSymbol(buy.symbol)
-
-    val isTON: Boolean
-        get() = sell.isTON || buy.isTON
-
-    val isTron: Boolean
-        get() = sell.isTron || buy.isTron
-
-    val fromForAnalytics: String
-        get() = if (sell.fiat) {
-            "fiat"
-        } else {
-            "crypto_$from"
-        }
-
-    val toForAnalytics: String
-        get() = if (buy.fiat) {
-            "fiat"
-        } else {
-            "crypto_$to"
-        }
-
-    val selectedProvider: PurchaseMethodEntity? by lazy {
-        providers.find { it.id.equals(selectedProviderId, ignoreCase = true) }
-    }
-
-    val hasProvider: Boolean by lazy {
-        selectedProvider != null && providers.isNotEmpty()
-    }
-
-    val inputMerchantMethods: List<String> by lazy {
-        if (!sell.fiat) {
-            return@lazy emptyList()
-        }
-        val providerId = selectedProviderId ?: return@lazy emptyList<String>()
-        val merchant = merchants.firstOrNull {
-            it.slug.equals(providerId, ignoreCase = true)
-        } ?: return@lazy emptyList<String>()
-        fixMethods(merchant.inputMethods)
-    }
-
-    val outputMerchantMethods: List<String> by lazy {
-        val providerId = selectedProviderId ?: return@lazy emptyList<String>()
-        val merchant = merchants.firstOrNull {
-            it.slug.equals(providerId, ignoreCase = true)
-        } ?: return@lazy emptyList<String>()
-        fixMethods(merchant.outputMethods)
-    }
-
-    val network: String
-        get() {
-            val network = sell.network
-            if (network.equals("fiat", ignoreCase = true)) {
-                return buy.network
-            }
-            return network
-        }
-
-    val type: String
-        get() {
-            if (sell.fiat) {
-                return buy.type
-            }
-            return sell.type
-        }
-
-    val purchaseType: String
-        get() = if (sell.fiat) "buy" else "sell"
-
-    val rateFormat: CharSequence? by lazy {
-        if (allowedPair == null || (sell.fiat && buy.fiat)) {
-            return@lazy null
-        }
-        if ((sell.isUSD && buy.isUSDT) || (sell.isUSDT && buy.isUSD)) {
-            val from = CurrencyFormatter.format("USD", Coins.ONE)
-            val to = CurrencyFormatter.format("USDT", Coins.ONE)
-            "$from ≈ $to"
-        } else {
-            val token = CurrencyInputState.findToken(sell, buy) ?: return@lazy null
-
-            val from = if (sell.fiat) CurrencyFormatter.formatFiat(rates.currencyCode, Coins.ONE) else CurrencyFormatter.format(token.symbol, Coins.ONE)
-            val price = if (sell.fiat) rates.convertFromFiat(token.address, Coins.ONE) else rates.convert(token.address, Coins.ONE)
-            val to = if (sell.fiat) CurrencyFormatter.format(token.symbol, price) else CurrencyFormatter.formatFiat(rates.currency.code, price)
-            "$from ≈ $to"
-        }
-    }
-
-    fun rateConvert(amount: Coins, reverse: Boolean): Coins {
-        return if (reverse) {
-            if (sell.fiat) {
-                rates.convert(buy.address, amount).setScale(buy.decimals)
-            } else {
-                rates.convertFromFiat(sell.address, amount).setScale(sell.decimals)
-            }
-        } else {
-            if (sell.fiat) {
-                rates.convertFromFiat(buy.address, amount).setScale(buy.decimals)
-            } else {
-                rates.convert(sell.address, amount).setScale(sell.decimals)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampInputsState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampInputsState.kt
deleted file mode 100644
index bae4819ee..000000000
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampInputsState.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.tonapps.tonkeeper.ui.screen.onramp.main.state
-
-import com.tonapps.icu.Coins
-
-data class OnRampInputsState(
-    val from: Coins = Coins.ZERO,
-    val to: Coins = Coins.ZERO,
-) {
-
-    val isEmpty: Boolean
-        get() = from.isZero && to.isZero
-}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampPaymentMethodState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampPaymentMethodState.kt
new file mode 100644
index 000000000..32c36828d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/OnRampPaymentMethodState.kt
@@ -0,0 +1,87 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main.state
+
+import android.content.Context
+import android.net.Uri
+import androidx.core.net.toUri
+import com.tonapps.tonkeeper.extensions.capitalized
+import com.tonapps.wallet.data.purchase.entity.OnRamp
+import com.tonapps.wallet.localization.Localization
+
+data class OnRampPaymentMethodState(
+    val selectedType: String? = null,
+    val methods: List<Method>
+) {
+
+    data class Method(
+        val type: String,
+        val title: String,
+        val subtitle: CharSequence?,
+        val icon: Uri,
+        val country: String
+    ) {
+
+        val isCard: Boolean by lazy {
+            type.equals(CARD_TYPE, true)
+        }
+    }
+
+    companion object {
+
+        const val CARD_TYPE = "card"
+
+        val sortKeys = listOf(
+            "card",
+            "google_pay",
+            "revolut",
+            "paypal"
+        )
+
+        fun createMethod(
+            context: Context,
+            data: OnRamp.Method,
+            country: String
+        ): Method {
+            val title = createTitle(context, data.type)
+
+            return Method(
+                type = data.type,
+                title = title,
+                subtitle = getSubtitleByType(context, data.type, country),
+                icon = data.image.toUri(),
+                country = country
+            )
+        }
+
+        private fun getSubtitleByType(
+            context: Context,
+            type: String,
+            country: String
+        ): CharSequence? {
+            if (!type.equals("card", true)) {
+                return null
+            }
+            if (country.equals("ru", true)) {
+                return "МИР"
+            }
+            return context.getString(Localization.credit_card_subtitle)
+        }
+
+        private fun getTitleResByType(type: String): Int? {
+            return when (type) {
+                "card" -> Localization.credit_card
+                "revolut" -> Localization.revolut
+                "google_pay" -> Localization.google_pay
+                "paypal" -> Localization.paypal
+                else -> null
+            }
+        }
+
+        private fun defaultTitle(type: String): String {
+            return type.replace("_", " ").capitalized
+        }
+
+        private fun createTitle(context: Context, type: String) = getTitleResByType(type)?.let {
+            context.getString(it)
+        } ?: defaultTitle(type)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/UiState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/UiState.kt
new file mode 100644
index 000000000..7ff820f10
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/state/UiState.kt
@@ -0,0 +1,77 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.main.state
+
+import android.content.Context
+import android.os.Parcelable
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.ui.screen.onramp.main.OnRampUtils
+import com.tonapps.tonkeeper.ui.screen.onramp.main.entities.ProviderEntity
+import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+
+sealed class UiState {
+
+    enum class Step {
+        Input, Confirm
+    }
+
+    data class RateFormatted(val from: CharSequence?, val to: CharSequence?): UiState()
+
+    data class Balance(
+        val balance: BalanceEntity? = null,
+        val insufficientBalance: Boolean = false,
+        val remainingFormat: CharSequence? = null
+    ): UiState()
+
+    data class MinAmount(
+        val amount: Coins,
+        val formatted: CharSequence
+    ): UiState()
+
+    @Parcelize
+    data class SelectedProvider(
+        val sendAmount: Coins,
+        val send: WalletCurrency,
+        val receive: WalletCurrency,
+        val providers: List<ProviderEntity>,
+        val selectedProviderId: String?,
+    ): Parcelable {
+
+        @IgnoredOnParcel
+        val selectedProvider: ProviderEntity? by lazy {
+            providers.firstOrNull {
+                it.id.equals(selectedProviderId, true)
+            } ?: providers.firstOrNull()
+        }
+
+        @IgnoredOnParcel
+        val receiveAmount: Double
+            get() = selectedProvider?.receive ?: 0.0
+
+        @IgnoredOnParcel
+        val receiveCoins: Coins by lazy {
+            Coins.of(receiveAmount, receive.decimals)
+        }
+
+        @IgnoredOnParcel
+        val receiveFormat: CharSequence by lazy {
+            CurrencyFormatter.format(receive.code, receiveCoins)
+        }
+
+        @IgnoredOnParcel
+        val sendFormat: CharSequence by lazy {
+            CurrencyFormatter.format(send.code, sendAmount)
+        }
+
+        fun getPreviewText(context: Context) = selectedProvider?.let {
+            OnRampUtils.createProviderTitle(context, it.title)
+        }
+
+        fun calculateRate(receiveAmount: Double): Coins {
+            val receiveCoins = Coins.of(receiveAmount, receive.decimals)
+            return receiveCoins / sendAmount
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/CurrencyInputView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/CurrencyInputView.kt
index d8e44c327..bacb98e53 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/CurrencyInputView.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/CurrencyInputView.kt
@@ -1,8 +1,12 @@
 package com.tonapps.tonkeeper.ui.screen.onramp.main.view
 
 import android.content.Context
+import android.graphics.Color
 import android.util.AttributeSet
+import android.util.Log
+import android.view.Gravity
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.view.setPadding
 import com.facebook.common.util.UriUtil
@@ -23,6 +27,10 @@ import uikit.extensions.hideKeyboard
 import uikit.extensions.useAttributes
 import uikit.widget.ColumnLayout
 import java.math.BigDecimal
+import androidx.core.view.isVisible
+import com.tonapps.uikit.color.fieldBackgroundColor
+import uikit.extensions.viewMoveTo
+import uikit.widget.RowLayout
 
 class CurrencyInputView @JvmOverloads constructor(
     context: Context,
@@ -42,6 +50,9 @@ class CurrencyInputView @JvmOverloads constructor(
     private val currencyPickerView: CurrencyPickerView
     private val tokenBalanceView: AppCompatTextView
     private val tokenBalanceMaxView: View
+    private val currencyEmptyView: View
+    private val inputContainerView: RowLayout
+    private val placeholderValueView: AppCompatTextView
 
     private var prefix: String? = null
 
@@ -49,35 +60,115 @@ class CurrencyInputView @JvmOverloads constructor(
         get() = valueView.doOnValueChange
         set(value) { valueView.doOnValueChange = value }
 
+    var doOnTextChange: ((text: String) -> Unit)?
+        get() = valueView.doOnTextChange
+        set(value) { valueView.doOnTextChange = value }
+
+    var doOnFocusChange: ((hasFocus: Boolean) -> Unit)? = null
+
     var doOnCurrencyClick: (() -> Unit)? = null
 
+    var doOnEditorAction: ((actionId: Int) -> Boolean)? = null
+        set(value) {
+            valueView.setOnEditorActionListener { _, actionId, _ ->
+                value?.invoke(actionId) == true
+            }
+        }
+
     val isFocusActive: Boolean
         get() = valueView.isFocused
 
     val isEmpty: Boolean
         get() = valueView.getValue() == 0.0
 
+    private var placeholderValue: String? = null
+
     init {
         inflate(context, R.layout.view_currency_input, this)
+        setBackgroundColor(context.fieldBackgroundColor)
         setPadding(offsetMedium)
         setDefault()
+        setOnClickListener {
+            focusWithKeyboard()
+        }
 
         titleView = findViewById(R.id.input_title)
         tokenBalanceView = findViewById(R.id.input_token_balance)
         tokenBalanceMaxView = findViewById(R.id.input_token_max)
+        placeholderValueView = findViewById(R.id.placeholder_value)
+        placeholderValueView.setBackgroundColor(Color.TRANSPARENT)
+
+        inputContainerView = findViewById(R.id.input_container)
+
+        currencyEmptyView = findViewById(R.id.input_currency_empty)
+        currencyEmptyView.setOnClickListener { doOnCurrencyClick?.invoke() }
 
         valueView = findViewById(R.id.input_value)
         valueView.setOnFocusChangeListener { _, hasFocus ->
             if (hasFocus) setActive() else setDefault()
+            doOnFocusChange?.invoke(hasFocus)
+            updatePlaceholder()
+            checkPlaceholderValue()
         }
 
         prefixView = findViewById(R.id.input_prefix)
 
+        valueView.onTextSizeChange = { unit, textSize ->
+            prefixView.setTextSize(unit, textSize)
+        }
+
         currencyPickerView = findViewById(R.id.input_currency)
         currencyPickerView.setOnClickListener { doOnCurrencyClick?.invoke() }
 
         context.useAttributes(attrs, R.styleable.CurrencyInputView) {
             titleView.text = it.getString(R.styleable.CurrencyInputView_android_title)
+            if (it.getBoolean(R.styleable.CurrencyInputView_disableInput, false)) {
+                valueView.isEnabled = false
+            }
+
+            applyGravity(it.getInt(R.styleable.CurrencyInputView_android_gravity, Gravity.RIGHT))
+
+
+            val valueScale = it.getInt(R.styleable.CurrencyInputView_valueScale, 0)
+            if (valueScale > 0) {
+                valueView.valueScale = valueScale
+            }
+        }
+    }
+
+    private fun updatePlaceholder() {
+        if (!isEmpty || placeholderValue.isNullOrBlank() || isFocusActive) {
+            placeholderValueView.visibility = GONE
+            valueView.hint = "0"
+        } else if (!isFocusActive) {
+            placeholderValueView.visibility = VISIBLE
+            placeholderValueView.text = EQUALS_SIGN_PREFIX + placeholderValue
+            valueView.hint = ""
+        }
+
+        checkPrefix()
+    }
+
+    private fun checkPlaceholderValue() {
+        if (isEmpty) {
+            valueView.setValue(placeholderValue)
+        }
+    }
+
+    fun setPlaceholder(value: String?) {
+        placeholderValue = if (value.isNullOrBlank() || value == "0" || value == "0.0") {
+            null
+        } else {
+            value
+        }
+        updatePlaceholder()
+    }
+
+    private fun applyGravity(gravity: Int) {
+        if (gravity == Gravity.LEFT) {
+            inputContainerView.viewMoveTo(currencyPickerView, 0)
+            inputContainerView.viewMoveTo(currencyEmptyView, 1)
+            valueView.gravity = Gravity.RIGHT
         }
     }
 
@@ -88,7 +179,11 @@ class CurrencyInputView @JvmOverloads constructor(
         tokenBalanceView.setText(Localization.insufficient_balance)
     }
 
-    fun setTokenBalance(tokenBalance: BalanceEntity?, remainingFormat: CharSequence?) {
+    fun setTokenBalance(
+        tokenBalance: BalanceEntity?,
+        remainingFormat: CharSequence?,
+        symbol: Boolean = true
+    ) {
         if (tokenBalance == null) {
             tokenBalanceView.visibility = View.GONE
             tokenBalanceMaxView.visibility = View.GONE
@@ -96,7 +191,7 @@ class CurrencyInputView @JvmOverloads constructor(
             tokenBalanceView.text = context.getString(Localization.remaining_balance, remainingFormat)
             showTokenBalance(tokenBalance.value)
         } else {
-            val format = CurrencyFormatter.format(tokenBalance.token.symbol, tokenBalance.value)
+            val format = CurrencyFormatter.format(if (symbol) tokenBalance.token.symbol else "", tokenBalance.value)
             tokenBalanceView.text = context.getString(Localization.balance_prefix, format)
             showTokenBalance(tokenBalance.value)
         }
@@ -113,11 +208,11 @@ class CurrencyInputView @JvmOverloads constructor(
 
     fun setPrefix(value: String?) {
         prefix = value
-        checkPrefix()
+        updatePlaceholder()
     }
 
     private fun checkPrefix() {
-        if (prefix.isNullOrBlank() || valueView.getValue() == 0.0 || valueView.isFocused) {
+        if (placeholderValueView.isVisible || prefix.isNullOrBlank() || valueView.getValue() == 0.0 || valueView.isFocused) {
             prefixView.visibility = View.GONE
         } else {
             prefixView.visibility = View.VISIBLE
@@ -139,17 +234,24 @@ class CurrencyInputView @JvmOverloads constructor(
 
     fun setValue(value: BigDecimal, notifyByUser: Boolean = false) {
         valueView.setValue(value, notifyByUser)
-        checkPrefix()
+        updatePlaceholder()
     }
 
     fun setValue(coins: Coins = Coins.ZERO, notifyByUser: Boolean = false) {
         setValue(coins.value, notifyByUser)
     }
 
+    fun getTextValue() = valueView.text
+
     fun getValue(): Double {
         return valueView.getValue()
     }
 
+    fun setValue(value: Double) {
+        valueView.setValue(value)
+        updatePlaceholder()
+    }
+
     fun setToken(token: TokenEntity) {
         setCurrency(CurrencyPickerView.Value(token))
     }
@@ -159,17 +261,26 @@ class CurrencyInputView @JvmOverloads constructor(
         setCurrency(value)
     }
 
+    fun isTokenEmpty() = currencyEmptyView.isVisible
+
+    fun setEmptyCurrency() {
+        currencyEmptyView.visibility = View.VISIBLE
+        currencyPickerView.visibility = View.GONE
+    }
+
     fun setCurrency(value: CurrencyPickerView.Value) {
         currencyPickerView.value = value
+        currencyEmptyView.visibility = View.GONE
+        currencyPickerView.visibility = View.VISIBLE
     }
 
     private fun setActive() {
         prefixView.visibility = View.GONE
-        setBackgroundResource(uikit.R.drawable.bg_content_focused)
+        setBackgroundResource(uikit.R.drawable.bg_field_focused)
     }
 
     private fun setDefault() {
-        setBackgroundResource(uikit.R.drawable.bg_content)
+        setBackgroundResource(uikit.R.drawable.bg_field)
     }
 
     fun focusWithKeyboard() {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/ReviewInputView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/ReviewInputView.kt
index 7a3311e40..7e543a0e6 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/ReviewInputView.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/main/view/ReviewInputView.kt
@@ -1,6 +1,7 @@
 package com.tonapps.tonkeeper.ui.screen.onramp.main.view
 
 import android.content.Context
+import android.text.method.MovementMethod
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.view.setPadding
@@ -33,6 +34,10 @@ class ReviewInputView @JvmOverloads constructor(
         }
     }
 
+    fun setTitleMovementMethod(movement: MovementMethod) {
+        titleView.movementMethod = movement
+    }
+
     fun setTitle(title: CharSequence) {
         titleView.text = title
     }
@@ -40,4 +45,12 @@ class ReviewInputView @JvmOverloads constructor(
     fun setValue(value: CharSequence) {
         valueView.text = value
     }
+
+    fun setValueTextSize(unit: Int, size: Float) {
+        valueView.setTextSize(unit, size)
+    }
+
+    fun setTitleTextSize(unit: Int, size: Float) {
+        titleView.setTextSize(unit, size)
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerArgs.kt
new file mode 100644
index 000000000..826dccc5c
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerArgs.kt
@@ -0,0 +1,27 @@
+package com.tonapps.tonkeeper.ui.screen.onramp.picker.currency
+
+import android.os.Bundle
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import uikit.base.BaseArgs
+
+class OnRampPickerArgs(
+    val currency: WalletCurrency,
+    val send: Boolean
+): BaseArgs() {
+
+    companion object {
+        private const val ARG_CURRENCY = "currency"
+        private const val ARG_SEND = "send"
+    }
+
+    constructor(bundle: Bundle) : this(
+        currency = bundle.getParcelableCompat(ARG_CURRENCY)!!,
+        send = bundle.getBoolean(ARG_SEND, false)
+    )
+
+    override fun toBundle() = Bundle().apply {
+        putParcelable(ARG_CURRENCY, currency)
+        putBoolean(ARG_SEND, send)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerCommand.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerCommand.kt
index 2b3e4f8d8..0317995a1 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerCommand.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerCommand.kt
@@ -3,7 +3,12 @@ package com.tonapps.tonkeeper.ui.screen.onramp.picker.currency
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 
 sealed class OnRampPickerCommand {
-    data class OpenCurrencyPicker(val currencies: List<WalletCurrency>): OnRampPickerCommand()
+    data class OpenCurrencyPicker(
+        val localization: Int,
+        val currencies: List<WalletCurrency>,
+        val extras: List<String>,
+    ): OnRampPickerCommand()
     data object Main: OnRampPickerCommand()
     data object Finish: OnRampPickerCommand()
+    data class SetCurrency(val currency: WalletCurrency): OnRampPickerCommand()
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerScreen.kt
index 70253f8d0..759dda380 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerScreen.kt
@@ -1,55 +1,75 @@
 package com.tonapps.tonkeeper.ui.screen.onramp.picker.currency
 
+import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
+import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.tonkeeper.extensions.hideKeyboard
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen
 import com.tonapps.tonkeeper.ui.base.picker.QueryReceiver
 import com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.fiat.OnRampFiatScreen
 import com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.main.OnRampCurrencyPickerScreen
+import com.tonapps.tonkeeper.ui.screen.swap.picker.SwapPickerArgs
+import com.tonapps.tonkeeper.ui.screen.swap.picker.SwapPickerScreen
+import com.tonapps.tonkeeper.ui.screen.swap.picker.SwapPickerViewModel
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.localization.Localization
 import org.koin.core.parameter.parametersOf
 import uikit.base.BaseFragment
+import uikit.extensions.activity
+import uikit.extensions.addForResult
 import uikit.extensions.collectFlow
 import uikit.extensions.commitChildAsSlide
+import uikit.widget.HeaderView
 import uikit.widget.ModalHeader
 import uikit.widget.SearchInput
+import kotlin.coroutines.cancellation.CancellationException
 
 class OnRampPickerScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_onramp_picker, wallet), BaseFragment.BottomSheet {
 
-    private val send: Boolean by lazy { requireArguments().getBoolean(ARG_SEND) }
+    private val args: OnRampPickerArgs by lazy { OnRampPickerArgs(requireArguments()) }
 
-    override val viewModel: OnRampPickerViewModel by walletViewModel { parametersOf(send) }
+    private val defaultTitle: Int
+        get() = if (args.send) Localization.send else Localization.receive
+
+    override val viewModel: OnRampPickerViewModel by walletViewModel {
+        parametersOf(args)
+    }
 
     private val currentFragment: Fragment?
         get() = childFragmentManager.fragments.lastOrNull()
 
-    private lateinit var headerView: ModalHeader
+    private lateinit var modalHeaderView: ModalHeader
+    private lateinit var headerView: HeaderView
     private lateinit var searchInput: SearchInput
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        modalHeaderView = view.findViewById(R.id.modal_header)
+        modalHeaderView.setOnClickListener { hideKeyboard() }
+        modalHeaderView.onCloseClick = { finish() }
+
         headerView = view.findViewById(R.id.header)
-        headerView.setOnClickListener { hideKeyboard() }
-        headerView.onCloseClick = { finish() }
+        headerView.doOnCloseClick = { back() }
+        headerView.doOnActionClick = { finish() }
 
         searchInput = view.findViewById(R.id.search)
         searchInput.doOnTextChanged = { text -> query(text.toString()) }
 
         collectFlow(viewModel.uiCommandFlow, ::onCommand)
-        applyDefaultTitle()
+        showModalHeader()
     }
 
-    private fun applyDefaultTitle() {
-        headerView.setTitle(if (send) Localization.sell else Localization.buy)
+    override fun onDragging() {
+        super.onDragging()
+        hideKeyboard()
     }
 
     private fun query(value: String) {
@@ -58,15 +78,28 @@ class OnRampPickerScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fra
 
     private fun onCommand(command: OnRampPickerCommand) {
         when (command) {
-            is OnRampPickerCommand.OpenCurrencyPicker -> setCurrencies(command.currencies)
+            is OnRampPickerCommand.OpenCurrencyPicker -> setCurrencies(command.localization,command.currencies, command.extras)
             is OnRampPickerCommand.Main -> setFragment(OnRampCurrencyPickerScreen.newInstance(wallet))
             is OnRampPickerCommand.Finish -> finish()
+            is OnRampPickerCommand.SetCurrency -> setResult(command.currency)
         }
     }
 
-    private fun setCurrencies(currencies: List<WalletCurrency>) {
-        setFragment(OnRampFiatScreen.newInstance(currencies))
-        headerView.setTitle(Localization.currency)
+    private fun setCurrencies(localization: Int, currencies: List<WalletCurrency>, extras: List<String>) {
+        setFragment(OnRampFiatScreen.newInstance(currencies, extras))
+        showHeader(localization)
+    }
+
+    private fun showHeader(localization: Int) {
+        headerView.title = getString(localization)
+        headerView.visibility = View.VISIBLE
+        modalHeaderView.visibility = View.GONE
+    }
+
+    private fun showModalHeader() {
+        headerView.visibility = View.GONE
+        modalHeaderView.visibility = View.VISIBLE
+        modalHeaderView.setTitle(defaultTitle)
     }
 
     private fun setFragment(fragment: Fragment) {
@@ -83,24 +116,48 @@ class OnRampPickerScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fra
         if (lastFragment == null || lastFragment is OnRampCurrencyPickerScreen) {
             return super.onBackPressed()
         }
-        applyDefaultTitle()
+        back()
+        return false
+    }
+    
+    private fun back() {
+        showModalHeader()
         childFragmentManager.popBackStack()
         searchInput.cancel()
-        return false
+    }
+
+    private fun setResult(currency: WalletCurrency) {
+        setResult(Bundle().apply {
+            putParcelable(ARG_CURRENCY, currency)
+        })
+        finish()
     }
 
     companion object {
 
+        private const val ARG_CURRENCY = "currency"
+
         fun parentViewModel(screen: Fragment): OnRampPickerViewModel {
             return (screen as OnRampPickerScreen).viewModel
         }
 
-        private const val ARG_SEND = "send"
+        private fun newInstance(wallet: WalletEntity, currency: WalletCurrency, send: Boolean): OnRampPickerScreen {
+            val args = OnRampPickerArgs(currency, send)
+            val screen = OnRampPickerScreen(wallet)
+            screen.setArgs(args)
+            return screen
+        }
 
-        fun newInstance(wallet: WalletEntity, send: Boolean): OnRampPickerScreen {
-            val fragment = OnRampPickerScreen(wallet)
-            fragment.putBooleanArg(ARG_SEND, send)
-            return fragment
+        suspend fun run(
+            context: Context,
+            wallet: WalletEntity,
+            currency: WalletCurrency,
+            send: Boolean
+        ): WalletCurrency {
+            val activity = context.activity ?: throw IllegalArgumentException("Context must be an Activity")
+            val screen = newInstance(wallet, currency, send)
+            val result = activity.addForResult(screen)
+            return result.getParcelableCompat<WalletCurrency>(ARG_CURRENCY) ?: throw CancellationException()
         }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerViewModel.kt
index bf7f0eff3..19c764290 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/OnRampPickerViewModel.kt
@@ -2,70 +2,60 @@ package com.tonapps.tonkeeper.ui.screen.onramp.picker.currency
 
 import android.app.Application
 import android.net.Uri
-import android.text.SpannableStringBuilder
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.facebook.common.util.UriUtil
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.mapList
 import com.tonapps.icu.CurrencyFormatter
-import com.tonapps.tonkeeper.api.getCurrencyCodeByCountry
-import com.tonapps.tonkeeper.extensions.getNormalizeCountryFlow
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.extensions.onRampDataFlow
-import com.tonapps.tonkeeper.extensions.onRampFormCurrencyFlow
 import com.tonapps.tonkeeper.manager.assets.AssetsManager
 import com.tonapps.tonkeeper.os.AndroidCurrency
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.main.list.Item
 import com.tonapps.tonkeeperx.R
-import com.tonapps.uikit.color.accentBlueColor
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.purchase.PurchaseRepository
 import com.tonapps.wallet.data.purchase.entity.OnRampCurrencies
-import com.tonapps.wallet.data.purchase.entity.TONAssetsEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
-import uikit.extensions.badgeAccentColor
 import uikit.extensions.withBlueBadge
-import kotlin.math.acos
 
 class OnRampPickerViewModel(
     app: Application,
+    private val args: OnRampPickerArgs,
     private val wallet: WalletEntity,
-    private val send: Boolean,
     private val settingsRepository: SettingsRepository,
     private val purchaseRepository: PurchaseRepository,
     private val tokenRepository: TokenRepository,
     private val assetsManager: AssetsManager,
-    private val api: API
+    private val api: API,
+    private val environment: Environment,
 ): BaseWalletVM(app) {
 
-    private val formCurrencyFlow = purchaseRepository.onRampFormCurrencyFlow(settingsRepository)
-
     private val onRampResultFlow = purchaseRepository
-        .onRampDataFlow(settingsRepository, api)
+        .onRampDataFlow(environment)
 
     private val onRampFlow = onRampResultFlow.map { it.data }
 
     private val currencyByCountry: WalletCurrency
         get() {
-            val code = AndroidCurrency.resolve(settingsRepository.country)?.currencyCode ?: "USA"
+            val code = AndroidCurrency.resolve(environment.country)?.currencyCode ?: "US"
             return WalletCurrency.ofOrDefault(code)
         }
 
@@ -74,11 +64,13 @@ class OnRampPickerViewModel(
 
     private val uiItemsTONAssetsFlow = onRampFlow.map {
         val assets = it.tonAssets
-        if (send) assets.input else assets.output
+        if (args.send) assets.input else assets.output
     }.map { jettonAddress ->
         val uiItems = mutableListOf<Item.Currency>()
-        if (send) {
-            val balances = assetsManager.getTokens(wallet, jettonAddress).sortedBy { it.fiat }.asReversed()
+        if (args.send) {
+            val balances = assetsManager.getTokens(wallet, jettonAddress).sortedBy {
+                it.fiat
+            }.filter { jettonAddress.contains(it.address) && it.blockchain == Blockchain.TON }.asReversed()
             for ((index, balance) in balances.withIndex()) {
                 val position = ListCell.getPosition(balances.size, index)
                 val format = CurrencyFormatter.format(settingsRepository.currency.code, balance.fiat)
@@ -105,22 +97,18 @@ class OnRampPickerViewModel(
         uiItems.toList()
     }.flowOn(Dispatchers.IO)
 
-    private val tonAssetsFlow = uiItemsTONAssetsFlow.mapList { it.currency }
-
     private val _searchQueryFlow = MutableStateFlow("")
     val searchQueryFlow = _searchQueryFlow.asSharedFlow().map { it.trim() }
 
     val uiItemsFlow = combine(
-        formCurrencyFlow,
         onRampFlow,
         uiItemsTONAssetsFlow,
         searchQueryFlow,
-    ) { (sendCurrency, receiveCurrency), supportedCurrencies, tonAssets, searchQuery ->
-        val selectedCurrency = if (send) sendCurrency else receiveCurrency
+    ) { supportedCurrencies, tonAssets, searchQuery ->
         val list = mutableListOf<Item>()
-        list.addAll(buildFiatBlock(selectedCurrency, supportedCurrencies.fiat, searchQuery))
-        list.addAll(buildTONAssetsBlock(selectedCurrency, tonAssets, searchQuery))
-        list.addAll(buildExternalBlock(selectedCurrency, supportedCurrencies.externalCurrency, searchQuery))
+        list.addAll(buildFiatBlock(args.currency, supportedCurrencies.fiat, searchQuery))
+        list.addAll(buildTONAssetsBlock(args.currency, tonAssets, searchQuery))
+        list.addAll(buildExternalBlock(args.currency, supportedCurrencies.externalCurrency, searchQuery))
         list.toList()
     }
 
@@ -135,27 +123,34 @@ class OnRampPickerViewModel(
     fun openFiatPicker() {
         onRampFlow
             .take(1)
-            .map { it.availableFiatSlugs }
+            .map { (it.availableFiatSlugs + WalletCurrency.FIAT).distinct() }
             .map { codes ->
                 codes.mapNotNull { WalletCurrency.of(it) }
-            }.collectFlow(::openCurrencyPicker)
+            }.collectFlow {
+                openCurrencyPicker(Localization.currency, it)
+            }
     }
 
     fun openTONAssetsPicker() {
-        tonAssetsFlow
+        uiItemsTONAssetsFlow
             .take(1)
-            .collectFlow(::openCurrencyPicker)
+            .collectFlow { assets ->
+                val currencies = assets.map { it.currency }
+                openCurrencyPicker(Localization.ton_assets, currencies, assets.map { it.title.toString() })
+            }
     }
 
     fun openCryptoPicker() {
         onRampFlow
             .take(1)
             .map { it.externalCurrency }
-            .collectFlow(::openCurrencyPicker)
+            .collectFlow {
+                openCurrencyPicker(Localization.crypto, it)
+            }
     }
 
-    private fun openCurrencyPicker(currencies: List<WalletCurrency>) {
-        pushCommand(OnRampPickerCommand.OpenCurrencyPicker(currencies))
+    private fun openCurrencyPicker(localization: Int, currencies: List<WalletCurrency>, extras: List<String> = emptyList()) {
+        pushCommand(OnRampPickerCommand.OpenCurrencyPicker(localization, currencies, extras))
     }
 
     fun close() {
@@ -173,7 +168,7 @@ class OnRampPickerViewModel(
                     add(selectedCurrency)
                 }
                 add(currencyByCountry)
-            }.distinct()
+            }.distinctBy { it.code }
         } else {
             WalletCurrency.FIAT.mapNotNull { WalletCurrency.of(it) }.filter {
                 it.containsQuery(query)
@@ -206,7 +201,7 @@ class OnRampPickerViewModel(
             val selected = selectedCurrency == currency
             list.add(Item.Currency(currency, position, selected))
         }
-        if (query.isEmpty() && list.size > 0) {
+        if (query.isEmpty() && list.isNotEmpty()) {
             list.add(Item.More(
                 id = ALL_CURRENCIES_ID,
                 title = getString(Localization.all_currencies),
@@ -214,8 +209,8 @@ class OnRampPickerViewModel(
             ))
         }
 
-        if (list.size > 0) {
-            val titleItem = Item.Title(getString(Localization.currency), fiatMethodIcons(if (send) supportedFiat.inputs else supportedFiat.outputs), true)
+        if (list.isNotEmpty()) {
+            val titleItem = Item.Title(getString(Localization.currency), fiatMethodIcons(if (args.send) supportedFiat.inputs else supportedFiat.outputs), true)
             list.add(0, titleItem)
         }
 
@@ -227,7 +222,7 @@ class OnRampPickerViewModel(
         tonAssets: List<Item.Currency>,
         query: String
     ): List<Item> {
-        val max = if (send) {
+        val max = if (args.send) {
             if (tonAssets.size == 4) 4 else 3
         } else {
             2
@@ -245,6 +240,16 @@ class OnRampPickerViewModel(
             }.take(3)
         }
 
+        val moreItem = if (query.isEmpty() && tonAssets.size > max) {
+            Item.More(
+                id = ALL_TON_ASSETS_ID,
+                title = getString(Localization.all_ton_assets),
+                values = tonAssets.drop(max).map { it.currency },
+            )
+        } else {
+            null
+        }
+
         var list = mutableListOf<Item>()
         for ((index, asset) in assets.withIndex()) {
             val selected = asset.currency == selectedCurrency
@@ -252,6 +257,8 @@ class OnRampPickerViewModel(
                 ListCell.getPosition(assets.size, index)
             } else if (index == 0) {
                 ListCell.Position.FIRST
+            } else if (moreItem == null && index == assets.size - 1) {
+                ListCell.Position.LAST
             } else {
                 ListCell.Position.MIDDLE
             }
@@ -261,13 +268,9 @@ class OnRampPickerViewModel(
             ))
         }
 
-        if (query.isEmpty() && tonAssets.size > max) {
+        if (moreItem != null) {
             list = list.take(max + 1).toMutableList()
-            list.add(Item.More(
-                id = ALL_TON_ASSETS_ID,
-                title = getString(Localization.all_ton_assets),
-                values = tonAssets.drop(max).map { it.currency },
-            ))
+            list.add(moreItem)
         }
 
         if (list.isNotEmpty()) {
@@ -304,7 +307,7 @@ class OnRampPickerViewModel(
             list.add(Item.Currency(currency, position, selected))
         }
 
-        if (query.isEmpty() && list.size > 0) {
+        if (query.isEmpty() && list.isNotEmpty()) {
             list.add(Item.More(
                 id = ALL_CRYPTO_ID,
                 title = getString(Localization.all_assets),
@@ -312,7 +315,7 @@ class OnRampPickerViewModel(
             ))
         }
 
-        if (list.size > 0) {
+        if (list.isNotEmpty()) {
             list.add(0, Item.Title(getString(Localization.crypto)))
         }
 
@@ -339,12 +342,7 @@ class OnRampPickerViewModel(
     }
 
     fun setCurrency(currency: WalletCurrency) {
-        if (send) {
-            purchaseRepository.sendCurrency = currency
-        } else {
-            purchaseRepository.receiveCurrency = currency
-        }
-        close()
+        pushCommand(OnRampPickerCommand.SetCurrency(currency))
     }
 
     companion object {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/fiat/OnRampFiatScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/fiat/OnRampFiatScreen.kt
index 35ba54ba9..ff7e4f470 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/fiat/OnRampFiatScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/fiat/OnRampFiatScreen.kt
@@ -17,6 +17,9 @@ class OnRampFiatScreen: CurrencyPickerScreen(), QueryReceiver {
             return array?.toList() ?: emptyList()
         }
 
+    override val extras: List<String>
+        get() = arguments?.getStringArrayList(ARG_EXTRAS) ?: emptyList()
+
     override fun onSelected(currency: WalletCurrency) {
         mainViewModel.setCurrency(currency)
     }
@@ -28,10 +31,15 @@ class OnRampFiatScreen: CurrencyPickerScreen(), QueryReceiver {
     companion object {
 
         private const val ARG_CURRENCIES = "currencies"
+        private const val ARG_EXTRAS = "extras"
 
-        fun newInstance(currencies: List<WalletCurrency>): OnRampFiatScreen {
+        fun newInstance(currencies: List<WalletCurrency>, extras: List<String>): OnRampFiatScreen {
+            if (extras.isNotEmpty() && extras.size != currencies.size) {
+                throw IllegalArgumentException("Extras size must match currencies size")
+            }
             val screen = OnRampFiatScreen()
             screen.putParcelableListArg(ARG_CURRENCIES, currencies)
+            screen.putStringList(ARG_EXTRAS, extras)
             return screen
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/OnRampCurrencyPickerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/OnRampCurrencyPickerScreen.kt
index ea09a94ef..574b5963d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/OnRampCurrencyPickerScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/OnRampCurrencyPickerScreen.kt
@@ -3,6 +3,7 @@ package com.tonapps.tonkeeper.ui.screen.onramp.picker.currency.main
 import android.os.Bundle
 import android.util.Log
 import android.view.View
+import androidx.core.view.doOnLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen
 import com.tonapps.tonkeeper.ui.base.picker.QueryReceiver
@@ -38,11 +39,6 @@ class OnRampCurrencyPickerScreen(wallet: WalletEntity): WalletContextScreen(R.la
     private lateinit var loaderView: View
     private lateinit var emptyView: View
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        collectFlow(viewModel.uiItemsFlow, ::setUiItems)
-    }
-
     private fun setUiItems(items: List<Item>) {
         if (items.isEmpty()) {
             loaderView.visibility = View.GONE
@@ -57,11 +53,17 @@ class OnRampCurrencyPickerScreen(wallet: WalletEntity): WalletContextScreen(R.la
         }
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(viewModel.uiItemsFlow, ::setUiItems)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         listView = view.findViewById(R.id.list)
         listView.adapter = adapter
         listView.applyNavBottomPadding(requireContext().getDimensionPixelSize(uikit.R.dimen.offsetMedium))
+        listView.isNestedScrollingEnabled = true
 
         loaderView = view.findViewById(R.id.loader)
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/list/Item.kt
index 78443a1ff..0923dcfbd 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/currency/main/list/Item.kt
@@ -26,7 +26,7 @@ sealed class Item(type: Int): BaseListItem(type) {
     ): Item(TYPE_TITLE)
 
     data class Currency(
-        val position: ListCell.Position,
+        override val position: ListCell.Position,
         val id: String,
         val icon: Uri? = null,
         val iconRes: Int? = null,
@@ -35,7 +35,7 @@ sealed class Item(type: Int): BaseListItem(type) {
         val network: String,
         val currency: WalletCurrency,
         val selected: Boolean,
-    ): Item(TYPE_CURRENCY) {
+    ): Item(TYPE_CURRENCY), ListCell {
 
         val isFiat: Boolean
             get() = network.equals("FIAT", true)
@@ -86,11 +86,11 @@ sealed class Item(type: Int): BaseListItem(type) {
     }
 
     data class More(
-        val position: ListCell.Position = ListCell.Position.LAST,
+        override val position: ListCell.Position = ListCell.Position.LAST,
         val id: String,
         val title: CharSequence,
         val values: List<WalletCurrency> = emptyList()
-    ): Item(TYPE_MORE) {
+    ): Item(TYPE_MORE), ListCell {
 
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerScreen.kt
index cb7e33970..512d2a857 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerScreen.kt
@@ -9,10 +9,10 @@ import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.BaseWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.UiState
 import com.tonapps.tonkeeper.ui.screen.onramp.picker.provider.list.Adapter
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.data.account.entities.WalletEntity
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
 import org.koin.core.parameter.parametersOf
 import uikit.base.BaseFragment
 import uikit.extensions.activity
@@ -24,21 +24,17 @@ import uikit.widget.ModalHeader
 
 class OnRampProviderPickerScreen(wallet: WalletEntity): BaseWalletScreen<ScreenContext.Wallet>(R.layout.fragment_onramp_provider_picker, ScreenContext.Wallet(wallet)), BaseFragment.Modal {
 
-    private val provider: PurchaseMethodEntity by lazy {
-        arguments?.getParcelableCompat<PurchaseMethodEntity>(PROVIDER)!!
-    }
-
-    private val providers: List<PurchaseMethodEntity> by lazy {
-        arguments?.getParcelableArrayList(PROVIDERS) ?: emptyList()
+    private val state: UiState.SelectedProvider by lazy {
+        arguments?.getParcelableCompat<UiState.SelectedProvider>(ARG_STATE)!!
     }
 
     override val viewModel: OnRampProviderPickerViewModel by walletViewModel {
-        parametersOf(provider, providers)
+        parametersOf(state)
     }
 
     private val adapter = Adapter { item ->
-        viewModel.setSelectedProvider(item.provider)
-        setResult(item.provider)
+        viewModel.setSelectedProvider(item.id)
+        setResult(item.id)
     }
 
     private lateinit var headerView: ModalHeader
@@ -59,34 +55,35 @@ class OnRampProviderPickerScreen(wallet: WalletEntity): BaseWalletScreen<ScreenC
         listView.adapter = adapter
 
         button = view.findViewById(R.id.button)
-        button.setOnClickListener { setResult(provider) }
+        button.setOnClickListener { setResult(state.selectedProviderId) }
         button.applyNavBottomMargin(16.dp)
     }
 
-    private fun setResult(provider: PurchaseMethodEntity) {
+    private fun setResult(providerId: String?) {
         setResult(Bundle().apply {
-            putParcelable(PROVIDER, provider)
+            putString(ARG_PROVIDER_ID, providerId)
         })
     }
 
     companion object {
 
-        private const val PROVIDER = "provider"
-        private const val PROVIDERS = "providers"
+        private const val ARG_STATE = "state"
+        private const val ARG_PROVIDER_ID = "provider_id"
 
         suspend fun run(
             context: Context,
             wallet: WalletEntity,
-            provider: PurchaseMethodEntity,
-            supportedProviders: List<PurchaseMethodEntity>
-        ): PurchaseMethodEntity {
+            state: UiState.SelectedProvider
+        ): String? {
+            if (state.providers.isEmpty()) {
+                throw IllegalArgumentException("No providers available")
+            }
             val activity = context.activity ?: throw IllegalArgumentException("Context must be an Activity")
             val fragment = OnRampProviderPickerScreen(wallet).apply {
-                putParcelableArg(PROVIDER, provider)
-                putParcelableArrayListArg(PROVIDERS, ArrayList(supportedProviders))
+                putParcelableArg(ARG_STATE, state)
             }
             val result = activity.addForResult(fragment)
-            return result.getParcelableCompat<PurchaseMethodEntity>(PROVIDER) ?: provider
+            return result.getString(ARG_PROVIDER_ID)
         }
 
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerViewModel.kt
index 0956b3b74..308d40a26 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/OnRampProviderPickerViewModel.kt
@@ -1,44 +1,60 @@
 package com.tonapps.tonkeeper.ui.screen.onramp.picker.provider
 
 import android.app.Application
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.onramp.main.state.UiState
 import com.tonapps.tonkeeper.ui.screen.onramp.picker.provider.list.Item
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.purchase.PurchaseRepository
-import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.update
 
 class OnRampProviderPickerViewModel(
     app: Application,
     private val wallet: WalletEntity,
-    provider: PurchaseMethodEntity,
-    supportedProviders: List<PurchaseMethodEntity>,
+    private val state: UiState.SelectedProvider,
     private val settingsRepository: SettingsRepository,
     private val purchaseRepository: PurchaseRepository,
 ): BaseWalletVM(app) {
 
-    private val _selectedProviderFlow = MutableStateFlow(provider)
-    val selectedProviderFlow = _selectedProviderFlow.asStateFlow()
+    private val _stateFlow = MutableStateFlow(state)
+    val stateFlow = _stateFlow.asStateFlow()
 
-    val uiItemsFlow = selectedProviderFlow.map { selectedProvider ->
+    val uiItemsFlow = stateFlow.map { state ->
+        val fromFormat = CurrencyFormatter.format(state.send.code, Coins.ONE, replaceSymbol = false)
+        val selectedProvider = state.selectedProvider!!
         val list = mutableListOf<Item>()
-        for ((index, itemProvider) in supportedProviders.withIndex()) {
-            val position = ListCell.getPosition(supportedProviders.size, index)
-            list.add(Item(
+        for ((index, provider) in state.providers.withIndex()) {
+            val minAmount = Coins.of(provider.minAmount, state.send.decimals)
+            val minAmountFormat = if (provider.minAmount > 0) CurrencyFormatter.format(state.send.code, minAmount, replaceSymbol = false) else ""
+            val rate =  if (provider.minAmount > 0) Coins.of(provider.receive / provider.minAmount, state.receive.decimals) else state.calculateRate(provider.receive)
+            val rateFormat = CurrencyFormatter.format(state.receive.code, rate, replaceSymbol = false)
+            val position = ListCell.getPosition(state.providers.size, index)
+            val item = Item(
                 position = position,
-                provider = itemProvider,
-                selected = itemProvider.id == selectedProvider.id,
-                best = index == 0 && supportedProviders.size > 1
-            ))
+                provider = provider,
+                selected = provider.id.equals(selectedProvider.id, true),
+                rateFormat = "$fromFormat ≈ $rateFormat",
+                best = index == 0 && state.providers.size > 1,
+                minAmountFormat = minAmountFormat
+            )
+            list.add(item)
         }
         list.toList()
     }
 
-    fun setSelectedProvider(provider: PurchaseMethodEntity) {
-        _selectedProviderFlow.value = provider
+    fun setSelectedProvider(providerId: String) {
+        _stateFlow.update {
+            it.copy(
+                selectedProviderId = providerId
+            )
+        }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Holder.kt
index 1badbbea5..dfb600019 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Holder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Holder.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.onramp.picker.provider.list
 
 import android.text.SpannableStringBuilder
 import android.util.Log
+import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
@@ -25,6 +26,7 @@ class Holder(
     private val titleView = findViewById<AppCompatTextView>(R.id.title)
     private val descriptionView = findViewById<AppCompatTextView>(R.id.description)
     private val arrowView = findViewById<AppCompatImageView>(R.id.arrow)
+    private val minView = findViewById<AppCompatTextView>(R.id.min)
 
     init {
         arrowView.imageTintList = context.accentBlueColor.stateList
@@ -47,6 +49,16 @@ class Holder(
         } else {
             arrowView.setImageDrawable(null)
         }
+        setMin(item.minAmountFormat)
+    }
+
+    private fun setMin(minAmountFormat: CharSequence) {
+        if (minAmountFormat.isEmpty()) {
+            minView.visibility = View.GONE
+        } else {
+            minView.visibility = View.VISIBLE
+            minView.text = context.getString(Localization.min_amount, minAmountFormat)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Item.kt
index ee87fdd3c..e792083e1 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/onramp/picker/provider/list/Item.kt
@@ -5,21 +5,35 @@ import com.tonapps.uikit.list.BaseListItem
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
 import androidx.core.net.toUri
+import com.tonapps.tonkeeper.ui.screen.onramp.main.entities.ProviderEntity
+import com.tonapps.wallet.api.entity.OnRampMerchantEntity
 
 data class Item(
     val position: ListCell.Position,
-    val provider: PurchaseMethodEntity,
+    val id: String,
+    val iconUri: Uri,
+    val title: String,
+    val description: CharSequence,
     val selected: Boolean,
-    val best: Boolean
+    val best: Boolean,
+    val minAmountFormat: CharSequence
 ): BaseListItem(0) {
 
-    val iconUri: Uri
-        get() = provider.iconUrl.toUri()
-
-    val title: String
-        get() = provider.title
-
-    val description: String
-        get() = provider.description
+    constructor(
+        position: ListCell.Position,
+        provider: ProviderEntity,
+        selected: Boolean,
+        best: Boolean,
+        rateFormat: CharSequence,
+        minAmountFormat: CharSequence
+    ) : this(
+        position = position,
+        id = provider.id,
+        iconUri = provider.iconUrl.toUri(),
+        title = provider.title,
+        description = rateFormat,
+        selected = selected,
+        best = best,
+        minAmountFormat = minAmountFormat
+    )
 }
-
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseConfirmDialog.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseConfirmDialog.kt
index feb530e14..9689bf95d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseConfirmDialog.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseConfirmDialog.kt
@@ -1,18 +1,28 @@
 package com.tonapps.tonkeeper.ui.screen.purchase
 
 import android.content.Context
+import android.text.SpannableStringBuilder
+import android.text.method.LinkMovementMethod
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.appcompat.widget.LinearLayoutCompat
 import com.facebook.drawee.view.SimpleDraweeView
+import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.ui.screen.onramp.main.entities.ProviderEntity
 import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentBlueColor
+import com.tonapps.uikit.color.textAccentColor
 import com.tonapps.uikit.color.textSecondaryColor
+import com.tonapps.wallet.data.purchase.entity.MerchantEntity
 import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
+import com.tonapps.wallet.localization.Localization
 import uikit.dialog.modal.ModalDialog
 import uikit.extensions.applyNavBottomPadding
+import uikit.extensions.clickable
 import uikit.extensions.dp
+import uikit.extensions.withBlueBadge
 import uikit.navigation.Navigation.Companion.navigation
 import uikit.widget.CheckBoxView
 import uikit.widget.HeaderView
@@ -26,12 +36,13 @@ class PurchaseConfirmDialog(
     private val iconView: SimpleDraweeView = findViewById(R.id.icon)!!
     private val titleView: AppCompatTextView = findViewById(R.id.title)!!
     private val subtitleView: AppCompatTextView = findViewById(R.id.subtitle)!!
-    private val infoView: LinearLayoutCompat = findViewById(R.id.info)!!
+    private val infoView: AppCompatTextView = findViewById(R.id.info)!!
     private val button: Button = findViewById(R.id.button)!!
     private val checkboxContainer: View = findViewById(R.id.checkbox_container)!!
     private val checkbox: CheckBoxView = findViewById(R.id.checkbox)!!
 
     init {
+        infoView.movementMethod = LinkMovementMethod.getInstance()
         headerView.doOnActionClick = { dismiss() }
         checkboxContainer.setOnClickListener { checkbox.toggle() }
         contentView.applyNavBottomPadding()
@@ -52,28 +63,48 @@ class PurchaseConfirmDialog(
             dismiss()
         }
         checkbox.checked = false
-        applyInfoButtons(method.infoButtons)
+        // applyInfoButtons(method.infoButtons)
     }
 
-    private fun applyInfoButtons(buttons: List<PurchaseMethodEntity.Button>) {
+    fun show(
+        provider: ProviderEntity,
+        callback: (showAgain: Boolean) -> Unit
+    ) {
+        super.show()
+        iconView.setImageURI(provider.iconUrl)
+        titleView.text = provider.title
+        subtitleView.text = provider.description
+        button.text = context.getString(Localization.open)
+        button.setOnClickListener {
+            callback(!checkbox.checked)
+            dismiss()
+        }
+        checkbox.checked = false
+        applyInfoButtons(provider.buttons)
+    }
+
+    private fun applyInfoButtons(buttons: List<MerchantEntity.Button>) {
         if (buttons.isNotEmpty()) {
-            infoView.removeAllViews()
-            infoView.visibility = View.VISIBLE
-            for (button in buttons) {
-                infoView.addView(createInfoButton(button))
-                infoView.addView(View(context), ViewGroup.LayoutParams(6.dp, 0))
+            val builder = SpannableStringBuilder()
+            for ((index, button) in buttons.withIndex()) {
+                builder.clickable(
+                    color = context.accentBlueColor,
+                    onClick = { openBrowser(button.url) },
+                    builderAction = { append(button.title) }
+                )
+                val isLast = index == buttons.size - 1
+                if (!isLast) {
+                    builder.append(" · ")
+                }
             }
+            infoView.text = builder
         } else {
-            infoView.visibility = View.GONE
+            infoView.text = context.getString(Localization.provider)
         }
     }
 
-    private fun createInfoButton(button: PurchaseMethodEntity.Button): View {
-        val buttonView = AppCompatTextView(context)
-        buttonView.text = button.title
-        buttonView.setOnClickListener { navigation?.openURL(button.url) }
-        buttonView.setTextAppearance(uikit.R.style.TextAppearance_Body1)
-        buttonView.setTextColor(context.textSecondaryColor)
-        return buttonView
+    private fun openBrowser(url: String) {
+        BrowserHelper.open(context, url)
+        dismiss()
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseScreen.kt
index 79da4f3a0..429876ccc 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseScreen.kt
@@ -55,7 +55,7 @@ class PurchaseScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragmen
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         collectFlow(viewModel.uiItemsFlow, adapter::submitList)
-        AnalyticsHelper.onRampOpen(settingsRepository.installId, source)
+        analytics?.onRampOpen(source)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -126,8 +126,7 @@ class PurchaseScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragmen
         } else {
             category
         }
-        AnalyticsHelper.onRampClick(
-            installId = settingsRepository.installId,
+        analytics?.onRampClick(
             type = viewModel.tabName,
             placement = fixedCategory,
             location = viewModel.country,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseViewModel.kt
index 30ceb1e24..2a6c7ea42 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/purchase/PurchaseViewModel.kt
@@ -1,8 +1,7 @@
 package com.tonapps.tonkeeper.ui.screen.purchase
 
 import android.app.Application
-import com.tonapps.tonkeeper.extensions.getNormalizeCountryFlow
-import com.tonapps.tonkeeper.koin.remoteConfig
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.purchase.list.Item
 import com.tonapps.uikit.list.ListCell
@@ -13,7 +12,6 @@ import com.tonapps.wallet.data.purchase.entity.PurchaseMethodEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
@@ -26,21 +24,18 @@ class PurchaseViewModel(
     private val settingsRepository: SettingsRepository,
     private val purchaseRepository: PurchaseRepository,
     private val api: API,
+    private val environment: Environment
 ): BaseWalletVM(app) {
 
     enum class Tab {
         BUY, SELL
     }
 
-    val countryFlow = settingsRepository.getNormalizeCountryFlow(api).map { country ->
-        context.remoteConfig?.hardcodedCountryCode ?: country
-    }
-
     private val _tabFlow = MutableStateFlow(Tab.BUY)
     val tabFlow = _tabFlow.asStateFlow()
 
     val country: String
-        get() = (countryFlow as? StateFlow)?.value ?: settingsRepository.country
+        get() = environment.country
 
     val tabName: String
         get() = when (tabFlow.value) {
@@ -48,6 +43,8 @@ class PurchaseViewModel(
             Tab.SELL -> "sell"
         }
 
+    val countryFlow = environment.countryFlow
+
     private val dataFlow = countryFlow.map { country ->
         purchaseRepository.get(wallet.testnet, country, settingsRepository.getLocale())
     }.filterNotNull().flowOn(Dispatchers.IO)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRScreen.kt
index 4d9b943ed..4179cb6a0 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRScreen.kt
@@ -3,6 +3,7 @@ package com.tonapps.tonkeeper.ui.screen.qr
 import android.content.Intent
 import android.os.Bundle
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -11,6 +12,7 @@ import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.extensions.copyToClipboard
 import com.tonapps.tonkeeper.extensions.toast
+import com.tonapps.tonkeeper.koin.api
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.compose.ComposeWalletScreen
 import com.tonapps.uikit.color.accentOrangeColor
@@ -39,7 +41,7 @@ class QRScreen(wallet: WalletEntity) : ComposeWalletScreen(wallet), BaseFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("receive_open", viewModel.installId)
+        analytics?.simpleTrackEvent("receive_open")
     }
 
     private fun getQrContent(address: String, token: TokenEntity): String {
@@ -77,8 +79,8 @@ class QRScreen(wallet: WalletEntity) : ComposeWalletScreen(wallet), BaseFragment
 
     @Composable
     override fun ScreenContent() {
-        val isTronDisabled = remoteConfig?.isTronDisabled ?: false
-        val tabsVisible = !hasToken && wallet.hasPrivateKey && !wallet.testnet && !isTronDisabled
+        val hasTronBalance by viewModel.hasTronBalanceFlow.collectAsState(false)
+        val tabsVisible = !hasToken && wallet.hasPrivateKey && !wallet.testnet && (!viewModel.isTronDisabled || hasTronBalance)
         val qrContent by remember {
             derivedStateOf {
                 if (viewModel.address.isNotEmpty()) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRViewModel.kt
index 6e905a256..1de9e7169 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/qr/QRViewModel.kt
@@ -41,6 +41,9 @@ class QRViewModel(
     val tronUsdtEnabled: Boolean
         get() = settingsRepository.getTronUsdtEnabled(wallet.id)
 
+    val isTronDisabled: Boolean
+        get() = api.config.flags.disableTron
+
     var token: TokenEntity by mutableStateOf(initialToken)
         private set
 
@@ -67,6 +70,10 @@ class QRViewModel(
             }.filter { !it.isTon }.sortedBy { it.index }
     }
 
+    val hasTronBalanceFlow = tokensFlow.map { tokens ->
+        tokens.any { it.address == TokenEntity.TRON_USDT.address && it.balance.value.isPositive }
+    }
+
     init {
         viewModelScope.launch {
             tronAddress = accountRepository.getTronAddress(wallet.id) ?: ""
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
index f19b5b351..bb3433425 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootActivity.kt
@@ -75,7 +75,11 @@ import uikit.extensions.findFragment
 import uikit.extensions.runAnimation
 import uikit.extensions.withAlpha
 import androidx.core.net.toUri
+import com.tonapps.blockchain.ton.TonSendMode
 import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.tonkeeper.koin.analytics
+import uikit.extensions.gestureNavigationEnabled
+import uikit.extensions.navigationMode
 
 class RootActivity : BaseWalletActivity() {
 
@@ -115,6 +119,7 @@ class RootActivity : BaseWalletActivity() {
         handleIntent(intent)
 
         lockView = findViewById(R.id.lock)
+        lockView.setOnClickListener {  }
         lockPasscodeView = findViewById(R.id.lock_passcode)
         lockPasscodeView.doOnCheck = {
             passcodeManager.lockscreenCheck(this, it)
@@ -245,10 +250,16 @@ class RootActivity : BaseWalletActivity() {
         }
     }
 
-    private fun setAppearanceLight(light: Boolean) {
+    fun setAppearanceLight(light: Boolean) {
+        val isLightTheme = settingsRepository.isLightTheme
+        var lightNavigationBars = light
+        if (isLightTheme && !gestureNavigationEnabled) {
+            lightNavigationBars = true
+        }
+
         with(windowInsetsController) {
             isAppearanceLightStatusBars = light
-            isAppearanceLightNavigationBars = light
+            isAppearanceLightNavigationBars = lightNavigationBars
         }
     }
 
@@ -303,7 +314,7 @@ class RootActivity : BaseWalletActivity() {
                     title = uri.host ?: "unknown",
                     url = uri,
                     iconUrl = "",
-                    source = "shortcut",
+                    source = "push",
                 )
             )
         }, DAppScreen::class.java)
@@ -318,7 +329,7 @@ class RootActivity : BaseWalletActivity() {
         message: RawMessageEntity
     ): com.tonapps.icu.Coins {
         try {
-            val transfer = message.getDefaultWalletTransfer()
+            val transfer = message.getDefaultWalletTransfer(TonSendMode.PAY_GAS_SEPARATELY.value + TonSendMode.IGNORE_ERRORS.value)
 
             val emulated = emulationUseCase(
                 message = accountRepository.messageBody(wallet, currentTimeSeconds() + 10 * 60, listOf(transfer)),
@@ -507,7 +518,7 @@ class RootActivity : BaseWalletActivity() {
         if (0 >= DevSettings.firstLaunchDate) {
             DevSettings.firstLaunchDeeplink = uri?.toString() ?: ""
         } else if (uri?.hasRefer() == true || uri?.hasUtmSource() == true) {
-            AnalyticsHelper.openRefDeeplink(settingsRepository.installId, uri.toString())
+            analytics?.openRefDeeplink(uri.toString())
         }
         val extras = intent.extras
         val dappDeepLink = extras?.getStringValue("dapp_deeplink")?.toUriOrNull()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
index 0ae7be342..af4dab8ef 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootViewModel.kt
@@ -10,7 +10,6 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.net.toUri
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import com.google.android.play.core.appupdate.AppUpdateInfo
 import com.google.android.play.core.appupdate.AppUpdateManager
@@ -18,24 +17,23 @@ import com.google.android.play.core.appupdate.AppUpdateManagerFactory
 import com.google.android.play.core.appupdate.AppUpdateOptions
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.UpdateAvailability
+import com.google.firebase.Firebase
 import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.crashlytics.crashlytics
 import com.google.firebase.crashlytics.setCustomKeys
-import com.google.firebase.ktx.Firebase
 import com.tonapps.blockchain.ton.extensions.equalsAddress
-import com.tonapps.blockchain.ton.extensions.isValidTonDomain
 import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.bestMessage
 import com.tonapps.extensions.currentTimeSeconds
 import com.tonapps.extensions.getStringValue
-import com.tonapps.extensions.locale
 import com.tonapps.extensions.setLocales
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.ledger.ton.LedgerConnectData
 import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.api.getCurrencyCodeByCountry
+import com.tonapps.tonkeeper.billing.BillingManager
 import com.tonapps.tonkeeper.client.safemode.SafeModeClient
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.core.DevSettings
@@ -68,10 +66,10 @@ import com.tonapps.tonkeeper.ui.screen.browser.confirm.DAppConfirmScreen
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
 import com.tonapps.tonkeeper.ui.screen.browser.safe.DAppSafeScreen
 import com.tonapps.tonkeeper.ui.screen.camera.CameraScreen
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewScreen
 import com.tonapps.tonkeeper.ui.screen.init.list.AccountItem
 import com.tonapps.tonkeeper.ui.screen.name.edit.EditNameScreen
 import com.tonapps.tonkeeper.ui.screen.onramp.main.OnRampScreen
-import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseScreen
 import com.tonapps.tonkeeper.ui.screen.qr.QRScreen
 import com.tonapps.tonkeeper.ui.screen.send.main.SendScreen
 import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
@@ -89,17 +87,16 @@ import com.tonapps.tonkeeper.ui.screen.wallet.manage.TokensManageScreen
 import com.tonapps.tonkeeper.ui.screen.wallet.picker.PickerScreen
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.api.API
-import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.browser.BrowserRepository
 import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.data.dapps.DAppsRepository
 import com.tonapps.wallet.data.dapps.entities.AppConnectEntity
-import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.passcode.LockScreen
 import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.data.purchase.PurchaseRepository
+import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.localization.Localization
@@ -119,7 +116,6 @@ import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
-import org.json.JSONObject
 import uikit.extensions.activity
 import java.util.concurrent.CancellationException
 import kotlin.math.abs
@@ -141,6 +137,9 @@ class RootViewModel(
     private val referrerClientHelper: ReferrerClientHelper,
     private val dAppsRepository: DAppsRepository,
     private val safeModeClient: SafeModeClient,
+    private val ratesRepository: RatesRepository,
+    private val analyticsHelper: AnalyticsHelper,
+    private val billingManager: BillingManager,
     savedStateHandle: SavedStateHandle,
 ): BaseWalletVM(app) {
 
@@ -185,7 +184,7 @@ class RootViewModel(
         if (0 >= DevSettings.firstLaunchDate) {
             val referrer = referrerClientHelper.getInstallReferrer()
             val deeplink = DevSettings.firstLaunchDeeplink.ifBlank { null }
-            AnalyticsHelper.firstLaunch(settingsRepository.installId, referrer, deeplink)
+            analyticsHelper.firstLaunch(referrer, deeplink)
             DevSettings.firstLaunchDate = currentTimeSeconds()
         }
     }
@@ -216,6 +215,16 @@ class RootViewModel(
     }
 
     init {
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                environment.setCountryFromStore(billingManager.getCountry())
+            } catch (_: Throwable) {
+                Log.d("RootViewModel", "Failed to get country from billing manager")
+            }
+            api.setCountry(deviceCountry = environment.country, storeCountry = environment.storeCountry)
+            api.initConfig()
+        }
+
         pushManager.clearNotifications()
 
         settingsRepository.languageFlow.collectFlow {
@@ -240,7 +249,14 @@ class RootViewModel(
         }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
 
         viewModelScope.launch(Dispatchers.IO) {
-            settingsRepository.firebaseToken = FirebasePush.requestToken()
+            val firebaseToken = FirebasePush.requestToken()
+            settingsRepository.firebaseToken = firebaseToken
+            ratesRepository.updateAll(settingsRepository.currency)
+            if (firebaseToken.isNullOrBlank()) {
+                Log.e("TonkeeperFirebasePush", "Failed to get Firebase push token")
+            } else {
+                Log.d("TonkeeperFirebasePush", "Firebase push token: $firebaseToken")
+            }
         }
 
         selectedWalletFlow.collectFlow { wallet ->
@@ -249,7 +265,7 @@ class RootViewModel(
         }
 
         api.configFlow.filter { !it.empty }.take(1).collectFlow { config ->
-            AnalyticsHelper.setConfig(context, config)
+            analyticsHelper.setConfig(context, config)
             sendFirstLaunchEvent()
         }
 
@@ -262,12 +278,6 @@ class RootViewModel(
             }
         }.launch()
 
-        settingsRepository.countryFlow.take(1).filter { it.isBlank() }.map {
-            api.resolveCountry()
-        }.filterNotNull().onEach {
-            settingsRepository.country = it
-        }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
-
         viewModelScope.launch(Dispatchers.IO) {
             if (environment.isGooglePlayServicesAvailable) {
                 delay(2000)
@@ -502,8 +512,7 @@ class RootViewModel(
                 processDAppPush(bundle)
             } else {
                 val deeplink = bundle.getString("deeplink")?.toUriOrNull() ?: return@collectFlow
-                AnalyticsHelper.trackPushClick(
-                    installId = installId,
+                analyticsHelper.trackPushClick(
                     pushId = pushId ?: pushType,
                     payload = deeplink.toString(),
                 )
@@ -534,6 +543,9 @@ class RootViewModel(
 
     private suspend fun processDeepLinkPush(uri: Uri, bundle: Bundle) {
         val wallet = deeplinkResolveWallet(bundle) ?: return
+        if (accountRepository.getSelectedWallet()?.id != wallet.id) {
+            accountRepository.setSelectedWallet(wallet.id)
+        }
         val deeplink = DeepLink(uri, false, null)
         processDeepLink(wallet, deeplink, null)
     }
@@ -591,7 +603,9 @@ class RootViewModel(
         fromPackageName: String?
     ) {
         val route = deeplink.route
-        if (route is DeepLinkRoute.TonConnect) {
+        if (route is DeepLinkRoute.DnsRenew) {
+            openScreen(DNSRenewScreen.newInstance(wallet, emptyList()))
+        } else if (route is DeepLinkRoute.TonConnect) {
             if (!wallet.isTonConnectSupported && accountRepository.getWallets().count { it.isTonConnectSupported } == 0) {
                 openScreen(AddWalletScreen.newInstance(true))
                 return
@@ -604,9 +618,9 @@ class RootViewModel(
         } else if (route is DeepLinkRoute.Send && !wallet.isWatchOnly) {
             openScreen(SendScreen.newInstance(wallet, type = SendScreen.Companion.Type.Default))
         } else if (route is DeepLinkRoute.Staking && !wallet.isWatchOnly) {
-            openScreen(StakingScreen.newInstance(wallet))
+            openScreen(StakingScreen.newInstance(wallet, from = "deeplink"))
         } else if (route is DeepLinkRoute.StakingPool) {
-            openScreen(StakeViewerScreen.newInstance(wallet, route.poolAddress, ""))
+            openScreen(StakeViewerScreen.newInstance(wallet, address = route.poolAddress, name = ""))
         } else if (route is DeepLinkRoute.AccountEvent) {
             if (route.address == null) {
                 showTransaction(route.eventId)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/InsufficientFundsDialog.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/InsufficientFundsDialog.kt
index ada27e035..ef7ddeb31 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/InsufficientFundsDialog.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/InsufficientFundsDialog.kt
@@ -4,10 +4,13 @@ import android.text.SpannableStringBuilder
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatImageView
+import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
 import com.tonapps.tonkeeper.core.Amount
+import com.tonapps.tonkeeper.core.InsufficientFundsException
 import com.tonapps.tonkeeper.extensions.getTitle
+import com.tonapps.tonkeeper.koin.api
 import com.tonapps.tonkeeper.ui.screen.battery.BatteryScreen
 import com.tonapps.tonkeeper.ui.screen.browser.more.BrowserMoreScreen
 import com.tonapps.tonkeeper.ui.screen.onramp.main.OnRampScreen
@@ -15,8 +18,10 @@ import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseScreen
 import com.tonapps.tonkeeper.ui.screen.send.main.helper.InsufficientBalanceType
 import com.tonapps.tonkeeper.view.BatteryView
 import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.localization.Localization
 import uikit.base.BaseFragment
 import uikit.dialog.modal.ModalDialog
@@ -38,6 +43,40 @@ class InsufficientFundsDialog(private val fragment: BaseFragment) : ModalDialog(
         findViewById<View>(R.id.close)!!.setOnClickListener { dismiss() }
     }
 
+    fun show(
+        wallet: WalletEntity,
+        e: InsufficientFundsException
+    ) {
+        super.show()
+        applyWalletTitle(wallet.label, e.singleWallet, e.type)
+        applyDescription(e.available, e.required, e.currency, e.withRechargeBattery, e.type)
+        batteryButton.visibility = if (e.withRechargeBattery) View.VISIBLE else View.GONE
+
+        val isBattery = e.type == InsufficientBalanceType.InsufficientBatteryChargesForFee
+
+        tonButton.visibility =
+            if (isBattery) View.GONE else View.VISIBLE
+        iconView.visibility = if (isBattery) View.GONE else View.VISIBLE
+        batteryView.setBatteryLevel(BatteryView.MIN_LEVEL)
+        batteryView.visibility = if (isBattery) View.VISIBLE else View.GONE
+
+        tonButton.text = context.getString(Localization.buy_ton).replace("TON", e.currency.code)
+        tonButton.setOnClickListener {
+            if (e.currency == WalletCurrency.TON) {
+                navigation?.add(OnRampScreen.newInstance(context, wallet, "insufficientFunds"))
+            } else {
+                fragment.finish()
+                navigation?.add(BrowserMoreScreen.newInstance(wallet, "defi"))
+            }
+            dismiss()
+        }
+
+        batteryButton.setOnClickListener {
+            navigation?.add(BatteryScreen.newInstance(wallet, from = "insufficient_funds"))
+            dismiss()
+        }
+    }
+
     fun show(
         wallet: WalletEntity,
         balance: Amount,
@@ -49,7 +88,8 @@ class InsufficientFundsDialog(private val fragment: BaseFragment) : ModalDialog(
         super.show()
         applyWalletTitle(wallet.label, singleWallet, type)
         applyDescription(balance, required, withRechargeBattery, type)
-        batteryButton.visibility = if (withRechargeBattery) View.VISIBLE else View.GONE
+        val isBatteryDisabled = context.api?.config?.flags?.disableBattery ?: false
+        batteryButton.visibility = if (withRechargeBattery && !isBatteryDisabled) View.VISIBLE else View.GONE
 
         val isBattery = type == InsufficientBalanceType.InsufficientBatteryChargesForFee
 
@@ -112,10 +152,39 @@ class InsufficientFundsDialog(private val fragment: BaseFragment) : ModalDialog(
             return
         } else {
             val balanceFormat =
-                CurrencyFormatter.format(balance.symbol, balance.value, balance.decimals)
+                CurrencyFormatter.format(balance.symbol, balance.value)
+                    .withCustomSymbol(context)
+            val requiredFormat =
+                CurrencyFormatter.format(required.symbol, required.value)
+                    .withCustomSymbol(context)
+
+            val resId =
+                if (withRechargeBattery || type == InsufficientBalanceType.InsufficientBalanceForFee) Localization.insufficient_balance_fees else Localization.insufficient_balance_default
+            textView.descriptionView.text = context.getString(resId, requiredFormat, balanceFormat)
+        }
+    }
+
+    private fun applyDescription(
+        balance: Coins,
+        required: Coins,
+        currency: WalletCurrency,
+        withRechargeBattery: Boolean,
+        type: InsufficientBalanceType
+    ) {
+        if (type == InsufficientBalanceType.InsufficientBatteryChargesForFee) {
+            textView.descriptionView.text =
+                context.getString(
+                    Localization.insufficient_balance_charges,
+                    CurrencyFormatter.format(value = required.value),
+                    CurrencyFormatter.format(value = balance.value)
+                )
+            return
+        } else {
+            val balanceFormat =
+                CurrencyFormatter.format(currency.code, balance.value)
                     .withCustomSymbol(context)
             val requiredFormat =
-                CurrencyFormatter.format(required.symbol, required.value, required.decimals)
+                CurrencyFormatter.format(currency.code, required.value)
                     .withCustomSymbol(context)
 
             val resId =
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt
index 9d84784c2..a7d184f74 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/add/AddContactViewModel.kt
@@ -2,7 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.send.contacts.add
 
 import android.app.Application
 import androidx.lifecycle.viewModelScope
-import com.tonapps.blockchain.ton.extensions.isTestnetAddress
+import com.tonapps.blockchain.ton.TonAddressTags
 import com.tonapps.blockchain.tron.isValidTronAddress
 import com.tonapps.extensions.bestMessage
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
@@ -65,11 +65,12 @@ class AddContactViewModel(
 
     init {
         userInputAddressFlow.collectFlow { address ->
+            val tags = TonAddressTags.of(address)
             if (address.isBlank()) {
                 _accountFlow.value = AddressAccount.Empty
-            } else if (address.contains(":")) {
+            } else if (!tags.userFriendly) {
                 _accountFlow.value = AddressAccount.Error
-            } else if (address.isTestnetAddress() && !wallet.testnet) {
+            } else if (tags.isTestnet == true && !wallet.testnet) {
                 _accountFlow.value = AddressAccount.Error
             } else if (address.isValidTronAddress() && tronUsdtEnabled) {
                 _accountFlow.value = AddressAccount.TronAccount(address)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsViewModel.kt
index 39268f5b3..0ac78f351 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/contacts/main/SendContactsViewModel.kt
@@ -3,10 +3,8 @@ package com.tonapps.tonkeeper.ui.screen.send.contacts.main
 import android.app.Application
 import android.util.Log
 import androidx.lifecycle.viewModelScope
-import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.blockchain.ton.extensions.toRawAddress
 import com.tonapps.extensions.filterList
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.core.entities.WalletExtendedEntity
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.send.contacts.main.list.Item
@@ -15,25 +13,20 @@ import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.contacts.ContactsRepository
 import com.tonapps.wallet.data.contacts.entities.ContactEntity
 import com.tonapps.wallet.data.events.EventsRepository
 import com.tonapps.wallet.data.settings.SettingsRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import okhttp3.internal.filterList
 
 class SendContactsViewModel(
     app: Application,
@@ -42,7 +35,7 @@ class SendContactsViewModel(
     private val settingsRepository: SettingsRepository,
     private val contactsRepository: ContactsRepository,
     private val eventsRepository: EventsRepository,
-    private val remoteConfig: RemoteConfig,
+    private val batteryRepository: BatteryRepository,
 ) : BaseWalletVM(app) {
 
     private val _myWalletsFlow = MutableStateFlow<List<Item.MyWallet>>(emptyList())
@@ -85,6 +78,9 @@ class SendContactsViewModel(
         uiItems.toList()
     }
 
+    private val tronEnabled: Boolean
+        get() = settingsRepository.getTronUsdtEnabled(wallet.id)
+
     init {
         viewModelScope.launch(Dispatchers.IO) {
             _myWalletsFlow.value = getMyWallets()
@@ -115,13 +111,12 @@ class SendContactsViewModel(
     }
 
     private val tronLatestTransactionsFlow = flow {
-        val tronEnabled = settingsRepository.getTronUsdtEnabled(wallet.id)
         if (!tronEnabled) {
             emit(emptyList())
             return@flow
         }
 
-        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+        val tronAddress = if (wallet.hasPrivateKey && !wallet.testnet && tronEnabled) {
             accountRepository.getTronAddress(wallet.id)
         } else null
         val tonProofToken = accountRepository.requestTonProofToken(wallet)
@@ -152,18 +147,21 @@ class SendContactsViewModel(
             accountId = wallet.accountId,
             testnet = wallet.testnet
         ),
-        latestTronContactsFlow,
+        latestTronContactsFlow
     ) { _, recipients, tronContacts ->
+        val gasProxyAddresses = batteryRepository.getConfig(wallet.testnet).gasProxy
         val tonContacts = recipients.filter {
             !contactsRepository.isHidden(it.account.address.toRawAddress(), wallet.testnet)
         }.mapIndexed { index, recipient ->
             val position = ListCell.getPosition(recipients.size, index)
             Item.LatestContact(position, recipient.account, recipient.timestamp, wallet.testnet)
+        }.filter {
+            it.address !in gasProxyAddresses
         }
 
-        Log.d("SendContactsViewModel", "tronContacts: $tronContacts")
-
-        val contacts = (tonContacts + tronContacts).sortedByDescending { it.timestamp }.take(6)
+        val contacts = (tonContacts + tronContacts).sortedByDescending {
+            it.timestamp
+        }.take(6)
 
         contacts.mapIndexed { index, item ->
             item.copy(
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendScreen.kt
index b92c6911b..6f7c1a5b1 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendScreen.kt
@@ -6,16 +6,16 @@ import android.text.SpannableString
 import android.text.method.LinkMovementMethod
 import android.text.style.ForegroundColorSpan
 import android.util.Log
-import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
 import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.extensions.getUserMessage
 import com.tonapps.extensions.isPositive
-import com.tonapps.extensions.short4
 import com.tonapps.extensions.shortTron
 import com.tonapps.extensions.uri
 import com.tonapps.icu.CurrencyFormatter
@@ -28,7 +28,6 @@ import com.tonapps.tonkeeper.extensions.copyToClipboard
 import com.tonapps.tonkeeper.extensions.getTitle
 import com.tonapps.tonkeeper.extensions.hideKeyboard
 import com.tonapps.tonkeeper.helper.BrowserHelper
-import com.tonapps.tonkeeper.koin.settingsRepository
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.popup.ActionSheet
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen
@@ -53,7 +52,6 @@ import com.tonapps.uikit.color.fieldActiveBorderColor
 import com.tonapps.uikit.color.fieldErrorBorderColor
 import com.tonapps.uikit.color.textAccentColor
 import com.tonapps.uikit.color.textSecondaryColor
-import com.tonapps.uikit.color.textTertiaryColor
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.TokenEntity
@@ -62,8 +60,10 @@ import com.tonapps.wallet.data.collectibles.entities.NftEntity
 import com.tonapps.wallet.data.core.HIDDEN_BALANCE
 import com.tonapps.wallet.localization.Localization
 import com.tonapps.wallet.localization.Plurals
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.launch
 import org.koin.core.parameter.parametersOf
 import org.ton.cell.Cell
 import uikit.base.BaseFragment
@@ -77,6 +77,7 @@ import uikit.extensions.getDimensionPixelSize
 import uikit.extensions.hideKeyboard
 import uikit.extensions.setEndDrawable
 import uikit.span.ClickableSpanCompat
+import uikit.widget.ColumnLayout
 import uikit.widget.FrescoView
 import uikit.widget.HeaderView
 import uikit.widget.InputView
@@ -128,7 +129,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
     private lateinit var reviewTitleView: AppCompatTextView
     private lateinit var reviewWalletView: TransactionDetailView
     private lateinit var reviewRecipientView: TransactionDetailView
-    private lateinit var reviewRecipientAddressView: TransactionDetailView
+    private lateinit var reviewRecipientAddressView: ColumnLayout
     private lateinit var reviewRecipientAmountView: TransactionDetailView
     private lateinit var reviewRecipientFeeView: TransactionDetailView
     private lateinit var reviewRecipientCommentView: TransactionDetailView
@@ -142,7 +143,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("send_open", viewModel.installId)
+        analytics?.simpleTrackEvent("send_open")
 
         navigation?.setFragmentResultListener(contractsRequestKey) { bundle ->
             val contact = bundle.getParcelableCompat<SendContact>("contact")
@@ -230,7 +231,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
 
         button = view.findViewById(R.id.button)
         button.setOnClickListener {
-            AnalyticsHelper.simpleTrackEvent("send_click", viewModel.installId)
+            analytics?.simpleTrackEvent("send_click")
             next()
         }
 
@@ -267,7 +268,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
         }
 
         confirmButton.setOnClickListener {
-            AnalyticsHelper.simpleTrackEvent("send_confirm", viewModel.installId)
+            analytics?.simpleTrackEvent("send_confirm")
             signAndSend()
         }
         confirmButton.setText(if (wallet.hasPrivateKey) Localization.confirm else Localization.continue_action)
@@ -334,6 +335,14 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
         )
     }
 
+    override fun onBackPressed(): Boolean {
+        if (!slidesView.isFirst) {
+            slidesView.prev()
+            return false
+        }
+        return super.onBackPressed()
+    }
+
     private fun applyTokenError(
         error: SendDestination.TokenError,
         swapMethod: WalletPurchaseMethodEntity?
@@ -363,7 +372,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
 
         val isUsdt = error.selectedToken.isTrc20 || error.selectedToken.isUsdt
 
-        if (swapMethod != null && isUsdt) {
+        if (swapMethod != null && isUsdt && !viewModel.isTronDisabled) {
             val spannableString = SpannableString("$errorText $swapText")
             val start = spannableString.indexOf(swapTitle)
             spannableString.setSpan(
@@ -439,22 +448,39 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
         targetAddress?.let { addressInput.text = it }
         bin?.let { viewModel.userInputBin(it) }
 
-        if (type == Type.Direct && amountNano.isPositive()) {
-            reviewHeaderView.setIcon(0)
-            reviewHeaderView.setAction(UIKitIcon.ic_close_16)
-            reviewHeaderView.doOnActionClick = { finish() }
-            next()
-            slidesView.next(false)
-            addressInput.hideKeyboard()
+        if (targetAddress != null) {
+            lifecycleScope.launch(Dispatchers.Main) {
+                if (viewModel.isNeedMemoAddress(targetAddress)) {
+                    showReviewState()
+                    commentInput.focus()
+                } else if (type == Type.Direct && amountNano.isPositive()) {
+                    showDirectState()
+                }
+            }
+        } else if (type == Type.Direct && amountNano.isPositive()) {
+            showDirectState()
         } else {
-            reviewHeaderView.setAction(0)
-            reviewHeaderView.setIcon(UIKitIcon.ic_chevron_left_16)
-            reviewHeaderView.doOnCloseClick = { showCreate() }
-            showCreate()
-            addressInput.focus()
+            showReviewState()
         }
     }
 
+    fun showDirectState() {
+        reviewHeaderView.setIcon(0)
+        reviewHeaderView.setAction(UIKitIcon.ic_close_16)
+        reviewHeaderView.doOnActionClick = { finish() }
+        next()
+        slidesView.next(false)
+        addressInput.hideKeyboard()
+    }
+
+    fun showReviewState() {
+        reviewHeaderView.setAction(0)
+        reviewHeaderView.setIcon(UIKitIcon.ic_chevron_left_16)
+        reviewHeaderView.doOnCloseClick = { showCreate() }
+        showCreate()
+        addressInput.focus()
+    }
+
     private fun applyCommentEncryptState(enabled: Boolean) {
         val textIsEmpty = commentInput.text.isBlank()
         val textSecondaryColor = requireContext().textSecondaryColor
@@ -608,23 +634,42 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
             amount.convertedFormat.withCustomSymbol(requireContext())
     }
 
+    private fun reviewRecipientAddressTitle(): AppCompatTextView {
+        return reviewRecipientAddressView.getChildAt(0) as AppCompatTextView
+    }
+
+    private fun reviewRecipientAddressValue(): AppCompatTextView {
+        return reviewRecipientAddressView.getChildAt(1) as AppCompatTextView
+    }
+
     private fun applyTransactionAccount(destination: SendDestination) {
         if (destination is SendDestination.TonAccount) {
             if (destination.displayName == null) {
+                reviewRecipientView.visibility = View.GONE
+                reviewRecipientView.orientation = LinearLayoutCompat.VERTICAL
                 reviewRecipientView.value = destination.displayAddress
                 reviewRecipientView.setOnClickListener {
                     requireContext().copyToClipboard(destination.displayAddress)
                 }
 
-                reviewRecipientAddressView.visibility = View.GONE
+                reviewRecipientAddressView.visibility = View.VISIBLE
+                reviewRecipientAddressTitle().setText(Localization.recipient)
+                reviewRecipientAddressValue().text = destination.displayAddress
+                reviewRecipientAddressView.setOnClickListener {
+                    requireContext().copyToClipboard(
+                        destination.displayAddress
+                    )
+                }
             } else {
+                reviewRecipientView.orientation = LinearLayoutCompat.HORIZONTAL
                 reviewRecipientView.value = destination.displayName
                 reviewRecipientView.setOnClickListener {
                     requireContext().copyToClipboard(destination.displayName!!)
                 }
 
                 reviewRecipientAddressView.visibility = View.VISIBLE
-                reviewRecipientAddressView.value = destination.displayAddress
+                reviewRecipientAddressTitle().setText(Localization.recipient_address)
+                reviewRecipientAddressValue().text = destination.displayAddress
                 reviewRecipientAddressView.setOnClickListener {
                     requireContext().copyToClipboard(
                         destination.displayAddress
@@ -709,20 +754,15 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
             }
 
             if (event.showToggle) {
-                val paymentMethodViewed =
-                    requireContext().settingsRepository?.paymentMethodViewed ?: false
-                reviewRecipientFeeView.subtitle = getString(Localization.change_fee_method)
+                reviewRecipientFeeView.subtitle = getString(Localization.edit_full)
                 reviewRecipientFeeView.setOnClickListener {
                     showFeeMethods(event.fee, reviewRecipientFeeView)
                 }
                 reviewRecipientFeeView.subtitleView.expandTouchArea(8.dp)
                 reviewRecipientFeeView.subtitleView.isEnabled = true
-                reviewRecipientFeeView.subtitleView.setTextColor(if (paymentMethodViewed) requireContext().textSecondaryColor else requireContext().textAccentColor)
+                reviewRecipientFeeView.subtitleView.setTextColor(requireContext().textAccentColor)
                 reviewRecipientFeeView.subtitleView.setEndDrawable(
-                    getDrawable(
-                        UIKitIcon.ic_chevron_right_12,
-                        if (paymentMethodViewed) requireContext().textSecondaryColor else requireContext().textAccentColor
-                    )
+                    getDrawable(UIKitIcon.ic_chevron_right_12, requireContext().textAccentColor)
                 )
 
             } else {
@@ -814,8 +854,7 @@ class SendScreen(wallet: WalletEntity) : WalletContextScreen(R.layout.fragment_s
                 is SendFee.TokenFee -> {
                     val formattedAmount = CurrencyFormatter.format(
                         fee.amount.token.symbol,
-                        fee.amount.value,
-                        2
+                        fee.amount.value
                     )
                     val formattedFiat = CurrencyFormatter.formatFiat(
                         fee.fiatCurrency.code,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt
index 17abd70e2..f2659476c 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt
@@ -4,9 +4,10 @@ import android.app.Application
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.tonapps.blockchain.ton.TonAddressTags
 import com.tonapps.blockchain.ton.contract.WalletFeature
 import com.tonapps.blockchain.ton.extensions.equalsAddress
-import com.tonapps.blockchain.ton.extensions.isTestnetAddress
+import com.tonapps.blockchain.ton.extensions.isValidTonAddress
 import com.tonapps.blockchain.tron.TronTransfer
 import com.tonapps.blockchain.tron.isValidTronAddress
 import com.tonapps.extensions.MutableEffectFlow
@@ -114,6 +115,7 @@ class SendViewModel(
     private val transactionManager: TransactionManager,
     private val signUseCase: SignUseCase,
     private val purchaseRepository: PurchaseRepository,
+    private val analytics: AnalyticsHelper
 ) : BaseWalletVM(app) {
 
     private val isNft: Boolean
@@ -122,6 +124,12 @@ class SendViewModel(
     val installId: String
         get() = settingsRepository.installId
 
+    val isTronDisabled: Boolean
+        get() = api.config.flags.disableTron
+
+    val isBatteryDisabled: Boolean
+        get() = api.config.flags.disableBattery
+
     data class UserInput(
         val address: String = "",
         val amount: Coins = Coins.ZERO,
@@ -169,22 +177,20 @@ class SendViewModel(
             userInputAddressFlow,
             tronAvailableFlow,
             selectedTokenFlow
-        ) { address, isTronAvailable, selectedToken ->
-            if (address.isEmpty()) {
+        ) { userInput, isTronAvailable, selectedToken ->
+            if (userInput.isEmpty()) {
                 SendDestination.Empty
-            } else if (isTronAvailable && address.isValidTronAddress()) {
+            } else if (isTronAvailable && userInput.isValidTronAddress()) {
                 if (selectedToken.isTrc20) {
-                    SendDestination.TronAccount(address)
+                    SendDestination.TronAccount(userInput)
                 } else {
                     SendDestination.TokenError(
                         addressBlockchain = Blockchain.TRON,
                         selectedToken = selectedToken.token
                     )
                 }
-            } else if (wallet.testnet != address.isTestnetAddress()) {
-                SendDestination.NotFound
             } else {
-                val destination = getDestinationAccount(address, wallet.testnet)
+                val destination = getDestinationAccount(userInput)
 
                 if (destination is SendDestination.TonAccount && selectedToken.isTrc20) {
                     SendDestination.TokenError(
@@ -296,7 +302,6 @@ class SendViewModel(
         val remainingFormat = CurrencyFormatter.format(
             currency = token.symbol,
             value = remainingToken,
-            customScale = 2,
             roundingMode = RoundingMode.DOWN,
             replaceSymbol = false
         )
@@ -307,7 +312,6 @@ class SendViewModel(
             convertedFormat = CurrencyFormatter.format(
                 currency = convertedCode,
                 value = converted,
-                customScale = 2,
                 roundingMode = RoundingMode.DOWN,
                 replaceSymbol = false
             ),
@@ -362,12 +366,11 @@ class SendViewModel(
             value = amount,
             converted = rates.convert(token.address, amount),
             format = CurrencyFormatter.format(
-                token.symbol, amount, token.decimals, RoundingMode.UP, false
+                token.symbol, amount, RoundingMode.UP, false
             ),
             convertedFormat = CurrencyFormatter.format(
                 currency.code,
                 rates.convert(token.address, amount),
-                token.decimals,
                 RoundingMode.UP,
             ),
         )
@@ -431,13 +434,12 @@ class SendViewModel(
             builder.setBounceable(true)
             builder.setAmount(Coins.ZERO)
             builder.setMax(false)
+        } else if (!transaction.token.isTon) {
+            builder.setMax(transaction.amount.value == token.balance.value)
+            builder.setBounceable(true)
+            builder.setAmount(transaction.amount.value)
         } else {
-            val isDirectTransferType = userInputFlow.value.type == SendScreen.Companion.Type.Direct
-            if (isDirectTransferType) {
-                builder.setMax(false)
-            } else {
-                builder.setMax(transaction.isRealMax(token.balance.value))
-            }
+            builder.setMax(transaction.amount.value == getTONBalance())
             builder.setAmount(transaction.amount.value)
             builder.setBounceable(transaction.destination.isBounce)
         }
@@ -464,13 +466,10 @@ class SendViewModel(
         SendTransaction.Amount(
             value = value,
             converted = rates.convert(token.address, value),
-            format = CurrencyFormatter.format(
-                token.symbol, value, token.decimals, RoundingMode.UP, false
-            ),
+            format = CurrencyFormatter.formatFull(token.symbol, value, token.decimals),
             convertedFormat = CurrencyFormatter.format(
                 currency.code,
                 rates.convert(token.address, value),
-                token.decimals,
                 RoundingMode.UP,
             ),
         )
@@ -542,22 +541,36 @@ class SendViewModel(
         }
     }
 
+    suspend fun isNeedMemoAddress(targetAddress: String): Boolean = withContext(Dispatchers.IO) {
+       api.resolveAccount(targetAddress, wallet.testnet)?.memoRequired == true
+    }
+
     private fun applyAmount(token: TokenEntity, amountNano: Long?) {
         amountNano?.let {
             _uiInputAmountFlow.tryEmit(Coins.of(it, token.decimals))
         }
     }
 
-    private suspend fun getDestinationAccount(
-        address: String, testnet: Boolean
-    ) = withContext(Dispatchers.IO) {
-        val accountDeferred = async { api.resolveAccount(address, testnet) }
-        val publicKeyDeferred = async { api.safeGetPublicKey(address, testnet) }
+    private suspend fun getDestinationAccount(userInput: String) = withContext(Dispatchers.IO) {
+        val tonAddressTags = TonAddressTags.of(userInput)
+        if (tonAddressTags.userFriendly && tonAddressTags.isTestnet != wallet.testnet) {
+            return@withContext SendDestination.NotFound
+        }
+
+        val accountDeferred = async { api.resolveAccount(userInput, wallet.testnet) }
+        val publicKeyDeferred = async { api.safeGetPublicKey(userInput, wallet.testnet) }
 
         val account = accountDeferred.await() ?: return@withContext SendDestination.NotFound
         val publicKey = publicKeyDeferred.await()
 
-        SendDestination.TonAccount(address, publicKey, account, wallet.testnet)
+        SendDestination.TonAccount(
+            userInput = userInput,
+            isUserInputAddress = userInput.isValidTonAddress(),
+            publicKey = publicKey,
+            account = account,
+            testnet = wallet.testnet,
+            tonAddressTags = tonAddressTags
+        )
     }
 
     private fun getFee(): Fee {
@@ -665,7 +678,7 @@ class SendViewModel(
             else -> BatteryTransaction.UNKNOWN
         }
         val batteryBalance = getBatteryBalance()
-        val batteryEnabled = !api.config.batteryDisabled && settingsRepository.batteryIsEnabledTx(
+        val batteryEnabled = !isBatteryDisabled && settingsRepository.batteryIsEnabledTx(
             wallet.accountId, txType
         )
         val required = when (type) {
@@ -894,7 +907,7 @@ class SendViewModel(
         excessesAddress: AddrStd,
         tonProofToken: String,
     ): SendFee.Battery? {
-        if (api.config.isBatteryDisabled) {
+        if (api.config.batterySendDisabled) {
             return null
         }
 
@@ -947,6 +960,11 @@ class SendViewModel(
         tokenAddress: String,
     ): SendFee.Gasless? {
         try {
+            if (api.config.flags.disableGasless) {
+                Log.d("SendViewModel", "Gasless fee calculation disabled by config")
+                return null
+            }
+
             val message = transfer.signForEstimation(
                 internalMessage = true,
                 jettonAmount = if (transfer.max) {
@@ -1005,7 +1023,7 @@ class SendViewModel(
         transfer: TransferEntity,
     ): SendFee.Ton {
         val message = transfer.signForEstimation(
-            internalMessage = false, jettonTransferAmount = TransferEntity.BASE_FORWARD_AMOUNT
+            internalMessage = false, jettonTransferAmount = TransferEntity.ONE_TON
         )
         // Emulate with higher balance to calculate fair amount to send
         val emulated = api.emulate(
@@ -1059,15 +1077,14 @@ class SendViewModel(
                 format = if (fee is SendFee.TokenFee) {
                     CurrencyFormatter.format(
                         fee.amount.token.symbol,
-                        fee.amount.value,
-                        fee.amount.token.decimals
+                        fee.amount.value
                     )
                 } else "",
                 convertedFormat = if (fee is SendFee.TokenFee) {
                     val rates = ratesRepository.getRates(currency, fee.amount.token.address)
                     val converted = rates.convert(fee.amount.token.address, fee.amount.value)
                     CurrencyFormatter.format(
-                        currency.code, converted, currency.decimals
+                        currency.code, converted
                     )
                 } else "",
                 showToggle = showToggle,
@@ -1163,7 +1180,6 @@ class SendViewModel(
             is SendFee.Gasless -> PreferredFeeMethod.GASLESS
         }
         settingsRepository.setPreferredFeeMethod(wallet.id, preferredMethod)
-        settingsRepository.paymentMethodViewed = true
         viewModelScope.launch(Dispatchers.IO) {
             transferFlow.firstOrNull()?.let { transfer ->
                 _feeFlow.tryEmit(fee)
@@ -1324,7 +1340,7 @@ class SendViewModel(
             tronAddress = transfer.from,
             tonProofToken = tonProofToken,
         )
-        AnalyticsHelper.simpleTrackEvent("send_success", settingsRepository.installId)
+        analytics.simpleTrackEvent("send_success")
         getBatteryBalance()
     }.catch {
         FirebaseCrashlytics.getInstance().recordException(it)
@@ -1353,7 +1369,7 @@ class SendViewModel(
     private fun Flow<Triple<Cell, WalletEntity, Boolean>>.sendTransfer() {
         this.map { (boc, wallet, withBattery) ->
             send(boc, wallet, withBattery)
-            AnalyticsHelper.simpleTrackEvent("send_success", settingsRepository.installId)
+            analytics.simpleTrackEvent("send_success")
         }.catch {
             FirebaseCrashlytics.getInstance().recordException(it)
             _uiEventFlow.tryEmit(SendEvent.Failed(it))
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendDestination.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendDestination.kt
index c389cfee4..0431f40d8 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendDestination.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendDestination.kt
@@ -1,6 +1,6 @@
 package com.tonapps.tonkeeper.ui.screen.send.main.state
 
-import com.tonapps.blockchain.ton.extensions.isTestnetAddress
+import com.tonapps.blockchain.ton.TonAddressTags
 import com.tonapps.blockchain.ton.extensions.isValidTonAddress
 import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.TokenEntity
@@ -18,7 +18,8 @@ sealed class SendDestination {
     ) : SendDestination()
 
     data class TonAccount(
-        val query: String,
+        val userInput: String,
+        val isUserInputAddress: Boolean,
         val publicKey: PublicKeyEd25519,
         val address: AddrStd,
         val memoRequired: Boolean,
@@ -26,32 +27,32 @@ sealed class SendDestination {
         val isWallet: Boolean,
         val name: String?,
         val isScam: Boolean,
-        val isBounce: Boolean,
         val existing: Boolean,
-        val testnet: Boolean
+        val testnet: Boolean,
+        val tonAddressTags: TonAddressTags,
+        val isBounce: Boolean,
     ) : SendDestination() {
 
         companion object {
-            private fun isBounce(query: String, account: io.tonapi.models.Account): Boolean {
-                if (account.status != AccountStatus.active && (query.startsWith("EQ") || query.isTestnetAddress())) {
+
+            private fun isBounce(
+                tonAddressTags: TonAddressTags,
+                isUserInputAddress: Boolean,
+                account: io.tonapi.models.Account
+            ): Boolean {
+                if (account.status != AccountStatus.active && (!tonAddressTags.isBounceable || tonAddressTags.isTestnet == true)) {
                     return false
                 }
-                val bounce = query.startsWith("EQ") || !query.startsWith("U")
-                if (!query.isValidTonAddress()) {
+                if (!isUserInputAddress) {
                     return !account.isWallet
                 }
-                return bounce
+                return tonAddressTags.isBounceable
             }
         }
 
-        val displayName: String?
-            get() {
-                return if (query.isValidTonAddress()) {
-                    name
-                } else {
-                    query.lowercase()
-                }
-            }
+        val displayName: String? by lazy {
+            if (isUserInputAddress) name else userInput.lowercase()
+        }
 
         val displayAddress: String
             get() {
@@ -63,12 +64,15 @@ sealed class SendDestination {
             }
 
         constructor(
-            query: String,
+            userInput: String,
+            isUserInputAddress: Boolean,
             publicKey: PublicKeyEd25519,
             account: io.tonapi.models.Account,
-            testnet: Boolean
+            testnet: Boolean,
+            tonAddressTags: TonAddressTags
         ) : this(
-            query = query,
+            userInput = userInput,
+            isUserInputAddress = isUserInputAddress,
             publicKey = publicKey,
             address = AddrStd(account.address),
             memoRequired = account.memoRequired ?: false,
@@ -76,9 +80,10 @@ sealed class SendDestination {
             isWallet = account.isWallet,
             name = account.name,
             isScam = account.isScam ?: false,
-            isBounce = isBounce(query, account),
             existing = (account.status == AccountStatus.active || account.status == AccountStatus.frozen),
-            testnet = testnet
+            testnet = testnet,
+            tonAddressTags = tonAddressTags,
+            isBounce = isBounce(tonAddressTags, isUserInputAddress, account)
         )
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendFee.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendFee.kt
index 92561fe3a..631607f96 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendFee.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/SendFee.kt
@@ -1,11 +1,12 @@
 package com.tonapps.tonkeeper.ui.screen.send.main.state
 
 import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.core.Fee
+import com.tonapps.tonkeeper.extensions.symbol
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import org.ton.block.AddrStd
 
-
 sealed class SendFee {
 
     interface TokenFee {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/TonTransaction.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/TonTransaction.kt
index 90a0744ff..a53771add 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/TonTransaction.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/state/TonTransaction.kt
@@ -14,10 +14,6 @@ data class TonTransaction(
     val max: Boolean
 ) {
 
-    fun isRealMax(balance: Coins): Boolean {
-        return amount.value >= balance
-    }
-
     data class Amount(
         val value: Coins,
         val converted: Coins,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt
index a28b9d1ea..ae44ab20e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionScreen.kt
@@ -55,6 +55,19 @@ import uikit.widget.SimpleRecyclerView
 import uikit.widget.SlideActionView
 import java.util.concurrent.CancellationException
 import androidx.core.view.isVisible
+import com.tonapps.extensions.uri
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.extensions.addFeeItem
+import com.tonapps.tonkeeper.extensions.formattedAmount
+import com.tonapps.tonkeeper.extensions.formattedCharges
+import com.tonapps.tonkeeper.extensions.formattedFiat
+import com.tonapps.tonkeeper.extensions.id
+import com.tonapps.tonkeeper.extensions.symbol
+import com.tonapps.tonkeeper.popup.ActionSheet
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.uikit.color.accentGreenColor
+import com.tonapps.wallet.localization.Plurals
+import uikit.extensions.dp
 import uikit.extensions.getDimensionPixelSize
 
 class SendTransactionScreen(wallet: WalletEntity) :
@@ -73,7 +86,17 @@ class SendTransactionScreen(wallet: WalletEntity) :
         parametersOf(args.request, args.batteryTransactionType, args.forceRelayer)
     }
 
-    private val historyAdapter = object : HistoryAdapter(disableOpenAction = true) {
+    private val feeMethodSelector: ActionSheet by lazy {
+        ActionSheet(requireContext())
+    }
+
+    private val historyAdapter = object : HistoryAdapter(
+        disableOpenAction = true,
+        shouldShowFeeToggle = {
+            viewModel.feeOptions.size > 1
+        },
+        showFeeMethods = ::showFeeMethods,
+    ) {
         override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
             super.onAttachedToRecyclerView(recyclerView)
             recyclerView.isNestedScrollingEnabled = true
@@ -164,10 +187,7 @@ class SendTransactionScreen(wallet: WalletEntity) :
         slideTextBuilder.append("\n")
         slideTextBuilder.append(SpannableString(secondLineText).apply {
             setSpan(
-                RelativeSizeSpan(0.8f),
-                0,
-                secondLineText.length,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                RelativeSizeSpan(0.8f), 0, secondLineText.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
             )
             setSpan(
                 ForegroundColorSpan(
@@ -326,6 +346,23 @@ class SendTransactionScreen(wallet: WalletEntity) :
         walletView.text = builder
     }
 
+    private fun showFeeMethods(currentFee: SendFee, targetView: View) {
+        feeMethodSelector.width = 264.dp
+
+        if (feeMethodSelector.isShowing) {
+            return
+        }
+
+        feeMethodSelector.clearItems()
+
+        viewModel.feeOptions.forEach { fee ->
+            feeMethodSelector.addFeeItem(fee, fee.id == currentFee?.id) {
+                viewModel.setFeeMethod(fee)
+            }
+        }
+        feeMethodSelector.showPopupAboveRight(targetView)
+    }
+
     companion object {
 
         const val ERROR = "error"
@@ -349,8 +386,7 @@ class SendTransactionScreen(wallet: WalletEntity) :
             batteryTxType: BatteryTransaction = BatteryTransaction.UNKNOWN,
             forceRelayer: Boolean = false,
         ): String {
-            val activity =
-                context.activity ?: throw IllegalArgumentException("Context must be an Activity")
+            val activity = context.activity ?: throw IllegalArgumentException("Context must be an Activity")
             val fragment = newInstance(wallet, request, batteryTxType, forceRelayer)
             val result = activity.addForResult(fragment)
             if (result.containsKey(ERROR)) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionState.kt
index b55294489..151d9b23b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionState.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionState.kt
@@ -5,6 +5,7 @@ import com.tonapps.tonkeeper.core.Amount
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeper.ui.screen.send.main.helper.InsufficientBalanceType
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
 import com.tonapps.wallet.data.account.entities.WalletEntity
 
 sealed class SendTransactionState {
@@ -26,7 +27,8 @@ sealed class SendTransactionState {
         val totalFormat: CharSequence,
         val isDangerous: Boolean,
         val nftCount: Int,
-        val failed: Boolean
+        val failed: Boolean,
+        val fee: SendFee,
     ): SendTransactionState() {
 
         val uiItems: List<HistoryItem>
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionViewModel.kt
index bb1fc797b..194bae26f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/transaction/SendTransactionViewModel.kt
@@ -13,12 +13,17 @@ import com.tonapps.icu.Coins
 import com.tonapps.ledger.ton.Transaction
 import com.tonapps.tonkeeper.core.Amount
 import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.core.Fee
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.extensions.getTransfers
+import com.tonapps.tonkeeper.helper.BatteryHelper
 import com.tonapps.tonkeeper.manager.assets.AssetsManager
 import com.tonapps.tonkeeper.manager.tx.TransactionManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.send.main.helper.InsufficientBalanceType
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.tonkeeper.usecase.emulation.Emulated
+import com.tonapps.tonkeeper.usecase.emulation.Emulated.Companion.buildFee
 import com.tonapps.tonkeeper.usecase.emulation.EmulationUseCase
 import com.tonapps.tonkeeper.usecase.sign.SignUseCase
 import com.tonapps.wallet.api.API
@@ -28,18 +33,23 @@ import com.tonapps.wallet.api.getDebugMessage
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.entities.MessageBodyEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.battery.BatteryMapper
 import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.data.events.EventsRepository
+import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.settings.BatteryTransaction
 import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.settings.entities.PreferredFeeMethod
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 import com.tonapps.wallet.localization.Localization
 import io.tonapi.models.JettonVerificationType
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
@@ -48,6 +58,7 @@ import org.ton.cell.Cell
 import org.ton.contract.wallet.WalletTransfer
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicLong
+import kotlin.math.abs
 
 class SendTransactionViewModel(
     app: Application,
@@ -64,7 +75,8 @@ class SendTransactionViewModel(
     private val emulationUseCase: EmulationUseCase,
     private val transactionManager: TransactionManager,
     private val batteryRepository: BatteryRepository,
-    private val assetsManager: AssetsManager
+    private val ratesRepository: RatesRepository,
+    private val analytics: AnalyticsHelper
 ) : BaseWalletVM(app) {
 
     private val currency = settingsRepository.currency
@@ -77,61 +89,116 @@ class SendTransactionViewModel(
 
     var message: MessageBodyEntity? = null
 
+    private var tonDetails: SendTransactionState.Details? = null
+    private var batteryDetails: SendTransactionState.Details? = null
+
+    val feeOptions: List<SendFee>
+        get() = listOfNotNull(
+            batteryDetails?.fee,
+            tonDetails?.fee,
+        )
+
     init {
-        AnalyticsHelper.tcViewConfirm(settingsRepository.installId, request.appUri.toString(), request.targetAddressValue)
+        analytics.tcViewConfirm(
+            request.appUri.toString(),
+            request.targetAddressValue
+        )
         viewModelScope.launch(Dispatchers.IO) {
             val tokens = getTokens()
-            val useBattery = isBatteryIsEnabledTx()
+            val useBattery = BatteryHelper.isBatteryIsEnabledTx(wallet, batteryTransactionType, settingsRepository, accountRepository, batteryRepository)
             try {
                 val transfers = transfers(tokens.filter { it.isRequestMinting }, true, useBattery)
-                message = accountRepository.messageBody(wallet, request.validUntil, transfers)
 
-                val emulated = emulationUseCase(
-                    message = message!!,
-                    useBattery = useBattery,
-                    forceRelayer = forceRelayer,
-                    params = true
-                )
+                message = messageBody(transfers)
 
-                isBattery.set(emulated.withBattery)
+                val tonDeferred = async {
+                    emulationUseCase(
+                        message = message!!,
+                        useBattery = false,
+                        forceRelayer = false,
+                        params = true
+                    )
+                }
 
-                emulationReadyDate.set(System.currentTimeMillis())
+                val batteryDeferred = async {
+                    if (useBattery || forceRelayer) {
+                        BatteryHelper.emulation(
+                            wallet = wallet,
+                            message = message!!,
+                            emulationUseCase = emulationUseCase,
+                            accountRepository = accountRepository,
+                            batteryRepository = batteryRepository,
+                            api = api
+                        )
+                    } else {
+                        null
+                    }
+                }
 
-                val details = historyHelper.create(wallet, emulated)
+                val batteryEmulated = batteryDeferred.await()
 
-                val totalFormatBuilder = StringBuilder(getString(Localization.total, emulated.totalFormat))
-                if (emulated.nftCount > 0) {
-                    totalFormatBuilder.append(" + ").append(emulated.nftCount).append(" NFT")
+                batteryDetails = if (batteryEmulated != null && !batteryEmulated.failed) {
+                    createDetails(batteryEmulated)
+                } else {
+                    null
                 }
 
-                // val jettons = emulated.loadTokens(wallet.testnet, tokenRepository)
-                // val hasCompressedJetton = jettons.any { it.isRequestMinting || it.customPayloadApiUri != null }
+                val tonEmulated = tonDeferred.await()
                 val tonBalance = getTONBalance()
-                val transferTonTotal = emulated.totalTon + emulated.totalFees
-                if (!emulated.withBattery && transferTonTotal > tonBalance) {
-                    _stateFlow.value = SendTransactionState.InsufficientBalance(
-                        wallet = wallet,
-                        balance = Amount(tonBalance),
-                        required = Amount(transferTonTotal),
-                        withRechargeBattery = forceRelayer || useBattery,
-                        singleWallet = isSingleWallet(),
-                        type = InsufficientBalanceType.InsufficientTONBalance
-                    )
+                val transferTonTotal = tonEmulated.totalTon + tonEmulated.totalFees
+
+                emulationReadyDate.set(System.currentTimeMillis())
+
+                if (transferTonTotal > tonBalance) {
+                    if (batteryDetails == null) {
+                        _stateFlow.value = SendTransactionState.InsufficientBalance(
+                            wallet = wallet,
+                            balance = Amount(tonBalance),
+                            required = Amount(transferTonTotal),
+                            withRechargeBattery = forceRelayer || useBattery,
+                            singleWallet = isSingleWallet(),
+                            type = InsufficientBalanceType.InsufficientTONBalance
+                        )
+
+                        return@launch
+                    }
+
+                    tonDetails = null
                 } else {
-                    _stateFlow.value = SendTransactionState.Details(
-                        emulated = details,
-                        totalFormat = if (emulated.failed) getString(Localization.unknown) else totalFormatBuilder.toString(),
-                        isDangerous = emulated.total.isDangerous,
-                        nftCount = emulated.nftCount,
-                        failed = emulated.failed
-                    )
+                    tonDetails = createDetails(tonEmulated)
+                }
+
+                val preferredFeeMethod = settingsRepository.getPreferredFeeMethod(wallet.id)
+                if (preferredFeeMethod == PreferredFeeMethod.BATTERY && batteryDetails != null) {
+                    _stateFlow.value = batteryDetails!!
+                    isBattery.set(true)
+                    return@launch
                 }
+                if (preferredFeeMethod == PreferredFeeMethod.TON && tonDetails != null) {
+                    _stateFlow.value = tonDetails!!
+                    isBattery.set(false)
+                    return@launch
+                }
+
+                if (batteryDetails != null) {
+                    _stateFlow.value = batteryDetails!!
+                    isBattery.set(true)
+                } else {
+                    _stateFlow.value = tonDetails!!
+                    isBattery.set(false)
+                }
+
             } catch (e: Throwable) {
-                FirebaseCrashlytics.getInstance().recordException(APIException.Emulation(
-                    boc = message?.createSignedBody(EmptyPrivateKeyEd25519.invoke(), forceRelayer || useBattery)?.base64() ?: "failed",
-                    sourceUri = request.appUri,
-                    cause = e
-                ))
+                FirebaseCrashlytics.getInstance().recordException(
+                    APIException.Emulation(
+                        boc = message?.createSignedBody(
+                            EmptyPrivateKeyEd25519.invoke(),
+                            forceRelayer || useBattery
+                        )?.base64() ?: "failed",
+                        sourceUri = request.appUri,
+                        cause = e
+                    )
+                )
 
                 val tonBalance = getTONBalance()
                 if (tonBalance == Coins.ZERO) {
@@ -151,23 +218,23 @@ class SendTransactionViewModel(
         }
     }
 
-    private suspend fun isBatteryIsEnabledTx(): Boolean = withContext(Dispatchers.IO) {
-        if (settingsRepository.batteryIsEnabledTx(wallet.accountId, batteryTransactionType)) {
-            getBatteryBalance().isPositive
-        } else {
-            false
+    private suspend fun createDetails(emulated: Emulated): SendTransactionState.Details {
+        val fee: SendFee = emulated.buildFee(wallet, api, accountRepository, batteryRepository, ratesRepository)
+
+        val details = historyHelper.create(wallet, emulated, fee)
+        val totalFormatBuilder = StringBuilder(getString(Localization.total, emulated.totalFormat))
+        if (emulated.nftCount > 0) {
+            totalFormatBuilder.append(" + ").append(emulated.nftCount).append(" NFT")
         }
-    }
 
-    private suspend fun getBatteryBalance(): Coins {
-        val tonProof = accountRepository.requestTonProofToken(wallet) ?: return Coins.ZERO
-        val entity = batteryRepository.getBalance(
-            tonProofToken = tonProof,
-            publicKey = wallet.publicKey,
-            testnet = wallet.testnet,
-            ignoreCache = true
+        return SendTransactionState.Details(
+            emulated = details,
+            totalFormat = if (emulated.failed) getString(Localization.unknown) else totalFormatBuilder.toString(),
+            isDangerous = emulated.total.isDangerous,
+            nftCount = emulated.nftCount,
+            failed = emulated.failed,
+            fee = fee,
         )
-        return entity.balance
     }
 
     private suspend fun isSingleWallet(): Boolean {
@@ -175,7 +242,11 @@ class SendTransactionViewModel(
     }
 
     private suspend fun getTONBalance(): Coins {
-        val balance = tokenRepository.getTON(settingsRepository.currency, wallet.accountId, wallet.testnet)?.balance?.value
+        val balance = tokenRepository.getTON(
+            settingsRepository.currency,
+            wallet.accountId,
+            wallet.testnet
+        )?.balance?.value
         return balance ?: Coins.ZERO
     }
 
@@ -191,21 +262,33 @@ class SendTransactionViewModel(
         val transfer = message.transfers.firstOrNull() ?: return null */
         val transactions = mutableListOf<Transaction>()
         for ((index, transfer) in message.transfers.withIndex()) {
-            transactions.add(Transaction.fromWalletTransfer(
-                walletTransfer = transfer,
-                seqno = message.seqNo + index,
-                timeout = message.validUntil
-            ))
+            transactions.add(
+                Transaction.fromWalletTransfer(
+                    walletTransfer = transfer,
+                    seqno = message.seqNo + index,
+                    timeout = message.validUntil
+                )
+            )
         }
 
         return transactions.toList()
     }
 
+    private suspend fun messageBody(transfers: List<WalletTransfer>): MessageBodyEntity {
+        val seqNo = request.seqNo ?: accountRepository.getSeqno(wallet)
+        return accountRepository.messageBody(
+            wallet = wallet,
+            seqNo = seqNo,
+            validUntil = request.validUntil,
+            transfers = transfers
+        )
+    }
+
     fun send() = flow {
         val isBattery = isBattery.get()
         val compressedTokens = getTokens().filter { it.isRequestMinting }
         val transfers = transfers(compressedTokens, false, isBattery)
-        val message = accountRepository.messageBody(wallet, request.validUntil, transfers)
+        val message = messageBody(transfers)
         val unsignedBody = message.createUnsignedBody(isBattery)
         val ledgerTransactions = getLedgerTransaction(message)
 
@@ -263,8 +346,7 @@ class SendTransactionViewModel(
                 isBattery -> "battery"
                 else -> "ton"
             }
-            AnalyticsHelper.tcSendSuccess(
-                installId = settingsRepository.installId,
+            analytics.tcSendSuccess(
                 url = request.appUri.toString(),
                 address = request.targetAddressValue,
                 feePaid = feePaid
@@ -279,7 +361,13 @@ class SendTransactionViewModel(
         return emulationReadyDate.get() - System.currentTimeMillis()
     }
 
-    private suspend fun transfers(compressedTokens: List<AccountTokenEntity>, forEmulation: Boolean, batteryEnabled: Boolean): List<WalletTransfer> {
+    // private suspend fun getTonBalance() = tokenRepository.getTonBalance(settingsRepository.currency, wallet.accountId, wallet.testnet)
+
+    private suspend fun transfers(
+        compressedTokens: List<AccountTokenEntity>,
+        forEmulation: Boolean,
+        batteryEnabled: Boolean
+    ): List<WalletTransfer> {
         val excessesAddress = if (!forEmulation && isBattery.get()) {
             batteryRepository.getConfig(wallet.testnet).excessesAddress
         } else null
@@ -289,7 +377,8 @@ class SendTransactionViewModel(
             compressedTokens = compressedTokens,
             excessesAddress = excessesAddress,
             api = api,
-            batteryEnabled = batteryEnabled
+            batteryEnabled = batteryEnabled,
+            tonBalance = null
         )
     }
 
@@ -297,4 +386,21 @@ class SendTransactionViewModel(
         return tokenRepository.get(currency, wallet.accountId, wallet.testnet, true) ?: emptyList()
     }
 
+    fun setFeeMethod(fee: SendFee) {
+        val preferredMethod = when (fee) {
+            is SendFee.Ton -> PreferredFeeMethod.TON
+            is SendFee.Battery -> PreferredFeeMethod.BATTERY
+            is SendFee.Gasless -> PreferredFeeMethod.GASLESS
+        }
+        settingsRepository.setPreferredFeeMethod(wallet.id, preferredMethod)
+
+        if (fee is SendFee.Battery) {
+            _stateFlow.value = batteryDetails!!
+            isBattery.set(true)
+        } else {
+            _stateFlow.value = tonDetails!!
+            isBattery.set(false)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/currency/CurrencyViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/currency/CurrencyViewModel.kt
index 05b8a586c..6fd61ecf0 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/currency/CurrencyViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/currency/CurrencyViewModel.kt
@@ -38,7 +38,7 @@ class CurrencyViewModel(
     }
 
     private fun buildUiItems(selectedCurrency: WalletCurrency): List<Item> {
-        val currencies = WalletCurrency.ALL
+        val currencies = WalletCurrency.ALL + listOf(WalletCurrency.TON_KEY, WalletCurrency.BTC_KEY)
         val items = mutableListOf<Item>()
         for ((index, currency) in currencies.withIndex()) {
             val titleRes = getNameResIdForCurrency(currency)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsScreen.kt
index b44ac17a4..726da5bd7 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsScreen.kt
@@ -59,7 +59,7 @@ class SettingsScreen(
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackScreenEvent("settings_open", viewModel.installId, from)
+        analytics?.simpleTrackScreenEvent("settings_open", from)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -71,7 +71,7 @@ class SettingsScreen(
     }
 
     private fun onClickItem(item: Item) {
-        AnalyticsHelper.simpleTrackEvent("settings_select", viewModel.installId, hashMapOf(
+        analytics?.simpleTrackEvent("settings_select", hashMapOf(
             "type" to item.name
         ))
         when (item) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsViewModel.kt
index 227dc169b..43fa58074 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/SettingsViewModel.kt
@@ -9,7 +9,6 @@ import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.extensions.appVersionCode
 import com.tonapps.tonkeeper.Environment
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.core.FirebaseHelper
 import com.tonapps.tonkeeper.core.entities.AssetsEntity
@@ -29,6 +28,7 @@ import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.backup.BackupRepository
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.SearchEngine
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.passcode.PasscodeManager
@@ -60,8 +60,9 @@ class SettingsViewModel(
     private val passcodeManager: PasscodeManager,
     private val rnLegacy: RNLegacy,
     private val environment: Environment,
-    private val remoteConfig: RemoteConfig,
     private val tokenRepository: TokenRepository,
+    private val batteryRepository: BatteryRepository,
+    private val analytics: AnalyticsHelper
 ) : BaseWalletVM(application) {
 
     private val safeMode: Boolean = settingsRepository.isSafeModeEnabled(api)
@@ -113,7 +114,7 @@ class SettingsViewModel(
     }
 
     fun signOut(callback: () -> Unit) {
-        AnalyticsHelper.simpleTrackEvent("delete_wallet", settingsRepository.installId)
+        analytics.simpleTrackEvent("delete_wallet")
         viewModelScope.launch(Dispatchers.IO) {
             tonConnectManager.clear(wallet)
             PushToggleWorker.run(context, wallet, PushManager.State.Delete)
@@ -169,7 +170,6 @@ class SettingsViewModel(
                 sortAddresses.add(index, TokenEntity.TRON_USDT.address)
             } else {
                 sortAddresses.add(1, TokenEntity.TRON_USDT.address)
-                settingsRepository.setTokenPinned(wallet.id, TokenEntity.TRC20_USDT , true)
             }
 
             val tronPrefs = settingsRepository.getTokenPrefs(wallet.id, TokenEntity.TRC20_USDT)
@@ -179,6 +179,7 @@ class SettingsViewModel(
             FirebaseHelper.trc20Enabled(!isHidden)
 
             if (!isHidden) {
+                settingsRepository.setTokenPinned(wallet.id, TokenEntity.TRC20_USDT , true)
                 settingsRepository.setTokensSort(wallet.id, sortAddresses)
             }
         }
@@ -229,28 +230,39 @@ class SettingsViewModel(
 
         uiItems.add(Item.Space)
 
-        if (wallet.hasPrivateKey && !wallet.testnet && !remoteConfig.isTronDisabled) {
+        if (wallet.hasPrivateKey && !wallet.testnet && !api.config.flags.disableTron) {
             val tronUsdtEnabled = settingsRepository.getTronUsdtEnabled(displayWallet.id)
             uiItems.add(Item.TronToggle(enabled = tronUsdtEnabled))
             uiItems.add(Item.Space)
         }
 
-        uiItems.add(Item.Notifications(ListCell.Position.FIRST))
+        if (environment.isGooglePlayServicesAvailable) {
+            uiItems.add(Item.Notifications(ListCell.Position.FIRST))
+        }
+
+        var secondCellPosition = if (environment.isGooglePlayServicesAvailable) {
+            ListCell.Position.MIDDLE
+        } else {
+            ListCell.Position.FIRST
+        }
 
         if (wallet.hasPrivateKey) {
             if (!hasW5) {
-                uiItems.add(Item.W5(ListCell.Position.MIDDLE))
+                uiItems.add(Item.W5(secondCellPosition))
+                secondCellPosition = ListCell.Position.MIDDLE
             }
             if (!hasV4R2) {
-                uiItems.add(Item.V4R2(ListCell.Position.MIDDLE))
+                uiItems.add(Item.V4R2(secondCellPosition))
+                secondCellPosition = ListCell.Position.MIDDLE
             }
         }
         if (!wallet.testnet) {
-            uiItems.add(Item.Currency(currency.code, ListCell.Position.MIDDLE))
+            uiItems.add(Item.Currency(currency.code, secondCellPosition))
+            secondCellPosition = ListCell.Position.MIDDLE
         }
 
         if (wallet.isTonConnectSupported) {
-            uiItems.add(Item.SearchEngine(searchEngine, ListCell.Position.MIDDLE))
+            uiItems.add(Item.SearchEngine(searchEngine, secondCellPosition))
             uiItems.add(Item.ConnectedApps(ListCell.Position.MIDDLE))
         }
 
@@ -258,7 +270,8 @@ class SettingsViewModel(
             getString(Localization.system)
         }.capitalized, ListCell.Position.MIDDLE))
 
-        if (wallet.hasPrivateKey && !api.config.batteryDisabled) {
+        val batteryCharges = getBatteryCharges()
+        if (wallet.hasPrivateKey && (!api.config.flags.disableBattery || batteryCharges > 0)) {
             uiItems.add(Item.Battery(ListCell.Position.MIDDLE))
         }
         if (WidgetManager.isRequestPinAppWidgetSupported) {
@@ -294,4 +307,10 @@ class SettingsViewModel(
         builder.appendQueryParameter("start", startParams)
         return builder.toString()
     }
+
+    private suspend fun getBatteryCharges(): Int = withContext(Dispatchers.IO) {
+        accountRepository.requestTonProofToken(wallet)?.let {
+            batteryRepository.getCharges(it, wallet.publicKey, wallet.testnet, true)
+        } ?: 0
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/holder/AccountHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/holder/AccountHolder.kt
index a3cf9a54a..7d9c55f40 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/holder/AccountHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/holder/AccountHolder.kt
@@ -10,6 +10,8 @@ import com.tonapps.emoji.ui.EmojiView
 import com.tonapps.tonkeeper.extensions.getWalletBadges
 import com.tonapps.tonkeeper.ui.screen.settings.main.list.Item
 import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.iconTertiaryColor
+import com.tonapps.uikit.color.stateList
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.data.account.Wallet
@@ -28,6 +30,10 @@ class AccountHolder(
     private val checkView = findViewById<AppCompatImageView>(R.id.check)
     private val typesView = findViewById<AppCompatTextView>(R.id.wallet_types)
 
+    init {
+        checkView.imageTintList = context.iconTertiaryColor.stateList
+    }
+
     override fun onBind(item: Item.Account) {
         itemView.setOnClickListener { onClick(item) }
         itemView.background = ListCell.Position.SINGLE.drawable(context)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingScreen.kt
index 4616cc3af..92ff0da88 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingScreen.kt
@@ -2,36 +2,40 @@ package com.tonapps.tonkeeper.ui.screen.staking.stake
 
 import android.os.Bundle
 import android.view.View
-import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
-import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.amount.StakeAmountFragment
 import com.tonapps.wallet.data.account.entities.WalletEntity
-import com.tonapps.wallet.data.dapps.entities.AppEntity
-import com.tonapps.wallet.data.staking.entities.PoolEntity
 import org.koin.core.parameter.parametersOf
 import uikit.base.BaseFragment
 import uikit.extensions.hideKeyboard
 
-class StakingScreen(wallet: WalletEntity): BaseHolderWalletScreen<ScreenContext.Wallet>(ScreenContext.Wallet(wallet)), BaseFragment.BottomSheet {
+class StakingScreen(wallet: WalletEntity) :
+    BaseHolderWalletScreen<ScreenContext.Wallet>(ScreenContext.Wallet(wallet)),
+    BaseFragment.BottomSheet {
 
     override val fragmentName: String = "StakingScreen"
 
-    private val poolAddress: String by lazy { arguments?.getString(POOL_ADDRESS_KEY) ?:"" }
+    private val poolAddress: String by lazy { arguments?.getString(POOL_ADDRESS_KEY) ?: "" }
+
+    private val from: String by lazy { arguments?.getString(FROM_KEY) ?: "" }
 
     override val viewModel: StakingViewModel by walletViewModel { parametersOf(poolAddress) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("staking_open", viewModel.installId)
+        analytics?.simpleTrackEvent(
+            "staking_open", hashMapOf(
+                "from" to from
+            )
+        )
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setFragment(StakeAmountFragment.newInstance())
+        setFragment(StakeAmountFragment.newInstance(from = from))
     }
 
     override fun onDragging() {
@@ -42,13 +46,16 @@ class StakingScreen(wallet: WalletEntity): BaseHolderWalletScreen<ScreenContext.
     companion object {
 
         private const val POOL_ADDRESS_KEY = "pool_address"
+        private const val FROM_KEY = "from"
 
-        fun newInstance(wallet: WalletEntity, poolAddress: String? = null): BaseFragment {
-            if (poolAddress?.equalsAddress(PoolEntity.ethena.address) == true) {
-                return DAppScreen.newInstance(wallet, AppEntity.ethena, "staking")
-            }
+        fun newInstance(
+            wallet: WalletEntity,
+            from: String,
+            poolAddress: String? = null,
+        ): BaseFragment {
             val fragment = StakingScreen(wallet)
             fragment.putStringArg(POOL_ADDRESS_KEY, poolAddress)
+            fragment.putStringArg(FROM_KEY, from)
             return fragment
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingViewModel.kt
index 06f08e781..4cb6181aa 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/StakingViewModel.kt
@@ -20,6 +20,7 @@ import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.usecase.emulation.Emulated
 import com.tonapps.tonkeeper.usecase.emulation.EmulationUseCase
 import com.tonapps.tonkeeper.usecase.sign.SignUseCase
+import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.SendBlockchainState
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.AccountRepository
@@ -31,7 +32,6 @@ import com.tonapps.wallet.data.staking.StakingRepository
 import com.tonapps.wallet.data.staking.entities.PoolEntity
 import com.tonapps.wallet.data.staking.entities.PoolInfoEntity
 import com.tonapps.wallet.data.token.TokenRepository
-import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -66,6 +66,7 @@ class StakingViewModel(
     private val transactionManager: TransactionManager,
     private val signUseCase: SignUseCase,
     private val emulationUseCase: EmulationUseCase,
+    private val api: API,
 ) : BaseWalletVM(app) {
 
     val installId: String
@@ -77,7 +78,7 @@ class StakingViewModel(
         val minStakeFormat: CharSequence,
         val insufficientBalance: Boolean,
         val requestMinStake: Boolean,
-        val hiddenBalance: Boolean
+        val hiddenBalance: Boolean,
     )
 
     private val _poolsFlow = MutableStateFlow<List<PoolInfoEntity>?>(null)
@@ -89,8 +90,20 @@ class StakingViewModel(
     private val _selectedPoolFlow = MutableStateFlow<PoolEntity?>(null)
     val selectedPoolFlow = _selectedPoolFlow.asStateFlow().filterNotNull()
 
-    private val _tokenFlow = MutableStateFlow<AccountTokenEntity?>(null)
-    val tokenFlow = _tokenFlow.asStateFlow().filterNotNull()
+    val tokenFlow = selectedPoolFlow.map { pool ->
+        val tokens = tokenRepository.get(settingsRepository.currency, wallet.accountId, wallet.testnet) ?: emptyList()
+
+        tokens.firstOrNull()
+    }.filterNotNull()
+
+    val analyticsFlow = combine(selectedPoolFlow, poolsFlow, tokenFlow) { pool, providers, token ->
+        val provider = providers.find { item -> item.pools.any { it.address == pool.address } }
+        hashMapOf<String, Any>(
+            "jetton_symbol" to token.symbol,
+            "provider_name" to (provider?.implementation?.title ?: ""),
+            "provider_domain" to (provider?.details?.url ?: ""),
+        )
+    }
 
     private val ratesFlow = tokenFlow.map { token ->
         ratesRepository.getRates(settingsRepository.currency, token.address)
@@ -135,22 +148,23 @@ class StakingViewModel(
     }
 
     val amountFormatFlow = combine(amountFlow, tokenFlow) { amount, token ->
-        CurrencyFormatter.format(token.symbol, amount)
+        CurrencyFormatter.formatFull(token.symbol, amount, token.decimals)
     }
 
     val apyFormatFlow = combine(
         amountFlow,
+        tokenFlow,
         selectedPoolFlow,
         poolsFlow
-    ) { amount, pool, pools ->
+    ) { amount, token, pool, pools ->
         val info = pools.find { it.implementation == pool.implementation } ?: return@combine ""
         val apyFormat = CurrencyFormatter.formatPercent(info.apy)
         if (amount.isPositive) {
             val earning = amount.multiply(pool.apy).divide(100)
-            "%s ≈ %s · %s".format(
+            "%s ≈ %s · %s".format(
                 getString(Localization.staking_apy),
                 apyFormat,
-                CurrencyFormatter.format(TokenEntity.TON.symbol, earning)
+                CurrencyFormatter.format(token.symbol, earning)
             )
         } else {
             "%s ≈ %s".format(
@@ -178,8 +192,9 @@ class StakingViewModel(
         updateAmount(0.0)
 
         viewModelScope.launch(Dispatchers.IO) {
-            _poolsFlow.value = stakingRepository.get(wallet.accountId, wallet.testnet).pools
-            _tokenFlow.value = tokenRepository.get(settingsRepository.currency, wallet.accountId, wallet.testnet)?.firstOrNull()
+            _poolsFlow.value = stakingRepository.get(wallet.accountId, wallet.testnet).pools.filter {
+                api.config.enabledStaking.contains(it.implementation.title)
+            }
         }
     }
 
@@ -294,11 +309,10 @@ class StakingViewModel(
         val fee = StakingPool.getTotalFee(extra.value, pool.implementation)
 
         val fiat = rates.convertTON(fee)
+        val first = CurrencyFormatter.format(TokenEntity.TON.symbol, fee)
+        val second = CurrencyFormatter.formatFiat(currency.code, fiat)
 
-        Pair(
-            CurrencyFormatter.format(TokenEntity.TON.symbol, fee, TokenEntity.TON.decimals),
-            CurrencyFormatter.format(currency.code, fiat, currency.decimals)
-        )
+        Pair(first, second)
     }
 
     fun stake(
@@ -365,4 +379,8 @@ class StakingViewModel(
             throw SendBlockchainException.fromState(state)
         }
     }
+
+    fun getAmount(): Double {
+        return _amountFlow.value
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/amount/StakeAmountFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/amount/StakeAmountFragment.kt
index 008186170..17e2f18d2 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/amount/StakeAmountFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/amount/StakeAmountFragment.kt
@@ -1,12 +1,17 @@
 package com.tonapps.tonkeeper.ui.screen.staking.stake.amount
 
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.lifecycle.lifecycleScope
+import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.component.coin.CoinEditText
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingViewModel
 import com.tonapps.tonkeeper.ui.screen.staking.stake.confirm.StakeConfirmFragment
@@ -17,18 +22,25 @@ import com.tonapps.uikit.color.accentRedColor
 import com.tonapps.uikit.color.stateList
 import com.tonapps.uikit.color.textSecondaryColor
 import com.tonapps.wallet.data.core.HIDDEN_BALANCE
+import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.entities.PoolEntity
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import uikit.extensions.collectFlow
 import uikit.extensions.focusWithKeyboard
 import uikit.extensions.hideKeyboard
 import uikit.extensions.withAlpha
 import uikit.widget.FrescoView
 import uikit.widget.HeaderView
+import kotlin.collections.map
+import kotlin.collections.plus
 
-class StakeAmountFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, StakingViewModel>(R.layout.fragment_stake_amount) {
+class StakeAmountFragment :
+    BaseHolderWalletScreen.ChildFragment<StakingScreen, StakingViewModel>(R.layout.fragment_stake_amount) {
+
+    private val from: String by lazy { arguments?.getString(ARG_FROM) ?: "" }
 
     private lateinit var amountView: CoinEditText
     private lateinit var poolItemView: View
@@ -51,27 +63,36 @@ class StakeAmountFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, S
         headerView.doOnActionClick = { finish() }
 
         amountView = view.findViewById(R.id.stake_amount)
-        amountView.suffix = "TON"
         amountView.doOnValueChange = { value, _ -> primaryViewModel.updateAmount(value) }
 
         currencyView = view.findViewById(R.id.stake_currency)
 
         poolItemView = view.findViewById(R.id.pool_item)
-        poolItemView.setOnClickListener { setFragment(StakeOptionsFragment.newInstance(primaryFragment.screenContext.wallet)) }
+        poolItemView.setOnClickListener {
+            setFragment(
+                StakeOptionsFragment.newInstance(
+                    primaryFragment.screenContext.wallet
+                )
+            )
+        }
 
         poolIconView = view.findViewById(R.id.pool_icon)
         poolIconView.setCircular()
 
         poolTitleView = view.findViewById(R.id.pool_name)
         poolMaxApyView = view.findViewById(R.id.pool_max_apy)
-        poolMaxApyView.backgroundTintList = requireContext().accentGreenColor.withAlpha(.16f).stateList
+        poolMaxApyView.backgroundTintList =
+            requireContext().accentGreenColor.withAlpha(.16f).stateList
 
         poolDescriptionView = view.findViewById(R.id.pool_description)
 
         availableView = view.findViewById(R.id.available)
 
         button = view.findViewById(R.id.next_button)
-        button.setOnClickListener { setFragment(StakeConfirmFragment.newInstance()) }
+
+        button.setOnClickListener {
+            openConfirm()
+        }
 
         view.findViewById<View>(R.id.max).setOnClickListener { applyMax() }
 
@@ -81,6 +102,16 @@ class StakeAmountFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, S
         collectFlow(primaryViewModel.apyFormatFlow.map {
             it.withCustomSymbol(requireContext())
         }, poolDescriptionView::setText)
+
+        collectFlow(primaryViewModel.tokenFlow) { token ->
+            amountView.suffix = token.symbol
+        }
+
+        collectFlow(primaryViewModel.analyticsFlow) { props ->
+            context?.analytics?.simpleTrackEvent(
+                "staking_plus_input", props.plus("from" to from) as MutableMap<String, Any>
+            )
+        }
     }
 
     private fun applyMax() {
@@ -110,20 +141,30 @@ class StakeAmountFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, S
     }
 
     private fun applyAvailableState(state: StakingViewModel.AvailableUiState) {
+        button.text = getString(Localization.continue_action)
         if (state.insufficientBalance) {
             availableView.setText(Localization.insufficient_balance)
             availableView.setTextColor(requireContext().accentRedColor)
             button.isEnabled = false
         } else if (state.remainingFormat == state.balanceFormat) {
-            availableView.text = if (state.hiddenBalance) HIDDEN_BALANCE else getString(Localization.available_balance, state.balanceFormat).withCustomSymbol(requireContext())
+            availableView.text = if (state.hiddenBalance) HIDDEN_BALANCE else getString(
+                Localization.available_balance,
+                state.balanceFormat
+            ).withCustomSymbol(requireContext())
             availableView.setTextColor(requireContext().textSecondaryColor)
             button.isEnabled = false
         } else if (state.requestMinStake) {
-            availableView.text = getString(Localization.minimum_amount, state.minStakeFormat).withCustomSymbol(requireContext())
+            availableView.text =
+                getString(Localization.minimum_amount, state.minStakeFormat).withCustomSymbol(
+                    requireContext()
+                )
             availableView.setTextColor(requireContext().accentRedColor)
             button.isEnabled = false
         } else {
-            availableView.text = getString(Localization.remaining_balance, state.remainingFormat).withCustomSymbol(requireContext())
+            availableView.text =
+                getString(Localization.remaining_balance, state.remainingFormat).withCustomSymbol(
+                    requireContext()
+                )
             availableView.setTextColor(requireContext().textSecondaryColor)
             button.isEnabled = true
         }
@@ -137,10 +178,22 @@ class StakeAmountFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, S
         poolMaxApyView.visibility = if (pool.maxApy) View.VISIBLE else View.GONE
     }
 
+    private fun openConfirm() {
+        setFragment(StakeConfirmFragment.newInstance())
+    }
+
     companion object {
 
         const val TAG = "stake_amount_fragment"
 
-        fun newInstance() = StakeAmountFragment()
+        private const val ARG_FROM = "from"
+
+        fun newInstance(from: String): StakeAmountFragment {
+            val fragment = StakeAmountFragment()
+            fragment.arguments = Bundle().apply {
+                putString(ARG_FROM, from)
+            }
+            return fragment
+        }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/confirm/StakeConfirmFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/confirm/StakeConfirmFragment.kt
index 50c303ff7..25ad79c6b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/confirm/StakeConfirmFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/confirm/StakeConfirmFragment.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
 import com.tonapps.tonkeeper.extensions.getTitle
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.screen.send.main.SendException
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
@@ -18,8 +19,10 @@ import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.entities.PoolEntity
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import uikit.extensions.collectFlow
 import uikit.widget.FrescoView
@@ -79,6 +82,12 @@ class StakeConfirmFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen,
             feeView.description = "≈ " + feeFiatFormat.withCustomSymbol(requireContext())
             button.isEnabled = true
         }
+
+        collectFlow(primaryViewModel.analyticsFlow) { props ->
+            context?.analytics?.simpleTrackEvent(
+                "staking_plus_confirm", props
+            )
+        }
     }
 
     private fun stake() {
@@ -87,6 +96,9 @@ class StakeConfirmFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen,
             val state = if (e is SendException.Cancelled) ProcessTaskView.State.DEFAULT else ProcessTaskView.State.FAILED
             setTaskState(state)
         }.onEach {
+            primaryViewModel.analyticsFlow.take(1).onEach { props ->
+                context?.analytics?.simpleTrackEvent("staking_plus_success", props)
+            }.collect()
             setTaskState(ProcessTaskView.State.SUCCESS)
             navigation?.openURL("tonkeeper://activity?from=stake")
             close()
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsArgs.kt
index 068f6b827..a6e7bccb6 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsArgs.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsArgs.kt
@@ -32,6 +32,9 @@ data class StakeDetailsArgs(
     val apy: BigDecimal
         get() = pool.apy
 
+    val bonusApy: BigDecimal?
+        get() = pool.bonusApy
+
     val minStake: Coins
         get() = pool.minStake
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsFragment.kt
index 4ad62f8e2..3f45bd9ed 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/details/StakeDetailsFragment.kt
@@ -7,10 +7,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.net.toUri
 import com.google.android.flexbox.FlexboxLayout
 import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.koin.api
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingViewModel
@@ -21,6 +23,7 @@ import com.tonapps.tonkeeper.ui.screen.swap.SwapArgs
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.entities.PoolDetailsEntity
 import com.tonapps.wallet.data.staking.entities.PoolEntity
 import com.tonapps.wallet.data.staking.entities.PoolInfoEntity
@@ -28,6 +31,7 @@ import com.tonapps.wallet.localization.Localization
 import uikit.extensions.applyBottomInsets
 import uikit.extensions.dp
 import uikit.extensions.drawable
+import uikit.extensions.getSpannable
 import uikit.extensions.inflate
 import uikit.extensions.pinToBottomInsets
 import uikit.extensions.setLeftDrawable
@@ -35,11 +39,14 @@ import uikit.extensions.withGreenBadge
 import uikit.navigation.Navigation.Companion.navigation
 import uikit.widget.HeaderView
 
-class StakeDetailsFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen, StakingViewModel>(R.layout.fragment_stake_details) {
+class StakeDetailsFragment :
+    BaseHolderWalletScreen.ChildFragment<StakingScreen, StakingViewModel>(R.layout.fragment_stake_details) {
 
     private val args: StakeDetailsArgs by lazy { StakeDetailsArgs(requireArguments()) }
 
+    private lateinit var detailsContentView: View
     private lateinit var poolApyTitleView: AppCompatTextView
+    private lateinit var descriptionView: AppCompatTextView
     private lateinit var linkDrawable: Drawable
     private lateinit var linksView: FlexboxLayout
     private lateinit var button: Button
@@ -51,14 +58,23 @@ class StakeDetailsFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen,
         headerView.doOnActionClick = { finish() }
         headerView.title = args.name
 
+        detailsContentView = view.findViewById(R.id.details_content)
+
         poolApyTitleView = view.findViewById(R.id.pool_apy_title)
+
+        descriptionView = view.findViewById(R.id.staking_description)
+
+        linkDrawable = requireContext().drawable(UIKitIcon.ic_globe_16)
+
+        detailsContentView.visibility = View.VISIBLE
         if (args.maxApy) {
-            poolApyTitleView.text = getString(Localization.staking_apy).withGreenBadge(requireContext(), Localization.staking_max_apy)
+            poolApyTitleView.text = getString(Localization.staking_apy).withGreenBadge(
+                requireContext(),
+                Localization.staking_max_apy
+            )
         } else {
             poolApyTitleView.text = getString(Localization.staking_apy)
         }
-
-        linkDrawable = requireContext().drawable(UIKitIcon.ic_globe_16)
         val apyView = view.findViewById<AppCompatTextView>(R.id.pool_apy)
         apyView.text = "≈ ${CurrencyFormatter.formatPercent(args.apy)}"
 
@@ -80,7 +96,8 @@ class StakeDetailsFragment: BaseHolderWalletScreen.ChildFragment<StakingScreen,
         linksView.removeAllViews()
         for (link in links) {
             val host = Uri.parse(link).host!!
-            val linkView = requireContext().inflate(R.layout.view_link, linksView) as AppCompatTextView
+            val linkView =
+                requireContext().inflate(R.layout.view_link, linksView) as AppCompatTextView
             linkView.text = host
             linkView.setLeftDrawable(linkDrawable)
             linkView.setOnClickListener { BrowserHelper.open(requireContext(), link) }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/options/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/options/list/Item.kt
index 9f1fa5af2..894f64dcc 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/options/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/stake/options/list/Item.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.uikit.list.BaseListItem
 import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.entities.PoolEntity
 import com.tonapps.wallet.data.staking.entities.PoolInfoEntity
 import com.tonapps.wallet.localization.Localization
@@ -20,14 +21,16 @@ sealed class Item(type: Int): BaseListItem(type) {
             selectedPool: PoolEntity,
         ): List<Item> {
             val items = mutableListOf<Item>()
-            val liquid = pools.filter { it.pools.size == 1 }
-            val other = pools.filter { it.pools.size > 1 }
+            val liquid = pools.filter { it.implementation == StakingPool.Implementation.LiquidTF }
+            val other = pools.filter { it.implementation != StakingPool.Implementation.LiquidTF }
 
-            items.add(Space)
-            items.add(Title(Localization.liquid_staking))
-            items.add(Space)
-            items.addAll(build(liquid, selectedPool))
-            items.add(Space)
+            if (liquid.isNotEmpty()) {
+                items.add(Space)
+                items.add(Title(Localization.liquid_staking))
+                items.add(Space)
+                items.addAll(build(liquid, selectedPool))
+                items.add(Space)
+            }
 
             if (other.isNotEmpty()) {
                 items.add(Space)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeScreen.kt
index 046d8d9a0..f9bb57355 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeScreen.kt
@@ -2,20 +2,13 @@ package com.tonapps.tonkeeper.ui.screen.staking.unstake
 
 import android.os.Bundle
 import android.view.View
-import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
-import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
-import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
 import com.tonapps.tonkeeper.ui.screen.staking.unstake.amount.UnStakeAmountFragment
 import com.tonapps.tonkeeper.ui.screen.staking.unstake.confirm.UnStakeConfirmFragment
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.StakeViewerScreen
 import com.tonapps.wallet.data.account.entities.WalletEntity
-import com.tonapps.wallet.data.dapps.entities.AppEntity
-import com.tonapps.wallet.data.staking.entities.PoolEntity
-import kotlinx.coroutines.delay
-import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import uikit.base.BaseFragment
 import uikit.extensions.collectFlow
@@ -57,9 +50,6 @@ class UnStakeScreen(wallet: WalletEntity): BaseHolderWalletScreen<ScreenContext.
         private const val POOL_ADDRESS_KEY = "pool_address"
 
         fun newInstance(wallet: WalletEntity, poolAddress: String): BaseFragment {
-            if (poolAddress.equalsAddress(PoolEntity.ethena.address)) {
-                return DAppScreen.newInstance(wallet, AppEntity.ethena, "unstaking")
-            }
             val fragment = UnStakeScreen(wallet)
             fragment.putStringArg(POOL_ADDRESS_KEY, poolAddress)
             return fragment
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeViewModel.kt
index e609e0f7b..4aa717396 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/UnStakeViewModel.kt
@@ -38,6 +38,7 @@ import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.staking.StakingPool
 import com.tonapps.wallet.data.staking.StakingRepository
 import com.tonapps.wallet.data.staking.entities.PoolEntity
+import com.tonapps.wallet.data.staking.entities.PoolInfoEntity
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 import kotlinx.coroutines.Dispatchers
@@ -80,7 +81,7 @@ class UnStakeViewModel(
     private val signUseCase: SignUseCase,
     private val emulationUseCase: EmulationUseCase,
     private val api: API
-): BaseWalletVM(app) {
+) : BaseWalletVM(app) {
 
     data class AvailableUiState(
         val balanceFormat: CharSequence = "",
@@ -104,6 +105,9 @@ class UnStakeViewModel(
     private val _stakeFlow = MutableStateFlow<StakedEntity?>(null)
     private val stakeFlow = _stakeFlow.asStateFlow().filterNotNull()
 
+    private val _poolInfoFlow = MutableStateFlow<PoolInfoEntity?>(null)
+    val poolInfoFlow = _poolInfoFlow.asStateFlow().filterNotNull()
+
     private val _cycleEndFormatFlow = MutableStateFlow<String?>(null)
     val cycleEndFormatFlow = _cycleEndFormatFlow.asStateFlow().filterNotNull()
 
@@ -135,13 +139,29 @@ class UnStakeViewModel(
     }.stateIn(viewModelScope, SharingStarted.Eagerly, AvailableUiState())
 
     val amountFormatFlow = amountFlow.map { amount ->
-        CurrencyFormatter.format(TokenEntity.TON.symbol, amount)
+        CurrencyFormatter.formatFull(TokenEntity.TON.symbol, amount, 9)
     }
 
     val fiatFormatFlow = availableUiStateFlow.map { it.fiatFormat }
 
     val poolFlow = stakeFlow.map { it.pool }
 
+    val tokenFlow = poolFlow.map { pool ->
+        val tokens =
+            tokenRepository.get(settingsRepository.currency, wallet.accountId, wallet.testnet)
+                ?: emptyList()
+        
+        tokens.firstOrNull()
+    }.filterNotNull()
+
+    val analyticsFlow = combine(poolFlow, poolInfoFlow, tokenFlow) { pool, poolInfo, token ->
+        hashMapOf<String, Any>(
+            "jetton_symbol" to token.symbol,
+            "provider_name" to poolInfo.implementation.title,
+            "provider_domain" to poolInfo.details.url,
+        )
+    }
+
     init {
         collectFlow(stakeFlow) { entity ->
             startTicker(entity.cycleEnd)
@@ -151,7 +171,12 @@ class UnStakeViewModel(
         updateAmount(0.0)
 
         viewModelScope.launch(Dispatchers.IO) {
-            _stakeFlow.value = loadStake()
+            val staked = loadStake()
+            _stakeFlow.value = staked
+            _poolInfoFlow.value = stakingRepository.get(
+                wallet.accountId,
+                wallet.testnet
+            ).pools.find { it.implementation == staked?.pool?.implementation }
         }
     }
 
@@ -187,8 +212,8 @@ class UnStakeViewModel(
         val fiat = rates.convertTON(fee)
 
         Pair(
-            CurrencyFormatter.format(TokenEntity.TON.symbol, fee, TokenEntity.TON.decimals),
-            CurrencyFormatter.format(currency.code, fiat, currency.decimals)
+            CurrencyFormatter.format(TokenEntity.TON.symbol, fee),
+            CurrencyFormatter.format(currency.code, fiat)
         )
     }
 
@@ -245,10 +270,18 @@ class UnStakeViewModel(
         builder.sendMode = (TonSendMode.PAY_GAS_SEPARATELY.value + TonSendMode.IGNORE_ERRORS.value)
         when (staked.pool.implementation) {
             StakingPool.Implementation.LiquidTF -> {
-                val token = pool.liquidJettonMaster?.let { getTokenBalance(it) } ?: throw IllegalStateException("Liquid jetton master not found")
+                val token = pool.liquidJettonMaster?.let { getTokenBalance(it) }
+                    ?: throw IllegalStateException("Liquid jetton master not found")
                 builder.applyLiquid(amount, wallet.contract.address, token, stateInitRef)
             }
-            StakingPool.Implementation.Whales -> builder.applyWhales(pool, amount, isSendAll, stateInitRef)
+
+            StakingPool.Implementation.Whales -> builder.applyWhales(
+                pool,
+                amount,
+                isSendAll,
+                stateInitRef
+            )
+
             StakingPool.Implementation.TF -> builder.applyTF(pool, stateInitRef)
             else -> throw IllegalStateException("Unsupported pool implementation")
         }
@@ -266,7 +299,12 @@ class UnStakeViewModel(
         return tokens.find { it.address.equalsAddress(tokenAddress) }
     }
 
-    private suspend fun WalletTransferBuilder.applyLiquid(amount: Coins, responseAddress: AddrStd, tsTONToken: AccountTokenEntity, stateInitRef: CellRef<StateInit>?) {
+    private suspend fun WalletTransferBuilder.applyLiquid(
+        amount: Coins,
+        responseAddress: AddrStd,
+        tsTONToken: AccountTokenEntity,
+        stateInitRef: CellRef<StateInit>?
+    ) {
         val address = tsTONToken.balance.walletAddress.toUserFriendly(
             wallet = false,
             bounceable = true,
@@ -295,7 +333,12 @@ class UnStakeViewModel(
         this.messageData = MessageData.raw(body, stateInitRef)
     }
 
-    private fun WalletTransferBuilder.applyWhales(pool: PoolEntity, amount: Coins, isSendAll: Boolean, stateInitRef: CellRef<StateInit>?) {
+    private fun WalletTransferBuilder.applyWhales(
+        pool: PoolEntity,
+        amount: Coins,
+        isSendAll: Boolean,
+        stateInitRef: CellRef<StateInit>?
+    ) {
         val body = buildCell {
             storeOpCode(TONOpCode.WHALES_WITHDRAW)
             storeQueryId(TransferEntity.newWalletQueryId())
@@ -337,9 +380,11 @@ class UnStakeViewModel(
 
     private suspend fun loadStake(): StakedEntity? {
         try {
-            val tokens = tokenRepository.get(currency, wallet.accountId, wallet.testnet) ?: return null
+            val tokens =
+                tokenRepository.get(currency, wallet.accountId, wallet.testnet) ?: return null
             val staking = stakingRepository.get(wallet.accountId, wallet.testnet)
-            val staked = StakedEntity.create(wallet, staking, tokens, currency, ratesRepository, api)
+            val staked =
+                StakedEntity.create(wallet, staking, tokens, currency, ratesRepository, api)
             return staked.find { it.pool.address.equalsAddress(poolAddress) }
         } catch (e: Throwable) {
             return null
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/amount/UnStakeAmountFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/amount/UnStakeAmountFragment.kt
index 6d63c4827..598b9e8ec 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/amount/UnStakeAmountFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/amount/UnStakeAmountFragment.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.tonkeeper.ui.base.BaseHolderWalletScreen
 import com.tonapps.tonkeeper.ui.component.coin.CoinEditText
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingViewModel
@@ -52,6 +53,9 @@ class UnStakeAmountFragment: BaseHolderWalletScreen.ChildFragment<UnStakeScreen,
         collectFlow(primaryViewModel.cycleEndFormatFlow) { date ->
             cycleView.text = getString(Localization.staking_unstake_cycle, date)
         }
+        collectFlow(primaryViewModel.analyticsFlow) {props ->
+            context?.analytics?.simpleTrackEvent("staking_minus_input", props)
+        }
     }
 
     private fun applyAvailableState(state: UnStakeViewModel.AvailableUiState) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/confirm/UnStakeConfirmFragment.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/confirm/UnStakeConfirmFragment.kt
index 5c603c80e..f60dcc2ab 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/confirm/UnStakeConfirmFragment.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/unstake/confirm/UnStakeConfirmFragment.kt
@@ -33,7 +33,6 @@ class UnStakeConfirmFragment: BaseHolderWalletScreen.ChildFragment<UnStakeScreen
     private lateinit var recipientView: TransactionDetailView
     private lateinit var amountView: TransactionDetailView
     private lateinit var feeView: TransactionDetailView
-    private lateinit var apyView: TransactionDetailView
     private lateinit var button: Button
     private lateinit var taskView: ProcessTaskView
 
@@ -53,8 +52,6 @@ class UnStakeConfirmFragment: BaseHolderWalletScreen.ChildFragment<UnStakeScreen
         feeView = view.findViewById(R.id.review_fee)
         feeView.setLoading()
 
-        apyView = view.findViewById(R.id.review_apy)
-
         button = view.findViewById(R.id.button)
         taskView = view.findViewById(R.id.task)
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerArgs.kt
index 19b75fa1d..3718d8464 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerArgs.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerArgs.kt
@@ -1,25 +1,30 @@
 package com.tonapps.tonkeeper.ui.screen.staking.viewer
 
 import android.os.Bundle
+import com.tonapps.wallet.api.entity.EthenaEntity
 import uikit.base.BaseArgs
 
 data class StakeViewerArgs(
     val address: String,
-    val name: String
-): BaseArgs() {
+    val name: String,
+    val ethenaType: String,
+) : BaseArgs() {
 
     private companion object {
         private const val ARG_ADDRESS = "address"
         private const val ARG_NAME = "name"
+        private const val ARG_ETHENA_TYPE = "ethena_type"
     }
 
     constructor(bundle: Bundle) : this(
         address = bundle.getString(ARG_ADDRESS)!!,
-        name = bundle.getString(ARG_NAME)!!
+        name = bundle.getString(ARG_NAME)!!,
+        ethenaType = bundle.getString(ARG_ETHENA_TYPE)!!
     )
 
     override fun toBundle() = Bundle().apply {
         putString(ARG_ADDRESS, address)
         putString(ARG_NAME, name)
+        putString(ARG_ETHENA_TYPE, ethenaType)
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerScreen.kt
index 7202290d8..ce0cef202 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerScreen.kt
@@ -8,6 +8,7 @@ import com.tonapps.tonkeeper.koin.walletViewModel
 import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
 import com.tonapps.tonkeeper.ui.base.ScreenContext
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.Adapter
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.flow.catch
@@ -21,7 +22,7 @@ class StakeViewerScreen(wallet: WalletEntity): BaseListWalletScreen<ScreenContex
 
     override val fragmentName: String = "StakeViewerScreen"
 
-    override val viewModel: StakeViewerViewModel by walletViewModel { parametersOf(args.address) }
+    override val viewModel: StakeViewerViewModel by walletViewModel { parametersOf(args.address, args.ethenaType) }
 
     private val args: StakeViewerArgs by lazy { StakeViewerArgs(requireArguments()) }
 
@@ -37,7 +38,11 @@ class StakeViewerScreen(wallet: WalletEntity): BaseListWalletScreen<ScreenContex
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setTitle(args.name)
+        val title = when {
+            args.ethenaType.isNotEmpty() -> getString(Localization.staked_usde)
+            else -> args.name
+        }
+        setTitle(title)
         setAdapter(adapter)
         collectFlow(viewModel.poolNameFlow, ::setTitle)
     }
@@ -46,7 +51,13 @@ class StakeViewerScreen(wallet: WalletEntity): BaseListWalletScreen<ScreenContex
 
         fun newInstance(wallet: WalletEntity, address: String, name: String): StakeViewerScreen {
             val fragment = StakeViewerScreen(wallet)
-            fragment.setArgs(StakeViewerArgs(address, name))
+            fragment.setArgs(StakeViewerArgs(address, name, ""))
+            return fragment
+        }
+
+        fun newInstance(wallet: WalletEntity, ethenaType: EthenaEntity.Method.Type): StakeViewerScreen {
+            val fragment = StakeViewerScreen(wallet)
+            fragment.setArgs(StakeViewerArgs(ethenaType = ethenaType.id, address = "", name = ""))
             return fragment
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerViewModel.kt
index 89bf2ad68..265880a92 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/StakeViewerViewModel.kt
@@ -1,19 +1,18 @@
 package com.tonapps.tonkeeper.ui.screen.staking.viewer
 
 import android.app.Application
-import android.util.Log
 import androidx.core.net.toUri
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.tonkeeper.core.entities.StakedEntity
+import com.tonapps.tonkeeper.manager.tx.TransactionManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.Item
 import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.TokenEntity
-import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.rates.RatesRepository
@@ -21,27 +20,35 @@ import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.staking.StakingRepository
 import com.tonapps.wallet.data.staking.entities.PoolDetailsEntity
 import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 class StakeViewerViewModel(
     app: Application,
     private val wallet: WalletEntity,
     private val poolAddress: String,
+    private val ethenaType: String,
     private val stakingRepository: StakingRepository,
     private val ratesRepository: RatesRepository,
     private val settingsRepository: SettingsRepository,
     private val tokenRepository: TokenRepository,
-    private val api: API
-): BaseWalletVM(app) {
+    private val api: API,
+    private val transactionManager: TransactionManager,
+) : BaseWalletVM(app) {
+
+    val usdeDisabled: Boolean
+        get() = api.config.flags.disableUsde
+
+    private val ethenaMethodType: EthenaEntity.Method.Type? =
+        if (ethenaType.isNotEmpty()) EthenaEntity.Method.Type.fromId(ethenaType) else null
 
     private val currency = settingsRepository.currency
     private val _poolFlow = MutableStateFlow<Pair<StakedEntity, PoolDetailsEntity>?>(null)
@@ -49,92 +56,234 @@ class StakeViewerViewModel(
 
     val poolNameFlow = poolFlow.map { it.first.pool.name }
 
-    val uiItemsFlow = poolFlow.map { (staked, details) ->
+    private val _ethenaDataFlow = MutableStateFlow<EthenaEntity?>(null)
+    private val ethenaDataFlow = _ethenaDataFlow.asStateFlow().filterNotNull()
+
+    private val _tokensFlow = MutableStateFlow<List<AccountTokenEntity>?>(null)
+    val tokensFlow = _tokensFlow.asStateFlow().filterNotNull()
+
+    val ethenaItemsFlow = combine(ethenaDataFlow, tokensFlow) { ethena, tokens ->
+        val uiItems = mutableListOf<Item>()
+
+        val method = ethena.methods.find { it.type == ethenaMethodType }
+
+        val tokenUsde = tokens.firstOrNull { it.isUSDe }
+        val tokenTsUsde = tokens.firstOrNull { it.isTsUSDe } ?: AccountTokenEntity.createEmpty(
+            TokenEntity.TS_USDE, wallet.accountId
+        )
+
+        if (method == null || tokenUsde == null) {
+            return@combine uiItems
+        }
+
+        val rates = ratesRepository.getRates(
+            settingsRepository.currency,
+            listOfNotNull(tokenUsde.address, tokenTsUsde.address)
+        )
+
+
+        val balance = rates.convert(
+            from = WalletCurrency.TS_USDE_TON_ETHENA,
+            value = tokenTsUsde.balance.value,
+            to = WalletCurrency.USDE_TON_ETHENA
+        )
+        val fiat = rates.convert(tokenUsde.address, balance)
+
+        uiItems.add(
+            Item.Balance(
+                ethenaType = method.type,
+                balance = balance,
+                balanceFormat = CurrencyFormatter.format(
+                    tokenUsde.symbol,
+                    balance,
+                ),
+                fiat = fiat,
+                fiatFormat = CurrencyFormatter.formatFiat(currency.code, fiat),
+                hiddenBalance = settingsRepository.hiddenBalances,
+            )
+        )
+        if (!usdeDisabled) {
+            uiItems.add(
+                Item.Actions(
+                    wallet = wallet,
+                    ethenaMethod = method,
+                    unstakeDisabled = balance.isZero
+                )
+            )
+            uiItems.add(Item.Space)
+            uiItems.add(
+                Item.EthenaDetails(
+                    apyTitle = method.apyTitle,
+                    apyDescription = method.apyDescription,
+                    apyFormat = CurrencyFormatter.formatPercent(method.apy),
+                    bonusApyFormat = method.bonusApy?.let { CurrencyFormatter.formatPercent(it) },
+                    bonusTitle = method.bonusTitle,
+                    bonusDescription = method.bonusDescription,
+                    bonusUrl = method.eligibleBonusUrl,
+                    faqUrl = ethena.about.faqUrl,
+                )
+            )
+            uiItems.add(Item.Space)
+        }
+        uiItems.add(
+            Item.Token(
+                iconUri = tokenTsUsde.token.imageUri,
+                address = tokenTsUsde.address,
+                symbol = tokenTsUsde.token.symbol,
+                name = tokenTsUsde.token.name,
+                balance = tokenTsUsde.balance.value,
+                balanceFormat = CurrencyFormatter.format(
+                    tokenTsUsde.token.symbol,
+                    tokenTsUsde.balance.value
+                ),
+                fiat = tokenTsUsde.fiat,
+                fiatFormat = CurrencyFormatter.formatFiat(currency.code, tokenTsUsde.fiat),
+                rate = CurrencyFormatter.formatFiat(
+                    currency.code,
+                    rates.getRate(tokenTsUsde.address)
+                ),
+                rateDiff24h = rates.getDiff7d(tokenTsUsde.address),
+                verified = tokenTsUsde.token.verification == TokenEntity.Verification.whitelist,
+                testnet = wallet.testnet,
+                hiddenBalance = settingsRepository.hiddenBalances,
+                blacklist = tokenTsUsde.token.verification == TokenEntity.Verification.blacklist,
+                wallet = wallet,
+            )
+        )
+        if (!usdeDisabled) {
+            uiItems.add(
+                Item.Description(
+                    description = ethena.about.tsusdeDescription,
+                    isEthena = true,
+                    uri = ethena.about.faqUrl.toUri()
+                )
+            )
+            uiItems.add(Item.Space)
+            uiItems.add(Item.Links(method.links))
+        }
+
+
+        uiItems
+    }.flowOn(Dispatchers.IO)
+
+    val stakingItemsFlow = poolFlow.map { (staked, details) ->
         val liquidToken = staked.liquidToken
-        val currencyCode = if (staked.isEthena) "USDe" else TokenEntity.TON.symbol
-        val rates = ratesRepository.getRates(currency, listOfNotNull(
-            currencyCode, liquidToken?.token?.address, WalletCurrency.USDE_TON_ETHENA_ADDRESS
-        ))
+        val currencyCode = TokenEntity.TON.symbol
+        val rates = ratesRepository.getRates(
+            currency, listOfNotNull(
+                currencyCode, liquidToken?.token?.address
+            )
+        )
 
         val amount = staked.balance
-        val fiat = if (staked.isEthena) {
-            liquidToken?.let {
-                rates.convert(it.token.address, it.value)
-            } ?: Coins.ZERO
-        } else {
-            rates.convert(TokenEntity.TON.symbol, amount)
-        }
+        val fiat = rates.convert(TokenEntity.TON.symbol, amount)
 
         val apyFormat = CurrencyFormatter.formatPercent(staked.pool.apy)
 
         val uiItems = mutableListOf<Item>()
-        uiItems.add(Item.Balance(
-            poolImplementation = staked.pool.implementation,
-            balance = amount,
-            balanceFormat = CurrencyFormatter.format(currencyCode, amount, customScale = 4),
-            fiat = fiat,
-            fiatFormat = CurrencyFormatter.formatFiat(currency.code, fiat),
-            hiddenBalance = settingsRepository.hiddenBalances,
-        ))
-        uiItems.add(Item.Actions(poolAddress, wallet))
+        uiItems.add(
+            Item.Balance(
+                poolImplementation = staked.pool.implementation,
+                balance = amount,
+                balanceFormat = CurrencyFormatter.format(currencyCode, amount),
+                fiat = fiat,
+                fiatFormat = CurrencyFormatter.formatFiat(currency.code, fiat),
+                hiddenBalance = settingsRepository.hiddenBalances,
+            )
+        )
+
+        val stakingDisabled = !api.config.enabledStaking.contains(staked.pool.implementation.title)
+
+        uiItems.add(
+            Item.Actions(
+                wallet = wallet,
+                poolAddress = poolAddress,
+                stakeDisabled = stakingDisabled
+            )
+        )
 
         if (liquidToken != null) {
             val tokenAddress = liquidToken.token.address
             val rateNow = rates.getRate(tokenAddress)
             val tokenFiat = rates.convert(tokenAddress, liquidToken.value)
             uiItems.add(Item.Space)
-            uiItems.add(Item.Token(
-                iconUri = liquidToken.token.imageUri,
-                address = tokenAddress,
-                symbol = liquidToken.token.symbol,
-                name = liquidToken.token.name,
-                balance = liquidToken.value,
-                balanceFormat = CurrencyFormatter.format(liquidToken.token.symbol, liquidToken.value),
-                fiat = tokenFiat,
-                fiatFormat = CurrencyFormatter.formatFiat(currency.code, tokenFiat),
-                rate = CurrencyFormatter.formatFiat(currency.code, rateNow),
-                rateDiff24h = rates.getDiff7d(tokenAddress),
-                verified = liquidToken.token.verification == TokenEntity.Verification.whitelist,
-                testnet = wallet.testnet,
-                hiddenBalance = settingsRepository.hiddenBalances,
-                blacklist = liquidToken.token.verification == TokenEntity.Verification.blacklist,
-                wallet = wallet,
-            ))
-            uiItems.add(Item.Space)
-            if (staked.isEthena) {
-                uiItems.add(Item.Description(Localization.stake_ethena_description))
-            } else {
-                uiItems.add(Item.Description(Localization.stake_tonstakers_description))
-            }
+            uiItems.add(
+                Item.Token(
+                    iconUri = liquidToken.token.imageUri,
+                    address = tokenAddress,
+                    symbol = liquidToken.token.symbol,
+                    name = liquidToken.token.name,
+                    balance = liquidToken.value,
+                    balanceFormat = CurrencyFormatter.format(
+                        liquidToken.token.symbol,
+                        liquidToken.value
+                    ),
+                    fiat = tokenFiat,
+                    fiatFormat = CurrencyFormatter.formatFiat(currency.code, tokenFiat),
+                    rate = CurrencyFormatter.formatFiat(currency.code, rateNow),
+                    rateDiff24h = rates.getDiff7d(tokenAddress),
+                    verified = liquidToken.token.verification == TokenEntity.Verification.whitelist,
+                    testnet = wallet.testnet,
+                    hiddenBalance = settingsRepository.hiddenBalances,
+                    blacklist = liquidToken.token.verification == TokenEntity.Verification.blacklist,
+                    wallet = wallet,
+                )
+            )
+            uiItems.add(Item.Description(getString(Localization.stake_tonstakers_description)))
             uiItems.add(Item.Space)
         }
 
         uiItems.add(Item.Space)
-        uiItems.add(Item.Details(
-            apyFormat = "≈ $apyFormat",
-            minDepositFormat = if (staked.pool.minStake == Coins.ZERO) "" else CurrencyFormatter.format(currencyCode, staked.pool.minStake),
-            maxApy = staked.maxApy
-        ))
-        uiItems.add(Item.Space)
-        if (staked.isEthena) {
-            uiItems.add(Item.Description(Localization.stake_ethena_disclaimer, "https://docs.ethena.fi/resources/terms-of-service".toUri()))
-        } else {
-            uiItems.add(Item.Description(Localization.staking_details_description))
-        }
+        uiItems.add(
+            Item.Details(
+                apyFormat = "≈ $apyFormat",
+                minDepositFormat = if (staked.pool.minStake == Coins.ZERO) "" else CurrencyFormatter.format(
+                    currencyCode,
+                    staked.pool.minStake
+                ),
+                maxApy = staked.maxApy
+            )
+        )
+        uiItems.add(Item.Description(getString(Localization.staking_details_description)))
         uiItems.add(Item.Space)
         uiItems.add(Item.Links(details.getLinks(poolAddress)))
         uiItems
     }.flowOn(Dispatchers.IO)
 
+    val uiItemsFlow = if (ethenaMethodType != null) {
+        ethenaItemsFlow
+    } else {
+        stakingItemsFlow
+    }
+
     init {
         viewModelScope.launch(Dispatchers.IO) {
-            val tokens = tokenRepository.get(currency, wallet.accountId, wallet.testnet) ?: return@launch
-            val staking = stakingRepository.get(wallet.accountId, wallet.testnet)
-            val staked = StakedEntity.create(wallet, staking, tokens, currency, ratesRepository, api)
-            val item = staked.find { it.pool.address.equalsAddress(poolAddress) } ?: return@launch
-            val details = staking.getDetails(item.pool.implementation) ?: return@launch
-            _poolFlow.value = Pair(item, details)
+            getData()
+        }
+        transactionManager.eventsFlow(wallet).collectFlow {
+            getData(true)
         }
     }
 
+    private suspend fun getData(refresh: Boolean = false) {
+        val tokens =
+            tokenRepository.get(currency, wallet.accountId, wallet.testnet, refresh = refresh)
+                ?: return
+        _tokensFlow.value = tokens
+
+        val ethenaData = if (ethenaMethodType != null) {
+            tokenRepository.getEthena(wallet.accountId)
+        } else {
+            null
+        }
+        ethenaData?.let { _ethenaDataFlow.value = it }
+
+        val staking = stakingRepository.get(wallet.accountId, wallet.testnet)
+        val staked =
+            StakedEntity.create(wallet, staking, tokens, currency, ratesRepository, api)
+        val item = staked.find { it.pool.address.equalsAddress(poolAddress) } ?: return
+        val details = staking.getDetails(item.pool.implementation) ?: return
+        _poolFlow.value = Pair(item, details)
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Adapter.kt
index 54e2db57c..cb1d5b4ba 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Adapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Adapter.kt
@@ -8,6 +8,7 @@ import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder.LinksHolder
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder.SpaceHolder
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder.TokenHolder
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder.DescriptionHolder
+import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder.EthenaDetailsHolder
 import com.tonapps.uikit.list.BaseListAdapter
 import com.tonapps.uikit.list.BaseListHolder
 import com.tonapps.uikit.list.BaseListItem
@@ -23,6 +24,7 @@ class Adapter: BaseListAdapter() {
             Item.TYPE_TOKEN -> TokenHolder(parent)
             Item.TYPE_SPACE -> SpaceHolder(parent)
             Item.TYPE_DESCRIPTION -> DescriptionHolder(parent)
+            Item.TYPE_ETHENA_DETAILS -> EthenaDetailsHolder(parent)
             else -> throw IllegalArgumentException("Unknown view type: $viewType")
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Item.kt
index e129a4c45..81c7d0c33 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/Item.kt
@@ -1,10 +1,10 @@
 package com.tonapps.tonkeeper.ui.screen.staking.viewer.list
 
 import android.net.Uri
-import androidx.annotation.StringRes
 import com.tonapps.icu.Coins
+import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.list.BaseListItem
-import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.staking.StakingPool
 
@@ -18,10 +18,12 @@ sealed class Item(type: Int): BaseListItem(type) {
         const val TYPE_TOKEN = 5
         const val TYPE_SPACE = 6
         const val TYPE_DESCRIPTION = 7
+        const val TYPE_ETHENA_DETAILS = 8
     }
 
     data class Balance(
-        val poolImplementation: StakingPool.Implementation,
+        val poolImplementation: StakingPool.Implementation? = null,
+        val ethenaType: EthenaEntity.Method.Type? = null,
         val balance: Coins,
         val balanceFormat: CharSequence,
         val fiat: Coins,
@@ -30,18 +32,43 @@ sealed class Item(type: Int): BaseListItem(type) {
     ): Item(TYPE_BALANCE) {
 
         val currencyIcon: Int by lazy {
-            if (poolImplementation == StakingPool.Implementation.Ethena) {
+            if (ethenaType != null) {
                 com.tonapps.wallet.api.R.drawable.ic_udse_ethena_with_bg
             } else {
                 com.tonapps.wallet.api.R.drawable.ic_ton_with_bg
             }
         }
+
+        val iconRes: Int?
+            get() {
+                if (poolImplementation != null) {
+                    return StakingPool.getIcon(poolImplementation)
+                } else {
+                    return when (ethenaType) {
+                        EthenaEntity.Method.Type.STONFI -> R.drawable.ethena
+                        EthenaEntity.Method.Type.AFFLUENT -> R.drawable.affluent
+                        null -> null
+                    }
+                }
+            }
     }
 
     data class Actions(
-        val poolAddress: String,
         val wallet: WalletEntity,
-    ): Item(TYPE_ACTIONS)
+        val stakeDisabled: Boolean = false,
+        val unstakeDisabled: Boolean = false,
+        val poolAddress: String? = null,
+        val ethenaMethod: EthenaEntity.Method? = null,
+    ): Item(TYPE_ACTIONS) {
+        val iconRes: Int?
+            get() {
+                return when (ethenaMethod?.type) {
+                    EthenaEntity.Method.Type.STONFI -> R.drawable.stonfi
+                    EthenaEntity.Method.Type.AFFLUENT -> R.drawable.affluent
+                    null -> null
+                }
+            }
+    }
 
     data class Details(
         val apyFormat: String,
@@ -74,7 +101,20 @@ sealed class Item(type: Int): BaseListItem(type) {
     data object Space: Item(TYPE_SPACE)
 
     data class Description(
-        @StringRes val resId: Int,
+        val description: String,
         val uri: Uri? = null,
+        val isEthena: Boolean = false,
     ): Item(TYPE_DESCRIPTION)
+
+    data class EthenaDetails(
+        val apyFormat: CharSequence,
+        val apyTitle: String,
+        val apyDescription: String,
+        val bonusApyFormat: CharSequence? = null,
+        val bonusTitle: String? = null,
+        val bonusDescription: String? = null,
+        val bonusUrl: String? = null,
+        val faqUrl: String,
+    ): Item(TYPE_ETHENA_DETAILS)
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/ActionsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/ActionsHolder.kt
index 82be67fcf..e9b5eeb30 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/ActionsHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/ActionsHolder.kt
@@ -2,6 +2,9 @@ package com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder
 
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.net.toUri
+import com.tonapps.extensions.uri
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
 import com.tonapps.tonkeeper.ui.screen.staking.unstake.UnStakeScreen
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.Item
@@ -17,12 +20,41 @@ class ActionsHolder(
     private val minusView = findViewById<View>(R.id.minus)
 
     override fun onBind(item: Item.Actions) {
+        plusView.isEnabled = !item.stakeDisabled
+        minusView.isEnabled = !item.unstakeDisabled
+
         plusView.setOnClickListener {
-            navigation?.add(StakingScreen.newInstance(item.wallet, item.poolAddress))
+            if (item.poolAddress != null) {
+                navigation?.add(StakingScreen.newInstance(item.wallet, from = "staking_viewer", poolAddress = item.poolAddress))
+            } else if (item.ethenaMethod != null) {
+                navigation?.add(
+                    DAppScreen.newInstance(
+                        wallet = item.wallet,
+                        title = item.ethenaMethod.name,
+                        url = item.ethenaMethod.depositUrl.toUri(),
+                        iconUrl = item.iconRes?.uri().toString(),
+                        source = "staking_viewer",
+                        forceConnect = true
+                    )
+                )
+            }
         }
 
         minusView.setOnClickListener {
-            navigation?.add(UnStakeScreen.newInstance(item.wallet, item.poolAddress))
+            if (item.poolAddress != null) {
+                navigation?.add(UnStakeScreen.newInstance(item.wallet, item.poolAddress))
+            } else if (item.ethenaMethod != null) {
+                navigation?.add(
+                    DAppScreen.newInstance(
+                        wallet = item.wallet,
+                        title = item.ethenaMethod.name,
+                        url = item.ethenaMethod.withdrawalUrl.toUri(),
+                        iconUrl = item.iconRes?.uri().toString(),
+                        source = "staking_viewer",
+                        forceConnect = true
+                    )
+                )
+            }
         }
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/BalanceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/BalanceHolder.kt
index 9858f593d..27e5ae3fe 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/BalanceHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/BalanceHolder.kt
@@ -22,7 +22,7 @@ class BalanceHolder(
     override fun onBind(item: Item.Balance) {
         balanceView.text = if (item.hiddenBalance) HIDDEN_BALANCE else item.balanceFormat.withCustomSymbol(context)
         fiatView.text = if (item.hiddenBalance) HIDDEN_BALANCE else item.fiatFormat.withCustomSymbol(context)
-        iconView.setLocalRes(StakingPool.getIcon(item.poolImplementation))
+        item.iconRes?.let { iconView.setLocalRes(it) }
         currencyIconView.setImageResource(item.currencyIcon)
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/DescriptionHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/DescriptionHolder.kt
index 2f4e9284a..e6ea49287 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/DescriptionHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/DescriptionHolder.kt
@@ -1,18 +1,33 @@
 package com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder
 
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
 import com.tonapps.tonkeeper.helper.BrowserHelper
 import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.Item
 import com.tonapps.tonkeeperx.R
-import uikit.extensions.getSpannable
+import com.tonapps.uikit.color.textAccentColor
+import com.tonapps.wallet.localization.Localization
 
-class DescriptionHolder(parent: ViewGroup): Holder<Item.Description>(parent, R.layout.view_staking_description) {
+class DescriptionHolder(parent: ViewGroup) :
+    Holder<Item.Description>(parent, R.layout.view_staking_description) {
 
     private val textView = findViewById<AppCompatTextView>(R.id.text)
 
     override fun onBind(item: Item.Description) {
-        textView.text = context.getSpannable(item.resId)
+        textView.text = if (item.isEthena) {
+            val aboutText = getString(Localization.about_ethena)
+            SpannableStringBuilder("${item.description} $aboutText").apply {
+                setSpan(
+                    ForegroundColorSpan(context.textAccentColor), length - aboutText.length, length,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
+        } else {
+            item.description
+        }
         if (item.uri == null) {
             textView.setOnClickListener(null)
         } else {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/EthenaDetailsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/EthenaDetailsHolder.kt
new file mode 100644
index 000000000..5bbf9ca68
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/EthenaDetailsHolder.kt
@@ -0,0 +1,38 @@
+package com.tonapps.tonkeeper.ui.screen.staking.viewer.list.holder
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.ui.screen.staking.viewer.list.Item
+import com.tonapps.tonkeeperx.R
+
+class EthenaDetailsHolder(
+    parent: ViewGroup,
+): Holder<Item.EthenaDetails>(parent, R.layout.view_ethena_details) {
+
+    private val apyView = findViewById<AppCompatTextView>(R.id.apy)
+    private val apyTitleView = findViewById<AppCompatTextView>(R.id.apy_title)
+    private val apySubtitleView = findViewById<AppCompatTextView>(R.id.apy_subtitle)
+    private val bonusApyTitleView = findViewById<AppCompatTextView>(R.id.bonus_apy_title)
+    private val bonusApySubtitleView = findViewById<AppCompatTextView>(R.id.bonus_apy_subtitle)
+    private val faqView = findViewById<AppCompatTextView>(R.id.faq)
+    private val checkEligibilityView = findViewById<AppCompatTextView>(R.id.check_eligibility)
+
+    override fun onBind(item: Item.EthenaDetails) {
+        apyTitleView.text = item.apyTitle
+        apySubtitleView.text = item.apyDescription
+        apyView.text = item.apyFormat
+
+        bonusApyTitleView.text = item.bonusTitle
+        bonusApySubtitleView.text = item.bonusDescription
+        faqView.setOnClickListener {
+            BrowserHelper.open(context, item.faqUrl)
+        }
+        checkEligibilityView.setOnClickListener {
+            item.bonusUrl?.let {
+                BrowserHelper.open(context, it)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/LinksHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/LinksHolder.kt
index 0d894092f..e410151c0 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/LinksHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/LinksHolder.kt
@@ -14,10 +14,11 @@ import uikit.extensions.inflate
 import uikit.extensions.setLeftDrawable
 import uikit.navigation.Navigation
 import uikit.widget.FlexboxWithGapLayout
+import androidx.core.net.toUri
 
 class LinksHolder(
     parent: ViewGroup,
-): Holder<Item.Links>(parent, R.layout.view_staking_links) {
+) : Holder<Item.Links>(parent, R.layout.view_staking_links) {
 
     private val linkDrawable = context.drawable(UIKitIcon.ic_globe_16)
     private val linksView = findViewById<FlexboxWithGapLayout>(R.id.links)
@@ -25,11 +26,16 @@ class LinksHolder(
     override fun onBind(item: Item.Links) {
         linksView.removeAllViews()
         for (link in item.links) {
-            val host = Uri.parse(link).host!!
+            val host = link.toUri().host ?: link
             val linkView = context.inflate(R.layout.view_link, linksView) as AppCompatTextView
             linkView.text = host
             linkView.setLeftDrawable(linkDrawable)
-            linkView.setOnClickListener { BrowserHelper.open(context, link) }
+            val fixedLink = if (link.startsWith("http")) {
+                    link
+                } else {
+                "https://$link"
+            }
+            linkView.setOnClickListener { BrowserHelper.open(context, fixedLink) }
             linksView.addView(linkView)
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/TokenHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/TokenHolder.kt
index 1c5f87fd0..3d314f5cb 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/TokenHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/viewer/list/holder/TokenHolder.kt
@@ -31,7 +31,16 @@ class TokenHolder(parent: ViewGroup): Holder<Item.Token>(parent, R.layout.view_c
 
     override fun onBind(item: Item.Token) {
         itemView.setOnClickListener {
-            Navigation.from(context)?.add(TokenScreen.newInstance(item.wallet, item.address, item.name, item.symbol))
+            if (item.balance.isPositive) {
+                Navigation.from(context)?.add(
+                    TokenScreen.newInstance(
+                        item.wallet,
+                        item.address,
+                        item.name,
+                        item.symbol
+                    )
+                )
+            }
         }
 
         if (item.blacklist) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/withdraw/StakeWithdrawViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/withdraw/StakeWithdrawViewModel.kt
index e22cfe93f..599a8509d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/withdraw/StakeWithdrawViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/staking/withdraw/StakeWithdrawViewModel.kt
@@ -89,8 +89,8 @@ class StakeWithdrawViewModel(
 
     val amountFormatFlow = amountFlow.map { amount ->
         val fiat = ratesRepository.getTONRates(currency).convertTON(amount)
-        val amountFormat = CurrencyFormatter.format(TokenEntity.TON.symbol, amount, TokenEntity.TON.decimals)
-        val fiatFormat = CurrencyFormatter.formatFiat(currency.code, fiat, currency.decimals, replaceSymbol = false)
+        val amountFormat = CurrencyFormatter.format(TokenEntity.TON.symbol, amount)
+        val fiatFormat = CurrencyFormatter.formatFiat(currency.code, fiat, replaceSymbol = false)
         Pair(amountFormat, fiatFormat)
     }.flowOn(Dispatchers.IO)
 
@@ -121,8 +121,8 @@ class StakeWithdrawViewModel(
         val rates = ratesRepository.getTONRates(currency)
         val fee = StakingPool.getTotalFee(extra.value, stake.pool.implementation)
 
-        val amount = CurrencyFormatter.format(TokenEntity.TON.symbol, fee, TokenEntity.TON.decimals)
-        val fiat = CurrencyFormatter.format(currency.code, rates.convertTON(fee), currency.decimals, replaceSymbol = false)
+        val amount = CurrencyFormatter.format(TokenEntity.TON.symbol, fee)
+        val fiat = CurrencyFormatter.format(currency.code, rates.convertTON(fee), replaceSymbol = false)
         Pair(amount, fiat)
     }.flowOn(Dispatchers.IO)
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/stories/remote/RemoteStoriesScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/stories/remote/RemoteStoriesScreen.kt
index 52ee18c43..971ec2b95 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/stories/remote/RemoteStoriesScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/stories/remote/RemoteStoriesScreen.kt
@@ -7,6 +7,7 @@ import com.tonapps.extensions.containsQuery
 import com.tonapps.extensions.getParcelableCompat
 import com.tonapps.extensions.toUriOrNull
 import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.koin.analytics
 import com.tonapps.wallet.api.entity.StoryEntity
 import com.tonapps.wallet.data.settings.SettingsRepository
 import org.koin.android.ext.android.inject
@@ -41,8 +42,7 @@ class RemoteStoriesScreen : BaseStoriesScreen() {
             )
         })
 
-        AnalyticsHelper.trackStoryOpen(
-            installId = installId,
+        context?.analytics?.trackStoryOpen(
             storiesId = stories.id,
             from = from
         )
@@ -50,8 +50,7 @@ class RemoteStoriesScreen : BaseStoriesScreen() {
 
     override fun onStoryItem(item: Item) {
         super.onStoryItem(item)
-        AnalyticsHelper.trackStoryView(
-            installId = installId,
+        context?.analytics?.trackStoryView(
             storiesId = stories.id,
             index = currentIndex + 1
         )
@@ -61,8 +60,7 @@ class RemoteStoriesScreen : BaseStoriesScreen() {
         super.onStoryButton(index)
         val button = stories.list.getOrNull(index)?.button ?: return
 
-        AnalyticsHelper.trackStoryClick(
-            installId = installId,
+        context?.analytics?.trackStoryClick(
             storiesId = stories.id,
             button = button,
             index = index
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/SwapScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/SwapScreen.kt
index 8f855a3f1..09ac9cbb7 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/SwapScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/SwapScreen.kt
@@ -3,24 +3,20 @@ package com.tonapps.tonkeeper.ui.screen.swap
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.WebResourceRequest
-import android.webkit.WebSettings
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updateLayoutParams
-import com.google.firebase.ktx.Firebase
-import com.google.firebase.perf.ktx.performance
 import com.tonapps.extensions.appVersionName
 import com.tonapps.extensions.locale
-import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.helper.BrowserHelper
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.base.WalletContextScreen
 import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.OmnistonScreen
 import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.data.settings.BatteryTransaction
@@ -32,6 +28,12 @@ import uikit.extensions.applyNavBottomPadding
 import uikit.extensions.getDimensionPixelSize
 import uikit.widget.webview.WebViewFixed
 import uikit.widget.webview.bridge.BridgeWebView
+import androidx.core.view.isGone
+import com.google.firebase.Firebase
+import com.google.firebase.perf.performance
+import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import org.ton.contract.wallet.WalletMessage
 
 class SwapScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_swap, wallet), BaseFragment.BottomSheet {
 
@@ -75,7 +77,7 @@ class SwapScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_sw
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("swap_open", settingsRepository.installId)
+        analytics?.swapOpen(args.uri, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -104,7 +106,7 @@ class SwapScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_sw
     }
 
     private fun hideCloseView() {
-        if (closeView.visibility == View.GONE) {
+        if (closeView.isGone) {
             return
         }
         closeView.postDelayed({
@@ -128,11 +130,11 @@ class SwapScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_sw
     private suspend fun sing(
         request: SignRequestEntity
     ): String {
-        AnalyticsHelper.simpleTrackEvent("swap_click", settingsRepository.installId)
+        analytics?.simpleTrackEvent("swap_click")
         return try {
             val boc = SendTransactionScreen.run(requireContext(), wallet, request, BatteryTransaction.SWAP)
             if (boc.isNotBlank()) {
-                AnalyticsHelper.simpleTrackEvent("swap_success", settingsRepository.installId)
+                analytics?.simpleTrackEvent("swap_success")
             }
             boc
         } catch (e: Throwable) {
@@ -148,16 +150,37 @@ class SwapScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_sw
 
     companion object {
 
+        fun bestToToken(fromToken: String): WalletCurrency {
+            if (fromToken.equalsAddress(WalletCurrency.USDE_TON_ETHENA_ADDRESS)) {
+                return WalletCurrency.USDT_TON
+            } else if (fromToken.equalsAddress(WalletCurrency.TS_USDE_TON_ETHENA_ADDRESS)) {
+                return WalletCurrency.USDE_TON_ETHENA
+            }
+            return WalletCurrency.TON
+        }
+
         fun newInstance(
             wallet: WalletEntity,
+            fromToken: WalletCurrency = WalletCurrency.TON,
+            toToken: WalletCurrency? = null,
+            nativeSwap: Boolean,
             uri: Uri,
-            address: String,
-            fromToken: String,
-            toToken: String? = null
-        ): SwapScreen {
-            val fragment = SwapScreen(wallet)
-            fragment.setArgs(SwapArgs(uri, address, fromToken, toToken))
-            return fragment
+        ): BaseFragment {
+            if (nativeSwap) {
+                return OmnistonScreen.newInstance(
+                    wallet = wallet,
+                    fromToken = fromToken,
+                    toToken = toToken ?: bestToToken(fromToken.address)
+                )
+            }
+            val screen = SwapScreen(wallet)
+            screen.setArgs(SwapArgs(
+                uri = uri,
+                address = wallet.address,
+                fromToken = fromToken.address,
+                toToken = (toToken ?: bestToToken(fromToken.address)).address
+            ))
+            return screen
         }
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonArgs.kt
new file mode 100644
index 000000000..d4c97198e
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonArgs.kt
@@ -0,0 +1,28 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston
+
+import android.os.Bundle
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import uikit.base.BaseArgs
+
+data class OmnistonArgs(
+    val fromToken: WalletCurrency,
+    val toToken: WalletCurrency
+): BaseArgs() {
+
+    private companion object {
+        private const val ARG_FROM_TOKEN = "from"
+        private const val ARG_TO_TOKEN = "to"
+    }
+
+    constructor(bundle: Bundle) : this(
+        fromToken = bundle.getParcelableCompat(ARG_FROM_TOKEN)!!,
+        toToken = bundle.getParcelableCompat(ARG_TO_TOKEN)!!
+    )
+
+    override fun toBundle(): Bundle = Bundle().apply {
+        putParcelable(ARG_FROM_TOKEN, fromToken)
+        putParcelable(ARG_TO_TOKEN, toToken)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonScreen.kt
new file mode 100644
index 000000000..acff7e3d9
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonScreen.kt
@@ -0,0 +1,478 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston
+
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.method.LinkMovementMethod
+import android.util.Log
+import android.util.TypedValue
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.Button
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.lifecycle.lifecycleScope
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.AnalyticsHelper
+import com.tonapps.tonkeeper.core.InsufficientFundsException
+import com.tonapps.tonkeeper.extensions.addFeeItem
+import com.tonapps.tonkeeper.extensions.finishDelay
+import com.tonapps.tonkeeper.extensions.hideKeyboard
+import com.tonapps.tonkeeper.extensions.id
+import com.tonapps.tonkeeper.extensions.routeToHistoryTab
+import com.tonapps.tonkeeper.helper.TwinInput
+import com.tonapps.tonkeeper.koin.walletViewModel
+import com.tonapps.tonkeeper.popup.ActionSheet
+import com.tonapps.tonkeeper.ui.base.WalletContextScreen
+import com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
+import com.tonapps.tonkeeper.ui.screen.onramp.main.view.ReviewInputView
+import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
+import com.tonapps.tonkeeper.ui.screen.send.InsufficientFundsDialog
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.OmnistonStep
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapInputsState
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapQuoteState
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapTokenState
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentBlueColor
+import com.tonapps.uikit.color.textAccentColor
+import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.core.parameter.parametersOf
+import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.doKeyboardAnimation
+import uikit.extensions.dp
+import uikit.extensions.reject
+import uikit.extensions.rotate180Animation
+import uikit.extensions.withBlueBadge
+import uikit.extensions.withClickable
+import uikit.extensions.withInterpunct
+import uikit.span.ClickableSpanCompat
+import uikit.widget.HeaderView
+import uikit.widget.LoadableButton
+import uikit.widget.LoaderView
+import uikit.widget.ModalHeader
+import uikit.widget.ProcessTaskView
+import uikit.widget.SlideActionView
+import uikit.widget.SlideBetweenView
+import uikit.widget.item.ItemLineView
+import kotlin.getValue
+
+class OmnistonScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_omniston, wallet), BaseFragment.BottomSheet {
+
+    override val viewModel: OmnistonViewModel by walletViewModel {
+        parametersOf(OmnistonArgs(requireArguments()))
+    }
+
+    private val insufficientFundsDialog: InsufficientFundsDialog by lazy {
+        InsufficientFundsDialog(this)
+    }
+
+    private val feeMethodSelector: ActionSheet by lazy {
+        ActionSheet(requireContext())
+    }
+
+    private val disableNext: Boolean
+        get() = continueButton.isLoading || !continueButton.isEnabled
+
+    private val rootViewMode: RootViewModel by activityViewModel()
+
+    private lateinit var slidesView: SlideBetweenView
+    private lateinit var headerView: HeaderView
+    private lateinit var modalHeaderView: ModalHeader
+    private lateinit var sendInputView: CurrencyInputView
+    private lateinit var receiveInputView: CurrencyInputView
+    private lateinit var continueButton: LoadableButton
+    private lateinit var actionContainerView: View
+    private lateinit var detailsContainerView: View
+    private lateinit var reviewSendView: ReviewInputView
+    private lateinit var reviewReceiveView: ReviewInputView
+    private lateinit var priceView: AppCompatTextView
+    private lateinit var priceReversedView: AppCompatTextView
+    private lateinit var slideActionView: SlideActionView
+    private lateinit var taskView: ProcessTaskView
+    private lateinit var feeView: ItemLineView
+    private lateinit var slippageView: ItemLineView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        analytics?.swapOpen(viewModel.swapUri, true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.findViewById<View>(R.id.edit).setOnClickListener {
+            reset()
+            sendInputView.focusWithKeyboard()
+        }
+
+        headerView = view.findViewById(R.id.header)
+        headerView.doOnCloseClick = { onBackPressed() }
+        headerView.doOnActionClick = { finish() }
+
+        taskView = view.findViewById(R.id.task)
+        priceView = view.findViewById(R.id.price)
+        priceReversedView = view.findViewById(R.id.price_reversed)
+        slideActionView = view.findViewById(R.id.slide_action)
+        slideActionView.doOnDone = { sign() }
+        feeView = view.findViewById(R.id.details_fee)
+
+        val bottomReviewView = view.findViewById<View>(R.id.bottom_review)
+        slidesView = view.findViewById(R.id.slides)
+
+        modalHeaderView = view.findViewById(R.id.modal_header)
+        modalHeaderView.onCloseClick = { finish() }
+
+        reviewSendView = view.findViewById(R.id.review_send)
+        reviewSendView.setTitleTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+        reviewSendView.setValueTextSize(TypedValue.COMPLEX_UNIT_SP, 28f)
+        applyReviewSend()
+
+        reviewReceiveView = view.findViewById(R.id.review_receive)
+        reviewReceiveView.setBackgroundResource(uikit.R.drawable.bg_content_top)
+        reviewReceiveView.setTitleTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
+        reviewReceiveView.setValueTextSize(TypedValue.COMPLEX_UNIT_SP, 28f)
+
+        slippageView = view.findViewById(R.id.details_slippage)
+
+        sendInputView = view.findViewById(R.id.send_input)
+        sendInputView.doOnTextChange = viewModel::updateSendInput
+        sendInputView.doOnFocusChange = { hasFocus ->
+            if (hasFocus) {
+                viewModel.updateFocusInput(TwinInput.Type.Send)
+            }
+        }
+
+        sendInputView.doOnCurrencyClick = {
+            hideKeyboard()
+            viewModel.pickCurrency(TwinInput.Type.Send)
+        }
+
+        receiveInputView = view.findViewById(R.id.receive_input)
+        receiveInputView.doOnTextChange = viewModel::updateReceiveInput
+        receiveInputView.doOnFocusChange = { hasFocus ->
+            if (hasFocus) {
+                viewModel.updateFocusInput(TwinInput.Type.Receive)
+            }
+        }
+        receiveInputView.doOnCurrencyClick = {
+            hideKeyboard()
+            viewModel.pickCurrency(TwinInput.Type.Receive)
+        }
+
+        view.findViewById<View>(R.id.switch_button).setOnClickListener(::switch)
+
+        reviewReceiveView.setOnClickListener {
+            receiveInputView.focusWithKeyboard()
+            reset()
+        }
+        reviewSendView.setOnClickListener {
+            sendInputView.focusWithKeyboard()
+            reset()
+        }
+
+        continueButton = view.findViewById(R.id.continue_button)
+        continueButton.setOnClickListener { next() }
+
+        actionContainerView = view.findViewById(R.id.action_container)
+
+        detailsContainerView = view.findViewById(R.id.details_container)
+
+        view.doKeyboardAnimation { offset, _, _ ->
+            bottomReviewView.translationY = -offset.toFloat()
+            actionContainerView.translationY = -offset.toFloat()
+        }
+
+        sendInputView.doOnEditorAction = { actionId ->
+            if (disableNext) {
+                continueButton.reject()
+                true
+            } else if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
+                if (sendInputView.isEmpty) {
+                    receiveInputView.focusWithKeyboard()
+                }
+                next()
+                true
+            } else {
+                false
+            }
+        }
+
+        receiveInputView.doOnEditorAction = { actionId ->
+            if (disableNext) {
+                continueButton.reject()
+                true
+            } else if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_NEXT) {
+                if (receiveInputView.isEmpty) {
+                    sendInputView.focusWithKeyboard()
+                }
+                next()
+                true
+            } else {
+                false
+            }
+        }
+
+        collectFlow(viewModel.quoteStateFlow, ::applyQuoteState)
+        collectFlow(viewModel.priceFlow) { (first, second) ->
+            priceView.text = first
+            priceReversedView.text = second
+        }
+        collectFlow(viewModel.stepFlow) { step ->
+            if (step == OmnistonStep.Input) {
+                headerView.visibility = View.GONE
+                modalHeaderView.visibility = View.VISIBLE
+                slidesView.prev()
+            } else {
+                headerView.visibility = View.VISIBLE
+                modalHeaderView.visibility = View.GONE
+                slideActionView.startReverseProgress()
+                slidesView.next()
+                hideKeyboard()
+            }
+        }
+
+        collectFlow(viewModel.sendOutputCurrencyFlow, sendInputView::setCurrency)
+        collectFlow(viewModel.sendPlaceholderValueFlow, sendInputView::setPlaceholder)
+
+        collectFlow(viewModel.sendOutputValueFlow, sendInputView::setValue)
+        collectFlow(viewModel.receiveOutputValueFlow, receiveInputView::setValue)
+
+        collectFlow(viewModel.receiveOutputCurrencyFlow, receiveInputView::setCurrency)
+        collectFlow(viewModel.receivePlaceholderValueFlow, receiveInputView::setPlaceholder)
+        collectFlow(viewModel.uiStateToken, ::applyTokenState)
+        collectFlow(viewModel.inputPrefixFlow, ::applyPrefix)
+        collectFlow(viewModel.countDownFlow, ::applyResetProgress)
+
+        collectFlow(viewModel.uiButtonStateFlow, continueButton::applyUiState)
+
+        collectFlow(viewModel.requestFocusFlow) { inputType ->
+            when (inputType) {
+                TwinInput.Type.Send -> sendInputView.focusWithKeyboard()
+                TwinInput.Type.Receive -> receiveInputView.focusWithKeyboard()
+            }
+        }
+    }
+
+    private fun applyResetProgress(progress: Float) {
+        slideActionView.setReverseProgress(progress)
+        if (progress >= 1f) {
+            reset()
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        hideKeyboard()
+    }
+
+    override fun onDragging() {
+        super.onDragging()
+        hideKeyboard()
+    }
+
+    private fun applyPrefix(inputType: TwinInput.Type) {
+        if (inputType == TwinInput.Type.Send) {
+            sendInputView.setPrefix(CurrencyInputView.EQUALS_SIGN_PREFIX)
+            receiveInputView.setPrefix(null)
+        } else {
+            sendInputView.setPrefix(null)
+            receiveInputView.setPrefix(CurrencyInputView.EQUALS_SIGN_PREFIX)
+        }
+    }
+
+    private fun applyTokenState(state: SwapTokenState) {
+        if (state.insufficientBalance) {
+            sendInputView.setInsufficientBalance()
+        } else {
+            sendInputView.setTokenBalance(state.tokenBalance, state.remainingFormat, false)
+        }
+    }
+
+    private fun applyReviewSend() {
+        val prefix = getString(Localization.send)
+        val edit = getString(Localization.edit)
+        val text = "$prefix · $edit"
+        val spannable = SpannableString(text)
+        spannable.setSpan(ClickableSpanCompat(requireContext().textAccentColor) {
+            reset()
+            sendInputView.focusWithKeyboard()
+        }, prefix.length + 3, text.length, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+        reviewSendView.setTitleMovementMethod(LinkMovementMethod.getInstance())
+        reviewSendView.setTitle(spannable)
+    }
+
+    private fun inputErrorState() {
+        sendInputView.focusWithKeyboard()
+        sendInputView.reject()
+    }
+
+    private fun signDefaultState() {
+        slideActionView.reset()
+        slideActionView.visibility = View.VISIBLE
+        taskView.visibility = View.GONE
+    }
+
+    private fun signLoading() {
+        taskView.visibility = View.VISIBLE
+        taskView.state = ProcessTaskView.State.LOADING
+        slideActionView.visibility = View.GONE
+    }
+
+    private fun signSuccess() {
+        analytics?.swapSuccess(
+            jettonSymbolFrom = viewModel.jettonSymbolFrom,
+            jettonSymbolTo = viewModel.jettonSymbolTo,
+            providerName = viewModel.providerName,
+            providerUrl = viewModel.providerUrl,
+            native = true,
+        )
+
+        rootViewMode.routeToHistoryTab("swap")
+        taskView.visibility = View.VISIBLE
+        taskView.state = ProcessTaskView.State.SUCCESS
+        finishDelay()
+    }
+
+    private fun singFailure() {
+        taskView.visibility = View.VISIBLE
+        taskView.state = ProcessTaskView.State.FAILED
+        postDelayed(5000) { signDefaultState() }
+    }
+
+    private fun sign() {
+        signLoading()
+        analytics?.swapConfirm(
+            jettonSymbolFrom = viewModel.jettonSymbolFrom,
+            jettonSymbolTo = viewModel.jettonSymbolTo,
+            providerName = viewModel.providerName,
+            providerUrl = viewModel.providerUrl,
+            native = true,
+        )
+        viewModel.sign { isSuccessful ->
+            if (isSuccessful) {
+                signSuccess()
+            } else {
+                singFailure()
+                slideActionView.reset()
+            }
+        }
+    }
+
+    private fun switch(view: View) {
+        view.rotate180Animation()
+        viewModel.switch()
+    }
+
+    override fun onBackPressed(): Boolean {
+        if (slidesView.isFirst) {
+            return super.onBackPressed()
+        } else {
+            reset()
+            sendInputView.focusWithKeyboard()
+            return false
+        }
+    }
+
+    private fun reset() {
+        viewModel.reset()
+        continueButton.isLoading = false
+        continueButton.isEnabled = true
+    }
+
+    private fun next() {
+        hideKeyboard()
+        continueButton.isLoading = true
+        lifecycleScope.launch {
+            try {
+                viewModel.next()
+            } catch (e: Throwable) {
+                inputErrorState()
+                continueButton.isLoading = false
+                if (e is InsufficientFundsException) {
+                    insufficientFundsDialog.show(wallet, e)
+                }
+            }
+        }
+        analytics?.swapClick(
+            jettonSymbolFrom = viewModel.jettonSymbolFrom,
+            jettonSymbolTo = viewModel.jettonSymbolTo,
+            native = true,
+            providerName = viewModel.providerName,
+        )
+    }
+
+    private fun applyQuoteState(state: SwapQuoteState) {
+        reviewSendView.setValue(state.fromUnitsFormat)
+        receiveInputView.setValue(state.toUnits)
+        reviewReceiveView.setValue(state.toUnitsFormat)
+        slippageView.value = CurrencyFormatter.formatPercent(state.slippage / 100)
+        applyDetailsContainer(state)
+
+        if (state.insufficientFunds != null) {
+            postDelayed(1000) {
+                insufficientFundsDialog.show(wallet, state.insufficientFunds)
+                reset()
+                sendInputView.focusWithKeyboard()
+            }
+        }
+    }
+
+    private fun applyDetailsContainer(state: SwapQuoteState) {
+        setLineValue(R.id.details_provider, state.provider)
+        setLineValue(R.id.details_rate, state.exchangeRate)
+        applyFee(state)
+    }
+
+    private fun applyFee(state: SwapQuoteState) {
+        setLineValue(R.id.details_fee, state.getFeeFormat(requireContext()))
+        if (state.canUseBattery && state.canEditFeeMethod) {
+            feeView.name = getString(Localization.fee).withInterpunct().withClickable(requireContext(), Localization.edit)
+            feeView.setOnClickListener { selectFeeMethod(state) }
+        } else {
+            feeView.name = getString(Localization.fee)
+            feeView.setOnClickListener(null)
+        }
+    }
+
+    private fun selectFeeMethod(state: SwapQuoteState) {
+        feeMethodSelector.width = 264.dp
+        if (feeMethodSelector.isShowing) {
+            return
+        }
+
+        feeMethodSelector.clearItems()
+        state.feeOptions.forEach { fee ->
+            feeMethodSelector.addFeeItem(fee, fee.id == state.selectedFee?.id) {
+                viewModel.setFeeMethod(fee)
+            }
+        }
+        feeMethodSelector.showPopupAboveRight(feeView)
+    }
+
+    private fun setLineValue(id: Int, value: CharSequence) {
+        detailsContainerView.findViewById<ItemLineView>(id).value = value
+    }
+
+    override fun onResume() {
+        super.onResume()
+        sendInputView.focusWithKeyboard()
+    }
+
+    companion object {
+
+        fun newInstance(
+            wallet: WalletEntity,
+            fromToken: WalletCurrency = WalletCurrency.TON,
+            toToken: WalletCurrency = WalletCurrency.USDT_TON
+        ): OmnistonScreen {
+            val screen = OmnistonScreen(wallet)
+            screen.setArgs(OmnistonArgs(fromToken, toToken))
+            return screen
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonViewModel.kt
new file mode 100644
index 000000000..93553433d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/OmnistonViewModel.kt
@@ -0,0 +1,738 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston
+
+import android.app.Application
+import android.net.Uri
+import android.util.Log
+import androidx.compose.ui.graphics.Color
+import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.extensions.base64
+import com.tonapps.blockchain.ton.extensions.cellFromHex
+import com.tonapps.blockchain.ton.extensions.toRawAddress
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.extensions.mapList
+import com.tonapps.extensions.singleValue
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.ledger.ton.Transaction
+import com.tonapps.tonkeeper.core.InsufficientFundsException
+import com.tonapps.tonkeeper.extensions.getTransfers
+import com.tonapps.tonkeeper.extensions.method
+import com.tonapps.tonkeeper.helper.BatteryHelper
+import com.tonapps.tonkeeper.helper.TwinInput
+import com.tonapps.tonkeeper.helper.TwinInput.Companion.opposite
+import com.tonapps.tonkeeper.manager.assets.AssetsManager
+import com.tonapps.tonkeeper.manager.tx.TransactionManager
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.component.coin.CoinEditText.Companion.asString2
+import com.tonapps.tonkeeper.ui.screen.send.main.helper.InsufficientBalanceType
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.OmnistonStep
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapQuoteState
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapRequest
+import com.tonapps.tonkeeper.ui.screen.swap.omniston.state.SwapTokenState
+import com.tonapps.tonkeeper.ui.screen.swap.picker.SwapPickerScreen
+import com.tonapps.tonkeeper.usecase.emulation.Emulated.Companion.buildFee
+import com.tonapps.tonkeeper.usecase.emulation.EmulationUseCase
+import com.tonapps.tonkeeper.usecase.sign.SignUseCase
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.SendBlockchainState
+import com.tonapps.wallet.api.entity.SwapEntity
+import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.account.entities.MessageBodyEntity
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.battery.BatteryRepository
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.core.entity.RawMessageEntity
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
+import com.tonapps.wallet.data.rates.RatesRepository
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.settings.entities.PreferredFeeMethod
+import com.tonapps.wallet.data.swap.SwapRepository
+import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.ton.cell.Cell
+import org.ton.contract.wallet.WalletTransfer
+import uikit.UiButtonState
+import uikit.extensions.collectFlow
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.atomic.AtomicInteger
+import kotlin.time.Duration.Companion.milliseconds
+
+class OmnistonViewModel(
+    app: Application,
+    args: OmnistonArgs,
+    private val wallet: WalletEntity,
+    private val swapRepository: SwapRepository,
+    private val tokenRepository: TokenRepository,
+    private val assetsManager: AssetsManager,
+    private val api: API,
+    private val signUseCase: SignUseCase,
+    private val transactionManager: TransactionManager,
+    private val accountRepository: AccountRepository,
+    private val batteryRepository: BatteryRepository,
+    private val ratesRepository: RatesRepository,
+    private val settingsRepository: SettingsRepository,
+    private val emulationUseCase: EmulationUseCase,
+): BaseWalletVM(app) {
+
+    private companion object {
+        private val defaultFromCurrency = WalletCurrency.TON
+        private val defaultToCurrency = WalletCurrency.USDT_TON
+    }
+
+    val installId: String
+        get() = settingsRepository.installId
+
+    val swapUri: Uri
+        get() = api.config.swapUri
+
+    private var swapStreamJob: Job? = null
+
+    private val twinInput = TwinInput(viewModelScope)
+
+    private var countDownJob: Job? = null
+    private val _countDownFlow = MutableStateFlow(0f)
+    val countDownFlow = _countDownFlow.asStateFlow()
+
+    private val _requestFocusFlow = MutableEffectFlow<TwinInput.Type?>()
+    val requestFocusFlow = _requestFocusFlow.asSharedFlow().filterNotNull()
+
+    private val lastSeqNo = AtomicInteger(0)
+    private val walletsCountRef = AtomicInteger(0)
+
+    private val _amountFlow = MutableEffectFlow<Coins>()
+    @OptIn(FlowPreview::class)
+    private val amountFlow = _amountFlow.asSharedFlow().debounce(1000)
+
+    private val _quoteStateFlow = MutableStateFlow(SwapQuoteState())
+    @OptIn(FlowPreview::class)
+    val quoteStateFlow = _quoteStateFlow.asStateFlow().debounce(100)
+
+    private val _stepFlow = MutableStateFlow(OmnistonStep.Input)
+    val stepFlow = _stepFlow.asStateFlow()
+
+    private val ratesFlow = swapRepository.assetsFlow
+        .mapList { it.address }
+        .map { ratesRepository.getRates(settingsRepository.currency, it) }
+
+    val sendPlaceholderValueFlow = twinInput.createConvertFlow(ratesFlow, TwinInput.Type.Send).map {
+        it.value.asString2(3)
+    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
+
+    val receivePlaceholderValueFlow = twinInput.createConvertFlow(ratesFlow, TwinInput.Type.Receive).map {
+        it.value.asString2(3)
+    }.stateIn(viewModelScope, SharingStarted.Lazily, "")
+
+    private val _sendOutputValueFlow = MutableStateFlow(Coins.ZERO)
+    val sendOutputValueFlow = _sendOutputValueFlow.asStateFlow()
+
+    private val _receiveOutputValueFlow = MutableStateFlow(Coins.ZERO)
+    val receiveOutputValueFlow = _receiveOutputValueFlow.asStateFlow()
+
+    val sendOutputCurrencyFlow = twinInput.stateFlow.map { it.sendCurrency }.distinctUntilChanged()
+    val receiveOutputCurrencyFlow = twinInput.stateFlow.map { it.receiveCurrency }.distinctUntilChanged()
+
+    val inputPrefixFlow = twinInput.stateFlow.map { it.focus.opposite }.distinctUntilChanged()
+
+    val priceFlow = combine(ratesFlow, twinInput.stateFlow) { rates, inputsState ->
+        val coins = Coins.ONE
+        val value = inputsState.convert(
+            rates = rates,
+            fromType = TwinInput.Type.Send,
+            value = coins
+        )
+        val formatFrom = CurrencyFormatter.format(inputsState.sendCurrency.code, coins)
+        val formatTo = CurrencyFormatter.format(inputsState.receiveCurrency.code, value)
+
+        val valueReversed = inputsState.convert(
+            rates = rates,
+            fromType = TwinInput.Type.Receive,
+            value = coins
+        )
+
+        val formatFromReversed = CurrencyFormatter.format(inputsState.receiveCurrency.code, coins)
+        val formatToReversed = CurrencyFormatter.format(inputsState.sendCurrency.code, valueReversed)
+
+        Pair("$formatFrom ≈ $formatTo", "$formatFromReversed ≈ $formatToReversed")
+    }
+
+    private val tokenBalanceFlow = twinInput.stateFlow
+        .map { it.sendCurrency }
+        .distinctUntilChanged()
+        .map { send ->
+            assetsManager.getToken(wallet, send.address)
+        }
+
+    val uiStateToken = combine(
+        tokenBalanceFlow,
+        twinInput.stateFlow.map { it.send.coins }.distinctUntilChanged()
+    ) { token, sendAmount ->
+        if (token == null) {
+            SwapTokenState()
+        } else {
+            val remaining = token.token.balance.value - sendAmount
+            SwapTokenState(
+                fromToken = token,
+                remaining = remaining
+            )
+        }
+    }.stateIn(viewModelScope, SharingStarted.Eagerly, SwapTokenState())
+
+    private val _uiButtonStateFlow = MutableStateFlow<UiButtonState>(UiButtonState.Default(false))
+    val uiButtonStateFlow = _uiButtonStateFlow.asStateFlow()
+
+    @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
+    private val swapRequestFlow = combine(
+        twinInput.stateFlow.map { it.send }.distinctUntilChanged(),
+        twinInput.stateFlow.map { it.receive }.distinctUntilChanged(),
+    ) { send, receive ->
+        val focus = twinInput.state.focus
+        val amount = if (focus == TwinInput.Type.Send) send.coins else receive.coins
+        SwapRequest(focus, amount, send.currency, receive.currency)
+    }.distinctUntilChanged()
+
+    val jettonSymbolFrom: String
+        get() = twinInput.state.getCurrency(TwinInput.Type.Send).symbol + "_ton"
+
+    val jettonSymbolTo: String
+        get() = twinInput.state.getCurrency(TwinInput.Type.Receive).symbol + "_ton"
+
+    val providerName: String
+        get() = _quoteStateFlow.value.provider.ifEmpty { "unknown" }
+
+    val providerUrl: String
+        get() = "unknown"
+
+    private var lastMessages: SwapEntity.Messages? = null
+
+    init {
+        applyInputsObserver()
+        applyDefaultCurrencies()
+        applyCurrenciesFromArgs(args)
+    }
+
+    private fun applyCurrenciesFromArgs(args: OmnistonArgs) {
+        if (args.fromToken == args.toToken) {
+            applyDefaultCurrencies()
+        } else {
+            updateSendCurrency(args.fromToken)
+            updateReceiveCurrency(args.toToken)
+        }
+    }
+
+    @OptIn(FlowPreview::class)
+    private fun applyInputsObserver() {
+        swapRequestFlow.onEach {
+            cancelSwapStream()
+            if (it.isEmpty) {
+                checkButtonState()
+            } else {
+                setButtonState(UiButtonState.Loading)
+            }
+        }.launch()
+
+        swapRequestFlow.filterNotNull()
+            .debounce(600)
+            .onEach(::startSwapStream)
+            .launch()
+
+        /*collectFlow(twinInput.stateFlow.filter { it.focus == TwinInput.Type.Send }.map { it.send.coins }.distinctUntilChanged()) {
+            _receiveOutputValueFlow.value = Coins.ZERO
+        }
+
+        collectFlow(twinInput.stateFlow.filter { it.focus == TwinInput.Type.Receive }.map { it.receive.coins }.distinctUntilChanged()) {
+            _sendOutputValueFlow.value = Coins.ZERO
+        }*/
+    }
+
+    private fun setMessages(messages: SwapEntity.Messages) {
+        if (messages.isEmpty) {
+            checkButtonState()
+            return
+        }
+
+        lastMessages = messages
+        if (twinInput.state.focus == TwinInput.Type.Send) {
+            val amount = Coins.ofNano(messages.askUnits, twinInput.state.receive.decimals)
+            _receiveOutputValueFlow.value = amount
+        } else if (twinInput.state.focus == TwinInput.Type.Receive) {
+            val amount = Coins.ofNano(messages.bidUnits, twinInput.state.send.decimals)
+            _sendOutputValueFlow.value = amount
+        }
+        checkButtonState()
+    }
+
+    private fun checkButtonState() {
+        if (lastMessages == null) {
+            return
+        }
+        if (twinInput.state.isEmpty) {
+            setButtonState(UiButtonState.Default(false))
+            return
+        }
+        val insufficientBalance = uiStateToken.value.insufficientBalance
+        setButtonState(UiButtonState.Default(!insufficientBalance))
+    }
+
+    private fun setOutputValue(type: TwinInput.Type, value: Coins) {
+        if (type == TwinInput.Type.Send) {
+            _sendOutputValueFlow.value = value
+            twinInput.updateValue(type, value.value.asString2())
+        } else {
+            _receiveOutputValueFlow.value = value
+            twinInput.updateValue(type, value.value.asString2())
+        }
+    }
+
+    private fun setButtonState(state: UiButtonState) {
+        _uiButtonStateFlow.value = state
+    }
+
+    fun updateFocusInput(type: TwinInput.Type) {
+        twinInput.updateFocus(type)
+    }
+
+    fun updateSendCurrency(currency: WalletCurrency) {
+        twinInput.updateCurrency(TwinInput.Type.Send, currency)
+    }
+
+    fun updateSendInput(amount: String) {
+        if (twinInput.state.focus == TwinInput.Type.Send) {
+            _sendOutputValueFlow.value = Coins.of(amount, twinInput.state.send.decimals)
+            _receiveOutputValueFlow.value = Coins.ZERO
+        }
+        twinInput.updateValue(TwinInput.Type.Send, amount)
+    }
+
+    fun updateReceiveInput(amount: String) {
+        if (twinInput.state.focus == TwinInput.Type.Receive) {
+            _receiveOutputValueFlow.value = Coins.of(amount, twinInput.state.receive.decimals)
+            _sendOutputValueFlow.value = Coins.ZERO
+        }
+        twinInput.updateValue(TwinInput.Type.Receive, amount)
+    }
+
+    fun updateReceiveCurrency(currency: WalletCurrency) {
+        twinInput.updateCurrency(TwinInput.Type.Receive, currency)
+    }
+
+    private fun applyDefaultCurrencies() {
+        updateSendCurrency(defaultFromCurrency)
+        updateReceiveCurrency(defaultToCurrency)
+    }
+
+    fun switch() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val oldSendValue = twinInput.state.send.value.trim()
+            val oldReceiveValue = twinInput.state.receive.value.trim()
+            val oldSendPlaceholder = sendPlaceholderValueFlow.value
+            val oldReceivePlaceholder = receivePlaceholderValueFlow.value
+
+            twinInput.switch()
+
+            if (oldSendValue.isEmpty() && oldReceiveValue.isEmpty()) {
+                cancelSwapStream()
+                setButtonState(UiButtonState.Default(false))
+            } else {
+                val newSendDec = twinInput.state.send.decimals
+                val newReceiveDec = twinInput.state.receive.decimals
+                val sendValue = oldSendValue.ifEmpty { oldSendPlaceholder }
+                val receiveValue = oldReceiveValue.ifEmpty { oldReceivePlaceholder }
+
+                _sendOutputValueFlow.value = Coins.of(receiveValue, newSendDec)
+
+                _receiveOutputValueFlow.value = Coins.of(sendValue, newReceiveDec)
+            }
+        }
+    }
+
+    fun pickCurrency(forType: TwinInput.Type) = viewModelScope.launch {
+        runCatching {
+            val selectedCurrency = twinInput.getCurrency(forType)
+            val ignoreCurrency = twinInput.getCurrency(forType.opposite)
+            SwapPickerScreen.run(context, wallet, selectedCurrency, ignoreCurrency, forType == TwinInput.Type.Send)
+        }.onSuccess { currency ->
+            if (currency == twinInput.state.getCurrency(forType)) {
+                return@onSuccess
+            } else if (twinInput.state.hasCurrency(currency)) {
+                _requestFocusFlow.tryEmit(forType)
+                switch()
+            } else {
+                _requestFocusFlow.tryEmit(twinInput.state.focus)
+                twinInput.updateCurrency(forType, currency)
+            }
+            if (twinInput.state.focus.opposite == TwinInput.Type.Send) {
+                _sendOutputValueFlow.value = Coins.ZERO
+            } else {
+                _receiveOutputValueFlow.value = Coins.ZERO
+            }
+        }
+    }
+
+    private suspend fun requestTONToken(): AccountTokenEntity? {
+        return tokenRepository.getTON(
+            currency = settingsRepository.currency,
+            accountId = wallet.accountId,
+            testnet = wallet.testnet,
+        )
+    }
+
+    private suspend fun isSingleWallet(): Boolean {
+        if (walletsCountRef.get() == 0) {
+            walletsCountRef.set(accountRepository.getWallets().size)
+        }
+        return walletsCountRef.get() == 1
+    }
+
+    suspend fun next() = withContext(Dispatchers.IO) {
+        try {
+            val stateMessages = lastMessages ?: throw Exception("Messages are empty")
+            val tonBalance = requestTONToken() ?: throw Exception("TON token not found")
+
+            val batteryEnabled = isBatteryIsEnabledTx()
+            val stateToken = uiStateToken.value
+            val fromCurrency = twinInput.state.send.currency
+            val toCurrency = twinInput.state.receive.currency
+            val bidUnits = Coins.ofNano(stateMessages.bidUnits, fromCurrency.decimals)
+            val askUnits = Coins.ofNano(stateMessages.askUnits, toCurrency.decimals)
+            if (bidUnits > stateToken.balance) {
+                throw InsufficientFundsException(
+                    currency = fromCurrency,
+                    required = bidUnits,
+                    available = stateToken.balance,
+                    type = if (stateToken.isTon) InsufficientBalanceType.InsufficientTONBalance else InsufficientBalanceType.InsufficientJettonBalance,
+                    withRechargeBattery = false,
+                    singleWallet = isSingleWallet()
+                )
+            }
+
+            val signRequest = createMessages(stateMessages.messages) ?: throw Exception("Messages are empty")
+            val tx = createEmulationTx(signRequest, batteryEnabled)
+            var preferredFeeMethod = settingsRepository.getPreferredFeeMethod(wallet.id)
+            var canEditFeeMethod = true
+            val gasBudget = Coins.ofNano(stateMessages.gasBudget)
+            val estimatedGasConsumption = Coins.ofNano(stateMessages.estimatedGasConsumption)
+            val totalTonFee = tx.tonEmulated?.totalFees ?: api.config.meanFeeSwap
+            val maxRequiredFee = listOf(gasBudget, estimatedGasConsumption, totalTonFee).max()
+            if (fromCurrency == WalletCurrency.TON && (bidUnits + maxRequiredFee) > tonBalance.balance.value) {
+                val requiredTONBalance = bidUnits + maxRequiredFee
+                if (requiredTONBalance >= tonBalance.balance.value) {
+                    throw InsufficientFundsException(
+                        currency = WalletCurrency.TON,
+                        required = requiredTONBalance,
+                        available = tonBalance.balance.value,
+                        type = InsufficientBalanceType.InsufficientBalanceForFee,
+                        withRechargeBattery = false,
+                        singleWallet = isSingleWallet()
+                    )
+                }
+            } else if (fromCurrency != WalletCurrency.TON) {
+                if (tx.batteryEmulated == null && maxRequiredFee > tonBalance.balance.value) {
+                    throw InsufficientFundsException(
+                        currency = WalletCurrency.TON,
+                        required = maxRequiredFee,
+                        available = tonBalance.balance.value,
+                        type = InsufficientBalanceType.InsufficientBalanceForFee,
+                        withRechargeBattery = true,
+                        singleWallet = isSingleWallet()
+                    )
+                } else if (maxRequiredFee > tonBalance.balance.value) {
+                    preferredFeeMethod = PreferredFeeMethod.BATTERY
+                    canEditFeeMethod = false
+                }
+            }
+
+            _quoteStateFlow.value = SwapQuoteState(
+                toUnits = askUnits,
+                provider = stateMessages.resolverName,
+                fromCurrency = fromCurrency,
+                toCurrency = toCurrency,
+                signRequest = signRequest,
+                fromUnits = bidUnits,
+                gasBudget = gasBudget,
+                estimatedGasConsumption = estimatedGasConsumption,
+                tx = tx,
+                selectedFee = tx.getFeeByMethod(preferredFeeMethod),
+                canEditFeeMethod = canEditFeeMethod,
+                meanFeeSwap = api.config.meanFeeSwap,
+                slippage = stateMessages.slippage
+            )
+
+            _stepFlow.value = OmnistonStep.Review
+            startResetTimer(stateMessages.tradeStartDeadline.toLong())
+        } catch (e: Throwable) {
+            throw e
+        }
+    }
+
+    private fun cancelResetTimer() {
+        countDownJob?.cancel()
+        countDownJob = null
+    }
+
+    private fun startResetTimer(tradeStartDeadline: Long) {
+        cancelResetTimer()
+
+        val deadlineMs = TimeUnit.SECONDS.toMillis(tradeStartDeadline)
+        val nowMs = System.currentTimeMillis()
+        val totalMs = (deadlineMs - nowMs).coerceAtLeast(0L)
+        if (totalMs == 0L) {
+            _countDownFlow.value = 1f
+            return
+        }
+
+        countDownJob = viewModelScope.launch {
+            while (isActive) {
+                val remaining = (deadlineMs - System.currentTimeMillis()).coerceAtLeast(0L)
+                val progress = 1f - (remaining.toFloat() / totalMs.toFloat())
+                _countDownFlow.value = progress
+                if (progress >= 1f) {
+                    break
+                }
+                delay(80)
+            }
+        }
+    }
+
+    private fun getLedgerTransaction(
+        message: MessageBodyEntity
+    ): List<Transaction> {
+        if (!message.wallet.isLedger) {
+            return emptyList()
+        }
+        val transactions = mutableListOf<Transaction>()
+        for ((index, transfer) in message.transfers.withIndex()) {
+            transactions.add(
+                Transaction.fromWalletTransfer(
+                    walletTransfer = transfer,
+                    seqno = message.seqNo + index,
+                    timeout = message.validUntil
+                )
+            )
+        }
+
+        return transactions.toList()
+    }
+
+    fun setFeeMethod(fee: SendFee) {
+        settingsRepository.setPreferredFeeMethod(wallet.id, fee.method)
+        _quoteStateFlow.update { state ->
+            state.copy(selectedFee = fee)
+        }
+    }
+
+    fun sign(callback: (isSuccessful: Boolean) -> Unit) {
+        val state = _quoteStateFlow.value
+        val signRequest = state.signRequest ?: return
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val isBattery = state.isPreferredFeeMethodBattery
+                val transfers = transfers(signRequest,false, isBattery)
+                val validUntil = accountRepository.getValidUntil(wallet.testnet)
+                val message = accountRepository.messageBody(wallet, validUntil, transfers)
+                val unsignedBody = message.createUnsignedBody(isBattery)
+                val ledgerTransactions = getLedgerTransaction(message)
+
+                val cells = mutableListOf<Cell>()
+                if (ledgerTransactions.size > 1) {
+                    for ((index, transaction) in ledgerTransactions.withIndex()) {
+                        val cell = signUseCase(
+                            context = context,
+                            wallet = wallet,
+                            seqNo = transaction.seqno,
+                            ledgerTransaction = transaction,
+                            transactionIndex = index,
+                            transactionCount = ledgerTransactions.size
+                        )
+                        cells.add(cell)
+                    }
+                } else {
+                    val cell = signUseCase(
+                        context = context,
+                        wallet = wallet,
+                        unsignedBody = unsignedBody,
+                        ledgerTransaction = ledgerTransactions.firstOrNull(),
+                        seqNo = getSeqNo()
+                    )
+                    cells.add(cell)
+                }
+                val confirmationTimeMillis = state.timestamp - System.currentTimeMillis()
+                val states = mutableListOf<SendBlockchainState>()
+                for (cell in cells) {
+                    val boc = cell.base64()
+                    val status = transactionManager.send(
+                        wallet = wallet,
+                        boc = boc,
+                        withBattery = isBattery,
+                        source = "swap",
+                        confirmationTime = confirmationTimeMillis / 1000.0
+                    )
+                    states.add(status)
+                }
+
+                val isSuccessful = states.all { it == SendBlockchainState.SUCCESS }
+                withContext(Dispatchers.Main) {
+                    callback(isSuccessful)
+                }
+            } catch (e: Throwable) {
+                withContext(Dispatchers.Main) {
+                    callback(false)
+                    next()
+                }
+            }
+        }
+    }
+
+    private fun createMessages(messages: List<SwapEntity.Message>): SignRequestEntity? {
+        if (messages.isEmpty()) {
+            return null
+        }
+        val builder = SignRequestEntity.Builder().setTestnet(wallet.testnet)
+        messages.forEach { omnistionTonMessage ->
+            val payload = omnistionTonMessage.payload?.cellFromHex()
+            builder.addMessage(RawMessageEntity.of(
+                address = omnistionTonMessage.targetAddress,
+                amount = Coins.ofNano(omnistionTonMessage.sendAmount).toLong(),
+                payload = payload?.base64()
+            ))
+        }
+        return builder.build(Uri.EMPTY)
+    }
+
+    private suspend fun getSeqNo(): Int {
+        var seqNo = lastSeqNo.get()
+        if (seqNo == 0) {
+            seqNo = accountRepository.getSeqno(wallet)
+            lastSeqNo.set(seqNo)
+        }
+        return seqNo
+    }
+
+    private suspend fun isBatteryIsEnabledTx(): Boolean {
+        if (twinInput.state.sendCurrency == WalletCurrency.TON) {
+            return false
+        }
+        return BatteryHelper.isBatteryIsEnabledTx(wallet, BatteryTransaction.SWAP, settingsRepository, accountRepository, batteryRepository)
+    }
+
+    private suspend fun batteryEmulated(message: MessageBodyEntity) = BatteryHelper.emulation(
+        wallet = wallet,
+        message = message,
+        emulationUseCase = emulationUseCase,
+        accountRepository = accountRepository,
+        batteryRepository = batteryRepository,
+        api = api
+    )
+
+    private suspend fun getTonBalance() = tokenRepository.getTonBalance(settingsRepository.currency, wallet.accountId, wallet.testnet)
+
+    private suspend fun transfers(
+        request: SignRequestEntity,
+        forEmulation: Boolean,
+        batteryEnabled: Boolean
+    ): List<WalletTransfer> {
+        val excessesAddress = if (!forEmulation) {
+            batteryRepository.getConfig(wallet.testnet).excessesAddress
+        } else null
+
+        return request.getTransfers(
+            wallet = wallet,
+            api = api,
+            batteryEnabled = batteryEnabled,
+            compressedTokens = emptyList(),
+            excessesAddress = excessesAddress,
+            tonBalance = getTonBalance()
+        )
+    }
+
+    private suspend fun createEmulationTx(
+        signRequest: SignRequestEntity,
+        batteryEnabled: Boolean
+    ): SwapQuoteState.Tx = withContext(Dispatchers.IO) {
+        val validUntil = accountRepository.getValidUntil(wallet.testnet)
+        val messageBody = MessageBodyEntity(
+            wallet = wallet,
+            seqNo = getSeqNo(),
+            validUntil = validUntil,
+            transfers = transfers(signRequest,true, batteryEnabled)
+        )
+
+        val tonDeferred = async {
+            emulationUseCase(
+                message = messageBody,
+                useBattery = false,
+                forceRelayer = false,
+                params = true
+            )
+        }
+
+        val batteryDeferred = async {
+            if (batteryEnabled) {
+                batteryEmulated(messageBody)
+            } else {
+                null
+            }
+        }
+
+        val tonEmulated = tonDeferred.await()
+        val batteryEmulated = batteryDeferred.await()
+
+        val batteryFee = if (batteryEmulated != null && !batteryEmulated.failed) {
+            batteryEmulated.buildFee(wallet, api, accountRepository, batteryRepository, ratesRepository)
+        } else null
+
+        val tonFee = tonEmulated.buildFee(wallet, api, accountRepository, batteryRepository, ratesRepository)
+
+        SwapQuoteState.Tx(
+            sendTonFee = tonFee,
+            tonEmulated = tonEmulated,
+            sendBatteryFee = batteryFee,
+            batteryEmulated = batteryEmulated,
+            messageBody = messageBody
+        )
+    }
+
+    private fun startSwapStream(request: SwapRequest) {
+        cancelSwapStream()
+        swapStreamJob = api.swapStream(
+            from = request.fromParam,
+            to = request.toParam,
+            userAddress = wallet.address.toRawAddress()
+        ).filterNotNull().onEach(::setMessages).launch()
+    }
+
+    private fun cancelSwapStream() {
+        cancelResetTimer()
+
+        swapStreamJob?.cancel()
+        swapStreamJob = null
+    }
+
+    fun reset() {
+        _stepFlow.value = OmnistonStep.Input
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/OmnistonStep.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/OmnistonStep.kt
new file mode 100644
index 000000000..9dc2a8e2f
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/OmnistonStep.kt
@@ -0,0 +1,5 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston.state
+
+enum class OmnistonStep {
+    Input, Review
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapInputsState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapInputsState.kt
new file mode 100644
index 000000000..9daeb312a
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapInputsState.kt
@@ -0,0 +1,44 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston.state
+
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.entities.AssetsEntity
+import com.tonapps.tonkeeper.helper.TwinInput
+import com.tonapps.wallet.api.entity.BalanceEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+data class SwapInputsState(
+    val input: TwinInput.State = TwinInput.State(),
+    val fromToken: AssetsEntity.Token? = null
+) {
+
+    val tokenBalance: BalanceEntity?
+        get() = fromToken?.token?.balance
+
+    val remaining: Coins by lazy {
+        // (fromToken?.balance ?: Coins.ZERO) - fromAmount
+        Coins.ZERO
+    }
+
+    val isFromTON: Boolean
+        get() = fromToken?.token?.isTon ?: false
+
+    val isMaxTON: Boolean by lazy {
+        val token = fromToken ?: return@lazy false
+        // token.token.isTon && fromAmount == token.token.balance.value
+        false
+    }
+
+    val insufficientBalance: Boolean
+        get() = remaining.isNegative
+
+
+
+    val fromFormat: CharSequence by lazy {
+        // CurrencyFormatter.format(from.code, fromAmount)
+        "ss"
+    }
+
+    val isEmpty: Boolean
+        get() = false // insufficientBalance || !fromAmount.isPositive
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapQuoteState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapQuoteState.kt
new file mode 100644
index 000000000..ec03cedfb
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapQuoteState.kt
@@ -0,0 +1,102 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston.state
+
+import android.content.Context
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.InsufficientFundsException
+import com.tonapps.tonkeeper.extensions.formattedAmount
+import com.tonapps.tonkeeper.extensions.formattedCharges
+import com.tonapps.tonkeeper.extensions.method
+import com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.tonkeeper.usecase.emulation.Emulated
+import com.tonapps.wallet.data.account.entities.MessageBodyEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
+import com.tonapps.wallet.data.settings.entities.PreferredFeeMethod
+
+data class SwapQuoteState(
+    val toUnits: Coins = Coins.ZERO,
+    val fromUnits: Coins = Coins.ZERO,
+    val fromCurrency: WalletCurrency = WalletCurrency.USDT_TON,
+    val toCurrency: WalletCurrency = WalletCurrency.TON,
+    val provider: String = "",
+    val blockchainFee: Coins = Coins.ZERO,
+    val signRequest: SignRequestEntity? = null,
+    val confirm: Boolean = false,
+    val gasBudget: Coins = Coins.ZERO,
+    val estimatedGasConsumption: Coins = Coins.ZERO,
+    val tx: Tx? = null,
+    val timestamp: Long = System.currentTimeMillis(),
+    val selectedFee: SendFee? = null,
+    val insufficientFunds: InsufficientFundsException? = null,
+    val canEditFeeMethod: Boolean = true,
+    val meanFeeSwap: Coins = Coins.ZERO,
+    val slippage: Int = 0
+) {
+
+    data class Tx(
+        val sendTonFee: SendFee? = null,
+        val tonEmulated: Emulated? = null,
+        val sendBatteryFee: SendFee? = null,
+        val batteryEmulated: Emulated? = null,
+        val messageBody: MessageBodyEntity? = null,
+    ) {
+
+        fun getFeeByMethod(method: PreferredFeeMethod): SendFee? {
+            if (method == PreferredFeeMethod.BATTERY && sendBatteryFee != null) {
+                return sendBatteryFee
+            }
+            return sendTonFee
+        }
+    }
+
+    val isEmpty: Boolean
+        get() = toUnits.isZero
+
+    val canUseBattery: Boolean
+        get() = tx?.sendBatteryFee != null && tx.batteryEmulated != null
+
+    val feeOptions: List<SendFee>
+        get() = listOfNotNull(
+            tx?.sendBatteryFee,
+            tx?.sendTonFee,
+        )
+
+    val totalFee: Coins by lazy {
+        val emulatedFee = tx?.tonEmulated?.totalFees ?: meanFeeSwap
+        listOf(gasBudget, estimatedGasConsumption, emulatedFee).max()
+    }
+
+    val isPreferredFeeMethodBattery: Boolean
+        get() = selectedFee?.method == PreferredFeeMethod.BATTERY
+
+    val toUnitsFormat: CharSequence by lazy {
+        CurrencyInputView.EQUALS_SIGN_PREFIX + CurrencyFormatter.format(toCurrency.code, toUnits)
+    }
+
+    val fromUnitsFormat: CharSequence by lazy {
+        CurrencyFormatter.format(fromCurrency.code, fromUnits)
+    }
+
+    val exchangeRate: CharSequence by lazy {
+        if (toUnits.isZero || fromUnits.isZero) {
+            return@lazy ""
+        }
+
+        val rate = toUnits / fromUnits
+        val value = Coins.ONE
+        val fromFormat = CurrencyFormatter.format(fromCurrency.code, value)
+        val toFormat = CurrencyFormatter.format(toCurrency.code, rate * value)
+
+        "$fromFormat ≈ $toFormat"
+    }
+
+    fun getFeeFormat(context: Context): CharSequence {
+        val format = when (selectedFee) {
+            is SendFee.Battery -> return selectedFee.formattedCharges(context)
+            else -> CurrencyFormatter.format("TON", totalFee)
+        }
+        return CurrencyInputView.EQUALS_SIGN_PREFIX + format
+    }
+}
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapRequest.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapRequest.kt
new file mode 100644
index 000000000..784d5d837
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapRequest.kt
@@ -0,0 +1,28 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston.state
+
+import com.tonapps.icu.Coins
+import com.tonapps.tonkeeper.helper.TwinInput
+import com.tonapps.wallet.api.SwapAssetParam
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+data class SwapRequest(
+    val type: TwinInput.Type,
+    val amount: Coins,
+    val from: WalletCurrency,
+    val to: WalletCurrency,
+) {
+
+    val isEmpty: Boolean
+        get() = !amount.isPositive
+
+
+    val fromParam: SwapAssetParam by lazy {
+        val amount = if (type == TwinInput.Type.Send) amount.toNano(from.decimals) else null
+        SwapAssetParam(from.address, amount)
+    }
+
+    val toParam: SwapAssetParam by lazy {
+        val amount = if (type == TwinInput.Type.Receive) amount.toNano(to.decimals) else null
+        SwapAssetParam(to.address, amount)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapTokenState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapTokenState.kt
new file mode 100644
index 000000000..be65dbd8b
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/omniston/state/SwapTokenState.kt
@@ -0,0 +1,28 @@
+package com.tonapps.tonkeeper.ui.screen.swap.omniston.state
+
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.entities.AssetsEntity
+import com.tonapps.wallet.api.entity.BalanceEntity
+
+data class SwapTokenState(
+    val fromToken: AssetsEntity.Token? = null,
+    val remaining: Coins = Coins.ZERO,
+) {
+
+    val tokenBalance: BalanceEntity?
+        get() = fromToken?.token?.balance
+
+    val balance: Coins
+        get() = tokenBalance?.value ?: Coins.ZERO
+
+    val insufficientBalance: Boolean
+        get() = remaining.isNegative
+
+    val isTon: Boolean
+        get() = fromToken?.token?.isTon == true
+
+    val remainingFormat: CharSequence? by lazy {
+        CurrencyFormatter.format("", remaining)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerArgs.kt
new file mode 100644
index 000000000..9c65752f0
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerArgs.kt
@@ -0,0 +1,31 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker
+
+import android.os.Bundle
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import uikit.base.BaseArgs
+
+data class SwapPickerArgs(
+    val selectedCurrency: WalletCurrency,
+    val ignoreCurrency: WalletCurrency,
+    val send: Boolean
+): BaseArgs() {
+
+    companion object {
+        private const val ARG_SELECTED_CURRENCY = "selected_currency"
+        private const val ARG_IGNORE_CURRENCY = "ignore_currency"
+        private const val ARG_SEND = "send"
+    }
+
+    constructor(bundle: Bundle) : this(
+        selectedCurrency = bundle.getParcelableCompat(ARG_SELECTED_CURRENCY)!!,
+        ignoreCurrency = bundle.getParcelableCompat(ARG_IGNORE_CURRENCY)!!,
+        send = bundle.getBoolean(ARG_SEND, false)
+    )
+
+    override fun toBundle() = Bundle().apply {
+        putParcelable(ARG_SELECTED_CURRENCY, selectedCurrency)
+        putParcelable(ARG_IGNORE_CURRENCY, ignoreCurrency)
+        putBoolean(ARG_SEND, send)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerScreen.kt
new file mode 100644
index 000000000..f7cff9450
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerScreen.kt
@@ -0,0 +1,124 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker
+
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.flowWithLifecycle
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.tonkeeper.koin.walletViewModel
+import com.tonapps.tonkeeper.ui.base.WalletContextScreen
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.Adapter
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.localization.Localization
+import org.koin.core.parameter.parametersOf
+import uikit.base.BaseFragment
+import uikit.extensions.activity
+import uikit.extensions.addForResult
+import uikit.extensions.collectFlow
+import uikit.extensions.smartScrollTo
+import uikit.widget.LoaderView
+import uikit.widget.ModalHeader
+import uikit.widget.SearchInput
+import kotlin.coroutines.cancellation.CancellationException
+
+class SwapPickerScreen(wallet: WalletEntity): WalletContextScreen(R.layout.fragment_swap_picker, wallet), BaseFragment.BottomSheet {
+
+    private val args: SwapPickerArgs by lazy { SwapPickerArgs(requireArguments()) }
+
+    override val viewModel: SwapPickerViewModel by walletViewModel {
+        parametersOf(args)
+    }
+
+    private lateinit var listView: RecyclerView
+    private lateinit var loaderView: LoaderView
+    private lateinit var searchInput: SearchInput
+    private lateinit var emptyView: View
+
+    private val adapter = Adapter {
+        if (it is Item.Token) {
+            onSelectedToken(it)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(viewModel.uiItemsFlow.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED), ::setUiItems)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val headerView = view.findViewById<ModalHeader>(R.id.header)
+        headerView.setTitle(if (args.send) Localization.send else Localization.receive)
+        headerView.onCloseClick = { finish() }
+
+        listView = view.findViewById(R.id.list)
+        listView.adapter = adapter
+
+        loaderView = view.findViewById(R.id.loader)
+        loaderView.startAnimation()
+
+        emptyView = view.findViewById(R.id.empty)
+
+        searchInput = view.findViewById(R.id.search)
+        searchInput.doOnTextChanged = {
+            viewModel.setSearchQuery(it.toString())
+        }
+    }
+
+    private fun setUiItems(list: List<Item>) {
+        if (list.isEmpty()) {
+            loaderView.visibility = View.GONE
+            listView.visibility = View.GONE
+            emptyView.visibility = View.VISIBLE
+        } else {
+            emptyView.visibility = View.GONE
+            listView.visibility = View.VISIBLE
+            adapter.submitList(list) {
+                loaderView.visibility = View.GONE
+                listView.smartScrollTo(adapter.selectedIndex)
+            }
+        }
+    }
+
+    private fun onSelectedToken(item: Item.Token) {
+        setResult(Bundle().apply {
+            putParcelable(ARG_CURRENCY, item.currency)
+        })
+    }
+
+    companion object {
+
+        private const val ARG_CURRENCY = "currency"
+
+        private fun newInstance(
+            wallet: WalletEntity,
+            selectedCurrency: WalletCurrency,
+            ignoreCurrency: WalletCurrency,
+            send: Boolean
+        ): SwapPickerScreen {
+            val args = SwapPickerArgs(selectedCurrency, ignoreCurrency, send)
+            val screen = SwapPickerScreen(wallet)
+            screen.setArgs(args)
+            return screen
+        }
+
+        suspend fun run(
+            context: Context,
+            wallet: WalletEntity,
+            selectedCurrency: WalletCurrency,
+            ignoreCurrency: WalletCurrency,
+            send: Boolean
+        ): WalletCurrency {
+            val activity = context.activity ?: throw IllegalArgumentException("Context must be an Activity")
+            val screen = newInstance(wallet, selectedCurrency, ignoreCurrency, send)
+            val result = activity.addForResult(screen)
+            return result.getParcelableCompat<WalletCurrency>(ARG_CURRENCY) ?: throw CancellationException()
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerViewModel.kt
new file mode 100644
index 000000000..509de795b
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/SwapPickerViewModel.kt
@@ -0,0 +1,78 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker
+
+import android.app.Application
+import androidx.lifecycle.viewModelScope
+import com.tonapps.blockchain.ton.extensions.equalsAddress
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.Item
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.swap.SwapRepository
+import com.tonapps.wallet.data.token.TokenRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+
+class SwapPickerViewModel(
+    app: Application,
+    private val args: SwapPickerArgs,
+    private val wallet: WalletEntity,
+    private val swapRepository: SwapRepository,
+    private val tokenRepository: TokenRepository,
+    private val settingsRepository: SettingsRepository
+): BaseWalletVM(app) {
+
+    private val _searchQueryFlow = MutableStateFlow("")
+    val searchQueryFlow = _searchQueryFlow.asSharedFlow().map { it.trim() }
+
+    val uiItemsFlow = combine(
+        swapRepository.assetsFlow,
+        searchQueryFlow
+    ) { currencies, query ->
+        currencies.filter { it.containsQuery(query) }
+    }.map { currencies ->
+        val items = mutableListOf<Item>()
+        val userCurrency = settingsRepository.currency
+        if (args.send) {
+            val supportedAddresses = currencies.map { it.address }
+            val tokens = getTokens().filter { supportedAddresses.contains(it.address) }
+            for ((index, token) in tokens.withIndex()) {
+                val currency = currencies.find { it.address.equalsAddress(token.address) }!!
+                val item = Item.Token(
+                    position = ListCell.getPosition(currencies.size, index),
+                    currency = currency,
+                    selected = currency == args.selectedCurrency,
+                    fiatFormatted = CurrencyFormatter.formatFiat(userCurrency.code, token.fiat)
+                )
+                items.add(item)
+            }
+        } else {
+            for ((index, currency) in currencies.withIndex()) {
+                val item = Item.Token(
+                    position = ListCell.getPosition(currencies.size, index),
+                    currency = currency,
+                    selected = currency == args.selectedCurrency,
+                    fiatFormatted = null
+                )
+                items.add(item)
+            }
+        }
+        items.toList()
+    }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null).filterNotNull()
+
+    fun setSearchQuery(query: String) {
+        _searchQueryFlow.tryEmit(query)
+    }
+
+    private suspend fun getTokens() = tokenRepository.get(
+        currency = settingsRepository.currency,
+        accountId = wallet.accountId,
+        testnet = wallet.testnet
+    ) ?: emptyList()
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Adapter.kt
new file mode 100644
index 000000000..128aec869
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Adapter.kt
@@ -0,0 +1,25 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker.list
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.holder.TokenHolder
+import com.tonapps.uikit.list.BaseListAdapter
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.uikit.list.BaseListItem
+
+class Adapter(
+    private val onClick: (Item) -> Unit
+): BaseListAdapter() {
+
+    val selectedIndex: Int
+        get() = currentList.indexOfFirst { it is Item.Token && it.selected }
+
+    override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
+        return TokenHolder(parent, onClick)
+    }
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        recyclerView.isNestedScrollingEnabled = true
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Item.kt
new file mode 100644
index 000000000..dcfde5b2d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/Item.kt
@@ -0,0 +1,35 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker.list
+
+import android.net.Uri
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.core.currency.WalletCurrency
+
+sealed class Item(type: Int): BaseListItem(type) {
+
+    companion object {
+        const val TYPE_TOKEN = 0
+        const val TYPE_TITLE = 1
+    }
+
+    data class Title(
+        val text: String
+    ) : Item(TYPE_TITLE)
+
+    data class Token(
+        val position: ListCell.Position = ListCell.Position.MIDDLE,
+        val currency: WalletCurrency,
+        val selected: Boolean,
+        val fiatFormatted: CharSequence?
+    ): Item(TYPE_TOKEN) {
+
+        val iconUri: Uri
+            get() = currency.iconUri ?: Uri.EMPTY
+
+        val code: String
+            get() = currency.code
+
+        val name: CharSequence
+            get() = fiatFormatted ?: currency.title
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/Holder.kt
new file mode 100644
index 000000000..bfd0f01b3
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/Holder.kt
@@ -0,0 +1,11 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.Item
+import com.tonapps.uikit.list.BaseListHolder
+
+abstract class Holder<I: Item>(
+    parent: ViewGroup,
+    @LayoutRes resId: Int,
+): BaseListHolder<I>(parent, resId)
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/TokenHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/TokenHolder.kt
new file mode 100644
index 000000000..cc2d5303c
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/swap/picker/list/holder/TokenHolder.kt
@@ -0,0 +1,50 @@
+package com.tonapps.tonkeeper.ui.screen.swap.picker.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.facebook.imagepipeline.common.ResizeOptions
+import com.tonapps.tonkeeper.ui.component.CountryFlagView
+import com.tonapps.tonkeeper.ui.screen.swap.picker.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.UIKitColor
+import com.tonapps.uikit.color.resolveColor
+import com.tonapps.wallet.data.core.HIDDEN_BALANCE
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.extensions.withBlueBadge
+import uikit.widget.FrescoView
+
+class TokenHolder(
+    parent: ViewGroup,
+    private val onClick: (Item.Token) -> Unit,
+): Holder<Item.Token>(parent, R.layout.view_currency_item) {
+
+    private val imageView = findViewById<FrescoView>(R.id.image)
+    private val iconView = findViewById<CountryFlagView>(R.id.icon)
+    private val symbolView = findViewById<AppCompatTextView>(R.id.symbol)
+    private val nameView = findViewById<AppCompatTextView>(R.id.name)
+    private val checkView = findViewById<View>(R.id.check)
+
+    init {
+        findViewById<View>(R.id.arrow).visibility = View.GONE
+        imageView.visibility = View.VISIBLE
+        iconView.visibility = View.GONE
+    }
+
+    override fun onBind(item: Item.Token) {
+        itemView.setOnClickListener { onClick(item) }
+        itemView.background = item.position.drawable(context)
+        imageView.setPlaceholder(null)
+        imageView.setImageURIWithResize(item.iconUri, ResizeOptions.forSquareSize(72)!!)
+
+        if (item.code.equals("USDT", true)) {
+            symbolView.text = item.code.withBlueBadge(context, Localization.ton)
+        } else {
+            symbolView.text = item.code
+        }
+        nameView.text = item.name
+        checkView.visibility = if (item.selected) View.VISIBLE else View.GONE
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenArgs.kt
index 41da527d6..8df124478 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenArgs.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenArgs.kt
@@ -6,24 +6,28 @@ import uikit.base.BaseArgs
 data class TokenArgs(
     val address: String,
     val name: String,
-    val symbol: String
+    val symbol: String,
+    val rawUsde: Boolean,
 ): BaseArgs() {
 
     companion object {
         private const val ARG_ADDRESS = "address"
         private const val ARG_NAME = "name"
         private const val ARG_SYMBOL = "symbol"
+        private const val ARG_RAW_USDE = "raw_usde"
     }
 
     constructor(bundle: Bundle) : this(
         address = bundle.getString(ARG_ADDRESS)!!,
         name = bundle.getString(ARG_NAME)!!,
-        symbol = bundle.getString(ARG_SYMBOL)!!
+        symbol = bundle.getString(ARG_SYMBOL)!!,
+        rawUsde = bundle.getBoolean(ARG_RAW_USDE)
     )
 
     override fun toBundle() = Bundle().apply {
         putString(ARG_ADDRESS, address)
         putString(ARG_NAME, name)
         putString(ARG_SYMBOL, symbol)
+        putBoolean(ARG_RAW_USDE, rawUsde)
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenScreen.kt
index c584d4a58..82cb72a92 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenScreen.kt
@@ -47,7 +47,7 @@ class TokenScreen(wallet: WalletEntity) :
 
     private val args: TokenArgs by lazy { TokenArgs(requireArguments()) }
 
-    override val viewModel: TokenViewModel by walletViewModel { parametersOf(args.address) }
+    override val viewModel: TokenViewModel by walletViewModel { parametersOf(args.address, args.rawUsde) }
 
     private val tokenAdapter = TokenAdapter {
         viewModel.setChartPeriod(it)
@@ -62,7 +62,7 @@ class TokenScreen(wallet: WalletEntity) :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        AnalyticsHelper.simpleTrackEvent("token_open", viewModel.installId)
+        analytics?.simpleTrackEvent("token_open")
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -181,10 +181,11 @@ class TokenScreen(wallet: WalletEntity) :
             wallet: WalletEntity,
             address: String,
             name: String,
-            symbol: String
+            symbol: String,
+            rawUsde: Boolean = false,
         ): TokenScreen {
             val fragment = TokenScreen(wallet)
-            fragment.setArgs(TokenArgs(address, name, symbol))
+            fragment.setArgs(TokenArgs(address, name, symbol, rawUsde))
             return fragment
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenViewModel.kt
index 8ddd83c0b..346449d18 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/TokenViewModel.kt
@@ -1,59 +1,60 @@
 package com.tonapps.tonkeeper.ui.screen.token.viewer
 
 import android.app.Application
-import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.tonapps.blockchain.ton.contract.BaseWalletContract
 import com.tonapps.blockchain.ton.contract.WalletVersion
-import com.tonapps.blockchain.ton.extensions.equalsAddress
 import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
 import com.tonapps.icu.Formatter
-import com.tonapps.tonkeeper.RemoteConfig
 import com.tonapps.tonkeeper.api.getCurrencyCodeByCountry
 import com.tonapps.tonkeeper.core.entities.WalletPurchaseMethodEntity
 import com.tonapps.tonkeeper.core.history.ActionOptions
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
 import com.tonapps.tonkeeper.extensions.isSafeModeEnabled
+import com.tonapps.tonkeeper.manager.tx.TransactionManager
 import com.tonapps.tonkeeper.ui.base.BaseWalletVM
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
+import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.ChartEntity
+import com.tonapps.wallet.api.entity.EthenaEntity
+import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.currency.WalletCurrency
-import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.events.EventsRepository
 import com.tonapps.wallet.data.purchase.PurchaseRepository
+import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.settings.ChartPeriod
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import com.tonapps.wallet.localization.Localization
 import io.tonapi.models.AccountEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import okhttp3.internal.toImmutableList
 
 // TODO Refactor this class
 class TokenViewModel(
     app: Application,
     private val wallet: WalletEntity,
     private val tokenAddress: String,
+    private val rawUsde: Boolean,
     private val tokenRepository: TokenRepository,
     private val settingsRepository: SettingsRepository,
     private val accountRepository: AccountRepository,
@@ -62,7 +63,8 @@ class TokenViewModel(
     private val historyHelper: HistoryHelper,
     private val batteryRepository: BatteryRepository,
     private val purchaseRepository: PurchaseRepository,
-    private val remoteConfig: RemoteConfig
+    private val ratesRepository: RatesRepository,
+    private val transactionManager: TransactionManager,
 ) : BaseWalletVM(app) {
 
     val burnAddress: String by lazy {
@@ -78,14 +80,20 @@ class TokenViewModel(
     var tronAddress: String? = null
         private set
 
-    private val _tokenFlow = MutableStateFlow<AccountTokenEntity?>(null)
-    val tokenFlow = _tokenFlow.asStateFlow().filterNotNull()
+    val usdeDisabled: Boolean
+        get() = api.config.flags.disableUsde
+
+    private val _tokensFlow = MutableStateFlow<List<AccountTokenEntity>?>(null)
+    val tokensFlow = _tokensFlow.asStateFlow().filterNotNull()
+
+    val tokenFlow =
+        tokensFlow.map { it.firstOrNull { token -> token.address == tokenAddress } }.filterNotNull()
 
     private val _uiItemsFlow = MutableStateFlow<List<Item>?>(null)
     val uiItemsFlow = _uiItemsFlow.asStateFlow().filterNotNull()
 
     private val _uiHistoryFlow =
-        MutableStateFlow<List<HistoryItem>>(listOf(HistoryItem.Loader(0, 0)))
+        MutableStateFlow<MutableList<HistoryItem>>(mutableListOf(HistoryItem.Loader(0, 0)))
     val uiHistoryFlow = _uiHistoryFlow.asStateFlow().filterNotNull()
 
     private val _chartFlow = MutableStateFlow<List<ChartEntity>?>(null)
@@ -93,29 +101,43 @@ class TokenViewModel(
 
     init {
         viewModelScope.launch(Dispatchers.IO) {
-            tronAddress = accountRepository.getTronAddress(wallet.id)
-
-            val list =
-                tokenRepository.get(settingsRepository.currency, wallet.accountId, wallet.testnet)
-                    ?: return@launch
-            val token = list.firstOrNull { it.address == tokenAddress } ?: return@launch
-            _tokenFlow.value = token
-            buildItems(token, emptyList())
-            load(token)
+            getData()
+        }
+        transactionManager.eventsFlow(wallet).collectFlow {
+            getData(true)
         }
 
         combine(
-            tokenFlow,
-            chartFlow,
-            settingsRepository.walletPrefsChangedFlow
-        ) { token, chart, _ ->
-            buildItems(token, chart)
+            tokenFlow, tokensFlow, chartFlow, settingsRepository.walletPrefsChangedFlow
+        ) { token, list, chart, _ ->
+            buildItems(token, list, chart, tokenRepository.getEthena(wallet.accountId))
         }.launchIn(viewModelScope)
     }
 
+    private suspend fun getData(refresh: Boolean = false) {
+        tronAddress = accountRepository.getTronAddress(wallet.id)
+
+        val list = tokenRepository.get(
+            settingsRepository.currency, wallet.accountId, wallet.testnet, refresh = refresh
+        ) ?: return
+        val token = list.firstOrNull { it.address == tokenAddress } ?: return
+
+        val ethena = if (!rawUsde && token.isUSDe && !usdeDisabled) {
+            tokenRepository.getEthena(wallet.accountId, true)
+        } else if (token.isTsUSDe && !usdeDisabled) {
+            tokenRepository.getEthena(wallet.accountId)
+        } else {
+            null
+        }
+
+        _tokensFlow.value = list
+        buildItems(token, list, emptyList(), ethena)
+        load(token)
+    }
+
     fun setChartPeriod(period: ChartPeriod) {
         settingsRepository.chartPeriod = period
-        _tokenFlow.filterNotNull().take(1).onEach {
+        tokenFlow.take(1).onEach {
             loadChartPeriod(it, period)
         }.launchIn(viewModelScope)
     }
@@ -150,12 +172,11 @@ class TokenViewModel(
             return
         }
 
-        viewModelScope.launch {
-            val lastLt = lastLt() ?: return@launch
-            val data = _tokenFlow.value ?: return@launch
-            val oldValues = _uiHistoryFlow.value ?: emptyList()
-            _uiHistoryFlow.value = historyHelper.withLoadingItem(oldValues)
-            loadHistory(data, lastLt)
+        tokenFlow.take(1).collectFlow { token ->
+            val lastLt = lastLt() ?: return@collectFlow
+            val oldValues = _uiHistoryFlow.value
+            _uiHistoryFlow.value = historyHelper.withLoadingItem(oldValues).toMutableList()
+            loadHistory(token, lastLt)
         }
     }
 
@@ -172,23 +193,88 @@ class TokenViewModel(
 
     private suspend fun buildItems(
         token: AccountTokenEntity,
-        charts: List<ChartEntity>
+        tokens: List<AccountTokenEntity>,
+        charts: List<ChartEntity>,
+        ethena: EthenaEntity?,
     ) {
         val currency = settingsRepository.currency.code
         val items = mutableListOf<Item>()
 
-        val stakeApp = if (remoteConfig.isEthenaEnabled && token.address.equalsAddress(WalletCurrency.USDE_TON_ETHENA_ADDRESS)) {
-            AppEntity.ethena
-        } else null
+        var headerBalance = token.balance.value
+
+        val balanceItems = mutableListOf<Item.EthenaBalance>()
+
+        val tokenTsUsde = tokens.firstOrNull { it.isTsUSDe }
+
+        val rates = ratesRepository.getRates(
+            settingsRepository.currency, listOfNotNull(token.address, tokenTsUsde?.address)
+        )
+
+        if (token.isUSDe && !rawUsde) {
+            val stonfiBalance = tokenTsUsde?.let {
+                rates.convert(
+                    from = WalletCurrency.TS_USDE_TON_ETHENA,
+                    value = it.balance.value,
+                    to = WalletCurrency.USDE_TON_ETHENA
+                )
+            } ?: Coins.ZERO
+            val stonfiFiat = rates.convert(token.address, stonfiBalance)
+
+            headerBalance += stonfiBalance
+
+            balanceItems.add(
+                Item.EthenaBalance(
+                    position = ListCell.Position.SINGLE,
+                    wallet = wallet,
+                    staked = false,
+                    balance = token.balance.value,
+                    balanceFormat = CurrencyFormatter.format(
+                        value = token.balance.value,
+                    ),
+                    fiatFormat = CurrencyFormatter.format(currency, token.fiat),
+                    fiatRate = CurrencyFormatter.format(currency, token.rateNow),
+                    rateDiff24h = rates.getDiff7d(token.address),
+                    verified = token.token.verification == TokenEntity.Verification.whitelist,
+                    hiddenBalance = settingsRepository.hiddenBalances,
+                )
+            )
+
+            val stonfiMethod =
+                ethena?.methods?.firstOrNull { it.type == EthenaEntity.Method.Type.STONFI }
+
+            if (stonfiMethod != null && ethena != null) {
+                balanceItems.add(
+                    Item.EthenaBalance(
+                        position = ListCell.Position.SINGLE,
+                        wallet = wallet,
+                        staked = true,
+                        methodType = stonfiMethod.type,
+                        showApy = !usdeDisabled,
+                        title = ethena.about.stakeTitle,
+                        apyText = ethena.about.stakeDescription,
+                        balance = stonfiBalance,
+                        balanceFormat = CurrencyFormatter.format(
+                            value = stonfiBalance,
+                        ),
+                        fiatFormat = CurrencyFormatter.format(currency, stonfiFiat),
+                        hiddenBalance = settingsRepository.hiddenBalances,
+                    )
+                )
+            }
+        }
+
+        val sortedBalanceItems = balanceItems.mapIndexed { index, item ->
+            item.copy(position = ListCell.getPosition(balanceItems.size, index))
+        }
+
+        val headerFiat = rates.convert(token.address, headerBalance)
 
         items.add(
             Item.Balance(
-                balance = CurrencyFormatter.format(
-                    token.symbol,
-                    token.balance.value,
-                    token.decimals
+                balance = CurrencyFormatter.formatFull(
+                    token.symbol, headerBalance, token.decimals
                 ),
-                fiat = CurrencyFormatter.format(currency, token.fiat),
+                fiat = CurrencyFormatter.format(currency, headerFiat),
                 iconUri = token.imageUri,
                 hiddenBalance = settingsRepository.hiddenBalances,
                 showNetwork = tronUsdtEnabled && (token.isUsdt || token.isTrc20),
@@ -199,36 +285,65 @@ class TokenViewModel(
             Item.Actions(
                 swapUri = api.config.swapUri,
                 swapMethod = if (token.isTrc20) getSwapMethod() else null,
+                swapEnabled = !api.config.flags.disableSwap,
                 token = token.balance.token,
                 wallet = wallet,
-                stakeApp = stakeApp
             )
         )
-        if (token.isUsdt && !wallet.isW5 && wallet.hasPrivateKey && settingsRepository.isUSDTW5(
+
+        if (balanceItems.isNotEmpty()) {
+            items.addAll(sortedBalanceItems)
+            if (!rawUsde && token.isUSDe && usdeDisabled) {
+                items.add(Item.Space)
+            }
+        }
+
+        if (token.isUSDe && !usdeDisabled && !rawUsde) {
+            ethena?.methods?.let { methods ->
+                items.add(Item.Space)
+                for ((index, method) in methods.withIndex()) {
+                    val position = ListCell.getPosition(methods.size, index)
+                    items.add(
+                        Item.EthenaMethod(
+                            position = position,
+                            wallet = wallet,
+                            methodType = method.type,
+                            url = method.depositUrl,
+                            name = method.name,
+                            apy = CurrencyFormatter.formatPercent(method.apy)
+                        )
+                    )
+                }
+            }
+
+            ethena?.about?.let {
+                items.add(Item.AboutEthena(description = it.description, url = it.aboutUrl))
+            }
+        }
+
+        if (token.isUsdt && !wallet.isW5 && wallet.hasPrivateKey && !api.config.flags.disableGasless && settingsRepository.isUSDTW5(
                 wallet.id
             )
         ) {
             items.add(
                 Item.W5Banner(
-                    wallet = wallet,
-                    addButton = !hasW5()
+                    wallet = wallet, addButton = !hasW5()
                 )
             )
         }
 
-        if (wallet.hasPrivateKey && token.isTrc20) {
+        if (wallet.hasPrivateKey && token.isTrc20 && !api.config.flags.disableBattery) {
             val batteryCharges = getBatteryCharges()
             if (batteryCharges < 300) {
                 items.add(
                     Item.BatteryBanner(
-                        wallet = wallet,
-                        token = token.balance.token
+                        wallet = wallet, token = token.balance.token
                     )
                 )
             }
         }
 
-        if (!token.isUsdt && !token.isTrc20) {
+        if (!token.isUsdt && !token.isTrc20 && !token.isUSDe) {
             if ((charts.size == 1 && charts.first().isEmpty) || !token.hasRate) {
                 _uiItemsFlow.value = items
                 return
@@ -239,7 +354,7 @@ class TokenViewModel(
             val rateDiff24h: String
             val delta: CharSequence
             if (2 >= charts.size) {
-                fiatPrice = CurrencyFormatter.format(currency, token.rateNow, 4)
+                fiatPrice = CurrencyFormatter.format(currency, token.rateNow)
                 rateDiff24h = token.rateDiff24h
                 delta = ""
             } else {
@@ -266,7 +381,7 @@ class TokenViewModel(
                 val growPercentFormat = Formatter.percent(growPercent)
 
                 fiatPrice =
-                    CurrencyFormatter.format(settingsRepository.currency.code, token.rateNow, 4)
+                    CurrencyFormatter.format(settingsRepository.currency.code, token.rateNow)
                 rateDiff24h = growPercentFormat
                 delta = priceDeltaFormat
             }
@@ -289,8 +404,7 @@ class TokenViewModel(
     }
 
     private suspend fun loadHistory(
-        token: AccountTokenEntity,
-        beforeLt: Long? = null
+        token: AccountTokenEntity, beforeLt: Long? = null
     ) = withContext(Dispatchers.IO) {
         if (token.token.blockchain === Blockchain.TRON) {
             loadTronHistory(beforeLt)
@@ -300,19 +414,26 @@ class TokenViewModel(
     }
 
     private suspend fun loadTonHistory(
-        token: AccountTokenEntity,
-        beforeLt: Long? = null
+        token: AccountTokenEntity, beforeLt: Long? = null
     ) = withContext(Dispatchers.IO) {
         val accountEvents =
             eventsRepository.loadForToken(token.address, wallet.accountId, wallet.testnet, beforeLt)
                 ?: return@withContext
         val walletEventItems = mapping(wallet, accountEvents.events)
         if (beforeLt == null) {
-            setEvents(walletEventItems)
+            if (walletEventItems.isNotEmpty()) {
+                setEvents(walletEventItems)
+            } else {
+                setEmptyEvents()
+            }
         } else {
-            val oldValue =
-                (_uiHistoryFlow.value).toImmutableList().filter { it !is HistoryItem.Loader }
-            setEvents(oldValue + walletEventItems)
+            val events =
+                _uiHistoryFlow.value.filter { it !is HistoryItem.Loader && it !is HistoryItem.Empty } + walletEventItems
+            if (events.isNotEmpty()) {
+                setEvents(events.distinctBy { it.uniqueId })
+            } else {
+                setEmptyEvents()
+            }
         }
     }
 
@@ -323,9 +444,9 @@ class TokenViewModel(
             return@withContext
         }
 
-        val tonProofToken =
-            accountRepository.requestTonProofToken(wallet) ?: return@withContext
-        val tronEvents = eventsRepository.loadTronEvents(tronAddress!!, tonProofToken, beforeLt) ?: return@withContext
+        val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: return@withContext
+        val tronEvents = eventsRepository.loadTronEvents(tronAddress!!, tonProofToken, beforeLt)
+            ?: return@withContext
         val walletEventItems = historyHelper.tronMapping(
             wallet = wallet,
             tronAddress = tronAddress!!,
@@ -337,22 +458,27 @@ class TokenViewModel(
         )
 
         if (beforeLt == null) {
-            setEvents(walletEventItems)
+            if (walletEventItems.isNotEmpty()) {
+                setEvents(walletEventItems)
+            } else {
+                setEmptyEvents()
+            }
         } else {
-            val oldValue =
-                (_uiHistoryFlow.value).toImmutableList().filter { it !is HistoryItem.Loader }
-            setEvents((oldValue + walletEventItems).distinctBy { it.uniqueId })
+            val events =
+                _uiHistoryFlow.value.filter { it !is HistoryItem.Loader && it !is HistoryItem.Empty } + walletEventItems
+            if (events.isNotEmpty()) {
+                setEvents(events.distinctBy { it.uniqueId })
+            } else {
+                setEmptyEvents()
+            }
         }
     }
 
     private suspend fun mapping(
-        wallet: WalletEntity,
-        events: List<AccountEvent>
+        wallet: WalletEntity, events: List<AccountEvent>
     ): List<HistoryItem> {
         return historyHelper.mapping(
-            wallet = wallet,
-            events = events,
-            options = ActionOptions(
+            wallet = wallet, events = events, options = ActionOptions(
                 safeMode = settingsRepository.isSafeModeEnabled(api),
                 hiddenBalances = settingsRepository.hiddenBalances,
                 tronEnabled = tronUsdtEnabled,
@@ -363,15 +489,19 @@ class TokenViewModel(
     private fun setEvents(
         items: List<HistoryItem>
     ) {
-        _uiHistoryFlow.value = historyHelper.groupByDate(items)
+        _uiHistoryFlow.value = historyHelper.groupByDate(items).toMutableList()
+    }
+
+    private fun setEmptyEvents() {
+        _uiHistoryFlow.value = mutableListOf(HistoryItem.Empty(context, Localization.empty_history))
     }
 
     private fun foundLastItem(): HistoryItem.Event? {
-        return _uiHistoryFlow.value?.lastOrNull { it is HistoryItem.Event } as? HistoryItem.Event
+        return _uiHistoryFlow.value.lastOrNull { it is HistoryItem.Event } as? HistoryItem.Event
     }
 
     private fun isLoading(): Boolean {
-        return _uiHistoryFlow.value?.lastOrNull { it is HistoryItem.Loader } != null
+        return _uiHistoryFlow.value.lastOrNull { it is HistoryItem.Loader } != null
     }
 
     private fun lastLt(): Long? {
@@ -383,16 +513,11 @@ class TokenViewModel(
     }
 
     private suspend fun loadChart(
-        token: AccountTokenEntity,
-        startDateSeconds: Long,
-        endDateSeconds: Long
+        token: AccountTokenEntity, startDateSeconds: Long, endDateSeconds: Long
     ) = withContext(Dispatchers.IO) {
-        val chart = if (!token.isUsdt && !token.isTrc20) {
+        val chart = if (!token.isStable) {
             api.loadChart(
-                token.address,
-                settingsRepository.currency.code,
-                startDateSeconds,
-                endDateSeconds
+                token.address, settingsRepository.currency.code, startDateSeconds, endDateSeconds
             )
         } else {
             emptyList()
@@ -456,10 +581,7 @@ class TokenViewModel(
         if (method != null) {
             val currency = api.getCurrencyCodeByCountry(settingsRepository)
             WalletPurchaseMethodEntity(
-                method = method,
-                wallet = wallet,
-                currency = currency,
-                config = api.config
+                method = method, wallet = wallet, currency = currency, config = api.config
             )
         } else {
             null
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/Item.kt
index 48b7da85a..02eead28e 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/Item.kt
@@ -3,15 +3,17 @@ package com.tonapps.tonkeeper.ui.screen.token.viewer.list
 import android.net.Uri
 import com.tonapps.icu.Coins
 import com.tonapps.tonkeeper.core.entities.WalletPurchaseMethodEntity
+import com.tonapps.tonkeeper.extensions.asCurrency
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.entity.Blockchain
 import com.tonapps.wallet.api.entity.ChartEntity
+import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
-import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.settings.ChartPeriod
 
 sealed class Item(type: Int): BaseListItem(type) {
@@ -22,6 +24,10 @@ sealed class Item(type: Int): BaseListItem(type) {
         const val TYPE_CHART = 2
         const val TYPE_W5_BANNER = 3
         const val TYPE_BATTERY_BANNER = 4
+        const val TYPE_ABOUT_ETHENA = 6
+        const val TYPE_SPACE = 7
+        const val TYPE_ETHENA_BALANCE = 8
+        const val TYPE_ETHENA_METHOD = 9
     }
 
     data class Balance(
@@ -43,8 +49,8 @@ sealed class Item(type: Int): BaseListItem(type) {
         val wallet: WalletEntity,
         val swapUri: Uri,
         val swapMethod: WalletPurchaseMethodEntity?,
+        val swapEnabled: Boolean,
         val token: TokenEntity,
-        val stakeApp: AppEntity?
     ): Item(TYPE_ACTIONS) {
 
         val walletAddress: String
@@ -56,24 +62,24 @@ sealed class Item(type: Int): BaseListItem(type) {
         val walletType: Wallet.Type
             get() = wallet.type
 
-        val stake: Boolean
-            get() = stakeApp != null
+        val currency: WalletCurrency
+            get() = token.asCurrency
 
         val send: Boolean
             get() = !wallet.isWatchOnly && token.isTransferable
 
         val swap: Boolean
             get() = if (token.isTrc20) {
-                wallet.hasPrivateKey && swapMethod != null
+                swapEnabled && wallet.hasPrivateKey && swapMethod != null
             } else {
-                token.verified && !wallet.isWatchOnly
+                swapEnabled && token.verified && !wallet.isWatchOnly
             }
 
         val maxColumnCount: Int
-            get() = if (swap && stake) {
-                4
-            } else {
+            get() = if (swap) {
                 3
+            } else {
+                2
             }
     }
 
@@ -97,4 +103,55 @@ sealed class Item(type: Int): BaseListItem(type) {
         val wallet: WalletEntity,
         val token: TokenEntity
     ): Item(TYPE_BATTERY_BANNER)
+
+    data class AboutEthena(
+        val description: String,
+        val url: String,
+    ): Item(TYPE_ABOUT_ETHENA)
+
+    data object Space: Item(TYPE_SPACE)
+
+    data class EthenaBalance(
+        val position: ListCell.Position,
+        val wallet: WalletEntity,
+        val staked: Boolean,
+        val methodType: EthenaEntity.Method.Type? = null,
+        val balance: Coins,
+        val balanceFormat: CharSequence,
+        val fiatFormat: CharSequence,
+        val showApy: Boolean = true,
+        val title: CharSequence? = null,
+        val apyText: CharSequence? = null,
+        val fiatRate: CharSequence? = null,
+        val rateDiff24h: String? = null,
+        val verified: Boolean = false,
+        val hiddenBalance: Boolean,
+    ): Item(TYPE_ETHENA_BALANCE) {
+        val iconRes: Int?
+            get() {
+                return when (methodType) {
+                    EthenaEntity.Method.Type.STONFI -> R.drawable.ethena
+                    EthenaEntity.Method.Type.AFFLUENT -> R.drawable.affluent
+                    null -> null
+                }
+            }
+    }
+
+    data class EthenaMethod(
+        val position: ListCell.Position,
+        val wallet: WalletEntity,
+        val methodType: EthenaEntity.Method.Type? = null,
+        val url: String,
+        val name: String,
+        val apy: CharSequence,
+    ): Item(TYPE_ETHENA_METHOD) {
+        val iconRes: Int?
+            get() {
+                return when (methodType) {
+                    EthenaEntity.Method.Type.STONFI -> R.drawable.stonfi
+                    EthenaEntity.Method.Type.AFFLUENT -> R.drawable.affluent
+                    null -> null
+                }
+            }
+    }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/TokenAdapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/TokenAdapter.kt
index edf817c85..6201f5ae2 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/TokenAdapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/TokenAdapter.kt
@@ -1,10 +1,14 @@
 package com.tonapps.tonkeeper.ui.screen.token.viewer.list
 
 import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.AboutEthenaHolder
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.ActionsHolder
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.BalanceHolder
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.BatteryBannerHolder
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.ChartHolder
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.EthenaBalanceHolder
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.EthenaMethodHolder
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.SpaceHolder
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder.W5BannerHolder
 import com.tonapps.uikit.list.BaseListAdapter
 import com.tonapps.uikit.list.BaseListHolder
@@ -21,6 +25,10 @@ class TokenAdapter(
             Item.TYPE_CHART -> ChartHolder(parent, chartPeriodCallback)
             Item.TYPE_W5_BANNER -> W5BannerHolder(parent)
             Item.TYPE_BATTERY_BANNER -> BatteryBannerHolder(parent)
+            Item.TYPE_ABOUT_ETHENA -> AboutEthenaHolder(parent)
+            Item.TYPE_SPACE -> SpaceHolder(parent)
+            Item.TYPE_ETHENA_BALANCE -> EthenaBalanceHolder(parent)
+            Item.TYPE_ETHENA_METHOD -> EthenaMethodHolder(parent)
             else -> throw IllegalArgumentException("Unknown view type: $viewType")
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/AboutEthenaHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/AboutEthenaHolder.kt
new file mode 100644
index 000000000..e2a441fa0
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/AboutEthenaHolder.kt
@@ -0,0 +1,34 @@
+package com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder
+
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.ForegroundColorSpan
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.textAccentColor
+import com.tonapps.wallet.localization.Localization
+
+class AboutEthenaHolder(parent: ViewGroup) :
+    Holder<Item.AboutEthena>(parent, R.layout.view_about_usde) {
+
+    private val descriptionView = findViewById<AppCompatTextView>(R.id.description)
+
+    override fun onBind(item: Item.AboutEthena) {
+        itemView.setOnClickListener {
+            BrowserHelper.open(context, item.url)
+        }
+
+        val aboutText = getString(Localization.about_ethena)
+        descriptionView.text = SpannableStringBuilder("${item.description} $aboutText").apply {
+            setSpan(
+                ForegroundColorSpan(context.textAccentColor),
+                length - aboutText.length, length,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ActionsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ActionsHolder.kt
index f5d5675be..a5e98b0e7 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ActionsHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ActionsHolder.kt
@@ -3,23 +3,25 @@ package com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder
 import android.view.View
 import android.view.ViewGroup
 import com.tonapps.tonkeeper.helper.BrowserHelper
+import com.tonapps.tonkeeper.koin.remoteConfig
+import com.tonapps.tonkeeper.koin.serverFlags
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
 import com.tonapps.tonkeeper.ui.screen.qr.QRScreen
 import com.tonapps.tonkeeper.ui.screen.send.main.SendScreen
+import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
 import com.tonapps.tonkeeper.ui.screen.swap.SwapScreen
 import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
 import com.tonapps.tonkeeperx.R
 import uikit.navigation.Navigation
 import uikit.widget.ButtonsLayout
 
-class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.view_token_actions) {
+class ActionsHolder(parent: ViewGroup) : Holder<Item.Actions>(parent, R.layout.view_token_actions) {
 
     private val navigation: Navigation?
         get() = Navigation.from(context)
 
     private val sendView = findViewById<View>(R.id.send)
     private val receiveView = findViewById<View>(R.id.receive)
-    private val stakeView = findViewById<View>(R.id.stake)
     private val swapView = findViewById<View>(R.id.swap)
     private val buttonsView = findViewById<ButtonsLayout>(R.id.buttons)
 
@@ -27,30 +29,33 @@ class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.vi
         buttonsView.maxColumnCount = item.maxColumnCount
         sendView.isEnabled = item.send
         sendView.setOnClickListener {
-            navigation?.add(SendScreen.newInstance(
-                wallet = item.wallet,
-                tokenAddress = item.tokenAddress,
-                type = SendScreen.Companion.Type.Default
-            ))
+            navigation?.add(
+                SendScreen.newInstance(
+                    wallet = item.wallet,
+                    tokenAddress = item.tokenAddress,
+                    type = SendScreen.Companion.Type.Default
+                )
+            )
         }
         receiveView.setOnClickListener {
             navigation?.add(QRScreen.newInstance(item.wallet, item.token))
         }
-        swapView.isEnabled = item.swap
+        swapView.visibility = if (item.swap) {
+            View.VISIBLE
+        } else {
+            View.GONE
+        }
         swapView.setOnClickListener {
             if (item.swapMethod != null) {
                 BrowserHelper.openPurchase(context, item.swapMethod)
             } else {
-                navigation?.add(SwapScreen.newInstance(item.wallet, item.swapUri, item.walletAddress, item.tokenAddress))
-            }
-        }
-
-        if (item.stakeApp == null) {
-            stakeView.visibility = View.GONE
-        } else {
-            stakeView.visibility = View.VISIBLE
-            stakeView.setOnClickListener {
-                navigation?.add(DAppScreen.newInstance(item.wallet, item.stakeApp, "token"))
+                val fragment = SwapScreen.newInstance(
+                    wallet = item.wallet,
+                    fromToken = item.currency,
+                    nativeSwap = context.serverFlags?.disableNativeSwap != true,
+                    uri = item.swapUri
+                )
+                navigation?.add(fragment)
             }
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ChartHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ChartHolder.kt
index 1480710a4..d46429bef 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ChartHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/ChartHolder.kt
@@ -66,7 +66,7 @@ class ChartHolder(
             priceView.text = item.fiatPrice.withCustomSymbol(context)
         } else {
             val coins = Coins.of(price)
-            priceView.text = CurrencyFormatter.formatFiat(item.currency.code, coins, 4).withCustomSymbol(context)
+            priceView.text = CurrencyFormatter.formatFiat(item.currency.code, coins).withCustomSymbol(context)
         }
         setDiffPrice(price, item)
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaBalanceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaBalanceHolder.kt
new file mode 100644
index 000000000..62c994e4e
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaBalanceHolder.kt
@@ -0,0 +1,93 @@
+package com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
+import com.tonapps.tonkeeper.extensions.buildRateString
+import com.tonapps.tonkeeper.ui.screen.staking.viewer.StakeViewerScreen
+import com.tonapps.tonkeeper.ui.screen.token.viewer.TokenScreen
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentOrangeColor
+import com.tonapps.uikit.color.textSecondaryColor
+import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.core.HIDDEN_BALANCE
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.navigation.Navigation.Companion.navigation
+import uikit.widget.FrescoView
+
+class EthenaBalanceHolder(parent: ViewGroup) :
+    Holder<Item.EthenaBalance>(parent, R.layout.view_ethena_balance) {
+
+    private val iconView = findViewById<FrescoView>(R.id.icon)
+    private val titleView = findViewById<AppCompatTextView>(R.id.title)
+    private val apyView = findViewById<AppCompatTextView>(R.id.apy)
+    private val balanceView = findViewById<AppCompatTextView>(R.id.balance)
+    private val balanceFiatView = findViewById<AppCompatTextView>(R.id.balance_fiat)
+
+    override fun onBind(item: Item.EthenaBalance) {
+        itemView.background = item.position.drawable(context)
+
+        titleView.text = if (item.staked) {
+            item.title ?: getString(Localization.staked_usde)
+        } else {
+            TokenEntity.USDE.symbol
+        }
+
+        balanceView.text = if (item.hiddenBalance) HIDDEN_BALANCE else item.balanceFormat
+        balanceFiatView.text = if (item.hiddenBalance) HIDDEN_BALANCE else item.fiatFormat
+
+        if (item.staked) {
+            iconView.visibility = View.VISIBLE
+            item.iconRes?.let { iconView.setLocalRes(it) }
+            apyView.text = if (item.showApy) {
+                item.apyText
+            } else {
+                getString(Localization.ethena)
+            }
+        } else {
+            iconView.visibility = View.GONE
+            if (item.fiatRate != null && item.rateDiff24h != null) {
+                setRate(item.fiatRate, item.rateDiff24h, item.verified)
+            }
+        }
+
+        itemView.setOnClickListener {
+            if (item.staked) {
+                item.methodType?.let {
+                    context.navigation?.add(
+                        StakeViewerScreen.newInstance(
+                            wallet = item.wallet,
+                            ethenaType = it
+                        )
+                    )
+                }
+            } else {
+                val token = TokenEntity.USDE
+                context.navigation?.add(
+                    TokenScreen.newInstance(
+                        item.wallet,
+                        address = token.address,
+                        name = token.name,
+                        symbol = token.symbol,
+                        rawUsde = true,
+                    )
+                )
+            }
+        }
+    }
+
+    private fun setRate(rate: CharSequence, rateDiff24h: String, verified: Boolean) {
+        apyView.visibility = View.VISIBLE
+        if (verified) {
+            apyView.text = context.buildRateString(rate, rateDiff24h).withCustomSymbol(context)
+            apyView.setTextColor(context.textSecondaryColor)
+        } else {
+            apyView.setText(Localization.unverified_token)
+            apyView.setTextColor(context.accentOrangeColor)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaMethodHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaMethodHolder.kt
new file mode 100644
index 000000000..cf8252566
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/EthenaMethodHolder.kt
@@ -0,0 +1,48 @@
+package com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.net.toUri
+import com.tonapps.extensions.uri
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.navigation.Navigation.Companion.navigation
+import uikit.widget.FrescoView
+
+class EthenaMethodHolder(parent: ViewGroup) :
+    Holder<Item.EthenaMethod>(parent, R.layout.view_ethena_method) {
+
+    private val iconView = findViewById<FrescoView>(R.id.icon)
+    private val titleView = findViewById<AppCompatTextView>(R.id.title)
+    private val apyView = findViewById<AppCompatTextView>(R.id.apy)
+    private val openButtonView = findViewById<View>(R.id.button_open)
+
+    override fun onBind(item: Item.EthenaMethod) {
+        itemView.background = item.position.drawable(context)
+
+        itemView.setOnClickListener { openDapp(item) }
+        openButtonView.setOnClickListener { openDapp(item) }
+
+        titleView.text = getString(Localization.deposit_and_stake)
+        apyView.text = context.getString(Localization.ethena_operated_by, item.name)
+        item.iconRes?.let { iconView.setLocalRes(it) }
+    }
+
+    private fun openDapp(item: Item.EthenaMethod) {
+        context.navigation?.add(
+            DAppScreen.newInstance(
+                wallet = item.wallet,
+                title = item.name,
+                url = item.url.toUri(),
+                iconUrl = item.iconRes?.uri().toString(),
+                source = "token_screen",
+                forceConnect = true
+            )
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/SpaceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/SpaceHolder.kt
new file mode 100644
index 000000000..cd76242e2
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/token/viewer/list/holder/SpaceHolder.kt
@@ -0,0 +1,13 @@
+package com.tonapps.tonkeeper.ui.screen.token.viewer.list.holder
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.token.viewer.list.Item
+import com.tonapps.tonkeeperx.R
+
+class SpaceHolder(parent: ViewGroup) :
+    Holder<Item.Space>(parent, R.layout.view_wallet_space) {
+
+    override fun onBind(item: Item.Space) {
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectScreen.kt
index c724cfc8b..ab7a6c569 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/tonconnect/TonConnectScreen.kt
@@ -124,7 +124,7 @@ class TonConnectScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_t
 
         setDefaultState()
 
-        AnalyticsHelper.tcRequest(viewModel.installId, args.app.url.toString())
+        analytics?.tcRequest(args.app.url.toString())
     }
 
     private fun connect(wallet: WalletEntity) {
@@ -157,7 +157,7 @@ class TonConnectScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_t
         proof: TONProof.Result? = null,
         proofError: BridgeError? = null,
     ) {
-        AnalyticsHelper.tcConnect(viewModel.installId, args.app.url.toString(), pushCheckBoxView.checked)
+        analytics?.tcConnect(args.app.url.toString(), pushCheckBoxView.checked)
         setResponse(TonConnectResponse(
             notifications = pushCheckBoxView.checked,
             proof = proof,
@@ -170,7 +170,7 @@ class TonConnectScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_t
         if (response.wallet.isTonConnectSupported) {
             setSuccessState()
             setResult(contract.createResult(response), false)
-            postDelayed(2000) {
+            postDelayed(1600) {
                 returnToApp()
                 finish()
             }
@@ -199,7 +199,7 @@ class TonConnectScreen: BaseWalletScreen<ScreenContext.None>(R.layout.fragment_t
     private fun setFailedState() {
         setTaskState()
         taskView.state = ProcessTaskView.State.FAILED
-        postDelayed(5000) { setDefaultState() }
+        postDelayed(3000) { setDefaultState() }
     }
 
     private fun setDefaultState() {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/transaction/TransactionScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/transaction/TransactionScreen.kt
index 564753c3f..d164263eb 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/transaction/TransactionScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/transaction/TransactionScreen.kt
@@ -50,10 +50,14 @@ import uikit.base.BaseFragment
 import uikit.dialog.modal.ModalDialog
 import uikit.extensions.dp
 import uikit.extensions.drawable
+import uikit.extensions.getViews
 import uikit.extensions.reject
 import uikit.extensions.setColor
 import uikit.navigation.Navigation.Companion.navigation
+import uikit.widget.ColumnLayout
 import uikit.widget.FrescoView
+import androidx.core.view.isVisible
+import androidx.core.net.toUri
 
 
 class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragment.Modal {
@@ -110,7 +114,7 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
     private lateinit var feeView: TransactionDetailView
     private lateinit var commentView: TransactionDetailView
     private lateinit var accountNameView: TransactionDetailView
-    private lateinit var accountAddressView: TransactionDetailView
+    private lateinit var accountAddressView: ColumnLayout
     private lateinit var explorerButton: AppCompatTextView
     private lateinit var unverifiedView: View
     private lateinit var failedView: View
@@ -176,6 +180,14 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
         }
     }
 
+    private fun accountAddressTitle(): AppCompatTextView {
+        return accountAddressView.getChildAt(0) as AppCompatTextView
+    }
+
+    private fun accountAddressValue(): AppCompatTextView {
+        return accountAddressView.getChildAt(1) as AppCompatTextView
+    }
+
     private fun initArgs(actionArgs: HistoryItem.Event) {
         spamView.visibility = if (isScam) View.VISIBLE else View.GONE
         feeView.title =
@@ -206,11 +218,11 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
                     Blockchain.TRON -> Localization.trc20
                     else -> Localization.ton
                 }
-                actionArgs.value.withCustomSymbol(requireContext())
+                actionArgs.valueFullFormatted.withCustomSymbol(requireContext())
                     .plus(" ")
                     .plus(getString(networkRes))
             } else {
-                actionArgs.value.withCustomSymbol(requireContext())
+                actionArgs.valueFullFormatted.withCustomSymbol(requireContext())
             }
             if (actionArgs.refund != null) {
                 feeView.setData(
@@ -262,11 +274,11 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
             iconSwapView.visibility = View.GONE
         } else if (actionArgs.isSwap) {
             iconView.visibility = View.GONE
-            iconSwap1View.setImageURI(Uri.parse(actionArgs.coinIconUrl), this)
-            iconSwap2View.setImageURI(Uri.parse(actionArgs.coinIconUrl2), this)
+            iconSwap1View.setImageURI(actionArgs.coinIconUrl.toUri(), this)
+            iconSwap2View.setImageURI(actionArgs.coinIconUrl2.toUri(), this)
             amount2View.visibility = View.VISIBLE
-            amount2View.text = actionArgs.value2.withCustomSymbol(requireContext())
-            accountAddressView.title = getString(Localization.recipient_address)
+            amount2View.text = actionArgs.valueFullFormatted2?.withCustomSymbol(requireContext())
+            accountAddressTitle().text = getString(Localization.recipient_address)
         } else if (actionArgs.hasNft) {
             iconSwapView.visibility = View.GONE
             val nft = actionArgs.nft!!
@@ -283,7 +295,7 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
             amount2View.setTextColor(requireContext().textPrimaryColor)
         } else if (actionArgs.coinIconUrl.isNotBlank()) {
             iconSwapView.visibility = View.GONE
-            iconView.setImageURI(Uri.parse(actionArgs.coinIconUrl), null)
+            iconView.setImageURI(actionArgs.coinIconUrl.toUri(), null)
 
             if (actionArgs.showNetwork) {
                 val networkIconRes = when (actionArgs.blockchain) {
@@ -476,13 +488,13 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
             applyAccountWithName(out, address!!, name!!)
         } else if (address != null) {
             accountAddressView.visibility = View.VISIBLE
-            accountAddressView.title = getAccountTitle(out)
+            accountAddressTitle().text = getAccountTitle(out)
             /*val shortAddress = if (blockchain == Blockchain.TRON) {
                 address.shortTron
             } else {
                 address.shortAddress
             }*/
-            accountAddressView.setData(address, "")
+            accountAddressValue().text = address
             accountAddressView.setOnClickListener {
                 context?.copyWithToast(address)
             }
@@ -500,12 +512,12 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
         }
 
         accountAddressView.visibility = View.VISIBLE
-        accountAddressView.title = getString(
+        accountAddressTitle().text = getString(
             if (out) {
                 Localization.recipient_address
             } else Localization.sender_address
         )
-        accountAddressView.setData(address, "")
+        accountAddressValue().text = address
         accountAddressView.setOnClickListener {
             context?.copyWithToast(address)
         }
@@ -520,16 +532,15 @@ class TransactionScreen : BaseFragment(R.layout.dialog_transaction), BaseFragmen
     }
 
     private fun updateDataView() {
-        val visibleViews = mutableListOf<TransactionDetailView>()
-        for (i in 0 until dataView.childCount) {
-            val child = dataView.getChildAt(i)
-            if (child is TransactionDetailView && child.visibility == View.VISIBLE) {
-                visibleViews.add(child)
-            }
-        }
+        val visibleViews = dataView.getViews().filter { it.isVisible }
 
         for (i in 0 until visibleViews.size) {
-            visibleViews[i].position = ListCell.getPosition(visibleViews.size, i)
+            val view = visibleViews[i]
+            if (view is TransactionDetailView) {
+                view.position = ListCell.getPosition(visibleViews.size, i)
+            } else {
+                view.background = ListCell.getPosition(visibleViews.size, i).drawable(requireContext())
+            }
         }
     }
 
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/State.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/State.kt
index 3b8bb81b1..7bde7e961 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/State.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/State.kt
@@ -2,6 +2,7 @@ package com.tonapps.tonkeeper.ui.screen.wallet.main
 
 import android.content.Context
 import android.text.SpannableStringBuilder
+import android.util.Log
 import com.tonapps.icu.Coins
 import com.tonapps.icu.Coins.Companion.sumOf
 import com.tonapps.icu.CurrencyFormatter
@@ -17,6 +18,7 @@ import com.tonapps.wallet.api.entity.ConfigEntity
 import com.tonapps.wallet.api.entity.NotificationEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.core.isAvailableBiometric
 import com.tonapps.wallet.data.dapps.entities.AppPushEntity
@@ -182,7 +184,9 @@ sealed class State {
                 wallet = wallet,
                 token = TokenEntity.TON,
                 swapUri = config.swapUri,
-                tronEnabled = tronUsdtEnabled
+                tronEnabled = tronUsdtEnabled,
+                isSwapDisabled = config.flags.disableSwap,
+                isStakingDisabled = config.flags.disableStaking,
             )
         }
 
@@ -295,6 +299,7 @@ sealed class State {
             setup: Setup?,
             lastUpdatedFormat: String,
             prefixYourAddress: Boolean,
+            renewDomains: List<DnsExpiringEntity>
         ): List<Item> {
             val uiItems = mutableListOf<Item>()
             if (apkStatus != APKManager.Status.Default && apkStatus !is APKManager.Status.UpdateAvailable) {
@@ -312,6 +317,10 @@ sealed class State {
                 uiItems.add(Item.Push(dAppNotifications.pushes))
             }
 
+            if (renewDomains.isNotEmpty()) {
+                uiItems.add(Item.RenewDomains(wallet, renewDomains))
+            }
+
             setup?.let {
                 val setupTypes = createSetupTypes(it)
                 if (setupTypes.isNotEmpty()) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
index 6260bbbab..bb9ee097f 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/WalletViewModel.kt
@@ -4,7 +4,9 @@ import android.app.Application
 import androidx.lifecycle.viewModelScope
 import com.tonapps.icu.Coins
 import com.tonapps.network.NetworkMonitor
+import com.tonapps.tonkeeper.Environment
 import com.tonapps.tonkeeper.RemoteConfig
+import com.tonapps.tonkeeper.core.DevSettings
 import com.tonapps.tonkeeper.core.entities.AssetsEntity.Companion.sort
 import com.tonapps.tonkeeper.extensions.hasPushPermission
 import com.tonapps.tonkeeper.helper.DateHelper
@@ -21,6 +23,8 @@ import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.backup.BackupRepository
 import com.tonapps.wallet.data.battery.BatteryRepository
+import com.tonapps.wallet.data.collectibles.CollectiblesRepository
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.core.ScreenCacheSource
 import com.tonapps.wallet.data.core.currency.WalletCurrency
 import com.tonapps.wallet.data.rates.RatesRepository
@@ -39,6 +43,7 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import uikit.extensions.collectFlow
+import java.math.BigDecimal
 import kotlin.time.Duration.Companion.minutes
 
 class WalletViewModel(
@@ -56,6 +61,8 @@ class WalletViewModel(
     private val assetsManager: AssetsManager,
     private val apkManager: APKManager,
     private val remoteConfig: RemoteConfig,
+    private val environment: Environment,
+    private val collectiblesRepository: CollectiblesRepository,
 ) : BaseWalletVM(app) {
 
     val installId: String
@@ -74,6 +81,9 @@ class WalletViewModel(
     private val _stateMainFlow = MutableStateFlow<State.Main?>(null)
     private val stateMainFlow = _stateMainFlow.asStateFlow().filterNotNull()
 
+    private val _domainRenewFlow = MutableStateFlow<List<DnsExpiringEntity>>(emptyList())
+    private val domainRenewFlow = _domainRenewFlow.asStateFlow().filterNotNull()
+
     private val updateWalletSettings = combine(
         settingsRepository.tokenPrefsChangedFlow,
         settingsRepository.walletPrefsChangedFlow,
@@ -81,9 +91,10 @@ class WalletViewModel(
     ) { _, _, _ -> }
 
     private val _stateSettingsFlow = combine(
+        api.configFlow,
         settingsRepository.hiddenBalancesFlow,
         statusFlow,
-    ) { hiddenBalance, status ->
+    ) { _, hiddenBalance, status ->
         State.Settings(hiddenBalance, api.config, status)
     }.distinctUntilChanged()
 
@@ -111,6 +122,8 @@ class WalletViewModel(
             _uiItemsFlow.value = cached
         }
 
+        requestDnsExpiring()
+
         collectFlow(transactionManager.eventsFlow(wallet)) { event ->
             if (event.pending) {
                 setStatus(Status.SendingTransaction)
@@ -119,6 +132,7 @@ class WalletViewModel(
                 delay(2000)
                 setStatus(Status.Default)
                 _lastLtFlow.value = event.lt
+                _domainRenewFlow.value = collectiblesRepository.getDnsSoonExpiring(wallet.accountId, wallet.testnet)
             }
         }
 
@@ -127,6 +141,8 @@ class WalletViewModel(
                 setStatus(Status.NoInternet)
                 delay(3000)
                 setStatus(Status.LastUpdated)
+            } else {
+                updateCuntryByIP()
             }
         }
 
@@ -167,7 +183,7 @@ class WalletViewModel(
                     battery = State.Battery(
                         balance = batteryBalance,
                         beta = api.config.batteryBeta,
-                        disabled = api.config.batteryDisabled,
+                        disabled = (api.config.flags.disableBattery && batteryBalance.value == BigDecimal.ZERO),
                         viewed = settingsRepository.batteryViewed,
                     ),
                     lt = currentLt,
@@ -195,7 +211,7 @@ class WalletViewModel(
                         battery = State.Battery(
                             balance = batteryBalance,
                             beta = api.config.batteryBeta,
-                            disabled = api.config.batteryDisabled,
+                            disabled = (api.config.flags.disableBattery && batteryBalance.value == BigDecimal.ZERO),
                             viewed = settingsRepository.batteryViewed,
                         ),
                         lt = currentLt,
@@ -221,7 +237,8 @@ class WalletViewModel(
             alertNotificationsFlow,
             _stateSettingsFlow,
             updateWalletSettings,
-        ) { state, alerts, settings, _ ->
+            domainRenewFlow,
+        ) { state, alerts, settings, _, renewDomains ->
             val status = settings.status /* if (settings.status == Status.NoInternet) {
                 settings.status
             } else if (settings.status != Status.SendingTransaction && settings.status != Status.TransactionConfirmed) {
@@ -235,7 +252,7 @@ class WalletViewModel(
                 val walletPushEnabled = settingsRepository.getPushWallet(state.wallet.id)
                 val hasInitializedWallet = accountRepository.getInitializedWallets().isNotEmpty()
                 State.Setup(
-                    pushEnabled = context.hasPushPermission() && walletPushEnabled,
+                    pushEnabled = !environment.isGooglePlayServicesAvailable || (context.hasPushPermission() && walletPushEnabled),
                     biometryEnabled = if (wallet.hasPrivateKey) settingsRepository.biometric else true,
                     hasBackup = if (wallet.hasPrivateKey) state.hasBackup else true,
                     showTelegramChannel = false,
@@ -259,7 +276,8 @@ class WalletViewModel(
                     lastUpdated,
                     settingsRepository.getLocale()
                 ),
-                prefixYourAddress = 3 > settingsRepository.addressCopyCount
+                prefixYourAddress = 3 > settingsRepository.addressCopyCount,
+                renewDomains = renewDomains
             )
             if (uiItems.isNotEmpty()) {
                 _uiItemsFlow.value = uiItems
@@ -277,11 +295,25 @@ class WalletViewModel(
         }
     }
 
+    private fun updateCuntryByIP() {
+        viewModelScope.launch {
+            environment.setCountryByIPAddress(api.resolveCountry())
+        }
+    }
+
     fun refresh() {
+        requestDnsExpiring()
         _statusFlow.value = Status.Updating
         _lastLtFlow.value += 1
     }
 
+    private fun requestDnsExpiring() {
+        viewModelScope.launch {
+            val period = if (DevSettings.dnsAll) 366 else 30
+            _domainRenewFlow.value = collectiblesRepository.getDnsSoonExpiring(wallet.accountId, wallet.testnet, period)
+        }
+    }
+
     private suspend fun checkAutoRefresh() {
         if (hasPendingTransaction()) {
             withContext(Dispatchers.Main) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
index d08467002..6834885f5 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/Item.kt
@@ -30,6 +30,7 @@ import com.tonapps.wallet.api.entity.NotificationEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.collectibles.entities.DnsExpiringEntity
 import com.tonapps.wallet.data.dapps.entities.AppEntity
 import com.tonapps.wallet.data.dapps.entities.AppPushEntity
 import com.tonapps.wallet.data.staking.StakingPool
@@ -55,6 +56,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         const val TYPE_SETUP_LINK = 11
         const val TYPE_STAKED = 12
         const val TYPE_APK_STATUS = 13
+        const val TYPE_RENEW_DOMAINS = 14
 
         fun createFromParcel(parcel: Parcel): Item {
             return when (parcel.readInt()) {
@@ -70,6 +72,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
                 TYPE_SETUP_LINK -> SetupLink(parcel)
                 TYPE_STAKED -> Stake(parcel)
                 TYPE_APK_STATUS -> ApkStatus(parcel)
+                TYPE_RENEW_DOMAINS -> RenewDomains(parcel)
                 else -> throw IllegalArgumentException("Unknown type")
             }
         }
@@ -195,6 +198,8 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         val token: TokenEntity,
         val swapUri: Uri,
         val tronEnabled: Boolean,
+        val isSwapDisabled: Boolean,
+        val isStakingDisabled: Boolean
     ): Item(TYPE_ACTIONS) {
 
         val address: String
@@ -207,6 +212,8 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             parcel.readParcelableCompat()!!,
             parcel.readParcelableCompat()!!,
             parcel.readParcelableCompat()!!,
+            parcel.readBooleanCompat(),
+            parcel.readBooleanCompat(),
             parcel.readBooleanCompat()
         )
 
@@ -215,6 +222,8 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             dest.writeParcelable(token, flags)
             dest.writeParcelable(swapUri, flags)
             dest.writeBooleanCompat(tronEnabled)
+            dest.writeBooleanCompat(isSwapDisabled)
+            dest.writeBooleanCompat(isStakingDisabled)
         }
 
         companion object CREATOR : Parcelable.Creator<Actions> {
@@ -253,11 +262,7 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
 
         @IgnoredOnParcel
         val currencyIcon: Int by lazy {
-            if (poolImplementation == StakingPool.Implementation.Ethena) {
-                com.tonapps.wallet.api.R.drawable.ic_udse_ethena_with_bg
-            } else {
-                com.tonapps.wallet.api.R.drawable.ic_ton_with_bg
-            }
+            com.tonapps.wallet.api.R.drawable.ic_ton_with_bg
         }
 
         constructor(parcel: Parcel) : this(
@@ -336,6 +341,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
 
         val isUSDT = address == TokenEntity.USDT.address
         val isTRC20 = address == TokenEntity.TRON_USDT.address
+        val isUSDe = address == TokenEntity.USDE.address
+
+        val isStable = isUSDT || isTRC20 || isUSDe
 
         constructor(
             position: ListCell.Position,
@@ -359,7 +367,6 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
                 CurrencyFormatter.formatFiat(
                     currency = currencyCode,
                     value = token.rateNow,
-                    customScale = 2,
                     roundingMode = RoundingMode.UP
                 )
             } else {
@@ -458,6 +465,28 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         }
     }
 
+    data class RenewDomains(
+        val wallet: WalletEntity,
+        val items: List<DnsExpiringEntity>
+    ): Item(TYPE_RENEW_DOMAINS) {
+
+        constructor(parcel: Parcel) : this(
+            parcel.readParcelableCompat()!!,
+            parcel.readArrayCompat(DnsExpiringEntity::class.java)?.toList() ?: emptyList()
+        )
+
+        override fun marshall(dest: Parcel, flags: Int) {
+            dest.writeParcelable(wallet, flags)
+            dest.writeArrayCompat(items.toTypedArray())
+        }
+
+        companion object CREATOR : Parcelable.Creator<Push> {
+            override fun createFromParcel(parcel: Parcel) = Push(parcel)
+
+            override fun newArray(size: Int): Array<Push?> = arrayOfNulls(size)
+        }
+    }
+
     data class Push(
         val textLine: String,
         val iconUris: List<Uri>,
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
index 8b38fe029..20ffd5252 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/WalletAdapter.kt
@@ -7,6 +7,7 @@ import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.ApkHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.BalanceHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.ManageHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.PushHolder
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.ReNewDomainsHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.SetupLinkHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.SetupSwitchHolder
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder.SetupTitleHolder
@@ -41,6 +42,7 @@ class WalletAdapter: BaseListAdapter() {
             Item.TYPE_SETUP_LINK -> SetupLinkHolder(parent)
             Item.TYPE_STAKED -> StakedHolder(parent)
             Item.TYPE_APK_STATUS -> ApkHolder(parent)
+            Item.TYPE_RENEW_DOMAINS -> ReNewDomainsHolder(parent)
             else -> throw IllegalArgumentException("Unknown view type: $viewType")
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
index bdf2b8cce..8b2e9ae60 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ActionsHolder.kt
@@ -3,9 +3,9 @@ package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 import android.view.View
 import android.view.ViewGroup
 import com.tonapps.tonkeeper.koin.remoteConfig
+import com.tonapps.tonkeeper.koin.serverFlags
 import com.tonapps.tonkeeper.ui.screen.camera.CameraScreen
 import com.tonapps.tonkeeper.ui.screen.onramp.main.OnRampScreen
-import com.tonapps.tonkeeper.ui.screen.purchase.PurchaseScreen
 import com.tonapps.tonkeeper.ui.screen.qr.QRScreen
 import com.tonapps.tonkeeper.ui.screen.send.main.SendScreen
 import com.tonapps.tonkeeper.ui.screen.staking.stake.StakingScreen
@@ -13,7 +13,6 @@ import com.tonapps.tonkeeper.ui.screen.swap.SwapScreen
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.api.entity.Blockchain
-import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.data.account.Wallet
 
 class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.view_wallet_actions) {
@@ -26,7 +25,6 @@ class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.vi
     private val stakeView = findViewById<View>(R.id.stake)
 
     override fun onBind(item: Item.Actions) {
-        val nativeOnrmapEnabled =
         scanView.setOnClickListener {
             val chains = mutableListOf(Blockchain.TON)
 
@@ -39,8 +37,13 @@ class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.vi
         receiveView.setOnClickListener {
             navigation?.add(QRScreen.newInstance(item.wallet))
         }
+
         swapView.setOnClickListener {
-            navigation?.add(SwapScreen.newInstance(item.wallet, item.swapUri, item.address, TokenEntity.TON.address))
+            navigation?.add(SwapScreen.newInstance(
+                wallet = item.wallet,
+                nativeSwap = context.serverFlags?.disableNativeSwap != true,
+                uri = item.swapUri
+            ))
         }
         buyOrSellView.setOnClickListener {
             navigation?.add(OnRampScreen.newInstance(context, item.wallet, "wallet"))
@@ -49,23 +52,19 @@ class ActionsHolder(parent: ViewGroup): Holder<Item.Actions>(parent, R.layout.vi
             navigation?.add(SendScreen.newInstance(item.wallet, type = SendScreen.Companion.Type.Default))
         }
         stakeView.setOnClickListener {
-            navigation?.add(StakingScreen.newInstance(item.wallet))
+            navigation?.add(StakingScreen.newInstance(wallet = item.wallet, from = "wallet"))
         }
 
-        val isSwapDisable = context.remoteConfig?.isSwapDisable == true
-        val isStakingDisable = context.remoteConfig?.isStakingDisable == true
-
-
-        swapView.isEnabled = item.walletType != Wallet.Type.Watch && item.walletType != Wallet.Type.Testnet && !isSwapDisable
+        swapView.isEnabled = item.walletType != Wallet.Type.Watch && item.walletType != Wallet.Type.Testnet && !item.isSwapDisabled
         sendView.isEnabled = item.walletType != Wallet.Type.Watch
         scanView.isEnabled = item.walletType != Wallet.Type.Watch
-        stakeView.isEnabled = item.walletType != Wallet.Type.Watch && item.walletType != Wallet.Type.Testnet && !isStakingDisable
+        stakeView.isEnabled = item.walletType != Wallet.Type.Watch && item.walletType != Wallet.Type.Testnet && !item.isStakingDisabled
         buyOrSellView.isEnabled = item.walletType != Wallet.Type.Testnet
 
-        if (isSwapDisable) {
+        if (item.isSwapDisabled) {
             swapView.alpha = 0f
         }
-        if (isStakingDisable) {
+        if (item.isStakingDisabled) {
             stakeView.alpha = 0f
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ReNewDomainsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ReNewDomainsHolder.kt
new file mode 100644
index 000000000..54f192709
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/ReNewDomainsHolder.kt
@@ -0,0 +1,38 @@
+package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.extensions.locale
+import com.tonapps.tonkeeper.helper.DateHelper
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewScreen
+import com.tonapps.tonkeeper.ui.screen.dns.renew.DNSRenewViewModel
+import com.tonapps.tonkeeper.ui.screen.send.transaction.SendTransactionScreen
+import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.launch
+
+class ReNewDomainsHolder(
+    parent: ViewGroup
+): Holder<Item.RenewDomains>(parent, R.layout.view_wallet_renew_domains) {
+
+    private val untilDateString: String by lazy {
+        DateHelper.untilDate(
+            locale = context.locale
+        )
+    }
+
+    private val textView = findViewById<AppCompatTextView>(R.id.text)
+
+    init {
+        itemView.layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)
+    }
+
+    override fun onBind(item: Item.RenewDomains) {
+        textView.text = context.getString(Localization.wallet_renew_dns, item.items.size, untilDateString)
+        itemView.setOnClickListener {
+            navigation?.add(DNSRenewScreen.newInstance(item.wallet, item.items))
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/StakedHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/StakedHolder.kt
index 6f56c7be8..237a40354 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/StakedHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/StakedHolder.kt
@@ -1,6 +1,5 @@
 package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
-import android.text.SpannableStringBuilder
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatImageView
@@ -22,9 +21,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import uikit.extensions.badgeGreen
 import uikit.extensions.drawable
-import uikit.extensions.withGreenBadge
 import uikit.widget.FrescoView
 import kotlin.time.Duration.Companion.seconds
 
@@ -46,14 +43,8 @@ class StakedHolder(parent: ViewGroup): Holder<Item.Stake>(parent, R.layout.view_
 
     override fun onBind(item: Item.Stake) {
         stopTicker()
-        val titleBuilder = SpannableStringBuilder(getString(Localization.staked))
-        if (item.poolImplementation == StakingPool.Implementation.Ethena) {
-            titleBuilder.append(" ")
-            titleBuilder.badgeGreen(context) {
-                append("APY ${item.apy.toPlainString()}%")
-            }
-        }
-        titleView.text = titleBuilder
+
+        titleView.text = getString(Localization.staked)
 
         currencyIconView.setImageResource(item.currencyIcon)
 
@@ -74,7 +65,7 @@ class StakedHolder(parent: ViewGroup): Holder<Item.Stake>(parent, R.layout.view_
         }
 
         itemView.setOnClickListener {
-            navigation?.add(StakeViewerScreen.newInstance(item.wallet, item.poolAddress, item.poolName))
+            navigation?.add(StakeViewerScreen.newInstance(wallet = item.wallet, address = item.poolAddress, name = item.poolName))
         }
 
         messageView.setOnClickListener(null)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
index b7d05f4c9..d82bb6619 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/TokenHolder.kt
@@ -1,7 +1,6 @@
 package com.tonapps.tonkeeper.ui.screen.wallet.main.list.holder
 
 import android.net.Uri
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatTextView
@@ -28,13 +27,15 @@ class TokenHolder(parent: ViewGroup): Holder<Item.Token>(parent, R.layout.view_c
     private val networkIconView = findViewById<FrescoView>(R.id.network_icon)
     private val titleView = findViewById<AppCompatTextView>(R.id.title)
     private val rateView = findViewById<AppCompatTextView>(R.id.rate)
+    private val balanceContainerView = findViewById<View>(R.id.balance_container)
     private val balanceView = findViewById<AppCompatTextView>(R.id.balance)
     private val balanceFiatView = findViewById<AppCompatTextView>(R.id.balance_currency)
+    private val openButtonView = findViewById<View>(R.id.button_open)
 
     override fun onBind(item: Item.Token) {
         itemView.background = item.position.drawable(context)
         itemView.setOnClickListener {
-            navigation?.add(TokenScreen.newInstance(item.wallet, item.address, item.name, item.symbol))
+            openToken(item)
         }
         if (item.blacklist) {
             titleView.text = getString(Localization.fake)
@@ -72,6 +73,17 @@ class TokenHolder(parent: ViewGroup): Holder<Item.Token>(parent, R.layout.view_c
             }
             setRate(item.rate, item.rateDiff24h, item.verified)
         }
+
+        if (item.isUSDe && item.balance.isZero) {
+            balanceContainerView.visibility = View.GONE
+            openButtonView.visibility = View.VISIBLE
+            openButtonView.setOnClickListener {
+                openToken(item)
+            }
+        } else {
+            balanceContainerView.visibility = View.VISIBLE
+            openButtonView.visibility = View.GONE
+        }
     }
 
     private fun setNetworkIcon(blockchain: Blockchain) {
@@ -104,4 +116,8 @@ class TokenHolder(parent: ViewGroup): Holder<Item.Token>(parent, R.layout.view_c
         }
     }
 
+    private fun openToken(item: Item.Token) {
+        navigation?.add(TokenScreen.newInstance(item.wallet, item.address, item.name, item.symbol))
+    }
+
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
index ca79e88e9..ce2688343 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/manage/TokensManageScreen.kt
@@ -17,6 +17,7 @@ import com.tonapps.wallet.localization.Localization
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import uikit.HapticHelper
+import uikit.R
 import uikit.base.BaseFragment
 import uikit.base.BaseListFragment
 import uikit.extensions.collectFlow
@@ -44,6 +45,7 @@ class TokensManageScreen(wallet: WalletEntity): BaseListWalletScreen<ScreenConte
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setTitle(getString(Localization.home_screen))
+        applyListMargin(top = requireContext().getDimensionPixelSize(R.dimen.barHeight))
         setAdapter(adapter)
         val horizontalOffset = requireContext().getDimensionPixelSize(uikit.R.dimen.cornerMedium)
         setListPadding(horizontalOffset, 0, horizontalOffset, 0)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
index ddfe4e646..90f52ad63 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/picker/PickerViewModel.kt
@@ -34,7 +34,8 @@ class PickerViewModel(
     private val from: String,
     private val accountRepository: AccountRepository,
     private val settingsRepository: SettingsRepository,
-    private val assetsManager: AssetsManager
+    private val assetsManager: AssetsManager,
+    private val analytics: AnalyticsHelper
 ): BaseWalletVM(app) {
 
     private val hiddenBalances = settingsRepository.hiddenBalances
@@ -91,7 +92,7 @@ class PickerViewModel(
         }
 
         uiItemsFlow.take(1).filterList { it is Item.Wallet }.map { it as List<Item.Wallet> }.onEach { wallets ->
-            AnalyticsHelper.simpleTrackEvent("wallet_click", settingsRepository.installId, hashMapOf(
+            analytics.simpleTrackEvent("wallet_click", hashMapOf(
                 "wallet_count" to wallets.size,
                 "wallet_type_list" to wallets.map { it.wallet.version.name }.distinct().joinToString(",")
             ))
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/Emulated.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/Emulated.kt
index cccb76fc1..6077e12e7 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/Emulated.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/Emulated.kt
@@ -1,14 +1,25 @@
 package com.tonapps.tonkeeper.usecase.emulation
 
+import android.util.Log
 import com.tonapps.blockchain.ton.extensions.toRawAddress
 import com.tonapps.icu.Coins
 import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.Fee
+import com.tonapps.tonkeeper.helper.BatteryHelper
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendFee
+import com.tonapps.wallet.api.API
 import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.account.entities.WalletEntity
+import com.tonapps.wallet.data.battery.BatteryMapper
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.entity.TransferType
 import com.tonapps.wallet.data.core.currency.WalletCurrency
+import com.tonapps.wallet.data.rates.RatesRepository
 import com.tonapps.wallet.data.token.TokenRepository
 import io.tonapi.models.JettonQuantity
 import io.tonapi.models.MessageConsequences
+import kotlin.math.abs
 
 data class Emulated(
     val consequences: MessageConsequences?,
@@ -21,6 +32,43 @@ data class Emulated(
 
     companion object {
         val defaultExtra = Extra(false, Coins.ONE, Coins.ONE)
+
+        suspend fun Emulated.buildFee(
+            wallet: WalletEntity,
+            api: API,
+            accountRepository: AccountRepository,
+            batteryRepository: BatteryRepository,
+            ratesRepository: RatesRepository
+        ): SendFee {
+            return if (withBattery && consequences != null) {
+                val extra = consequences.event.extra
+                val chargesBalance = BatteryHelper.getBatteryCharges(wallet, accountRepository, batteryRepository)
+                val charges = BatteryMapper.calculateChargesAmount(
+                    Coins.of(abs(extra)).value,
+                    api.config.batteryMeanFees
+                )
+                val batteryConfig = batteryRepository.getConfig(wallet.testnet)
+                val excessesAddress = batteryConfig.excessesAddress
+                SendFee.Battery(
+                    charges = charges,
+                    chargesBalance = chargesBalance,
+                    extra = extra,
+                    excessesAddress = excessesAddress!!,
+                )
+            } else {
+                val fee = Fee(extra.value, extra.isRefund)
+                val rates = ratesRepository.getTONRates(currency)
+                val converted = rates.convertTON(fee.value)
+                val totalFees = consequences?.trace?.transaction?.totalFees ?: 0
+                SendFee.Ton(
+                    amount = fee,
+                    fiatAmount = converted,
+                    fiatCurrency = currency,
+                    // extra = consequences?.event?.extra ?: 0
+                    extra = totalFees
+                )
+            }
+        }
     }
 
     val nftCount: Int
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/EmulationUseCase.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/EmulationUseCase.kt
index 5ee168aab..4afb48ce4 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/EmulationUseCase.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/usecase/emulation/EmulationUseCase.kt
@@ -45,7 +45,6 @@ class EmulationUseCase(
                 emulateWithBattery(
                     message = message,
                     forceRelayer = forceRelayer,
-                    params = params
                 )
             } else {
                 emulate(message, params)
@@ -75,30 +74,26 @@ class EmulationUseCase(
     private suspend fun emulateWithBattery(
         message: MessageBodyEntity,
         forceRelayer: Boolean,
-        params: Boolean,
     ): Emulated {
-        try {
-            if (api.config.isBatteryDisabled) {
-                throw IllegalStateException("Battery is disabled")
-            }
-
-            val wallet = message.wallet
-            val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: throw IllegalStateException("Can't find TonProof token")
-            val boc = createMessage(message, true)
-
-            val (consequences, withBattery) = batteryRepository.emulate(
-                tonProofToken = tonProofToken,
-                publicKey = wallet.publicKey,
-                testnet = wallet.testnet,
-                boc = boc,
-                forceRelayer = forceRelayer,
-                safeModeEnabled = settingsRepository.isSafeModeEnabled(api)
-            ) ?: throw IllegalStateException("Failed to emulate battery")
-
-            return parseEmulated(wallet, consequences, TransferType.Battery)
-        } catch (e: Throwable) {
-            return emulate(message, params)
+        if (api.config.batterySendDisabled) {
+            throw IllegalStateException("Battery is disabled")
         }
+
+        val wallet = message.wallet
+        val tonProofToken = accountRepository.requestTonProofToken(wallet)
+            ?: throw IllegalStateException("Can't find TonProof token")
+        val boc = createMessage(message, true)
+
+        val (consequences, withBattery) = batteryRepository.emulate(
+            tonProofToken = tonProofToken,
+            publicKey = wallet.publicKey,
+            testnet = wallet.testnet,
+            boc = boc,
+            forceRelayer = forceRelayer,
+            safeModeEnabled = settingsRepository.isSafeModeEnabled(api)
+        ) ?: throw IllegalStateException("Failed to emulate battery")
+
+        return parseEmulated(wallet, consequences, TransferType.Battery)
     }
 
     private suspend fun emulate(message: MessageBodyEntity, params: Boolean): Emulated {
@@ -185,18 +180,22 @@ class EmulationUseCase(
         jettons: List<JettonQuantity>
     ): List<BalanceEntity> {
         val list = mutableListOf<BalanceEntity>()
-        list.add(BalanceEntity.create(
-            accountId = wallet.address,
-            value = Coins.of(tonValue),
-        ))
+        list.add(
+            BalanceEntity.create(
+                accountId = wallet.address,
+                value = Coins.of(tonValue),
+            )
+        )
         for (jettonQuantity in jettons) {
             val token = TokenEntity(jettonQuantity.jetton)
             val value = Coins.ofNano(jettonQuantity.quantity, token.decimals)
-            list.add(BalanceEntity(
-                token = token,
-                value = value,
-                walletAddress = jettonQuantity.walletAddress.address
-            ))
+            list.add(
+                BalanceEntity(
+                    token = token,
+                    value = value,
+                    walletAddress = jettonQuantity.walletAddress.address
+                )
+            )
         }
         return list.toList()
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/TransactionDetailView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/TransactionDetailView.kt
index 1841d7605..bd7f3eb40 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/TransactionDetailView.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/TransactionDetailView.kt
@@ -73,8 +73,8 @@ class TransactionDetailView @JvmOverloads constructor(
         inflate(context, R.layout.view_transaction_detail, this)
         setPaddingHorizontal(context.getDimensionPixelSize(uikit.R.dimen.offsetMedium))
         setPaddingVertical(context.getDimensionPixelSize(uikit.R.dimen.offsetMedium))
-        orientation = HORIZONTAL
         minimumHeight = context.getDimensionPixelSize(uikit.R.dimen.itemHeight)
+        orientation = HORIZONTAL
 
         titleView = findViewById(R.id.title)
         subtitleView = findViewById(R.id.subtitle)
diff --git a/apps/wallet/instance/app/src/main/res/drawable-nodpi/affluent.png b/apps/wallet/instance/app/src/main/res/drawable-nodpi/affluent.png
new file mode 100644
index 000000000..095dceaad
Binary files /dev/null and b/apps/wallet/instance/app/src/main/res/drawable-nodpi/affluent.png differ
diff --git a/apps/wallet/instance/app/src/main/res/drawable-nodpi/ethena.png b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ethena.png
new file mode 100644
index 000000000..7b3e55c44
Binary files /dev/null and b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ethena.png differ
diff --git a/apps/wallet/instance/app/src/main/res/drawable-nodpi/stonfi.png b/apps/wallet/instance/app/src/main/res/drawable-nodpi/stonfi.png
new file mode 100644
index 000000000..49fcdbec9
Binary files /dev/null and b/apps/wallet/instance/app/src/main/res/drawable-nodpi/stonfi.png differ
diff --git a/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_down_outline_28.xml b/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_down_outline_28.xml
new file mode 100644
index 000000000..5724cca1d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_down_outline_28.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M13,6V19.586L8.707,15.293C8.316,14.902 7.683,14.902 7.293,15.293C6.902,15.684 6.902,16.316 7.293,16.707L13.293,22.707L13.369,22.775C13.762,23.096 14.341,23.073 14.707,22.707L20.707,16.707L20.775,16.631C21.096,16.238 21.073,15.659 20.707,15.293C20.341,14.927 19.762,14.904 19.369,15.225L19.293,15.293L15,19.586V6C15,5.448 14.552,5 14,5C13.448,5 13,5.448 13,6Z"
+      android:fillColor="#ffffff"/>
+  <group>
+    <clip-path
+        android:pathData="M13,6V19.586L8.707,15.293C8.316,14.902 7.683,14.902 7.293,15.293C6.902,15.684 6.902,16.316 7.293,16.707L13.293,22.707L13.369,22.775C13.762,23.096 14.341,23.073 14.707,22.707L20.707,16.707L20.775,16.631C21.096,16.238 21.073,15.659 20.707,15.293C20.341,14.927 19.762,14.904 19.369,15.225L19.293,15.293L15,19.586V6C15,5.448 14.552,5 14,5C13.448,5 13,5.448 13,6Z"/>
+    <path
+        android:pathData="M13,19.586L12.293,20.293L14,22V19.586H13ZM8.707,15.293L8,16L8,16L8.707,15.293ZM7.293,15.293L8,16L8,16L7.293,15.293ZM7.293,16.707L8,16L8,16L7.293,16.707ZM13.293,22.707L12.586,23.414L12.605,23.433L12.625,23.451L13.293,22.707ZM13.369,22.775L12.701,23.52L12.719,23.535L12.737,23.55L13.369,22.775ZM14.707,22.707L14,22L14,22L14.707,22.707ZM20.707,16.707L21.414,17.414L21.433,17.395L21.451,17.375L20.707,16.707ZM20.775,16.631L21.52,17.299L21.535,17.281L21.55,17.263L20.775,16.631ZM20.707,15.293L20,16L20,16L20.707,15.293ZM19.369,15.225L18.737,14.45L18.719,14.465L18.701,14.48L19.369,15.225ZM19.293,15.293L18.625,14.549L18.605,14.567L18.586,14.586L19.293,15.293ZM15,19.586H14V22L15.707,20.293L15,19.586ZM13,6H12V19.586H13H14V6H13ZM13,19.586L13.707,18.879L9.414,14.586L8.707,15.293L8,16L12.293,20.293L13,19.586ZM8.707,15.293L9.414,14.586C8.633,13.805 7.367,13.805 6.586,14.586L7.293,15.293L8,16L8,16L8.707,15.293ZM7.293,15.293L6.586,14.586C5.805,15.367 5.805,16.633 6.586,17.414L7.293,16.707L8,16V16L7.293,15.293ZM7.293,16.707L6.586,17.414L12.586,23.414L13.293,22.707L14,22L8,16L7.293,16.707ZM13.293,22.707L12.625,23.451L12.701,23.52L13.369,22.775L14.037,22.031L13.961,21.963L13.293,22.707ZM13.369,22.775L12.737,23.55C13.523,24.191 14.681,24.147 15.414,23.414L14.707,22.707L14,22C13.998,22.001 13.999,22.001 14,22C14.001,22 14.001,22 14.001,22C14,22 13.999,22 14,22C14,22 14,22 14.001,22C14.001,22 14.001,22.001 14.001,22L13.369,22.775ZM14.707,22.707L15.414,23.414L21.414,17.414L20.707,16.707L20,16L14,22L14.707,22.707ZM20.707,16.707L21.451,17.375L21.52,17.299L20.775,16.631L20.031,15.963L19.963,16.039L20.707,16.707ZM20.775,16.631L21.55,17.263C22.191,16.477 22.147,15.319 21.414,14.586L20.707,15.293L20,16C20.001,16.001 20,16.001 20,16C20,15.999 20,15.999 20,15.999C20,16 20,16.001 20,16C20,16 20,16 20,15.999C20,15.999 20,15.999 20,15.999L20.775,16.631ZM20.707,15.293L21.414,14.586C20.681,13.853 19.523,13.809 18.737,14.45L19.369,15.225L20.001,16C20.001,15.999 20.001,16 20.001,16C20,16 20,16 20,16C19.999,16 20,16 20.001,16C20.001,16 20.001,16 20,16C19.999,15.999 19.999,15.999 20,16L20.707,15.293ZM19.369,15.225L18.701,14.48L18.625,14.549L19.293,15.293L19.961,16.037L20.037,15.969L19.369,15.225ZM19.293,15.293L18.586,14.586L14.293,18.879L15,19.586L15.707,20.293L20,16L19.293,15.293ZM15,19.586H16V6H15H14V19.586H15ZM15,6H16C16,4.895 15.104,4 14,4V5V6H15ZM14,5V4C12.895,4 12,4.895 12,6H13H14V5Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_up_outline_28.xml b/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_up_outline_28.xml
new file mode 100644
index 000000000..163429359
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/drawable/ic_arrow_up_outline_28.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="29dp"
+    android:height="28dp"
+    android:viewportWidth="29"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M13.5,22V8.414L9.207,12.707C8.816,13.097 8.183,13.097 7.793,12.707C7.402,12.316 7.402,11.683 7.793,11.293L13.793,5.293L13.869,5.224C14.262,4.904 14.841,4.927 15.207,5.293L21.207,11.293L21.275,11.369C21.596,11.762 21.573,12.341 21.207,12.707C20.841,13.073 20.262,13.095 19.869,12.775L19.793,12.707L15.5,8.414V22C15.5,22.552 15.052,23 14.5,23C13.948,23 13.5,22.552 13.5,22Z"
+      android:fillColor="#ffffff"/>
+  <group>
+    <clip-path
+        android:pathData="M13.5,22V8.414L9.207,12.707C8.816,13.097 8.183,13.097 7.793,12.707C7.402,12.316 7.402,11.683 7.793,11.293L13.793,5.293L13.869,5.224C14.262,4.904 14.841,4.927 15.207,5.293L21.207,11.293L21.275,11.369C21.596,11.762 21.573,12.341 21.207,12.707C20.841,13.073 20.262,13.095 19.869,12.775L19.793,12.707L15.5,8.414V22C15.5,22.552 15.052,23 14.5,23C13.948,23 13.5,22.552 13.5,22Z"/>
+    <path
+        android:pathData="M13.5,8.414H14.5V6L12.793,7.707L13.5,8.414ZM9.207,12.707L8.5,12L9.207,12.707ZM7.793,11.293L7.086,10.586L7.793,11.293ZM13.793,5.293L13.125,4.548L13.105,4.567L13.086,4.586L13.793,5.293ZM13.869,5.224L13.237,4.449L13.219,4.464L13.201,4.48L13.869,5.224ZM21.207,11.293L21.951,10.625L21.933,10.605L21.914,10.586L21.207,11.293ZM21.275,11.369L22.05,10.737L22.035,10.719L22.02,10.701L21.275,11.369ZM21.207,12.707L21.914,13.414L21.207,12.707ZM19.869,12.775L19.201,13.519L19.219,13.535L19.237,13.55L19.869,12.775ZM19.793,12.707L19.086,13.414L19.105,13.433L19.125,13.451L19.793,12.707ZM15.5,8.414L16.207,7.707L14.5,6V8.414H15.5ZM13.5,22H14.5V8.414H13.5H12.5V22H13.5ZM13.5,8.414L12.793,7.707L8.5,12L9.207,12.707L9.914,13.414L14.207,9.121L13.5,8.414ZM9.207,12.707L8.5,12H8.5L7.793,12.707L7.086,13.414C7.867,14.195 9.133,14.195 9.914,13.414L9.207,12.707ZM7.793,12.707L8.5,12V12L7.793,11.293L7.086,10.586C6.305,11.367 6.305,12.633 7.086,13.414L7.793,12.707ZM7.793,11.293L8.5,12L14.5,6L13.793,5.293L13.086,4.586L7.086,10.586L7.793,11.293ZM13.793,5.293L14.461,6.037L14.537,5.969L13.869,5.224L13.201,4.48L13.125,4.548L13.793,5.293ZM13.869,5.224L14.501,5.999C14.501,5.999 14.501,5.999 14.501,6C14.5,6 14.5,6 14.5,6C14.499,6 14.5,6 14.501,6C14.501,6 14.501,6 14.5,6C14.499,5.999 14.498,5.999 14.5,6L15.207,5.293L15.914,4.586C15.181,3.853 14.023,3.808 13.237,4.449L13.869,5.224ZM15.207,5.293L14.5,6L20.5,12L21.207,11.293L21.914,10.586L15.914,4.586L15.207,5.293ZM21.207,11.293L20.463,11.961L20.531,12.037L21.275,11.369L22.02,10.701L21.951,10.625L21.207,11.293ZM21.275,11.369L20.5,12.001C20.5,12.001 20.5,12.001 20.5,12C20.5,12 20.5,12 20.5,12C20.5,11.999 20.5,12 20.5,12C20.5,12.001 20.5,12.001 20.5,12C20.5,11.999 20.501,11.998 20.5,12L21.207,12.707L21.914,13.414C22.647,12.681 22.691,11.523 22.05,10.737L21.275,11.369ZM21.207,12.707L20.5,12C20.499,12.001 20.499,12 20.5,12C20.501,11.999 20.501,12 20.501,12C20.5,12 20.499,11.999 20.5,12C20.5,12 20.5,12 20.501,12C20.501,12 20.501,12 20.501,12L19.869,12.775L19.237,13.55C20.023,14.191 21.181,14.147 21.914,13.414L21.207,12.707ZM19.869,12.775L20.537,12.031L20.461,11.963L19.793,12.707L19.125,13.451L19.201,13.519L19.869,12.775ZM19.793,12.707L20.5,12L16.207,7.707L15.5,8.414L14.793,9.121L19.086,13.414L19.793,12.707ZM15.5,8.414H14.5V22H15.5H16.5V8.414H15.5ZM15.5,22H14.5V23V24C15.604,24 16.5,23.104 16.5,22H15.5ZM14.5,23V22H13.5H12.5C12.5,23.104 13.395,24 14.5,24V23Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/apps/wallet/instance/app/src/main/res/layout/dialog_dns_onsale.xml b/apps/wallet/instance/app/src/main/res/layout/dialog_dns_onsale.xml
new file mode 100644
index 000000000..991cfda8f
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/dialog_dns_onsale.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/offsetMedium"
+    android:id="@+id/container">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/close"
+        android:layout_width="@dimen/actionSize"
+        android:layout_height="@dimen/actionSize"
+        android:layout_gravity="end|center"
+        android:background="@drawable/bg_oval_button_secondary"
+        android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_close_16"
+        android:tint="?attr/buttonSecondaryForegroundColor" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="84dp"
+        android:layout_height="84dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_exclamationmark_circle_84"
+        android:tint="?attr/iconSecondaryColor" />
+
+    <uikit.widget.TextHeaderView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="@dimen/offsetMedium"
+        android:title="@string/dns_onsale_error_title"
+        android:description="@string/dns_onsale_error_desc"/>
+
+   <Button
+        android:id="@+id/ton"
+        style="@style/Widget.App.Button.Secondary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/offsetMedium"
+        android:text="@string/ok"
+        android:textAppearance="@style/TextAppearance.Label1" />
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/dialog_transaction.xml b/apps/wallet/instance/app/src/main/res/layout/dialog_transaction.xml
index a02445fea..3d2afd4f6 100644
--- a/apps/wallet/instance/app/src/main/res/layout/dialog_transaction.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/dialog_transaction.xml
@@ -212,10 +212,28 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <com.tonapps.tonkeeper.view.TransactionDetailView
+        <uikit.widget.ColumnLayout
             android:id="@+id/account_address"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:padding="@dimen/offsetMedium">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextAppearance.Body1"
+                android:textColor="?attr/textSecondaryColor"
+                android:text="@string/recipient_address"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textAppearance="@style/TextAppearance.Label1"
+                android:textColor="?attr/textPrimaryColor"
+                android:scrollbars="vertical" />
+
+        </uikit.widget.ColumnLayout>
 
         <com.tonapps.tonkeeper.view.TransactionDetailView
             android:id="@+id/fee"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_browser_main.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_browser_main.xml
index 093270f44..33e0bf180 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_browser_main.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_browser_main.xml
@@ -35,7 +35,8 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_gravity="center"
-            android:padding="6dp"/>
+            android:padding="6dp"
+            android:visibility="gone"/>
     </uikit.widget.RowLayout>
 
     <uikit.widget.SlideBetweenView
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml
index fb6575e2c..bd0f8fb39 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_dev.xml
@@ -36,6 +36,35 @@
                     android:textColor="?attr/textPrimaryColor"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
+                <uikit.widget.ColumnLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_content"
+                    android:layout_marginHorizontal="@dimen/offsetMedium"
+                    android:layout_marginBottom="@dimen/offsetMedium"
+                    android:padding="@dimen/offsetMedium">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/debug_country_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="?attr/textPrimaryColor"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+
+                    <androidx.appcompat.widget.AppCompatEditText
+                        android:id="@+id/debug_country_input"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:singleLine="true"
+                        android:maxLength="2"
+                        android:textAllCaps="true"
+                        android:hint="Country code"
+                        android:textColor="?attr/textPrimaryColor"
+                        android:textColorHint="?attr/textSecondaryColor"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
+
+                </uikit.widget.ColumnLayout>
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/icons"
                     android:layout_width="match_parent"
@@ -53,6 +82,23 @@
                     app:position="first"
                     android:text="Blur"/>
 
+                <uikit.widget.item.ItemSwitchView
+                    android:id="@+id/dns_all"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/offsetMedium"
+                    android:text="Enable DNS 366 days"
+                    app:position="middle"/>
+
+
+                <uikit.widget.item.ItemTextView
+                    android:id="@+id/copy_firebase_push"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/offsetMedium"
+                    android:text="Firebase push token"
+                    app:position="middle"/>
+
                 <uikit.widget.item.ItemSwitchView
                     android:id="@+id/ignore_system_font_size"
                     android:layout_width="match_parent"
@@ -109,6 +155,7 @@
                     android:text="Import mnemonic again from RN"
                     app:position="last"/>
 
+
             </uikit.widget.ColumnLayout>
 
         </androidx.core.widget.NestedScrollView>
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
index dd10a2e3b..2ff453cda 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_main_events_list.xml
@@ -45,6 +45,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
+            android:clipToPadding="false"
             android:paddingBottom="16dp"
             android:paddingHorizontal="@dimen/offsetMedium"/>
 
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_nft.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_nft.xml
index 6eaafd579..26b1a9671 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_nft.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_nft.xml
@@ -152,18 +152,24 @@
                 android:textAppearance="@style/TextAppearance.Label1"
                 android:text="@string/transfer"/>
 
-            <Button
-                style="@style/Widget.App.Button"
-                android:id="@+id/domain_link"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/transfer_disabled"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/offsetMedium"
                 android:layout_marginTop="@dimen/offsetMedium"
-                android:textAppearance="@style/TextAppearance.Label1"
-                android:text="@string/domain_link_button"/>
+                android:visibility="gone"
+                android:text="@string/nft_disabled_transfer"
+                android:textColor="?attr/textSecondaryColor"
+                android:textAppearance="@style/TextAppearance.Body2"/>
+
+            <uikit.widget.ColumnLayout
+                android:id="@+id/buttons_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
             <Button
-                style="@style/Widget.App.Button"
+                style="@style/Widget.App.Button.Secondary"
                 android:id="@+id/domain_renew"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -172,21 +178,15 @@
                 android:textAppearance="@style/TextAppearance.Label1"
                 android:text="@string/domain_renew_button"/>
 
-            <uikit.widget.ColumnLayout
-                android:id="@+id/buttons_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
-
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/transfer_disabled"
+                android:id="@+id/domain_expiration"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/offsetMedium"
-                android:layout_marginTop="@dimen/offsetMedium"
-                android:visibility="gone"
-                android:text="@string/nft_disabled_transfer"
+                android:layout_marginVertical="@dimen/offsetMedium"
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:gravity="center"
                 android:textColor="?attr/textSecondaryColor"
-                android:textAppearance="@style/TextAppearance.Body2"/>
+                android:visibility="gone"/>
 
             <uikit.widget.RowLayout
                 android:layout_width="match_parent"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_omniston.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston.xml
new file mode 100644
index 000000000..9035ad6b3
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <uikit.widget.ModalHeader
+        android:id="@+id/modal_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:ignoreSystemOffset="true"
+        android:text="@string/swap"/>
+
+    <uikit.widget.HeaderView
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:ignoreSystemOffset="true"
+        android:title="@string/confirm_swap"
+        android:icon="@drawable/ic_chevron_left_16"
+        android:action="@drawable/ic_close_16"
+        android:visibility="gone"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <uikit.widget.SlideBetweenView
+            android:id="@+id/slides"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <include
+                layout="@layout/fragment_omniston_inputs"/>
+            <include
+                layout="@layout/fragment_omniston_review"/>
+        </uikit.widget.SlideBetweenView>
+
+    </FrameLayout>
+
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_inputs.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_inputs.xml
new file mode 100644
index 000000000..3530277ba
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_inputs.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/offsetMedium">
+
+            <uikit.widget.ColumnLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
+                    android:id="@+id/send_input"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:title="@string/send"/>
+
+                <com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
+                    android:id="@+id/receive_input"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:title="@string/receive"
+                    app:valueScale="3"
+                    android:clickable="false"/>
+
+            </uikit.widget.ColumnLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/switch_button"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_swap_vertical_16"
+                android:scaleType="centerInside"
+                android:tint="?attr/iconPrimaryColor"
+                android:background="@drawable/bg_button_tertiary"/>
+
+        </FrameLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/price"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:gravity="center"
+            android:paddingHorizontal="12dp"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/price_reversed"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:paddingHorizontal="12dp"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+
+    </uikit.widget.ColumnLayout>
+
+    <FrameLayout
+        android:id="@+id/action_container"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/itemHeight"
+        android:layout_gravity="bottom"
+        android:layout_marginVertical="@dimen/offsetMedium">
+
+        <uikit.widget.LoadableButton
+            android:id="@+id/continue_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="@dimen/offsetMedium"
+            android:text="@string/continue_action"/>
+
+
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_review.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_review.xml
new file mode 100644
index 000000000..6e6b805f6
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_omniston_review.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    android:paddingHorizontal="@dimen/offsetMedium"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <uikit.widget.ColumnLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.tonapps.tonkeeper.ui.screen.onramp.main.view.ReviewInputView
+                    android:id="@+id/review_send"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:title="@string/send"/>
+
+                <com.tonapps.tonkeeper.ui.screen.onramp.main.view.ReviewInputView
+                    android:id="@+id/review_receive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_content_top"
+                    android:title="@string/receive"
+                    android:layout_marginTop="8dp"/>
+
+            </uikit.widget.ColumnLayout>
+            
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center|end"
+                android:layout_marginEnd="24dp"
+                android:background="@drawable/bg_oval_button_tertiary"
+                android:scaleType="centerInside"
+                android:tint="?attr/textPrimaryColor"
+                android:src="@drawable/ic_arrow_down_16"/>
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/edit"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/tertiaryHeight"
+                android:layout_gravity="center|end"
+                android:background="@drawable/bg_button_tertiary_18"
+                android:layout_marginEnd="24dp"
+                android:paddingVertical="6dp"
+                android:paddingHorizontal="14dp"
+                android:gravity="center"
+                android:visibility="gone"
+                android:textColor="?attr/textPrimaryColor"
+                android:text="@string/edit"
+                android:textAppearance="@style/TextAppearance.Label2"/>
+
+        </FrameLayout>
+
+        <uikit.widget.ColumnLayout
+            android:id="@+id/details_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:background="@drawable/bg_content_bottom">
+
+            <uikit.widget.DividerView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <uikit.widget.item.ItemLineView
+                android:id="@+id/details_rate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:name="@string/exchange_rate"/>
+
+            <uikit.widget.item.ItemLineView
+                android:id="@+id/details_fee"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:name="@string/fee"/>
+
+            <uikit.widget.item.ItemLineView
+                android:id="@+id/details_slippage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:name="@string/slippage"/>
+
+            <uikit.widget.item.ItemLineView
+                android:id="@+id/details_provider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:name="@string/provider"/>
+
+        </uikit.widget.ColumnLayout>
+
+    </uikit.widget.ColumnLayout>
+
+    <FrameLayout
+        android:id="@+id/bottom_review"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom">
+
+        <uikit.widget.ProcessTaskView
+            android:id="@+id/task"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginVertical="@dimen/offsetMedium"
+            android:visibility="gone"
+            app:successLabel="@string/done"
+            app:errorLabel="@string/error"/>
+
+        <uikit.widget.SlideActionView
+            android:id="@+id/slide_action"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="@dimen/offsetMedium"
+            android:text="@string/slide_to_confirm"
+            android:filterTouchesWhenObscured="true"/>
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp.xml
index ff63ddffe..df6190af6 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp.xml
@@ -4,28 +4,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <uikit.widget.HeaderView
+        android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <uikit.widget.HeaderView
-            android:id="@+id/header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:ignoreSystemOffset="true"
-            android:title="@string/buy_or_sell_dot"
-            android:icon="@drawable/ic_chevron_left_16"
-            android:action="@drawable/ic_close_16"/>
-
-        <com.tonapps.tonkeeper.ui.component.CountryFlagView
-            android:id="@+id/country"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginTop="@dimen/offsetMedium"
-            android:layout_marginStart="@dimen/offsetMedium"
-            android:padding="6dp"/>
-
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        app:ignoreSystemOffset="true"
+        android:title="@string/buy_or_sell_dot"
+        android:action="@drawable/ic_close_16"/>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -47,38 +32,68 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_margin="@dimen/offsetMedium">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/pair_not_available"
-                android:textAppearance="@style/TextAppearance.Body2"
-                android:textColor="?attr/textSecondaryColor"
+            
+            <View
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:visibility="gone"
-                android:text="@string/pair_not_available"/>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/provider_title"
-                android:textAppearance="@style/TextAppearance.Body2"
-                android:textColor="?attr/textTertiaryColor"
-                android:gravity="center"
-                android:visibility="gone"
-                android:drawableEnd="@drawable/ic_switch_16"
-                android:drawablePadding="2dp"
-                android:drawableTint="?attr/textSecondaryColor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
+                android:layout_height="32dp"
+                android:background="@drawable/bg_gradient"/>
 
-            <uikit.widget.LoadableButton
-                android:id="@+id/next_button"
+            <uikit.widget.ColumnLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/offsetMedium"
-                android:textAppearance="@style/TextAppearance.Label1"
-                android:enabled="false"
-                android:text="@string/continue_action"/>
+                android:background="?attr/backgroundPageColor">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/min_max"
+                    android:textAppearance="@style/TextAppearance.Body2"
+                    android:textColor="?attr/textSecondaryColor"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/offsetMedium"
+                    android:gravity="center"
+                    android:visibility="gone"/>
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/pair_not_available"
+                    android:textAppearance="@style/TextAppearance.Body2"
+                    android:textColor="?attr/textSecondaryColor"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/offsetMedium"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    android:text="@string/pair_not_available"/>
+
+                <FrameLayout
+                    android:id="@+id/provider_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/offsetMedium"
+                    android:visibility="gone">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/provider_title"
+                        android:textAppearance="@style/TextAppearance.Body2"
+                        android:textColor="?attr/textTertiaryColor"
+                        android:gravity="center"
+                        android:drawableEnd="@drawable/ic_switch_16"
+                        android:drawablePadding="4dp"
+                        android:drawableTint="?attr/textTertiaryColor"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"/>
+
+                </FrameLayout>
+
+                <uikit.widget.LoadableButton
+                    android:id="@+id/next_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearance.Label1"
+                    android:enabled="false"
+                    android:text="@string/continue_action"/>
+
+            </uikit.widget.ColumnLayout>
 
         </uikit.widget.ColumnLayout>
 
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_inputs.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_inputs.xml
index ebc523e30..8942ae507 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_inputs.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_inputs.xml
@@ -17,14 +17,15 @@
                 android:id="@+id/sell_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:title="@string/sell"/>
+                android:title="@string/send"/>
 
             <com.tonapps.tonkeeper.ui.screen.onramp.main.view.CurrencyInputView
                 android:id="@+id/buy_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:title="@string/buy"/>
+                android:title="@string/receive"
+                app:valueScale="3"/>
 
         </uikit.widget.ColumnLayout>
 
@@ -35,17 +36,32 @@
             android:layout_gravity="center"
             android:src="@drawable/ic_swap_vertical_16"
             android:scaleType="centerInside"
+            android:tint="?attr/iconPrimaryColor"
             android:background="@drawable/bg_button_tertiary"/>
 
     </FrameLayout>
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/price"
+    <uikit.widget.ColumnLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:padding="12dp"
-        android:textAppearance="@style/TextAppearance.Body2"
-        android:textColor="?attr/textSecondaryColor"/>
+        android:padding="12dp">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/price"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/price_reversed"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+
+    </uikit.widget.ColumnLayout>
 
 </uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_picker.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_picker.xml
index 8816c3362..dcf97d1bb 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_picker.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_picker.xml
@@ -5,10 +5,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <uikit.widget.ModalHeader
+        android:id="@+id/modal_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:ignoreSystemOffset="true"
+        android:text="@string/choose_token"/>
+
+    <uikit.widget.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:ignoreSystemOffset="true"/>
+        app:ignoreSystemOffset="true"
+        android:icon="@drawable/ic_chevron_left_16"
+        android:action="@drawable/ic_close_16"
+        android:visibility="gone"/>
 
     <uikit.widget.SearchInput
         android:id="@+id/search"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_review.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_review.xml
index 873139e75..abc172176 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_review.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_onramp_review.xml
@@ -2,6 +2,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/confirm_page"
+    android:paddingBottom="32dp"
     android:visibility="gone"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
@@ -63,42 +65,12 @@
                 android:textAppearance="@style/TextAppearance.Label1"
                 android:textColor="?attr/textPrimaryColor"
                 android:text="@string/payment_method"/>
-
-            <com.tonapps.tonkeeper.ui.component.PaymentTypeView
-                android:id="@+id/payment_cards"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:title="@string/credit_card"
-                android:subtitle="@string/credit_card_subtitle"
-                android:icon="@drawable/ic_payment_method_card"
-                android:tag="card"/>
-
-            <com.tonapps.tonkeeper.ui.component.PaymentTypeView
-                android:id="@+id/payment_google_pay"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:title="@string/google_pay"
-                android:tag="google_pay"
-                android:icon="@drawable/google_pay"/>
-
-            <com.tonapps.tonkeeper.ui.component.PaymentTypeView
-                android:id="@+id/payment_revolut"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:title="@string/revolut"
-                android:tag="revolut_pay"
-                android:icon="@drawable/revolut"/>
-
-            <com.tonapps.tonkeeper.ui.component.PaymentTypeView
-                android:id="@+id/payment_paypal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:title="@string/paypal"
-                android:tag="paypal"
-                android:icon="@drawable/paypal"/>
-
         </uikit.widget.ColumnLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="116dp"/>
+
     </uikit.widget.ColumnLayout>
 
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_purchase_confirm.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_purchase_confirm.xml
index a4c2bb7d8..63fc970cb 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_purchase_confirm.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_purchase_confirm.xml
@@ -29,46 +29,55 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/offsetMedium"
-            android:textAppearance="@style/TextAppearance.H3"
+            android:textAppearance="@style/TextAppearance.H2"
             android:textColor="?attr/textPrimaryColor"
             android:gravity="center_horizontal"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/subtitle"
+            android:id="@+id/info"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginTop="@dimen/offsetExtraSmall"
+            android:layout_marginHorizontal="@dimen/offsetMedium"
+            android:gravity="center"
             android:textAppearance="@style/TextAppearance.Body1"
-            android:textColor="?attr/textSecondaryColor"
+            android:textColor="?attr/textTertiaryColor"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/offsetExtraSmall"
+            android:visibility="gone"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textPrimaryColor"
             android:gravity="center_horizontal"/>
 
-        <uikit.widget.ColumnLayout
+        <uikit.widget.RowLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/offsetMedium"
             android:background="@drawable/bg_content"
-            android:orientation="vertical"
             android:padding="@dimen/offsetMedium">
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:text="@string/fiat_open_description"
-                android:textAppearance="@style/TextAppearance.Body1"
-                android:textColor="?attr/textPrimaryColor"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textPrimaryColor" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:src="@drawable/ic_exclamationmark_circle_16"
+                android:tint="?attr/textSecondaryColor"/>
 
-            <uikit.widget.RowLayout
-                android:id="@+id/info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/offsetExtraSmall"
-                android:orientation="horizontal"/>
 
-        </uikit.widget.ColumnLayout>
+        </uikit.widget.RowLayout>
 
         <Button
             style="@style/Widget.App.Button"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_send_review.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_send_review.xml
index 95ba90505..a4b6f55ba 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_send_review.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_send_review.xml
@@ -87,11 +87,29 @@
                     android:layout_height="wrap_content"
                     android:title="@string/recipient" />
 
-                <com.tonapps.tonkeeper.view.TransactionDetailView
+                <uikit.widget.ColumnLayout
                     android:id="@+id/review_recipient_address"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:title="@string/recipient_address" />
+                    android:paddingHorizontal="@dimen/offsetMedium">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@style/TextAppearance.Body1"
+                        android:textColor="?attr/textSecondaryColor"
+                        android:text="@string/recipient_address"/>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:textAppearance="@style/TextAppearance.Label1"
+                        android:textColor="?attr/textPrimaryColor"
+                        android:scrollbars="vertical" />
+
+                </uikit.widget.ColumnLayout>
+
 
                 <com.tonapps.tonkeeper.view.TransactionDetailView
                     android:id="@+id/review_amount"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_send_transaction.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_send_transaction.xml
index ead40c8fc..85b49ca48 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_send_transaction.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_send_transaction.xml
@@ -114,7 +114,7 @@
     <FrameLayout
         android:id="@+id/action"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="106dp"
         android:paddingHorizontal="@dimen/offsetMedium">
 
         <uikit.widget.ColumnLayout
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_stake_details.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_stake_details.xml
index 396942019..df2c07483 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_stake_details.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_stake_details.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <uikit.widget.HeaderView
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:ignoreSystemOffset="true"
+        android:action="@drawable/ic_close_16"
         android:icon="@drawable/ic_chevron_left_16"
-        android:action="@drawable/ic_close_16"/>
+        app:ignoreSystemOffset="true" />
 
     <uikit.widget.ColumnLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/offsetMedium"
-        android:layout_marginTop="@dimen/barHeight">
+        android:layout_marginTop="@dimen/barHeight"
+        android:padding="@dimen/offsetMedium">
 
         <uikit.widget.ColumnLayout
+            android:id="@+id/details_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/bg_content"
@@ -34,14 +35,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:text="@string/staking_apy"
                     android:textAppearance="@style/TextAppearance.Body2"
-                    android:textColor="?attr/textSecondaryColor"
-                    android:text="@string/staking_apy"/>
+                    android:textColor="?attr/textSecondaryColor" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/pool_apy"
@@ -49,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:textAppearance="@style/TextAppearance.Body2"
-                    android:textColor="?attr/textPrimaryColor"/>
+                    android:textColor="?attr/textPrimaryColor" />
             </uikit.widget.RowLayout>
 
 
@@ -61,14 +62,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
+                    android:text="@string/staking_minimal_deposit"
                     android:textAppearance="@style/TextAppearance.Body2"
-                    android:textColor="?attr/textSecondaryColor"
-                    android:text="@string/staking_minimal_deposit"/>
+                    android:textColor="?attr/textSecondaryColor" />
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/pool_min_deposit"
@@ -76,18 +77,19 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:textAppearance="@style/TextAppearance.Body2"
-                    android:textColor="?attr/textPrimaryColor"/>
+                    android:textColor="?attr/textPrimaryColor" />
             </uikit.widget.RowLayout>
 
         </uikit.widget.ColumnLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/staking_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
+            android:text="@string/staking_details_description"
             android:textAppearance="@style/TextAppearance.Body3"
-            android:textColor="?attr/textTertiaryColor"
-            android:text="@string/staking_details_description"/>
+            android:textColor="?attr/textTertiaryColor" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
@@ -96,27 +98,27 @@
             android:gravity="center_vertical"
             android:text="@string/staking_links"
             android:textAppearance="@style/TextAppearance.H3"
-            android:textColor="?attr/textPrimaryColor"/>
+            android:textColor="?attr/textPrimaryColor" />
 
         <uikit.widget.FlexboxWithGapLayout
             android:id="@+id/links"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:gapVertical="8dp"
-            app:gapHorizontal="8dp"
             app:flexDirection="row"
             app:flexWrap="wrap"
-            app:layout_flexGrow="1"/>
+            app:gapHorizontal="8dp"
+            app:gapVertical="8dp"
+            app:layout_flexGrow="1" />
 
     </uikit.widget.ColumnLayout>
 
     <Button
-        style="@style/Widget.App.Button"
         android:id="@+id/choose_button"
+        style="@style/Widget.App.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:layout_margin="@dimen/offsetMedium"
-        android:textAppearance="@style/TextAppearance.Label1"
-        android:text="@string/staking_choose"/>
+        android:text="@string/staking_choose"
+        android:textAppearance="@style/TextAppearance.Label1" />
 </FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_swap_picker.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_swap_picker.xml
new file mode 100644
index 000000000..c392c8824
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_swap_picker.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <uikit.widget.ModalHeader
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:ignoreSystemOffset="true"
+        android:text="@string/choose_token"/>
+
+    <uikit.widget.SearchInput
+        android:id="@+id/search"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/offsetMedium"
+        android:hint="@string/search"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <uikit.widget.SimpleRecyclerView
+            android:id="@+id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/offsetMedium"
+            android:paddingBottom="@dimen/offsetMedium"/>
+
+        <uikit.widget.LoaderView
+            android:id="@+id/loader"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/offsetMedium"
+            android:gravity="center"
+            android:visibility="gone"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"
+            android:text="@string/currency_not_found"/>
+
+    </FrameLayout>
+
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_about_usde.xml b/apps/wallet/instance/app/src/main/res/layout/view_about_usde.xml
new file mode 100644
index 000000000..3feea0c34
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_about_usde.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/offsetMedium">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_content"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="12dp">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/about_usde"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+    </uikit.widget.ColumnLayout>
+
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_battery_restore_iap.xml b/apps/wallet/instance/app/src/main/res/layout/view_battery_restore_iap.xml
index 37709411a..5011b4602 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_battery_restore_iap.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_battery_restore_iap.xml
@@ -10,6 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:layout_gravity="center"
         android:textAppearance="@style/TextAppearance.Body2"
         android:textColor="?attr/textTertiaryColor" />
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_cell_jetton.xml b/apps/wallet/instance/app/src/main/res/layout/view_cell_jetton.xml
index 5f29f1ad7..a4f394d25 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_cell_jetton.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_cell_jetton.xml
@@ -3,10 +3,10 @@
     xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="76dp"
-    android:orientation="horizontal"
-    android:paddingHorizontal="@dimen/offsetMedium"
     android:clipChildren="false"
-    android:clipToPadding="false">
+    android:clipToPadding="false"
+    android:orientation="horizontal"
+    android:paddingHorizontal="@dimen/offsetMedium">
 
     <FrameLayout
         android:layout_width="44dp"
@@ -63,6 +63,7 @@
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/balance_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -92,4 +93,16 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
+    <Button
+        android:id="@+id/button_open"
+        style="@style/Widget.App.Button.Small.Tertiary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:paddingVertical="0dp"
+        android:text="@string/open"
+        android:textAppearance="@style/TextAppearance.Label2"
+        android:textColor="?attr/textPrimaryColor"
+        android:visibility="gone" />
+
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_collectibles.xml b/apps/wallet/instance/app/src/main/res/layout/view_collectibles.xml
index 2adac1b65..de105590a 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_collectibles.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_collectibles.xml
@@ -27,6 +27,16 @@
             android:scaleType="centerInside"
             android:src="@drawable/ic_sale_badge_16"/>
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/fire_badge"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_margin="8dp"
+            android:layout_gravity="end|bottom"
+            android:scaleType="centerInside"
+            android:tint="?attr/accentRedColor"
+            android:src="@drawable/ic_fire_badge_16"/>
+
     </uikit.widget.SquareFrameLayout>
 
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_currency_input.xml b/apps/wallet/instance/app/src/main/res/layout/view_currency_input.xml
index 835095512..8d1a8f52b 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_currency_input.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_currency_input.xml
@@ -38,6 +38,7 @@
     </uikit.widget.RowLayout>
 
     <uikit.widget.RowLayout
+        android:id="@+id/input_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="8dp">
@@ -52,28 +53,59 @@
             android:textSize="28sp"
             android:visibility="gone"/>
 
-        <com.tonapps.tonkeeper.ui.component.coin.CoinEditText
-            android:id="@+id/input_value"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@null"
-            android:singleLine="true"
-            android:digits="0123456789.,"
-            android:maxLength="9"
-            android:inputType="numberDecimal|textNoSuggestions"
-            android:textCursorDrawable="@drawable/cursor"
-            android:textColor="?attr/textPrimaryColor"
-            android:textColorHint="?attr/textSecondaryColor"
-            android:textSize="28sp"
-            android:fontFamily="@font/montserrat_semi_bold"
-            android:hint="0"/>
+            android:layout_weight="1">
+
+            <com.tonapps.tonkeeper.ui.component.coin.CoinEditText
+                android:id="@+id/input_value"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:singleLine="true"
+                android:digits="0123456789.,"
+                android:maxLength="9"
+                android:inputType="numberDecimal|textNoSuggestions"
+                android:textCursorDrawable="@drawable/cursor"
+                android:textColor="?attr/textPrimaryColor"
+                android:textColorHint="?attr/textSecondaryColor"
+                android:textSize="28sp"
+                android:fontFamily="@font/montserrat_semi_bold"
+                android:hint="0"/>
+
+            <view class="uikit.widget.SlideActionView$GradientTextView"
+                android:id="@+id/placeholder_value"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingTop="2dp"
+                android:visibility="gone"
+                android:textColor="?attr/textPrimaryColor"
+                android:textColorHint="?attr/textSecondaryColor"
+                android:textSize="28sp"
+                android:fontFamily="@font/montserrat_semi_bold"/>
+
+        </FrameLayout>
 
         <com.tonapps.tonkeeper.ui.component.token.CurrencyPickerView
             android:id="@+id/input_currency"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/input_currency_empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingHorizontal="@dimen/offsetMedium"
+            android:paddingVertical="8dp"
+            android:background="@drawable/bg_button_tertiary_18"
+            android:visibility="gone"
+            android:textAllCaps="true"
+            android:textColor="?attr/textPrimaryColor"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:gravity="center"
+            android:text="@string/staking_choose"/>
+
     </uikit.widget.RowLayout>
 
 </merge>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_currency_item.xml b/apps/wallet/instance/app/src/main/res/layout/view_currency_item.xml
index 263ff5eaf..23b149257 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_currency_item.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_currency_item.xml
@@ -82,7 +82,7 @@
         android:layout_height="16dp"
         android:layout_gravity="center"
         android:src="@drawable/ic_chevron_right_16"
-        android:tint="?attr/iconSecondaryColor"
+        android:tint="?attr/iconTertiaryColor"
         android:scaleType="centerInside"/>
 
 </uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_domain_renew.xml b/apps/wallet/instance/app/src/main/res/layout/view_domain_renew.xml
new file mode 100644
index 000000000..6802ecabe
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_domain_renew.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="76dp"
+    android:paddingHorizontal="@dimen/offsetMedium">
+    
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center">
+        
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor"/>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/details"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"/>
+        
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_gravity="center"
+        android:tint="?attr/iconSecondaryColor"
+        android:src="@drawable/ic_chevron_right_16"/>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_ethena_balance.xml b/apps/wallet/instance/app/src/main/res/layout/view_ethena_balance.xml
new file mode 100644
index 000000000..48fad85f3
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_ethena_balance.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:minHeight="76dp"
+    android:orientation="horizontal"
+    android:layout_marginHorizontal="@dimen/offsetMedium"
+    android:padding="@dimen/offsetMedium">
+
+    <FrameLayout
+        android:layout_width="44dp"
+        android:layout_height="44dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/currency_icon"
+            android:layout_width="44dp"
+            android:layout_height="44dp"
+            android:src="@drawable/ic_udse_ethena_with_bg" />
+
+        <uikit.widget.FrescoView
+            android:id="@+id/icon"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_gravity="end|bottom"
+            android:translationX="6dp"
+            android:translationY="6dp"
+            android:scaleType="centerCrop"
+            fresco:roundAsCircle="true"
+            fresco:roundingBorderColor="?attr/backgroundContentColor"
+            fresco:roundingBorderPadding="1dp"
+            fresco:roundingBorderWidth="2dp" />
+    </FrameLayout>
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="14dp"
+        android:layout_weight="1">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/apy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/balance_fiat"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginTop="2dp"
+            android:gravity="end"
+            android:maxLength="12"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/balance"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="end"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_ethena_details.xml b/apps/wallet/instance/app/src/main/res/layout/view_ethena_details.xml
new file mode 100644
index 000000000..bbc40341e
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_ethena_details.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.ColumnLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_content">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <uikit.widget.RowLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/apy_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textAppearance="@style/TextAppearance.Label1"
+                android:textColor="?attr/textPrimaryColor" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/apy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textAppearance="@style/TextAppearance.Label1"
+                android:textColor="?attr/textPrimaryColor" />
+        </uikit.widget.RowLayout>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/apy_subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </uikit.widget.ColumnLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginLeft="16dp"
+        android:background="?attr/separatorCommonColor" />
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/bonus_apy_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/bonus_apy_subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+        <uikit.widget.RowLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/faq"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/faq"
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textAccentColor" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text=" · "
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textSecondaryColor" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/check_eligibility"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ethena_check_eligibility"
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textAccentColor" />
+        </uikit.widget.RowLayout>
+
+    </uikit.widget.ColumnLayout>
+
+
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_ethena_method.xml b/apps/wallet/instance/app/src/main/res/layout/view_ethena_method.xml
new file mode 100644
index 000000000..773b73e93
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_ethena_method.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="@dimen/offsetMedium"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:minHeight="76dp"
+    android:orientation="horizontal"
+    android:padding="@dimen/offsetMedium">
+
+    <uikit.widget.FrescoView
+        android:id="@+id/icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        fresco:placeholderImage="@drawable/bg_content_tint_16"
+        fresco:roundedCornerRadius="@dimen/cornerSmall"/>
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="14dp"
+        android:layout_weight="1">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/apy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/button_open"
+            style="@style/Widget.App.Button.Small.Tertiary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:paddingVertical="0dp"
+            android:text="@string/open"
+            android:textAppearance="@style/TextAppearance.Label2"
+            android:textColor="?attr/textPrimaryColor" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_history_empty.xml b/apps/wallet/instance/app/src/main/res/layout/view_history_empty.xml
index 545576896..ae30accee 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_history_empty.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_history_empty.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:gravity="center"
+        android:paddingVertical="56dp"
         android:textAppearance="@style/TextAppearance.Body1"
         android:textColor="?attr/textTertiaryColor"/>
 
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_list_title.xml b/apps/wallet/instance/app/src/main/res/layout/view_list_title.xml
new file mode 100644
index 000000000..b0c6971f2
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_list_title.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:layout_marginHorizontal="@dimen/offsetMedium">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center"
+        android:textAppearance="@style/TextAppearance.Label1"
+        android:textColor="?attr/textPrimaryColor"/>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_payment_type.xml b/apps/wallet/instance/app/src/main/res/layout/view_payment_type.xml
index 5eb180767..d0f73d666 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_payment_type.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_payment_type.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatImageView
+    <uikit.widget.FrescoView
         android:id="@+id/icon"
         android:layout_width="36dp"
         android:layout_height="36dp"
@@ -39,6 +40,7 @@
         android:id="@+id/check"
         android:layout_width="28dp"
         android:layout_height="28dp"
+        android:layout_gravity="center"
         android:src="@drawable/ic_donemark_otline_28"
         android:tint="?attr/accentBlueColor"
         android:scaleType="centerInside"/>
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_purchase_method.xml b/apps/wallet/instance/app/src/main/res/layout/view_purchase_method.xml
index 32b9132c2..c8068dacd 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_purchase_method.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_purchase_method.xml
@@ -34,6 +34,15 @@
             android:textAppearance="@style/TextAppearance.Body2"
             android:textColor="?attr/textSecondaryColor"/>
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/min"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/offsetExtraExtraSmall"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/accentOrangeColor"/>
+
+
     </uikit.widget.ColumnLayout>
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_staking_description.xml b/apps/wallet/instance/app/src/main/res/layout/view_staking_description.xml
index ab2ac87ce..6416304ff 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_staking_description.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_staking_description.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="12dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/text"
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_token_actions.xml b/apps/wallet/instance/app/src/main/res/layout/view_token_actions.xml
index 0c7f9f202..f5608b0e5 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_token_actions.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_token_actions.xml
@@ -14,23 +14,16 @@
             android:id="@+id/send"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:icon="@drawable/ic_arrow_up_28"
+            android:icon="@drawable/ic_arrow_up_outline_28"
             android:title="@string/send"/>
 
         <uikit.widget.IconButtonView
             android:id="@+id/receive"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:icon="@drawable/ic_arrow_down_28"
+            android:icon="@drawable/ic_arrow_down_outline_28"
             android:title="@string/receive"/>
 
-        <uikit.widget.IconButtonView
-            android:id="@+id/stake"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:icon="@drawable/ic_staking_outline_28"
-            android:title="@string/stake"/>
-
         <uikit.widget.IconButtonView
             android:id="@+id/swap"
             android:layout_width="wrap_content"
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_transaction_detail.xml b/apps/wallet/instance/app/src/main/res/layout/view_transaction_detail.xml
index 4396d2c99..2124a475f 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_transaction_detail.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_transaction_detail.xml
@@ -11,6 +11,7 @@
             android:orientation="vertical">
 
             <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/values_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_wallet_renew_domains.xml b/apps/wallet/instance/app/src/main/res/layout/view_wallet_renew_domains.xml
new file mode 100644
index 000000000..85bc3bca1
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_wallet_renew_domains.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.RowLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_content_tint"
+    android:padding="@dimen/offsetMedium"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:src="@drawable/ic_globe_28"
+        android:background="@drawable/bg_oval"
+        android:scaleType="centerInside"
+        android:tint="?attr/textPrimaryColor"
+        android:backgroundTint="?attr/backgroundContentAttentionColor"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center"
+        android:paddingHorizontal="@dimen/offsetMedium"
+        android:breakStrategy="high_quality"
+        android:textAppearance="@style/TextAppearance.Body2"
+        android:textColor="?attr/textPrimaryColor"/>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_gravity="center"
+        android:tint="?attr/iconSecondaryColor"
+        android:src="@drawable/ic_chevron_right_16"/>
+
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/values/styleable.xml b/apps/wallet/instance/app/src/main/res/values/styleable.xml
index bce40dcd2..8e83e967d 100644
--- a/apps/wallet/instance/app/src/main/res/values/styleable.xml
+++ b/apps/wallet/instance/app/src/main/res/values/styleable.xml
@@ -10,6 +10,9 @@
 
     <declare-styleable name="CurrencyInputView">
         <attr name="android:title" format="string|reference"/>
+        <attr name="disableInput" format="boolean"/>
+        <attr name="android:gravity" format="integer"/>
+        <attr name="valueScale" format="integer"/>
     </declare-styleable>
 
     <declare-styleable name="ReviewInputView">
@@ -23,6 +26,7 @@
     <declare-styleable name="TransactionDetailView">
         <attr name="position"/>
         <attr name="android:title" format="string|reference"/>
+        <attr name="android:orientation" format="integer"/>
     </declare-styleable>
 
     <declare-styleable name="BatteryView">
diff --git a/apps/wallet/instance/main/build.gradle.kts b/apps/wallet/instance/main/build.gradle.kts
index 533b73332..7dd51ba93 100644
--- a/apps/wallet/instance/main/build.gradle.kts
+++ b/apps/wallet/instance/main/build.gradle.kts
@@ -22,10 +22,10 @@ android {
     defaultConfig {
         applicationId = "com.ton_keeper"
         minSdk = Build.minSdkVersion
-        targetSdk = 35
+        targetSdk = Build.compileSdkVersion
         versionCode = 600
 
-        versionName = "5.1.6" // Format is "major.minor.patch" (e.g. "1.0.0") and only numbers are allowed
+        versionName = "5.4" // Format is "major.minor.patch" (e.g. "1.0.0") and only numbers are allowed
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -102,7 +102,7 @@ baselineProfile {
 
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
-    implementation(project(Dependence.Wallet.app))
+    implementation(project(ProjectModules.Wallet.app))
 
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test:core:1.6.1")
diff --git a/apps/wallet/instance/main/default/release/baselineProfiles/0/main-default-release.dm b/apps/wallet/instance/main/default/release/baselineProfiles/0/main-default-release.dm
new file mode 100644
index 000000000..feea359f4
Binary files /dev/null and b/apps/wallet/instance/main/default/release/baselineProfiles/0/main-default-release.dm differ
diff --git a/apps/wallet/instance/main/default/release/baselineProfiles/1/main-default-release.dm b/apps/wallet/instance/main/default/release/baselineProfiles/1/main-default-release.dm
new file mode 100644
index 000000000..85f61bf2c
Binary files /dev/null and b/apps/wallet/instance/main/default/release/baselineProfiles/1/main-default-release.dm differ
diff --git a/apps/wallet/instance/main/default/release/output-metadata.json b/apps/wallet/instance/main/default/release/output-metadata.json
new file mode 100644
index 000000000..d65414d6e
--- /dev/null
+++ b/apps/wallet/instance/main/default/release/output-metadata.json
@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.ton_keeper",
+  "variantName": "defaultRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 600,
+      "versionName": "5.3.0",
+      "outputFile": "main-default-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/main-default-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/main-default-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 24
+}
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-bg/strings.xml b/apps/wallet/localization/src/main/res/values-bg/strings.xml
index 62a6d6ee7..c67a5ef6b 100644
--- a/apps/wallet/localization/src/main/res/values-bg/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-bg/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s ще бъде изтеглен след %2$s</string>
     <string name="edit_full">Редактиране</string>
     <string name="safe_mode_tonconnect_description">Можете да промените това в настройките за сигурност на портфейла си.</string>
+    <string name="renew_dns_done">Домейнът е удължен за 1 година</string>
     <string name="staking_unstake_cycle">Заявката за премахване на залагане ще бъде обработена след края на цикъла на валидиране в %1$s</string>
     <string name="send_transaction_scroll">Проверете всички подробности, за да потвърдите</string>
     <string name="send_transaction_detail">Общата стойност на токените, които ще бъдат изпратени от вашия портфейл. Възстановяванията не са включени в общата стойност.</string>
@@ -92,7 +93,6 @@
     <string name="staking_minimum_deposit">Минимален депозит %1$s.</string>
     <string name="staking_options">Опции</string>
     <string name="gasless_switch_label">Докоснете, за да платите в %1$s</string>
-    <string name="change_fee_method">Промяна на метода на плащане</string>
     <string name="battery_disclaimer">Едно таксуване покрива средната такса за транзакция. Някои транзакции може да струват повече.</string>
     <string name="restore_purchases">Възстановяване на покупките</string>
     <string name="battery_refilled">Заредена батерия</string>
@@ -189,6 +189,7 @@
     <string name="unsubscribed">Отписано</string>
     <string name="subscribed">Абонирано</string>
     <string name="received">Получено</string>
+    <string name="on_sale">В ПРОМОЦИЯ</string>
     <string name="nft_transfer">Трансфер на NFT</string>
     <string name="nft_disabled_transfer">NFT в момента е на продажба в пазара. За трансфер, трябва първо да го премахнете от продажба.</string>
 
@@ -214,6 +215,7 @@
     <string name="yesterday">Вчера</string>
     <string name="collectibles">Колекционерски предмети</string>
     <string name="purchases">Покупки</string>
+    <string name="enter_amount">Въведете сума</string>
     <string name="call_contract">Повикване на договор</string>
     <string name="contract_address">Адрес на договора</string>
     <string name="about_collection">За колекцията</string>
@@ -394,6 +396,7 @@
     <string name="logout_confirmation">Имам резервно копие на възстановителната фраза</string>
     <string name="last_updated">Актуализиран %1$s</string>
     <string name="back_up_now">Направете резервно копие сега</string>
+    <string name="confirm_swap">Потвърждаване на размяната</string>
     <string name="max">Макс</string>
     <string name="confirm_and_send">Потвърди и изпрати</string>
     <string name="confirm_action">Потвърдете действие</string>
@@ -418,7 +421,7 @@
     <string name="system">Система</string>
     <string name="network_fee">Мрежова такса</string>
     <string name="confirm">Потвърдете</string>
-    <string name="send_request_comment">Трябва да включите бележка от обмена за трансфер. Без нея средствата ви ще бъдат загубени.</string>
+    <string name="send_request_comment">При изпращане не забравяйте да включите бележката или тагa от борсата. Без него средствата няма да бъдат депозирани и може да бъдат загубени.</string>
     <string name="banner_top">В момента използвате експериментална версия на Tonkeeper.</string>
     <string name="banner_top_button">Инсталирайте стабилната версия</string>
     <string name="signer_description">Отворете Signer » Изберете необходимия ключ » Сканирайте QR код</string>
@@ -498,7 +501,6 @@
         <item quantity="one">≈ %1$s заряд за %2$s</item>
         <item quantity="other">≈ %1$s заряда за %2$s</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Ще бъде платено с батерията</string>
     <string name="battery_settings_title">Настройки на батерията</string>
     <string name="battery_settings_subtitle">Избраните транзакции ще бъдат платени с батерията Tonkeeper.</string>
     <string name="battery_recharge_title">Презареждане</string>
@@ -529,6 +531,7 @@
     <string name="name">Име</string>
     <string name="ledger_blind_signing_error">Сляпото подписване трябва да е активирано в Настройки на Ledger</string>
     <string name="nothing_to_restore">Нищо за възстановяване</string>
+    <string name="purchase">Покупка</string>
     <string name="new_contact">Нов адрес</string>
     <string name="contact_delete_dialog">Сигурни ли сте, че искате да изтриете „%1$s“ от вашата адресна книга?</string>
     <string name="add_to_contact">Добавяне към адресната книга</string>
@@ -556,6 +559,7 @@
     <string name="stories_safemode_2_subtitle">За да избегнете спам и фалшиви артикули.</string>
     <string name="stories_safemode_3_title">Само проверени токени</string>
     <string name="tx_marked_as_spam">Транзакцията е маркирана като спам</string>
+    <string name="exchange_rate">Валутен курс</string>
     <string name="address_prefix">Адрес:</string>
     <string name="your_address">Вашият адрес:</string>
     <string name="safe_mode_tokens_footer">Безопасният режим е активиран. Налични са само потвърдени токени. <annotation colorAttr="textAccentColor">Настройки</annotation></string>
@@ -626,9 +630,28 @@
     <string name="credit_card_subtitle">Visa или Mastercard</string>
     <string name="currency_not_found">Валутата не е намерена</string>
     <string name="onrmap_provider_description">Други доставчици са налични за различни валутни двойки.</string>
+    <string name="min_amount">Мин. сума: %1$s</string>
     <string name="stake_ethena_description">Токенът tsUSDe представлява USDe, държан чрез Ethena, децентрализирана услуга за стейкинг. tsUSDe автоматично натрупва награди за стейкинг, с минимално заключване.</string>
     <string name="support_title">Нуждаете се от помощ?</string>
     <string name="support_subtitle">Пишете ни в Telegram — ще направим всичко възможно да помогнем.</string>
     <string name="ask_question">Задайте въпрос</string>
+    <string name="renew_dns_title">Изтичащи домейни</string>
+    <string name="renew_dns_expires">Изтича след %1$d дни</string>
+    <string name="wallet_renew_dns">Имате %1$d изтичащи домейна. Подновете всички до %2$s.</string>
+    <string name="renew_dns_until">Подновяване на всички до %1$s</string>
+    <string name="renew_signel_dns_until">Подновяване до %1$s</string>
+    <string name="renew_dns_all">Подновяване на всички</string>
+    <string name="dns_onsale_error_title">Домейнът е в продажба на пазара сега</string>
+    <string name="dns_onsale_error_desc">За подновяване на домейн, първо трябва да го премахнете от продажба.</string>
+    <string name="choose_token">Изберете токен</string>
+    <string name="about_usde">Относно USDe</string>
+    <string name="empty_history">Няма транзакции</string>
+    <string name="staked_usde">Заложен USDe</string>
+    <string name="learn_more">Научете повече</string>
+    <string name="charging_unavailable">Зареждането на батерията не е налично</string>
+    <string name="ethena_operated_by">Управлява се от %1$s</string>
+    <string name="deposit_and_stake">Депозирайте и заложете</string>
+    <string name="ethena_check_eligibility">Проверете статуса</string>
+    <string name="about_ethena">Относно Ethena</string>
 
 </resources>
diff --git a/apps/wallet/localization/src/main/res/values-es/strings.xml b/apps/wallet/localization/src/main/res/values-es/strings.xml
index 1aa584fc8..cc7c34710 100644
--- a/apps/wallet/localization/src/main/res/values-es/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-es/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s se retirarán en %2$s</string>
     <string name="edit_full">Editar</string>
     <string name="safe_mode_tonconnect_description">Puedes cambiar esto en la configuración de seguridad de tu billetera.</string>
+    <string name="renew_dns_done">Dominio extendido por 1 año</string>
     <string name="staking_unstake_cycle">La solicitud de cancelación de participación se procesará después del final del ciclo de validación en %1$s</string>
     <string name="send_transaction_scroll">Verifique todos los detalles para confirmar</string>
     <string name="send_transaction_detail">El valor total de los tokens que se enviarán desde su billetera. Los reembolsos no están incluidos en el valor total.</string>
@@ -149,6 +150,7 @@
     <string name="unsubscribed">Dado de baja</string>
     <string name="subscribed">Suscrito</string>
     <string name="received">Recibido</string>
+    <string name="on_sale">EN VENTA</string>
     <string name="nft_transfer">Transferencia de NFT</string>
     <string name="nft_disabled_transfer">El NFT está en venta en el mercado ahora. Para transferirlo, primero debes quitarlo de la venta.</string>
     <string name="continue_action">Continuar</string>
@@ -172,6 +174,7 @@
     <string name="yesterday">Ayer</string>
     <string name="collectibles">Coleccionables</string>
     <string name="purchases">Compras</string>
+    <string name="enter_amount">Ingrese el monto</string>
     <string name="call_contract">Llamar contrato</string>
     <string name="contract_address">Dirección del contrato</string>
     <string name="about_collection">Sobre la colección</string>
@@ -329,6 +332,7 @@
     <string name="logout_confirmation">Tengo una copia de seguridad de la frase de recuperación para %1$s</string>
     <string name="last_updated">Actualizado %1$s</string>
     <string name="back_up_now">Hacer copia de seguridad</string>
+    <string name="confirm_swap">Confirmar intercambio</string>
     <string name="max">Máx</string>
     <string name="confirm_and_send">Confirmar y enviar</string>
     <string name="confirm_action">Confirmar acción</string>
@@ -353,7 +357,7 @@
     <string name="system">Sistema</string>
     <string name="network_fee">Tarifa de red</string>
     <string name="confirm">Confirmar</string>
-    <string name="send_request_comment">Debe incluir la nota del intercambio para la transferencia. Sin ella, sus fondos se perderán.</string>
+    <string name="send_request_comment">Al enviar, asegúrate de incluir el memo o etiqueta del intercambio. Sin él, los fondos no se depositarán y podrían perderse.</string>
     <string name="banner_top">Actualmente estás usando una versión experimental de Tonkeeper.</string>
     <string name="banner_top_button">Instalar versión estable</string>
     <string name="signer_description">Abra Signer » Seleccione la clave requerida » Escanee el código QR</string>
@@ -429,7 +433,6 @@
         <item quantity="one">≈ %1$s carga por %2$s</item>
         <item quantity="other">≈ %1$s cargas por %2$s</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Se pagará con la batería</string>
     <string name="battery_settings_title">Configuración de la batería</string>
     <string name="battery_settings_subtitle">Las transacciones seleccionadas serán pagadas por la batería de Tonkeeper.</string>
     <string name="battery_recharge_title">Recargar</string>
@@ -443,7 +446,6 @@
     <string name="promocode_hint">Código promocional</string>
     <string name="refund">Reembolso</string>
     <string name="gasless_switch_label">Toque para pagar en %1$s</string>
-    <string name="change_fee_method">Cambiar método de pago</string>
     <string name="battery_large_pack">Grande</string>
     <string name="battery_medium_pack">Medio</string>
     <string name="battery_small_pack">Pequeño</string>
@@ -480,6 +482,7 @@
     <string name="name">Nombre</string>
     <string name="ledger_blind_signing_error">La firma ciega debe estar habilitada en la configuración de Ledger</string>
     <string name="nothing_to_restore">Nada que restaurar</string>
+    <string name="purchase">Compra</string>
     <string name="new_contact">Nueva dirección</string>
     <string name="contact_delete_dialog">¿Está seguro de que desea eliminar “%1$s” de su libreta de direcciones?</string>
     <string name="add_to_contact">Agregar a la libreta de direcciones</string>
@@ -509,6 +512,7 @@
     <string name="stories_safemode_2_subtitle">Para evitar spam y artículos falsos.</string>
     <string name="stories_safemode_3_title">Solo tokens verificados</string>
     <string name="tx_marked_as_spam">Transacción marcada como Spam</string>
+    <string name="exchange_rate">Tipo de cambio</string>
     <string name="address_prefix">DIRECCIÓN:</string>
     <string name="your_address">Su dirección:</string>
     <string name="safe_mode_tokens_footer">El modo seguro está habilitado. Solo están disponibles los tokens verificados. <annotation colorAttr="textAccentColor">Configuración</annotation></string>
@@ -580,8 +584,28 @@
     <string name="credit_card_subtitle">Visa o Mastercard</string>
     <string name="currency_not_found">Moneda no encontrada</string>
     <string name="onrmap_provider_description">Otros proveedores disponibles para diferentes pares de divisas.</string>
+    <string name="min_amount">Importe mínimo: %1$s</string>
     <string name="stake_ethena_description">El token tsUSDe representa USDe mantenido a través de Ethena, un servicio de staking descentralizado. tsUSDe acumula automáticamente recompensas de staking, con un bloqueo mínimo.</string>
     <string name="support_title">¿Necesitas ayuda?</string>
     <string name="support_subtitle">Pregúntanos en Telegram — haremos todo lo posible por ayudarte.</string>
     <string name="ask_question">Hacer una pregunta</string>
+    <string name="renew_dns_title">Dominios que expiran</string>
+    <string name="renew_dns_expires">Caduca en %1$d días</string>
+    <string name="wallet_renew_dns">Tienes %1$d dominios a punto de expirar. Renueva todos hasta %2$s.</string>
+    <string name="renew_dns_until">Renovar todo hasta %1$s</string>
+    <string name="renew_signel_dns_until">Renovar hasta %1$s</string>
+    <string name="renew_dns_all">Renovar todo</string>
+    <string name="dns_onsale_error_title">El dominio está a la venta en el mercado ahora</string>
+    <string name="dns_onsale_error_desc">Para renovar el dominio, primero debes eliminarlo de la venta.</string>
+    <string name="choose_token">Elija token</string>
+    <string name="about_usde">Acerca de USDe</string>
+    <string name="empty_history">Sin transacciones</string>
+    <string name="staked_usde">USDe en staking</string>
+    <string name="learn_more">Más información</string>
+    <string name="charging_unavailable">La carga de la batería no está disponible</string>
+    <string name="ethena_operated_by">Operado por %1$s</string>
+    <string name="deposit_and_stake">Depositar y hacer staking</string>
+    <string name="ethena_check_eligibility">Comprobar estado</string>
+    <string name="about_ethena">Acerca de Ethena</string>
+
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-in/strings.xml b/apps/wallet/localization/src/main/res/values-in/strings.xml
index 919d79ad7..d1b4f9cbf 100644
--- a/apps/wallet/localization/src/main/res/values-in/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-in/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s akan ditarik dalam %2$s</string>
     <string name="edit_full">Sunting</string>
     <string name="safe_mode_tonconnect_description">Anda dapat mengubahnya di Pengaturan Keamanan dompet Anda.</string>
+    <string name="renew_dns_done">Domain diperpanjang selama 1 tahun</string>
     <string name="staking_unstake_cycle">Permintaan pembatalan taruhan akan diproses setelah akhir siklus validasi dalam %1$s</string>
     <string name="send_transaction_scroll">Periksa semua detail untuk konfirmasi</string>
     <string name="send_transaction_detail">Nilai total token yang akan dikirim dari dompet Anda. Pengembalian dana tidak termasuk dalam nilai total.</string>
@@ -149,6 +150,7 @@
     <string name="unsubscribed">Berhenti Berlangganan</string>
     <string name="subscribed">Berlangganan</string>
     <string name="received">Diterima</string>
+    <string name="on_sale">DI JUAL</string>
     <string name="nft_transfer">Transfer NFT</string>
     <string name="nft_disabled_transfer">NFT sedang dijual di marketplace sekarang. Untuk mentransfer, Anda harus menghapusnya dari penjualan terlebih dahulu.</string>
     <string name="continue_action">Lanjutkan</string>
@@ -172,6 +174,7 @@
     <string name="yesterday">Kemarin</string>
     <string name="collectibles">Koleksi</string>
     <string name="purchases">Pembelian</string>
+    <string name="enter_amount">Masukkan Jumlah</string>
     <string name="call_contract">Panggil kontrak</string>
     <string name="contract_address">Alamat kontrak</string>
     <string name="about_collection">Tentang koleksi</string>
@@ -329,6 +332,7 @@
     <string name="logout_confirmation">Saya memiliki salinan cadangan dari frasa pemulihan untuk %1$s</string>
     <string name="last_updated">Diperbarui %1$s</string>
     <string name="back_up_now">Cadangkan sekarang</string>
+    <string name="confirm_swap">Konfirmasi Pertukaran</string>
     <string name="max">Maks</string>
     <string name="confirm_and_send">Konfirmasi dan kirim</string>
     <string name="confirm_action">Konfirmasi tindakan</string>
@@ -353,7 +357,7 @@
     <string name="system">Sistem</string>
     <string name="network_fee">Biaya jaringan</string>
     <string name="confirm">Konfirmasi</string>
-    <string name="send_request_comment">Anda harus menyertakan catatan dari bursa untuk transfer. Tanpanya, dana Anda akan hilang.</string>
+    <string name="send_request_comment">Saat mengirim, pastikan untuk menyertakan memo atau tag dari bursa. Tanpanya, dana tidak akan disetorkan dan bisa hilang.</string>
     <string name="banner_top">Anda saat ini menggunakan versi eksperimental dari Tonkeeper.</string>
     <string name="banner_top_button">Instal versi stabil</string>
     <string name="signer_description">Buka Penanda » Pilih kunci yang diperlukan » Pindai kode QR</string>
@@ -427,7 +431,6 @@
     <plurals name="battery_charges_per_action">
         <item quantity="other">≈ %1$s pengisian per %2$s</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Akan dibayar dengan Baterai</string>
     <string name="battery_settings_title">Pengaturan Baterai</string>
     <string name="battery_settings_subtitle">Transaksi yang dipilih akan dibayar oleh Baterai Tonkeeper.</string>
     <string name="battery_recharge_title">Isi ulang</string>
@@ -441,7 +444,6 @@
     <string name="promocode_hint">Kode Promo</string>
     <string name="refund">Pengembalian</string>
     <string name="gasless_switch_label">Ketuk untuk membayar dalam %1$s</string>
-    <string name="change_fee_method">Ubah metode pembayaran</string>
     <string name="battery_large_pack">Besar</string>
     <string name="battery_medium_pack">Sedang</string>
     <string name="battery_small_pack">Kecil</string>
@@ -475,6 +477,7 @@
     <string name="name">Nama</string>
     <string name="ledger_blind_signing_error">Penandatanganan Buta harus diaktifkan di Pengaturan Buku Besar</string>
     <string name="nothing_to_restore">Tidak ada yang perlu dikembalikan</string>
+    <string name="purchase">Pembelian</string>
     <string name="new_contact">Alamat Baru</string>
     <string name="contact_delete_dialog">Apakah Anda yakin ingin menghapus “%1$s” dari Buku Alamat Anda?</string>
     <string name="add_to_contact">Tambahkan ke Buku Alamat</string>
@@ -504,6 +507,7 @@
     <string name="stories_safemode_2_subtitle">Untuk menghindari spam dan barang palsu.</string>
     <string name="stories_safemode_3_title">Hanya Token Terverifikasi</string>
     <string name="tx_marked_as_spam">Transaksi ditandai sebagai Spam</string>
+    <string name="exchange_rate">Kurs</string>
     <string name="address_prefix">Alamat:</string>
     <string name="your_address">Alamat Anda:</string>
     <string name="safe_mode_tokens_footer">Mode aman diaktifkan. Hanya token terverifikasi yang tersedia. <annotation colorAttr="textAccentColor">Pengaturan</annotation></string>
@@ -575,8 +579,28 @@
     <string name="credit_card_subtitle">Visa atau Mastercard</string>
     <string name="currency_not_found">Mata uang tidak ditemukan</string>
     <string name="onrmap_provider_description">Penyedia lain tersedia untuk pasangan mata uang yang berbeda.</string>
+    <string name="min_amount">Jumlah minimum: %1$s</string>
     <string name="stake_ethena_description">Token tsUSDe mewakili USDe yang disimpan melalui Ethena, layanan staking yang terdesentralisasi. tsUSDe secara otomatis mengumpulkan imbalan staking, dengan penguncian minimal.</string>
     <string name="support_title">Butuh bantuan?</string>
     <string name="support_subtitle">Tanyakan pada kami di Telegram — kami akan berusaha sebaik mungkin untuk membantu.</string>
     <string name="ask_question">Ajukan Pertanyaan</string>
+    <string name="renew_dns_title">Domain yang kedaluwarsa</string>
+    <string name="renew_dns_expires">Kedaluwarsa dalam %1$d hari</string>
+    <string name="wallet_renew_dns">Anda memiliki %1$d domain yang akan kedaluwarsa. Perpanjang semuanya hingga %2$s.</string>
+    <string name="renew_dns_until">Perbarui semuanya hingga %1$s</string>
+    <string name="renew_signel_dns_until">Perpanjang hingga %1$s</string>
+    <string name="renew_dns_all">Perbarui semuanya</string>
+    <string name="dns_onsale_error_title">Domain sekarang dijual di pasar</string>
+    <string name="dns_onsale_error_desc">Untuk memperbarui domain, Anda harus menghapusnya dari penjualan terlebih dahulu.</string>
+    <string name="choose_token">Pilih Token</string>
+    <string name="about_usde">Tentang USDe</string>
+    <string name="empty_history">Tidak ada transaksi</string>
+    <string name="staked_usde">USDe yang di-stake</string>
+    <string name="learn_more">Pelajari lebih lanjut</string>
+    <string name="charging_unavailable">Pengisian baterai tidak tersedia</string>
+    <string name="ethena_operated_by">Dioperasikan oleh %1$s</string>
+    <string name="deposit_and_stake">Deposit &amp; Stake</string>
+    <string name="ethena_check_eligibility">Periksa Status</string>
+    <string name="about_ethena">Tentang Ethena</string>
+
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-ru/strings.xml b/apps/wallet/localization/src/main/res/values-ru/strings.xml
index 2ed9061f2..f4547840f 100644
--- a/apps/wallet/localization/src/main/res/values-ru/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-ru/strings.xml
@@ -232,6 +232,7 @@
     <string name="multi_account_secret_wrong">Пожалуйста, используйте Tonkeeper Desktop для акаунта мульти-кошелька</string>
     <string name="insufficient_balance_default">Необходимо: %1$s.\nВаш баланс: %2$s.</string>
     <string name="name">Имя</string>
+    <string name="purchase">Покупка</string>
     <string name="new_contact">Новый адрес</string>
     <string name="edit">Ред.</string>
     <string name="edit_full">Изменить</string>
@@ -250,13 +251,20 @@
     <string name="safe_mode_tonconnect_title">Подключение доступно только к проверенным приложениям</string>
     <string name="safe_mode_tonconnect_description">Вы можете изменить это в настройках безопасности вашего кошелька.</string>
     <string name="your_address">Ваш адрес:</string>
+    <string name="exchange_rate">Курс</string>
     <string name="address_prefix">Адрес:</string>
     <string name="safe_mode_tokens_footer">Безопасный режим включён. Доступны только проверенные токены. <annotation colorAttr="textAccentColor">Настройки</annotation></string>
     <string name="all">Все</string>
     <string name="report_encrypted_comment">Комментарий из этой транзакции будет отправлен вместе с жалобой в расшифрованном виде.</string>
     <string name="report_encrypted_comment_button">Пожаловаться всё равно</string>
     <string name="tx_marked_as_not_spam">Отмечено как не спам</string>
-
+    <string name="renew_dns_title">Истекающие домены</string>
+    <string name="renew_dns_expires">Истекает через %1$d д.</string>
+    <string name="wallet_renew_dns">У вас есть %1$d домена с истекающим сроком аренды. Продлите все до %2$s.</string>
+    <string name="renew_dns_until">Продлить все до %1$s</string>
+    <string name="renew_signel_dns_until">Продлить  до %1$s</string>
+    <string name="renew_dns_all">Продлить все</string>
+    <string name="renew_dns_done">Домен продлён на 1 год</string>
 
     <!-- not reviewed -->
     <string name="unstake_amount">Сумма снятия ставки</string>
@@ -266,6 +274,7 @@
     <string name="stake_tonstakers_description">Когда вы делаете ставку TON в пуле Tonstakers, вы получаете токен под названием tsTON, который представляет вашу долю в пуле. По мере того, как пул накапливает прибыль, ваш tsTON представляет большее количество TON.</string>
 
     <string name="view_details">Подробнее</string>
+    <string name="on_sale">В ПРОДАЖЕ</string>
     <string name="nft_transfer">Отправка NFT</string>
     <string name="nft_disabled_transfer">NFT сейчас продается на маркетплейсе. Для передачи следует сначала снять его с продажи.</string>
     <string name="delete_account_alert">Удалить аккаунт?</string>
@@ -308,6 +317,7 @@
     <string name="tokens">Токены</string>
 
     <string name="address">Адрес</string>
+    <string name="enter_amount">Введите сумму</string>
     <string name="call_contract">Вызов контракта</string>
     <string name="contract_address">Адрес контракта</string>
     <string name="about_collection">Подробнее о коллекции</string>
@@ -408,6 +418,7 @@
     <string name="logout_confirmation">У меня есть резервная копия фразы восстановления кошелька %1$s</string>
     <string name="back_up_now">Скопировать сейчас</string>
     <string name="last_updated">Обновлён в %1$s</string>
+    <string name="confirm_swap">Подтвердить обмен</string>
     <string name="max">Макс</string>
 
 
@@ -543,7 +554,6 @@
         <item quantity="many">≈ %1$s отправок токенов</item>
         <item quantity="other">≈ %1$s отправок токенов</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Будет оплачена батарейкой</string>
     <string name="battery_settings_title">Настройки батарейки</string>
     <string name="battery_settings_subtitle">Выбранные транзакции будут оплачены батарейкой Tonkeeper.</string>
     <string name="battery_recharge_title">Зарядка</string>
@@ -557,7 +567,6 @@
     <string name="promocode_hint">Промокод</string>
     <string name="refund">Возврат</string>
     <string name="gasless_switch_label">Оплатить в %1$s</string>
-    <string name="change_fee_method">Изменить способ оплаты</string>
     <string name="or">или</string>
     <string name="battery_large_pack">Большой</string>
     <string name="battery_medium_pack">Средний</string>
@@ -649,8 +658,21 @@
     <string name="close">Закрыть</string>
     <string name="dapp_safe_modal_title">Ссылка ведет на мошеннический сервис</string>
     <string name="dapp_safe_model_button">Как оставаться в безопасности</string>
+    <string name="min_amount">Мин. сумма: %1$s</string>
     <string name="stake_ethena_description">Токен tsUSDe представляет собой USDe, хранящиеся через Ethena, децентрализованный сервис ставок. tsUSDe автоматически накапливает вознаграждения за ставки с минимальной блокировкой.</string>
     <string name="support_title">Нужна помощь?</string>
     <string name="support_subtitle">Задайте свой вопрос в нашем боте в Telegram — поможем разобраться.</string>
     <string name="ask_question">Задать вопрос</string>
+    <string name="dns_onsale_error_title">Домен сейчас продается на торговой площадке</string>
+    <string name="dns_onsale_error_desc">Для продления домена вам необходимо сначала снять его с продажи.</string>
+    <string name="choose_token">Выберите токен</string>
+    <string name="about_usde">Подробнее про USDe</string>
+    <string name="empty_history">Транзакций нет</string>
+    <string name="staked_usde">Стейкинг USDe</string>
+    <string name="learn_more">Подробнее</string>
+    <string name="charging_unavailable">Зарядка батарейки недоступна</string>
+    <string name="ethena_operated_by">Управляется %1$s</string>
+    <string name="deposit_and_stake">Депозит и стейкинг</string>
+    <string name="ethena_check_eligibility">Проверить статус</string>
+    <string name="about_ethena">Подробнее об Ethena</string>
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-tr/strings.xml b/apps/wallet/localization/src/main/res/values-tr/strings.xml
index 9cdc7a86c..02b90fe7a 100644
--- a/apps/wallet/localization/src/main/res/values-tr/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-tr/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s %2$s içinde çekilecek</string>
     <string name="edit_full">Düzenlemek</string>
     <string name="safe_mode_tonconnect_description">Bunu cüzdanınızın Güvenlik Ayarları\'ndan değiştirebilirsiniz.</string>
+    <string name="renew_dns_done">Alan adı 1 yıl uzatıldı</string>
     <string name="staking_unstake_cycle">Paydan çıkarma isteği, %1$s\'deki doğrulama döngüsünün bitiminden sonra işlenecektir.</string>
     <string name="send_transaction_scroll">Onaylamak için tüm ayrıntıları kontrol edin</string>
     <string name="send_transaction_detail">Cüzdanınızdan gönderilecek tokenların toplam değeri. İadeler toplam değere dahil değildir.</string>
@@ -62,6 +63,7 @@
     <string name="liquid_staking">Sıvı Hisse Senedi</string>
     <string name="other">Diğer</string>
     <string name="minimum_amount">En az %1$s</string>
+    <string name="min_amount">Min. tutar: %1$s</string>
     <string name="stake_ethena_description">tsUSDe token\'ı, merkezi olmayan bir staking hizmeti olan Ethena aracılığıyla tutulan USDE\'yi temsil eder. tsUSDe, minimum kilitlemeyle otomatik olarak staking ödülleri biriktirir.</string>
     <string name="stake_ethena_disclaimer">Bu, geçen haftanın ortalama protokol ödüllerine ve stake edilmiş ortalama USDe miktarına dayalı tahmini yıllık getiridir. Getiri, haftalık bileşik faizle yıllık hale getirilir. <annotation colorAttr="textSecondaryColor">Geçmiş performans gelecekteki sonuçları garanti etmez.</annotation> Stake ve ödüller, üçüncü taraf bir hizmet olan Ethena tarafından sağlanır ve <annotation colorAttr="textAccentColor">şartlarına</annotation> tabidir.</string>
     <string name="stake_tonstakers_description">Tonstakers havuzunda TON stake ettiğinizde, havuzdaki payınızı temsil eden tsTON adlı bir token alırsınız. Havuz kar biriktirdikçe, tsTON\'unuz daha büyük miktarda TON\'u temsil eder.</string>
@@ -150,6 +152,7 @@
     <string name="unsubscribed">Abonelik İptal Edildi</string>
     <string name="subscribed">Abone Olundu</string>
     <string name="received">Alındı</string>
+    <string name="on_sale">SATIŞTA</string>
     <string name="nft_transfer">NFT Transferi</string>
     <string name="nft_disabled_transfer">NFT şu anda pazarda satışta. Transfer için önce satıştan kaldırmalısınız.</string>
     <string name="continue_action">Devam Et</string>
@@ -173,6 +176,7 @@
     <string name="yesterday">Dün</string>
     <string name="collectibles">Koleksiyonlar</string>
     <string name="purchases">Satın Alımlar</string>
+    <string name="enter_amount">Tutarı Girin</string>
     <string name="call_contract">Sözleşmeyi ara</string>
     <string name="contract_address">Sözleşme adresi</string>
     <string name="about_collection">Koleksiyon hakkında</string>
@@ -330,6 +334,7 @@
     <string name="logout_confirmation">%1$s için kurtarma ifadesinin yedek kopyası var</string>
     <string name="last_updated">Güncellendi %1$s</string>
     <string name="back_up_now">Yedekle</string>
+    <string name="confirm_swap">Takas Onayını Onayla</string>
     <string name="max">Maks</string>
     <string name="confirm_and_send">Onayla ve gönder</string>
     <string name="confirm_action">İşlemi onayla</string>
@@ -354,7 +359,7 @@
     <string name="system">Sistem</string>
     <string name="network_fee">Ağ ücreti</string>
     <string name="confirm">Onayla</string>
-    <string name="send_request_comment">Transfer için borsadan aldığınız notu eklemelisiniz. Onsuz, paranız kaybolacaktır.</string>
+    <string name="send_request_comment">Gönderirken borsadan alınan notu veya etiketi eklediğinizden emin olun. Olmazsa, fonlar yatırılmaz ve kaybolabilir.</string>
     <string name="banner_top">Şu anda Tonkeeper\'ın deneysel bir sürümünü kullanıyorsunuz.</string>
     <string name="banner_top_button">Kararlı sürümü yükle</string>
     <string name="signer_description">Açık İmzalayıcı » Gerekli anahtarı seç » QR kodunu tara</string>
@@ -430,7 +435,6 @@
         <item quantity="one">≈ %1$s şarj başına %2$s</item>
         <item quantity="other">≈ %1$s şarj başına %2$s</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Batarya ile ödenecek</string>
     <string name="battery_settings_title">Batarya Ayarları</string>
     <string name="battery_settings_subtitle">Seçilen işlemler Tonkeeper Bataryası ile ödenecektir.</string>
     <string name="battery_recharge_title">Yeniden şarj et</string>
@@ -444,7 +448,6 @@
     <string name="promocode_hint">Promosyon Kodu</string>
     <string name="refund">Geri ödemek</string>
     <string name="gasless_switch_label">%1$s ile ödeme yapmak için dokunun</string>
-    <string name="change_fee_method">Ödeme yöntemini değiştir</string>
     <string name="battery_large_pack">Büyük</string>
     <string name="battery_medium_pack">Orta</string>
     <string name="battery_small_pack">Küçük</string>
@@ -481,6 +484,7 @@
     <string name="name">İsim</string>
     <string name="ledger_blind_signing_error">Kör İmzalama, Defter Ayarlarında etkinleştirilmelidir</string>
     <string name="nothing_to_restore">Geri yüklenecek bir şey yok</string>
+    <string name="purchase">Satın almak</string>
     <string name="new_contact">Yeni Adres</string>
     <string name="contact_delete_dialog">“%1$s” adresini Adres Defterinizden silmek istediğinizden emin misiniz?</string>
     <string name="add_to_contact">Adres Defterine Ekle</string>
@@ -510,6 +514,7 @@
     <string name="stories_safemode_2_subtitle">Spam ve sahte ürünlerden kaçınmak için.</string>
     <string name="stories_safemode_3_title">Sadece Doğrulanmış Tokenlar</string>
     <string name="tx_marked_as_spam">İşlem Spam olarak işaretlendi</string>
+    <string name="exchange_rate">Döviz kuru</string>
     <string name="address_prefix">Adres:</string>
     <string name="your_address">Adresiniz:</string>
     <string name="safe_mode_tokens_footer">Güvenli mod etkinleştirildi. Yalnızca doğrulanmış tokenlar kullanılabilir. <annotation colorAttr="textAccentColor">Ayarlar</annotation></string>
@@ -584,4 +589,23 @@
     <string name="support_title">Yardıma mı ihtiyacınız var?</string>
     <string name="support_subtitle">Telegram’dan bize sorun — size yardımcı olmak için elimizden geleni yapacağız.</string>
     <string name="ask_question">Soru Sor</string>
+    <string name="renew_dns_title">Son kullanma tarihi dolan alan adları</string>
+    <string name="renew_dns_expires">%1$d gün içinde sona eriyor</string>
+    <string name="wallet_renew_dns">%1$d tane süresi dolacak alan adınız var. %2$s tarihine kadar hepsini yenileyin.</string>
+    <string name="renew_dns_until">%1$s tarihine kadar tümünü yenile</string>
+    <string name="renew_signel_dns_until">%1$s tarihine kadar yenile</string>
+    <string name="renew_dns_all">Tümünü yenile</string>
+    <string name="dns_onsale_error_title">Alan adı şu anda pazaryerinde satışta</string>
+    <string name="dns_onsale_error_desc">Alan adını yenilemek için öncelikle onu satıştan kaldırmanız gerekmektedir.</string>
+    <string name="choose_token">Jeton Seçin</string>
+    <string name="about_usde">USDe hakkında</string>
+    <string name="empty_history">İşlem yok</string>
+    <string name="staked_usde">Stake edilmiş USDe</string>
+    <string name="learn_more">Daha fazla bilgi</string>
+    <string name="charging_unavailable">Batarya şarjı mevcut değil</string>
+    <string name="ethena_operated_by">%1$s tarafından işletilmektedir</string>
+    <string name="deposit_and_stake">Yatır &amp; Stake et</string>
+    <string name="ethena_check_eligibility">Durumu Kontrol Et</string>
+    <string name="about_ethena">Ethena Hakkında</string>
+
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-uk/strings.xml b/apps/wallet/localization/src/main/res/values-uk/strings.xml
index c910db8fc..64ec32147 100644
--- a/apps/wallet/localization/src/main/res/values-uk/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-uk/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s буде знято через %2$s</string>
     <string name="edit_full">Редагувати</string>
     <string name="safe_mode_tonconnect_description">Ви можете змінити це в налаштуваннях безпеки свого гаманця.</string>
+    <string name="renew_dns_done">Домен продовжено на 1 рік</string>
     <string name="staking_unstake_cycle">Запит на скасування ставки буде оброблено після завершення циклу перевірки в %1$s</string>
     <string name="send_transaction_scroll">Перевірте всі деталі для підтвердження</string>
     <string name="send_transaction_detail">Загальна вартість токенів, які будуть надіслані з вашого гаманця. Відшкодування не входять до загальної вартості.</string>
@@ -149,6 +150,7 @@
     <string name="unsubscribed">Відписано</string>
     <string name="subscribed">Підписано</string>
     <string name="received">Отримано</string>
+    <string name="on_sale">РОЗПРОДАЖ</string>
     <string name="nft_transfer">Передача NFT</string>
     <string name="nft_disabled_transfer">NFT зараз продається на ринку. Для передачі спочатку зніміть його з продажу.</string>
     <string name="continue_action">Продовжити</string>
@@ -172,6 +174,7 @@
     <string name="yesterday">Вчора</string>
     <string name="collectibles">Колекційні предмети</string>
     <string name="purchases">Покупки</string>
+    <string name="enter_amount">Введіть суму</string>
     <string name="call_contract">Викликати контракт</string>
     <string name="contract_address">Адреса контракту</string>
     <string name="about_collection">Про колекцію</string>
@@ -329,6 +332,7 @@
     <string name="logout_confirmation">У мене є резервна копія фрази відновлення для %1$s</string>
     <string name="last_updated">Оновлено %1$s</string>
     <string name="back_up_now">Зробити резервну копію зараз</string>
+    <string name="confirm_swap">Підтвердити обмін</string>
     <string name="max">Макс</string>
     <string name="confirm_and_send">Підтвердити та надіслати</string>
     <string name="confirm_action">Підтвердити дію</string>
@@ -353,7 +357,7 @@
     <string name="system">Система</string>
     <string name="network_fee">Мережевий збір</string>
     <string name="confirm">Підтвердити</string>
-    <string name="send_request_comment">Ви повинні додати примітку від обміну для переказу. Без неї ваші кошти будуть втрачені.</string>
+    <string name="send_request_comment">Під час надсилання обов’язково додайте примітку або тег від біржі. Без цього кошти не будуть зараховані й можуть бути втрачені.</string>
     <string name="banner_top">Ви використовуєте експериментальну версію Tonkeeper.</string>
     <string name="banner_top_button">Встановити стабільну версію</string>
     <string name="signer_description">Відкрийте Signer » Виберіть потрібний ключ » Скануйте QR-код</string>
@@ -433,7 +437,6 @@
         <item quantity="many">≈ %1$s зарядів за %2$s</item>
         <item quantity="other">≈ %1$s зарядів за %2$s</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Буде сплачено батареєю</string>
     <string name="battery_settings_title">Налаштування батареї</string>
     <string name="battery_settings_subtitle">Вибрані транзакції будуть сплачені батареєю Tonkeeper.</string>
     <string name="battery_recharge_title">Перезарядка</string>
@@ -447,7 +450,6 @@
     <string name="promocode_hint">Промокод</string>
     <string name="refund">Повернення</string>
     <string name="gasless_switch_label">Торкніться, щоб оплатити %1$s</string>
-    <string name="change_fee_method">Змінити спосіб оплати</string>
     <string name="battery_large_pack">Великий</string>
     <string name="battery_medium_pack">Середній</string>
     <string name="battery_small_pack">Маленький</string>
@@ -490,6 +492,7 @@
     <string name="nothing_to_restore">Відновлювати нічого</string>
     <string name="name">Ім\'я</string>
     <string name="ledger_blind_signing_error">Сліпий підпис має бути ввімкнено в налаштуваннях Ledger</string>
+    <string name="purchase">Купівля</string>
     <string name="new_contact">Нова адреса</string>
     <string name="contact_delete_dialog">Ви впевнені, що бажаєте видалити «%1$s» зі своєї адресної книги?</string>
     <string name="add_to_contact">Додати до адресної книги</string>
@@ -519,6 +522,7 @@
     <string name="stories_safemode_2_subtitle">Щоб уникнути спаму та фейків.</string>
     <string name="stories_safemode_3_title">Тільки перевірені токени</string>
     <string name="tx_marked_as_spam">Трансакцію позначено як спам</string>
+    <string name="exchange_rate">Обмінний курс</string>
     <string name="address_prefix">Адреса:</string>
     <string name="your_address">Адреса гаманця:</string>
     <string name="safe_mode_tokens_footer">Безпечний режим увімкнено. Доступні лише перевірені токени. <annotation colorAttr="textAccentColor">Налаштування</annotation></string>
@@ -590,8 +594,28 @@
     <string name="credit_card_subtitle">Visa або Mastercard</string>
     <string name="currency_not_found">Валюта не знайдена</string>
     <string name="onrmap_provider_description">Інші постачальники доступні для різних валютних пар.</string>
+    <string name="min_amount">Мінімальна сума: %1$s</string>
     <string name="stake_ethena_description">Токен tsUSDe представляє USDe, що зберігається через Ethena, децентралізований сервіс стейкінгу. tsUSDe автоматично накопичує винагороду за стейкінг з мінімальним блокуванням.</string>
     <string name="support_title">Потрібна допомога?</string>
     <string name="support_subtitle">Напишіть нам у Telegram — ми зробимо все можливе, щоб допомогти.</string>
     <string name="ask_question">Поставити запитання</string>
+    <string name="renew_dns_title">Домени, термін дії яких закінчується</string>
+    <string name="renew_dns_expires">Термін дії закінчується через %1$d днів</string>
+    <string name="wallet_renew_dns">У вас є %1$d доменів, термін дії яких закінчується. Поновіть усі до %2$s.</string>
+    <string name="renew_dns_until">Поновити все до %1$s</string>
+    <string name="renew_signel_dns_until">Поновити до %1$s</string>
+    <string name="renew_dns_all">Поновити все</string>
+    <string name="dns_onsale_error_title">Домен зараз продається на торговельній платформі</string>
+    <string name="dns_onsale_error_desc">Щоб поновити домен, спочатку слід зняти його з продажу.</string>
+    <string name="choose_token">Виберіть токен</string>
+    <string name="about_usde">Про USDe</string>
+    <string name="empty_history">Немає транзакцій</string>
+    <string name="staked_usde">Застейканий USDe</string>
+    <string name="learn_more">Дізнатися більше</string>
+    <string name="charging_unavailable">Заряджання батареї недоступне</string>
+    <string name="ethena_operated_by">Керується %1$s</string>
+    <string name="deposit_and_stake">Депозит і стейкінг</string>
+    <string name="ethena_check_eligibility">Перевірити статус</string>
+    <string name="about_ethena">Про Ethena</string>
+
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-uz/strings.xml b/apps/wallet/localization/src/main/res/values-uz/strings.xml
index 4d6f14b2d..da491155a 100644
--- a/apps/wallet/localization/src/main/res/values-uz/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-uz/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s %2$s ichida yechib olinadi</string>
     <string name="edit_full">Tahrirlash</string>
     <string name="safe_mode_tonconnect_description">Buni hamyoningiz Xavfsizlik sozlamalarida oʻzgartirishingiz mumkin.</string>
+    <string name="renew_dns_done">Domen 1 yilga uzaytirildi</string>
     <string name="staking_unstake_cycle">Toʻlovni bekor qilish soʻrovi %1$s da tekshirish davri tugaganidan keyin koʻrib chiqiladi</string>
     <string name="send_transaction_scroll">Tasdiqlash uchun barcha tafsilotlarni tekshiring</string>
     <string name="send_transaction_detail">Hamyoningizdan yuboriladigan tokenlarning umumiy qiymati. To\'lovlar umumiy qiymatga kiritilmagan.</string>
@@ -62,6 +63,7 @@
     <string name="liquid_staking">Suyuqlikni to\'ldirish</string>
     <string name="other">Boshqa</string>
     <string name="minimum_amount">Minimal %1$s</string>
+    <string name="min_amount">Min. miqdori: %1$s</string>
     <string name="stake_ethena_description">tsUSDe tokeni markazlashtirilmagan staking xizmati Ethena orqali o\'tkaziladigan USDe ni ifodalaydi. tsUSDe minimal blokirovka bilan avtomatik ravishda staking mukofotlarini oladi.</string>
     <string name="stake_ethena_disclaimer">Bu o\'tgan haftadagi o\'rtacha protokol mukofotlari va stavkaga qo\'yilgan o\'rtacha USDe miqdoriga asoslangan taxminiy yillik daromaddir. Daromad haftalik birikma bilan yillik hisoblanadi. <annotation colorAttr="textSecondaryColor">O‘tgan ishlash kelajakdagi natijalarni kafolatlamaydi.</annotation> Staking va mukofotlar uchinchi tomon xizmati Ethena tomonidan taqdim etiladi va ularning <annotation colorAttr="textAccentColor">shartlariga</annotation> bo‘ysunadi.</string>
     <string name="stake_tonstakers_description">Tonstakerlar hovuziga TON qo‘shganingizda, siz hovuzdagi ulushingizni ifodalovchi tsTON deb nomlangan token olasiz. Hovuz daromadni to\'plaganligi sababli, sizning tsTON ko\'proq TON miqdorini bildiradi.</string>
@@ -150,6 +152,7 @@
     <string name="unsubscribed">Obuna bekor qilindi</string>
     <string name="subscribed">Obuna bo\'ldi</string>
     <string name="received">Qabul qilindi</string>
+    <string name="on_sale">SOTISHDA</string>
     <string name="nft_transfer">NFT O\'tkazmasi</string>
     <string name="nft_disabled_transfer">NFT hozir bozorda sotilmoqda. Uni o\'tkazish uchun avval sotuvdan olib tashlashingiz kerak.</string>
     <string name="continue_action">Davom etish</string>
@@ -173,6 +176,7 @@
     <string name="yesterday">Kecha</string>
     <string name="collectibles">Kolleksiya buyumlari</string>
     <string name="purchases">Xaridlar</string>
+    <string name="enter_amount">Miqdorni kiriting</string>
     <string name="call_contract">Shartnomani chaqirish</string>
     <string name="contract_address">Shartnoma manzili</string>
     <string name="about_collection">Kolleksiya haqida</string>
@@ -331,6 +335,7 @@
     <string name="logout_confirmation">Men %1$s uchun tiklash iborasining zaxira nusxasiga egaman</string>
     <string name="last_updated">Yangilangan %1$s</string>
     <string name="back_up_now">Hozir nusxa oling</string>
+    <string name="confirm_swap">Almashtirishni tasdiqlang</string>
     <string name="max">Maks</string>
     <string name="confirm_and_send">Tasdiqlang va yuboring</string>
     <string name="confirm_action">Harakatni tasdiqlang</string>
@@ -355,7 +360,7 @@
     <string name="system">Tizim</string>
     <string name="network_fee">Tarmoq to\'lovi</string>
     <string name="confirm">Tasdiqlash</string>
-    <string name="send_request_comment">Pul oʻtkazmasi uchun almashinuvdan eslatmani kiritishingiz kerak. Aks holda, mablagʻlaringiz yoʻqoladi.</string>
+    <string name="send_request_comment">Yuborishda birjadan olingan eslatma yoki tegni qo‘shganingizga ishonch hosil qiling. U bo‘lmasa, mablag‘lar tushmaydi va yo‘qolishi mumkin.</string>
     <string name="banner_top">Siz hozirda Tonkeeper-ning tajribaviy versiyasidan foydalanmoqdasiz.</string>
     <string name="banner_top_button">Barqaror versiyani o\'rnating</string>
     <string name="signer_description">Signer-ni oching » Kerakli kalitni tanlang » QR kodni skaner qiling</string>
@@ -432,7 +437,6 @@
         <item quantity="one">≈ %1$s zaryad %2$s uchun</item>
         <item quantity="other">≈ %1$s zaryadlar %2$s uchun</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Batareya bilan to‘lanadi</string>
     <string name="battery_settings_title">Batareya Sozlamalari</string>
     <string name="battery_settings_subtitle">Tanlangan tranzaktsiyalar Tonkeeper Batareya orqali to‘lanadi.</string>
     <string name="battery_recharge_title">Zaryadlash</string>
@@ -446,7 +450,6 @@
     <string name="promocode_hint">Kupon kodi</string>
     <string name="refund">To\'lovni qaytarish</string>
     <string name="gasless_switch_label">%1$s orqali toʻlash uchun bosing</string>
-    <string name="change_fee_method">Toʻlov usulini oʻzgartirish</string>
     <string name="battery_large_pack">Katta</string>
     <string name="battery_medium_pack">O\'rta</string>
     <string name="battery_small_pack">Kichik</string>
@@ -485,6 +488,7 @@
     <string name="nothing_to_restore">Qayta tiklash uchun hech narsa yo\'q</string>
     <string name="name">Ism</string>
     <string name="ledger_blind_signing_error">Ledger sozlamalarida koʻr-koʻrona imzo qoʻyish yoqilishi kerak</string>
+    <string name="purchase">Sotib olish</string>
     <string name="new_contact">Yangi manzil</string>
     <string name="contact_delete_dialog">Haqiqatan ham “%1$s” manzillar kitobingizdan o‘chirib tashlansinmi?</string>
     <string name="add_to_contact">Manzillar kitobiga qo\'shish</string>
@@ -515,6 +519,7 @@
     <string name="stories_safemode_3_title">Faqat tasdiqlangan tokenlar</string>
     <string name="open_explorer">Explorerda oching</string>
     <string name="tx_marked_as_spam">Tranzaksiya Spam sifatida belgilandi</string>
+    <string name="exchange_rate">Valyuta kursi</string>
     <string name="address_prefix">Manzil:</string>
     <string name="your_address">Sizning manzilingiz:</string>
     <string name="safe_mode_tokens_footer">Xavfsiz rejim yoqilgan. Faqat tasdiqlangan tokenlar mavjud. <annotation colorAttr="textAccentColor">Sozlamalar</annotation></string>
@@ -584,4 +589,23 @@
     <string name="support_title">Yordam kerakmi?</string>
     <string name="support_subtitle">Telegram orqali bizga murojaat qiling — yordam berishga harakat qilamiz.</string>
     <string name="ask_question">Savol berish</string>
+    <string name="renew_dns_title">Domenlar muddati tugayapti</string>
+    <string name="renew_dns_expires">Muddati %1$d kundan keyin tugaydi</string>
+    <string name="wallet_renew_dns">Sizda muddati tugagan %1$d domen bor. Hammasini %2$sgacha yangilang.</string>
+    <string name="renew_dns_until">%1$sgacha hammasini yangilang</string>
+    <string name="renew_signel_dns_until">%1$s gacha yangilang</string>
+    <string name="renew_dns_all">Hammasini yangilang</string>
+    <string name="dns_onsale_error_title">Domen hozirda bozorda sotilmoqda</string>
+    <string name="dns_onsale_error_desc">Domenni yangilash uchun avval uni sotuvdan olib tashlashingiz kerak.</string>
+    <string name="choose_token">Token-ni tanlang</string>
+    <string name="about_usde">USDe haqida</string>
+    <string name="empty_history">Tranzaksiyalar yo‘q</string>
+    <string name="staked_usde">Stak qilingan USDe</string>
+    <string name="learn_more">Batafsil ma’lumot</string>
+    <string name="charging_unavailable">Batareya zaryadlash mavjud emas</string>
+    <string name="ethena_operated_by">%1$s tomonidan boshqariladi</string>
+    <string name="deposit_and_stake">Depozit va stake qilish</string>
+    <string name="ethena_check_eligibility">Statusni tekshirish</string>
+    <string name="about_ethena">Ethena haqida</string>
+
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-zh/strings.xml b/apps/wallet/localization/src/main/res/values-zh/strings.xml
index d70cad93c..a649ada6b 100644
--- a/apps/wallet/localization/src/main/res/values-zh/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-zh/strings.xml
@@ -10,6 +10,7 @@
     <string name="staking_pending_withdraw">%1$s 将在 %2$s 内被提取</string>
     <string name="edit_full">编辑</string>
     <string name="safe_mode_tonconnect_description">您可以在钱包的安全设置中更改此设置。</string>
+    <string name="renew_dns_done">域名续期 1 年</string>
     <string name="staking_unstake_cycle">取消质押请求将在 %1$s 的验证周期结束后处理</string>
     <string name="send_transaction_scroll">检查所有详细信息以确认</string>
     <string name="send_transaction_detail">将从您的钱包发送的代币总价值。退款不包含在总价值中。</string>
@@ -62,6 +63,7 @@
     <string name="liquid_staking">流动性质押</string>
     <string name="other">其他</string>
     <string name="minimum_amount">最低 %1$s</string>
+    <string name="min_amount">最低金额：%1$s</string>
     <string name="stake_ethena_description">tsUSDe 代币代表通过 Ethena（一种去中心化的质押服务）持有的 USDe。tsUSDe 会自动累积质押奖励，且锁定时间最少。</string>
     <string name="stake_ethena_disclaimer">这是根据过去一周的平均协议奖励和平均质押 USDe 数量估算的年化收益。收益按周复利计算，以年化形式呈现。<annotation colorAttr="textSecondaryColor">过往表现不保证未来结果。</annotation> 质押和奖励由第三方服务商 Ethena 提供，并受其<annotation colorAttr="textAccentColor">条款</annotation>约束。</string>
     <string name="stake_tonstakers_description">当您在 Tonstakers 池中质押 TON 时，您会收到一个名为 tsTON 的代币，它代表您在池中的份额。随着池子积累利润，您的 tsTON 代表的 TON 数量会越来越多。</string>
@@ -150,6 +152,7 @@
     <string name="unsubscribed">取消订阅</string>
     <string name="subscribed">已订阅</string>
     <string name="received">已接收</string>
+    <string name="on_sale">特价</string>
     <string name="nft_transfer">NFT转移</string>
     <string name="nft_disabled_transfer">NFT目前在市场上出售。要进行转让，您应先将其从销售中移除。</string>
     <string name="continue_action">继续</string>
@@ -173,6 +176,7 @@
     <string name="yesterday">昨天</string>
     <string name="collectibles">收藏品</string>
     <string name="purchases">购买</string>
+    <string name="enter_amount">输入金额</string>
     <string name="call_contract">调用合约</string>
     <string name="contract_address">合约地址</string>
     <string name="about_collection">关于收藏</string>
@@ -330,6 +334,7 @@
     <string name="logout_confirmation">我有%1$s的恢复短语备份副本</string>
     <string name="last_updated">更新 %1$s</string>
     <string name="back_up_now">备份</string>
+    <string name="confirm_swap">确认交换</string>
     <string name="max">最大</string>
     <string name="confirm_and_send">确认并发送</string>
     <string name="confirm_action">确认操作</string>
@@ -354,7 +359,7 @@
     <string name="system">系统</string>
     <string name="network_fee">网络费用</string>
     <string name="confirm">确认</string>
-    <string name="send_request_comment">您必须包含来自交易所的备注进行转账。否则，您的资金将丢失。</string>
+    <string name="send_request_comment">发送时，请务必包含交易所提供的备注或标签。否则资金将无法入账，且可能丢失。</string>
     <string name="banner_top">您当前正在使用 Tonkeeper 的实验版本。</string>
     <string name="banner_top_button">安装稳定版</string>
     <string name="signer_description">打开签名器 » 选择所需的密钥 » 扫描二维码</string>
@@ -428,7 +433,6 @@
     <plurals name="battery_charges_per_action">
         <item quantity="other">≈ 每 %2$s %1$s 次充电</item>
     </plurals>
-    <string name="will_be_paid_with_battery">将使用电池支付</string>
     <string name="battery_settings_title">电池设置</string>
     <string name="battery_settings_subtitle">选定的交易将由 Tonkeeper 电池支付。</string>
     <string name="battery_recharge_title">充值</string>
@@ -442,7 +446,6 @@
     <string name="promocode_hint">促销代码</string>
     <string name="refund">退款</string>
     <string name="gasless_switch_label">%1$s 后即可轻触付款</string>
-    <string name="change_fee_method">更改付款方式</string>
     <string name="battery_large_pack">大的</string>
     <string name="battery_medium_pack">中等的</string>
     <string name="battery_small_pack">小的</string>
@@ -476,6 +479,7 @@
     <string name="name">姓名</string>
     <string name="ledger_blind_signing_error">必须在 Ledger 设置中启用盲签名</string>
     <string name="nothing_to_restore">没什么可恢复的</string>
+    <string name="purchase">购买</string>
     <string name="new_contact">新地址</string>
     <string name="contact_delete_dialog">您确实要从地址簿中删除“%1$s”吗？</string>
     <string name="add_to_contact">添加到地址簿</string>
@@ -505,6 +509,7 @@
     <string name="stories_safemode_2_subtitle">以避免垃圾邮件和假冒物品。</string>
     <string name="stories_safemode_3_title">仅限已验证的代币</string>
     <string name="tx_marked_as_spam">交易被标记为垃圾邮件</string>
+    <string name="exchange_rate">汇率</string>
     <string name="address_prefix">地址：</string>
     <string name="your_address">您的地址：</string>
     <string name="safe_mode_tokens_footer">安全模式已启用。仅可使用经过验证的令牌。<annotation colorAttr="textAccentColor">设置</annotation></string>
@@ -579,5 +584,23 @@
     <string name="support_title">需要帮助吗？</string>
     <string name="support_subtitle">在 Telegram 上联系我，我们会尽力提供帮助。</string>
     <string name="ask_question">提出问题</string>
+    <string name="renew_dns_title">域名到期</string>
+    <string name="renew_dns_expires">%1$d 天后过期</string>
+    <string name="wallet_renew_dns">您有 %1$d 个域名即将过期。请全部续订至 %2$s。</string>
+    <string name="renew_dns_until">全部续订至 %1$s</string>
+    <string name="renew_signel_dns_until">续订至 %1$s</string>
+    <string name="renew_dns_all">全部续订</string>
+    <string name="dns_onsale_error_title">域名现在在市场上出售</string>
+    <string name="dns_onsale_error_desc">要续订域名，您应该先将其从销售中移除。</string>
+    <string name="choose_token">选择代币</string>
+    <string name="about_usde">关于 USDe</string>
+    <string name="empty_history">暂无交易</string>
+    <string name="staked_usde">已质押 USDe</string>
+    <string name="learn_more">了解更多</string>
+    <string name="charging_unavailable">电池充电不可用</string>
+    <string name="ethena_operated_by">由 %1$s 运营</string>
+    <string name="deposit_and_stake">存入并质押</string>
+    <string name="ethena_check_eligibility">检查状态</string>
+    <string name="about_ethena">关于 Ethena</string>
 
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values/strings.xml b/apps/wallet/localization/src/main/res/values/strings.xml
index 0494a4642..25606407a 100644
--- a/apps/wallet/localization/src/main/res/values/strings.xml
+++ b/apps/wallet/localization/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="w5beta" translatable="false">W5 Beta</string>
     <string name="fake" translatable="false">FAKE</string>
     <string name="beta" translatable="false">Beta</string>
+    <string name="slippage" translatable="false">Slippage</string>
     <string name="ok" translatable="false">OK</string>
     <string name="usb" translatable="false">USB</string>
     <string name="sign_data" translatable="false">Sign data</string>
@@ -75,6 +76,7 @@
     <string name="payment_method_not_found">Payment method not available</string>
     <string name="app_not_found">App not found</string>
     <string name="name">Name</string>
+    <string name="purchase">Purchase</string>
     <string name="new_contact">New Address</string>
     <string name="contact_delete_dialog">Are you sure you want to delete “%1$s” from your Address Book?</string>
     <string name="add_to_contact">Add to Address Book</string>
@@ -96,6 +98,7 @@
         <item quantity="many">%1$d NFTs</item>
         <item quantity="other">%1$d NFTs</item>
     </plurals>
+    <string name="exchange_rate">Exchange rate</string>
     <string name="address_prefix">Address:</string>
     <string name="your_address">Your address:</string>
     <string name="safe_mode_tokens_footer">Safe mode is enabled. Only verified tokens are available. <annotation colorAttr="textAccentColor">Settings</annotation></string>
@@ -103,6 +106,13 @@
     <string name="safe_mode_tonconnect_title">Connections are available only to verified apps</string>
     <string name="safe_mode_tonconnect_description">You can change this in your wallet’s Security Settings.</string>
 
+    <string name="renew_dns_title">Expiring domains</string>
+    <string name="renew_dns_expires">Expires in %1$d days</string>
+    <string name="wallet_renew_dns">You have %1$d expiring domains. Renew all until %2$s.</string>
+    <string name="renew_dns_until">Renew all until %1$s</string>
+    <string name="renew_signel_dns_until">Renew until %1$s</string>
+    <string name="renew_dns_all">Renew all</string>
+    <string name="renew_dns_done">Domain extended for 1 year</string>
     <string name="staking_unstake_cycle">Unstake request will be processed after the end of the validation cycle in %1$s</string>
 
     <string name="send_transaction_scroll">Check all details to confirm</string>
@@ -172,8 +182,9 @@
     <string name="liquid_staking">Liquid Staking</string>
     <string name="other">Other</string>
     <string name="minimum_amount">Minimum %1$s</string>
+    <string name="min_amount">Min. amount: %1$s</string>
     <string name="stake_ethena_description">The tsUSDe token represents USDe held through Ethena, a decentralized staking service. tsUSDe automatically accrues staking rewards, with minimal lock up.</string>
-    <string name="stake_ethena_disclaimer">This is the estimated annual return based on the past week’s average protocol rewards and the average amount of staked USDe. The return is annualized with weekly compounding. <annotation colorAttr="textSecondaryColor">Past performance does not guarantee future results.</annotation> Staking and rewards are provided by Ethena, a third-party service, and are subject to their <annotation colorAttr="textAccentColor">terms</annotation>.</string>
+    <string name="stake_ethena_disclaimer">This is the estimated annual return based on the past week’s average protocol rewards and the average amount of staked USDe. The return is annualized with weekly compounding. <annotation colorAttr="textSecondaryColor">Past performance does not guarantee future results.</annotation>\n\nStaking services and related rewards are provided by Ethena, an independent third-party service. Subject to their <annotation colorAttr="textAccentColor">terms of service</annotation>.</string>
     <string name="stake_tonstakers_description">When you stake TON in a Tonstakers pool, you receive a token called tsTON that represents your share in the pool. As the pool accumulates profits, your tsTON represents larger amount of TON.</string>
     <string name="edit">Edit</string>
     <string name="pinned">Pinned</string>
@@ -278,6 +289,9 @@
     <string name="unsubscribed">Unsubscribed</string>
     <string name="subscribed">Subscribed</string>
     <string name="received">Received</string>
+    <string name="dns_onsale_error_title">Domain is on sale at the marketplace now</string>
+    <string name="dns_onsale_error_desc">For renew domain, you should remove it from sale first.</string>
+    <string name="on_sale">ON SALE</string>
     <string name="nft_transfer">NFT Transfer</string>
     <string name="nft_disabled_transfer">NFT is on sale at the marketplace now. For transfer, you should remove it from sale first.</string>
     <string name="continue_action">Continue</string>
@@ -302,6 +316,8 @@
     <string name="yesterday">Yesterday</string>
     <string name="collectibles">Collectibles</string>
     <string name="purchases">Purchases</string>
+    <string name="choose_token">Choose Token</string>
+    <string name="enter_amount">Enter Amount</string>
     <string name="call_contract">Call contract</string>
     <string name="contract_address">Contract address</string>
     <string name="about_collection">About collection</string>
@@ -321,7 +337,7 @@
     <string name="new_wallet">New wallet</string>
     <string name="buy_toncoin">Buy Toncoin</string>
     <string name="buy_ton">Buy TON</string>
-    <string name="buy_or_sell_dot">Buy · Sell</string>
+    <string name="buy_or_sell_dot">Buy &amp; Sell Crypto</string>
     <string name="buy_or_sell">Buy or sell</string>
     <string name="fiat_open_description">You are opening an external app not operated by Tonkeeper.</string>
     <string name="buy">Buy</string>
@@ -496,6 +512,7 @@
     <string name="logout_confirmation">I have a backup copy of the recovery phrase for %1$s</string>
     <string name="last_updated">Updated %1$s</string>
     <string name="back_up_now">Back up</string>
+    <string name="confirm_swap">Confirm Swap</string>
     <string name="max">Max</string>
     <string name="confirm_and_send">Confirm and send</string>
     <string name="confirm_action">Confirm Action</string>
@@ -624,7 +641,6 @@
         <item quantity="many">≈ %1$s token transfers</item>
         <item quantity="other">≈ %1$s token transfers</item>
     </plurals>
-    <string name="will_be_paid_with_battery">Will be paid with Battery</string>
     <string name="battery_settings_title">Battery Settings</string>
     <string name="battery_settings_subtitle">Selected transactions will be paid by Tonkeeper Battery.</string>
     <string name="battery_recharge_title">Recharge</string>
@@ -638,7 +654,6 @@
     <string name="promocode_hint">Promo Code</string>
     <string name="refund">Refund</string>
     <string name="gasless_switch_label">Tap to pay in %1$s</string>
-    <string name="change_fee_method">Change Payment Method</string>
     <string name="recharge_battery">Recharge Battery</string>
     <string name="or">or</string>
     <string name="battery_large_pack">Large</string>
@@ -676,4 +691,14 @@
     <string name="support_title">Need help?</string>
     <string name="support_subtitle">Ask us on Telegram — we’ll do our best to help.</string>
     <string name="ask_question">Ask a Question</string>
+    <string name="about_usde">About USDe</string>
+    <string name="empty_history">No transactions</string>
+    <string name="staked_usde">Staked USDe</string>
+    <string name="learn_more">Learn more</string>
+    <string name="charging_unavailable">Battery charging is unavailable</string>
+    <string name="ethena_operated_by">Operated by %1$s</string>
+    <string name="deposit_and_stake">Deposit &amp; Stake</string>
+    <string name="ethena" translatable="false">Ethena</string>
+    <string name="ethena_check_eligibility">Check Eligibility</string>
+    <string name="about_ethena">About Ethena</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index f85a38969..77fc1f0b2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,17 +1,19 @@
 import com.android.build.gradle.AppExtension
 
 plugins {
-    id("com.android.application") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
-    id("com.android.library") version "8.9.1" apply false
-    id("com.google.gms.google-services") version "4.4.2" apply false
-    id("com.google.firebase.crashlytics") version "3.0.3" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0"
-    id("com.android.test") version "8.9.1" apply false
-    id("androidx.baselineprofile") version "1.3.4"
-    id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
-    id("com.google.firebase.firebase-perf") version "1.4.2" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0"
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.kotlin) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.test) apply false
+    alias(libs.plugins.android.baselineprofile)
+    alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.multiplatform.library) apply false
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.firebase.services) apply false
+    alias(libs.plugins.firebase.crashlytics) apply false
+    alias(libs.plugins.firebase.performance) apply false
 }
 
 allprojects {
diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html
index 8e699aca4..17c5e4382 100644
--- a/build/reports/problems/problems-report.html
+++ b/build/reports/problems/problems-report.html
@@ -650,12 +650,12 @@
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] source value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"source value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-source","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] target value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"target value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-target","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] To suppress warnings about obsolete options, use -Xlint:-options."}],"contextualLabel":"To suppress warnings about obsolete options, use -Xlint:-options.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-suppression","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] source value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"source value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-source","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] target value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"target value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-target","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] To suppress warnings about obsolete options, use -Xlint:-options."}],"contextualLabel":"To suppress warnings about obsolete options, use -Xlint:-options.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-suppression","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] source value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"source value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-source","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] target value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"target value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-target","displayName":"Java compilation warning"}]},{"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] To suppress warnings about obsolete options, use -Xlint:-options."}],"contextualLabel":"To suppress warnings about obsolete options, use -Xlint:-options.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-suppression","displayName":"Java compilation warning"}]}],"problemsReport":{"totalProblemCount":9,"buildName":"TON Apps","requestedTasks":":apps:wallet:instance:main:assembleDefaultDebug :apps:wallet:instance:main:assembleDefaultDebugUnitTest :apps:wallet:instance:main:assembleDefaultDebugAndroidTest :apps:signer:assembleDebug :apps:signer:assembleDebugUnitTest :apps:signer:assembleDebugAndroidTest","documentationLink":"https://docs.gradle.org/8.11.1/userguide/problems-report.html","documentationLinkCaption":"Problem report"}}
+{"diagnostics":[{"locations":[{"taskPath":":apps:wallet:instance:main:compileDefaultDebugJavaWithJavac"}],"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] source value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"source value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-source","displayName":"Java compilation warning"}]},{"locations":[{"taskPath":":apps:wallet:instance:main:compileDefaultDebugJavaWithJavac"}],"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] target value 8 is obsolete and will be removed in a future release"}],"contextualLabel":"target value 8 is obsolete and will be removed in a future release","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-target","displayName":"Java compilation warning"}]},{"locations":[{"taskPath":":apps:wallet:instance:main:compileDefaultDebugJavaWithJavac"}],"problem":[{"text":"Java compilation warning"}],"severity":"WARNING","problemDetails":[{"text":"warning: [options] To suppress warnings about obsolete options, use -Xlint:-options."}],"contextualLabel":"To suppress warnings about obsolete options, use -Xlint:-options.","problemId":[{"name":"java","displayName":"Java compilation"},{"name":"compilation","displayName":"Compilation"},{"name":"compiler-warn-option-obsolete-suppression","displayName":"Java compilation warning"}]}],"problemsReport":{"totalProblemCount":3,"buildName":"TON Apps","requestedTasks":":apps:wallet:instance:main:assembleDefaultDebug :apps:wallet:instance:main:assembleDefaultDebugUnitTest :apps:wallet:instance:main:assembleDefaultDebugAndroidTest :apps:signer:assembleDebug :apps:signer:assembleDebugUnitTest :apps:signer:assembleDebugAndroidTest","documentationLink":"https://docs.gradle.org/8.13/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>
                 <script type="text/javascript">
-                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,q,y,B,C,x,j,P,I,S,z,E,T,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,qn,yn,Bn,Cn,xn,jn,Pn,In,Sn,zn=Math.imul,En=ArrayBuffer.isView;function Tn(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();if(t>=n.length)return An(n);if(1===t)return dr(n[0]);var r=0,i=Lr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,Wn(n.length-t|0,0))}function Ln(n){return n.length-1|0}function Nn(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,ue(t,n[f]))return f}while(u<=o)}return-1}function An(n){switch(n.length){case 0:return bt();case 1:return dr(n[0]);default:return function(n){return Nr(function(n){return new qt(n,!1)}(n))}(n)}}function Mn(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Fn(n,wi(),t,r,i,e,u,o).toString()}function Fn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Vt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Dn(n){if(n.i())throw pu("List is empty.");return n.j(0)}function On(n){return new Zn(n)}function Rn(n){if(Ge(n,Ei)){var t;switch(n.k()){case 0:t=bt();break;case 1:t=dr(Ge(n,zi)?n.j(0):n.f().h());break;default:t=$n(n)}return t}return pt(Un(n))}function Hn(n){if(Ge(n,Ei)&&n.k()<=1)return Rn(n);var t=Un(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return hr();var r=mt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function $n(n){return Nr(n)}function Gn(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();var r=n.k();if(t>=r)return Rn(n);if(1===t)return dr(Vn(n));var i=Lr();if(Ge(n,hi)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Un(n){return Ge(n,Ei)?$n(n):Qn(n,Tr())}function Vn(n){if(n.i())throw pu("List is empty.");return n.j(mt(n))}function Qn(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function Zn(n){this.n_1=n}function Yn(n,t){return n>t?t:n}function Wn(n,t){return n<t?t:n}function Kn(n,t){return Gt().q(n,t,-1)}function Xn(n,t){return new zt(n,t)}function Jn(n){var t=n.f();if(!t.g())return bt();var r=t.h();if(!t.g())return dr(r);var i=Tr();for(i.d(r);t.g();)i.d(t.h());return i}function nt(n){this.r_1=n}function tt(n,t){this.s_1=n,this.t_1=t}function rt(){}function it(n){this.x_1=n,this.w_1=0}function et(n,t){this.a1_1=n,it.call(this,n),ot().b1(t,this.a1_1.k()),this.w_1=t}function ut(){t=this}function ot(){return null==t&&new ut,t}function ft(){ot(),rt.call(this)}function st(n){this.h1_1=n}function ct(n,t){return t===n?"(this Map)":Di(t)}function at(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(ue(e.j1(),t)){r=e;break n}}r=null}return r}function ht(){r=this}function lt(){return null==r&&new ht,r}function _t(n){this.q1_1=n,rt.call(this)}function vt(){lt(),this.n1_1=null,this.o1_1=null}function dt(){i=this}function gt(){return null==i&&new dt,i}function wt(n){return n.length>0?Je(n):bt()}function bt(){return null==e&&new kt,e}function pt(n){switch(n.k()){case 0:return bt();case 1:return dr(n.j(0));default:return n}}function mt(n){return n.k()-1|0}function kt(){e=this,this.z1_1=new ve(-1478467534,-1720727600)}function qt(n,t){this.b2_1=n,this.c2_1=t}function yt(){u=this}function Bt(){return null==u&&new yt,u}function Ct(n,t){return Ge(n,Ei)?n.k():t}function xt(n,t){if(Ge(t,Ei))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function jt(){}function Pt(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw su("Position index "+t+" must be in range ["+De(0,n.k())+"].");return n.k()-t|0}(n,t))}function It(n){ft.call(this),this.i2_1=n}function St(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function zt(n,t){this.l2_1=n,this.m2_1=t}function Et(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,hr()}n.o2_1=0}function Tt(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Lt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function Nt(){return null==o&&new At,o}function At(){o=this,this.u2_1=new ve(1993859828,793161749)}function Mt(n,t,r){return Ft(Ft(n,r)-Ft(t,r)|0,r)}function Ft(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Dt(){f=this,this.p_1=new Rt(1,0)}function Ot(){return null==f&&new Dt,f}function Rt(n,t){Ot(),Ut.call(this,n,t,1)}function Ht(n,t,r){jt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function $t(){s=this}function Gt(){return null==s&&new $t,s}function Ut(n,t,r){if(Gt(),0===r)throw ou("Step must be non-zero.");if(r===_r().MIN_VALUE)throw ou("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Mt(t,n,r)|0;else{if(!(r<0))throw ou("Step is zero.");i=n<=t?t:t+Mt(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Vt(n,t,r){null!=r?n.e(r(t)):null==t||Qe(t)?n.e(t):t instanceof Si?n.i3(t.h3_1):n.e(Di(t))}function Qt(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=pi(n),e=pi(t);return i===e||ue(new Si(Qi(ji(i).toLowerCase(),0)),new Si(Qi(ji(e).toLowerCase(),0)))}function Zt(n){return Yi(n)-1|0}function Yt(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?Wt(n,t,r,Yi(n),i):n.indexOf(t,r)}function Wt(n,t,r,i,e,u){var o=(u=u!==A&&u)?Kn(Yn(r,Zt(n)),Wn(i,0)):De(Wn(r,0),Yn(i,Yi(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,Ci(t,0,n,a,Yi(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,nr(t,0,n,v,Yi(t),e))return v}while(v!==l)}return-1}function Kt(n){var t=0,r=Yi(n)-1|0,i=!1;n:for(;t<=r;){var e=mi(Qi(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return Wi(n,t,r+1|0)}function Xt(n,t){return re(Wi(n,t.y2(),t.c3()+1|0))}function Jt(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,tr(e=e===A?0:e);var u,o,f=Je(t);return new er(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ge(n,zi))return function(n){var t;switch(n.k()){case 0:throw pu("List is empty.");case 1:t=n.j(0);break;default:throw ou("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw pu("Collection is empty.");var r=t.h();if(t.g())throw ou("Collection has more than one element.");return r}(t),u=Yt(n,e,r);return u<0?null:or(u,e)}var o=De(Wn(r,0),Yi(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(Ci(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return or(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(nr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return or(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:or(r.t3_1,r.u3_1.length)}))}function nr(n,t,r,i,e,u){if(i<0||t<0||t>(Yi(n)-e|0)||i>(Yi(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!Qt(Qi(n,t+f|0),Qi(r,i+f|0),u))return!1}while(o<e);return!0}function tr(n){if(!(n>=0))throw ou(re("Limit must be non-negative, but was "+n))}function rr(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>Yi(n.o3_1.p3_1))n.m3_1=De(n.k3_1,Zt(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=De(n.k3_1,Zt(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=_r().MIN_VALUE?Ot().p_1:De(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function ir(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw ou("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,Yi(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function er(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function ur(n,t){this.t3_1=n,this.u3_1=t}function or(n,t){return new ur(n,t)}function fr(){}function sr(){}function cr(){}function ar(){c=this}function hr(){return null==c&&new ar,c}function lr(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function _r(){return null==a&&new lr,a}function vr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function dr(n){return 0===(t=[n]).length?Tr():Nr(new qt(t,!0));var t}function gr(n){return n<0&&function(){throw ku("Index overflow has happened.")}(),n}function wr(n){return void 0!==n.toArray?n.toArray():vr(n)}function br(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=se(fe(Qr)),function(n,t,r){Sr.call(r),Qr.call(r),r.y5_1=function(n){return Gr(n,0,se(fe(Ur)))}(n)}(r,0,i),i));var t,r,i}function pr(){rt.call(this)}function mr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function kr(n,t){this.n4_1=n,mr.call(this,n),ot().b1(t,this.n4_1.k()),this.h4_1=t}function qr(){pr.call(this),this.o4_1=0}function yr(n){this.r4_1=n}function Br(n){this.s4_1=n}function Cr(n,t){this.t4_1=n,this.u4_1=t}function xr(){Sr.call(this)}function jr(n){this.x4_1=n,Sr.call(this)}function Pr(n){this.e5_1=n,pr.call(this)}function Ir(){vt.call(this),this.c5_1=null,this.d5_1=null}function Sr(){pr.call(this)}function zr(){h=this;var n=Lr();n.c_1=!0,this.i5_1=n}function Er(){return null==h&&new zr,h}function Tr(){return n=se(fe(Mr)),t=[],Mr.call(n,t),n;var n,t}function Lr(n){return t=se(fe(Mr)),r=[],Mr.call(t,r),t;var t,r}function Nr(n){return function(n,t){var r;return r=wr(n),Mr.call(t,r),t}(n,se(fe(Mr)))}function Ar(n,t){return ot().e1(t,n.k()),t}function Mr(n){Er(),qr.call(this),this.b_1=n,this.c_1=!1}function Fr(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Fr(n,t,r,u,e),f=Fr(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Dr(n,t){return(3&n)-(3&t)|0}function Or(){_=this}function Rr(n){this.n5_1=n,xr.call(this)}function Hr(n){return function(n,t){Ir.call(t),Ur.call(t),t.t5_1=n,t.u5_1=n.w5()}(new Xr((null==_&&new Or,_)),n),n}function $r(){return Hr(se(fe(Ur)))}function Gr(n,t,r){if(Hr(r),!(n>=0))throw ou(re("Negative initial capacity: "+n));if(!(t>=0))throw ou(re("Non-positive load factor: "+t));return r}function Ur(){this.v5_1=null}function Vr(n,t){return Sr.call(t),Qr.call(t),t.y5_1=n,t}function Qr(){}function Zr(n,t){var r=Wr(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Ue(i))return Yr(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function Yr(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function Wr(n,t){var r=n.i6_1[t];return void 0===r?null:r}function Kr(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function Xr(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function Jr(){}function ni(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function ti(){v=this;var n,t=(oi(0,0,n=se(fe(fi))),n);t.x6_1=!0,this.e7_1=t}function ri(){return null==v&&new ti,v}function ii(n,t,r){this.d7_1=n,Cr.call(this,t,r),this.b7_1=null,this.c7_1=null}function ei(n){this.y6_1=n,xr.call(this)}function ui(){return Hr(n=se(fe(fi))),fi.call(n),n.w6_1=$r(),n;var n}function oi(n,t,r){return Gr(n,t,r),fi.call(r),r.w6_1=$r(),r}function fi(){ri(),this.v6_1=null,this.x6_1=!1}function si(){d=this;var n=ci(0),t=n.y5_1;(t instanceof fi?t:le()).j5(),this.f7_1=n}function ci(n){return function(n,t){return function(n,t,r){Vr(function(n,t){return oi(n,t,se(fe(fi)))}(n,t),r),ai.call(r)}(n,0,t),t}(n,se(fe(ai)))}function ai(){null==d&&new si}function hi(){}function li(){}function _i(n){li.call(this),this.k7_1=n}function vi(){di.call(this)}function di(){li.call(this),this.m7_1=""}function gi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new _i(process.stdout):new vi}}function wi(){return n=se(fe(bi)),bi.call(n,""),n;var n}function bi(n){this.o7_1=void 0!==n?n:""}function pi(n){var t=ji(n).toUpperCase();return t.length>1?n:Qi(t,0)}function mi(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function ki(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function qi(){return null==b&&new ki,b}function yi(n,t){qi(),this.v7_1=n,this.w7_1=function(n){if(Ge(n,Ei)){var t;switch(n.k()){case 0:t=Nt();break;case 1:t=br(Ge(n,zi)?n.j(0):n.f().h());break;default:t=Qn(n,ci(n.k()))}return t}return function(n){switch(n.k()){case 0:return Nt();case 1:return br(n.f().h());default:return n}}(Qn(n,(r=se(fe(ai)),Vr(ui(),r),ai.call(r),r)));var r}(t),this.x7_1=new RegExp(n,Mn(t,"","gu",A,A,A,Bi)),this.y7_1=null,this.z7_1=null}function Bi(n){return n.d8_1}function Ci(n,t,r,i,e,u){return nr(n,t,r,i,e,u=u!==A&&u)}function xi(n,t){return n-t|0}function ji(n){return String.fromCharCode(n)}function Pi(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Ii(){return null==p&&new Pi,p}function Si(n){Ii(),this.h3_1=n}function zi(){}function Ei(){}function Ti(){}function Li(){}function Ni(){}function Ai(){}function Mi(){m=this}function Fi(n,t){null==m&&new Mi,this.p8_1=n,this.q8_1=t}function Di(n){var t=null==n?null:re(n);return null==t?"null":t}function Oi(n){return new Ri(n)}function Ri(n){this.t8_1=n,this.s8_1=0}function Hi(){return Vi(),k}function $i(){return Vi(),q}function Gi(){return Vi(),y}function Ui(){return Vi(),B}function Vi(){x||(x=!0,k=new ArrayBuffer(8),q=new Float64Array(Hi()),new Float32Array(Hi()),y=new Int32Array(Hi()),$i()[0]=-1,B=0!==Gi()[0]?1:0,C=1-Ui()|0)}function Qi(n,t){var r;if(Zi(n)){var i,e=n.charCodeAt(t);if(Ii(),e<0?i=!0:(Ii(),i=e>65535),i)throw ou("Invalid Char code: "+e);r=Fe(e)}else r=n.y3(t);return r}function Zi(n){return"string"==typeof n}function Yi(n){return Zi(n)?n.length:n.x3()}function Wi(n,t,r){return Zi(n)?n.substring(t,r):n.z3(t,r)}function Ki(n){return re(n)}function Xi(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?Ji(n,t):t instanceof ve?Ji(n,t.w8()):ne(n,t);break;case"string":case"boolean":r=ne(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function Ji(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function ne(n,t){return n<t?-1:n>t?1:0}function te(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function re(n){return null==n?"null":function(n){return!!He(n)||En(n)}(n)?"[...]":n.toString()}function ie(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():te(n);break;case"function":t=te(n);break;case"number":t=function(n){return Vi(),(0|n)===n?Me(n):($i()[0]=n,zn(Gi()[(Vi(),C)],31)+Gi()[Ui()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=ee(String(n))}return t}function ee(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=zn(t,31)+u|0}while(e!==i);return t}function ue(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function oe(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function fe(n){return n.prototype}function se(n){return Object.create(n)}function ce(n,t,r){Error.call(n),function(n,t,r){var i=Ke(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function ae(n){var t;return null==n?function(){throw xu()}():t=n,t}function he(){throw Pu()}function le(){throw Su()}function _e(){j=this,this.x8_1=new ve(0,-2147483648),this.y8_1=new ve(-1,2147483647),this.z8_1=8,this.a9_1=64}function ve(n,t){null==j&&new _e,cr.call(this),this.u8_1=n,this.v8_1=t}function de(){return Ae(),P}function ge(){return Ae(),I}function we(){return Ae(),S}function be(){return Ae(),E}function pe(){return Ae(),T}function me(n,t){if(Ae(),Ce(n,t))return 0;var r=Pe(n),i=Pe(t);return r&&!i?-1:!r&&i?1:Pe(qe(n,t))?-1:1}function ke(n,t){Ae();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new ve((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function qe(n,t){return Ae(),ke(n,t.e9())}function ye(n,t){if(Ae(),Ie(n))return de();if(Ie(t))return de();if(Ce(n,be()))return Se(t)?be():de();if(Ce(t,be()))return Se(n)?be():de();if(Pe(n))return Pe(t)?ye(ze(n),ze(t)):ze(ye(ze(n),t));if(Pe(t))return ze(ye(n,ze(t)));if(Ee(n,pe())&&Ee(t,pe()))return Te(Be(n)*Be(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+zn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+zn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+zn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+zn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+zn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+zn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((zn(r,c)+zn(i,s)|0)+zn(e,f)|0)+zn(u,o)|0)|0,new ve(l<<16|_,(a&=65535)<<16|h)}function Be(n){return Ae(),4294967296*n.v8_1+function(n){return Ae(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function Ce(n,t){return Ae(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function xe(n,t){if(Ae(),t<2||36<t)throw _u("radix out of range: "+t);if(Ie(n))return"0";if(Pe(n)){if(Ce(n,be())){var r=je(t),i=n.d9(r),e=qe(ye(i,r),n).g9();return xe(i,t)+e.toString(t)}return"-"+xe(ze(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Te(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=qe(f,ye(c,o)).g9().toString(t);if(Ie(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function je(n){return Ae(),new ve(n,n<0?-1:0)}function Pe(n){return Ae(),n.v8_1<0}function Ie(n){return Ae(),0===n.v8_1&&0===n.u8_1}function Se(n){return Ae(),!(1&~n.u8_1)}function ze(n){return Ae(),n.e9()}function Ee(n,t){return Ae(),me(n,t)<0}function Te(n){if(Ae(),(t=n)!=t)return de();if(n<=-0x8000000000000000)return be();if(n+1>=0x8000000000000000)return Ae(),z;if(n<0)return ze(Te(-n));var t,r=4294967296;return new ve(n%r|0,n/r|0)}function Le(n,t){return Ae(),me(n,t)>0}function Ne(n,t){return Ae(),me(n,t)>=0}function Ae(){L||(L=!0,P=je(0),I=je(1),S=je(-1),z=new ve(-1,2147483647),E=new ve(0,-2147483648),T=je(16777216))}function Me(n){return n instanceof ve?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function Fe(n){var t;return t=function(n){return n<<16>>16}(Me(n)),function(n){return 65535&n}(t)}function De(n,t){return new Rt(n,t)}function Oe(n,t,r,i){return Re("class",n,t,r,i,null)}function Re(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function He(n){return Array.isArray(n)}function $e(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ge(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!!(n[r]&i)}(r,t)}(n,t.$metadata$.iid)}function Ue(n){return!!He(n)&&!n.$type$}function Ve(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function Qe(n){return"string"==typeof n||Ge(n,fr)}function Ze(n,t,r,i){return Re("interface",n,t,r,i,(null==N&&(N=0),N=Ye()+1|0,Ye()))}function Ye(){if(null!=N)return N;!function(){throw Eu("lateinit property iid has not been initialized")}()}function We(n,t,r,i){return Re("object",n,t,r,i,null)}function Ke(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(Xe(n,"message")&&(u|=1),Xe(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=Ke(o))}return null!=r&&(r.errorInfo=u),u}function Xe(n,t){return n.hasOwnProperty(t)}function Je(n){return new Mr(n)}function nu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=Qi(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function tu(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function ru(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=Yi(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[Qi(n,e)]=e}while(r<=i);var u=nu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=nu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=nu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function iu(){return null==M&&new ru,M}function eu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function uu(){return null==F&&new eu,F}function ou(n){var t=function(n,t){return gu(n,t),fu.call(t),t}(n,se(fe(fu)));return oe(t,ou),t}function fu(){oe(this,fu)}function su(n){var t=function(n,t){return gu(n,t),cu.call(t),t}(n,se(fe(cu)));return oe(t,su),t}function cu(){oe(this,cu)}function au(n){var t=function(n,t){return gu(n,t),hu.call(t),t}(n,se(fe(hu)));return oe(t,au),t}function hu(){oe(this,hu)}function lu(n,t){return ce(t,n),vu.call(t),t}function _u(n){var t=lu(n,se(fe(vu)));return oe(t,_u),t}function vu(){oe(this,vu)}function du(n){return function(n){ce(n),vu.call(n)}(n),wu.call(n),n}function gu(n,t){return lu(n,t),wu.call(t),t}function wu(){oe(this,wu)}function bu(){var n,t=(du(n=se(fe(mu))),mu.call(n),n);return oe(t,bu),t}function pu(n){var t=function(n,t){return gu(n,t),mu.call(t),t}(n,se(fe(mu)));return oe(t,pu),t}function mu(){oe(this,mu)}function ku(n){var t=function(n,t){return gu(n,t),qu.call(t),t}(n,se(fe(qu)));return oe(t,ku),t}function qu(){oe(this,qu)}function yu(){var n,t=(du(n=se(fe(Cu))),Cu.call(n),n);return oe(t,yu),t}function Bu(n){var t=function(n,t){return gu(n,t),Cu.call(t),t}(n,se(fe(Cu)));return oe(t,Bu),t}function Cu(){oe(this,Cu)}function xu(){var n,t=(du(n=se(fe(ju))),ju.call(n),n);return oe(t,xu),t}function ju(){oe(this,ju)}function Pu(){var n,t=(du(n=se(fe(Iu))),Iu.call(n),n);return oe(t,Pu),t}function Iu(){oe(this,Iu)}function Su(){var n,t=(du(n=se(fe(zu))),zu.call(n),n);return oe(t,Su),t}function zu(){oe(this,zu)}function Eu(n){var t=function(n,t){return gu(n,t),Tu.call(t),t}(n,se(fe(Tu)));return oe(t,Eu),t}function Tu(){oe(this,Tu)}function Lu(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return yi.call(t,n,Nt()),t}(r,se(fe(yi)))).a8(i)}function Nu(n,t){this.o9_1=n,this.p9_1=t}function Au(n){this.q9_1=n}function Mu(n,t,r){var i,e=Mf(),u=Yu(),o=Af().ga(t),f=Yu();if(0===Yi(r))i=Tf();else{var s=n.ia_1,c=null==s?null:new Au(s).v9(r,"Copy reference to the clipboard");i=null==c?Tf():c}return e.ja([u,o,f,i])}function Fu(n){n=n===A?null:n,this.ia_1=n}function Du(n,t,r){Zu.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Ou(n,t){this.ra_1=n,this.sa_1=t}function Ru(n,t){Zu.call(this),this.va_1=n,this.wa_1=t}function Hu(n,t){Zu.call(this),this.xa_1=n,this.ya_1=t}function $u(n){Zu.call(this),this.za_1=n}function Gu(n){Zu.call(this),this.ab_1=n}function Uu(n){Zu.call(this),this.bb_1=n}function Vu(n,t){Zu.call(this),this.cb_1=n,this.db_1=t}function Qu(n){Zu.call(this),this.eb_1=n}function Zu(){}function Yu(){return to(),D}function Wu(){return to(),O}function Ku(){return to(),R}function Xu(){return to(),H}function Ju(n){return to(),Mf().fb(Xf(no),n)}function no(n){return to(),n.gb(["invisible-text","text-for-copy"]),hr()}function to(){$||($=!0,D=Ju("`"),O=Ju(" "),R=Ju("("),H=Ju(")"))}function ro(n,t){Zu.call(this),this.hb_1=n,this.ib_1=t}function io(n){Zu.call(this),this.jb_1=n}function eo(n,t){Zu.call(this),this.kb_1=n,this.lb_1=t}function uo(n){Zu.call(this),this.mb_1=n}function oo(n){Zu.call(this),this.nb_1=n}function fo(n){Zu.call(this),this.ob_1=n}function so(n,t,r){Zu.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function co(n){Zu.call(this),this.sb_1=n}function ao(n){Zu.call(this),this.tb_1=n}function ho(n){return n.xb_1.vb_1.k()}function lo(){if(Z)return hr();Z=!0,G=new mo("Inputs",0,"Build configuration inputs"),U=new mo("ByMessage",1,"Problems grouped by message"),V=new mo("ByLocation",2,"Problems grouped by location"),Q=new mo("IncompatibleTasks",3,"Incompatible tasks")}function _o(n){bc.call(this),this.yb_1=n}function vo(n){bc.call(this),this.ac_1=n}function go(n){bc.call(this),this.bc_1=n}function wo(n){bc.call(this),this.cc_1=n}function bo(n){ko.call(this),this.dc_1=n}function po(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function mo(n,t,r){Fi.call(this,n,t),this.qc_1=r}function ko(){mc.call(this)}function qo(n,t){var r=Nf(),i=Xf(To),e=Nf().y9(Xf(Lo),[]),u=function(n,t){var r,i=Nf(),e=Xf(Do),u=Mf().ga("Learn more about the "),o=Hf();return i.y9(e,[u,o.fb(Xf((r=t,function(n){return n.bd(r.tc_1),hr()})),t.sc_1),Mf().ga(".")])}(0,t.gc_1),o=Nf().y9(Xf(No),[Bo(0,t)]),f=Nf();return r.y9(i,[e,u,o,f.y9(Xf(Ao),[Po(0,Oo(),t.lc_1,ho(t.jc_1)),Po(0,Ro(),t.lc_1,ho(t.hc_1)),Po(0,Ho(),t.lc_1,ho(t.ic_1)),Po(0,$o(),t.lc_1,ho(t.kc_1))])])}function yo(n,t){var r,i,e=Nf(),u=Xf(Mo);switch(t.lc_1.q8_1){case 0:r=So(0,t.jc_1,((i=function(n){return new go(n)}).callableName="<init>",i));break;case 3:r=So(0,t.kc_1,function(){var n=function(n){return new wo(n)};return n.callableName="<init>",n}());break;case 1:r=So(0,t.hc_1,function(){var n=function(n){return new vo(n)};return n.callableName="<init>",n}());break;case 2:r=So(0,t.ic_1,function(){var n=function(n){return new _o(n)};return n.callableName="<init>",n}());break;default:he()}return e.y9(u,[r])}function Bo(n,t){return Nf().ja([jo(0,t),Co(0,t)])}function Co(n,t){for(var r=Nf(),i=t.fc_1,e=Tr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,xt(e,0===gr(s)?dr(xo(Uo(),f)):wt([$f().ja([]),xo(Uo(),f)]))}return r.ha(e)}function xo(n,t){return Ff().ja([Cc(t)])}function jo(n,t){return Lf().ja([yc().ka(t.ec_1)])}function Po(n,t,r,i){var e,u,o;return Nf().y9(Xf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),hr()):u.equals(o)?(n.t9("group-selector--active"),hr()):(n.u9(function(n){return function(t){return new bo(n)}}(u)),hr()),hr()})),[Mf().rc(t.qc_1,[Io(0,i)])])}function Io(n,t){return Mf().y9(Xf(Fo),[Wu(),Ku(),Mf().ga(""+t),Xu()])}function So(n,t,r){return function(n,t,r){var i,e=Nf(),u=Df();return e.ja([u.ha(ks(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Ru?zc(i,(Uo(),(t=function(n){return zo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,kc()):r instanceof Hu?zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r.xa_1,r.ya_1,qc()):r instanceof ro?zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r.hb_1,r.ib_1,A,Io(Uo(),n.cd().vb_1.k())):r instanceof Du?Sc(i,n,r):zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function zo(n,t){var r;return t instanceof io?xc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),hr()})):t instanceof so?xc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),hr()}}(t)):t instanceof fo?xc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),hr()}}(t)):t instanceof eo?xc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),hr()}}(t)):t instanceof oo?xc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),hr()}}(t)):t instanceof co?xc(function(n){return function(t){return t.ed(n.sb_1),hr()}}(t)):t instanceof ao?xc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),hr()}}(t)):t instanceof Qu?xc(function(n){return function(t){return t.ed(n.eb_1),hr()}}(t)):t instanceof $u?Cc(t.za_1):t instanceof Vu?Vo(t):Mf().ga(re(t))}function Eo(n){return n.t9("report-wrapper"),hr()}function To(n){return n.t9("header"),hr()}function Lo(n){return n.t9("gradle-logo"),hr()}function No(n){return n.t9("title"),hr()}function Ao(n){return n.t9("groups"),hr()}function Mo(n){return n.t9("content"),hr()}function Fo(n){return n.t9("group-selector__count"),hr()}function Do(n){return n.t9("learn-more"),hr()}function Oo(){return lo(),G}function Ro(){return lo(),U}function Ho(){return lo(),V}function $o(){return lo(),Q}function Go(){Y=this}function Uo(){return null==Y&&new Go,Y}function Vo(n){var t;return Hf().fb(Xf((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),hr()})),n.db_1)}function Qo(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function Zo(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function Yo(n,t){for(var r=_f(n),i=t.trace,e=Lr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=Xo(s),e.d(f)}return new Qo(t,r,e)}function Wo(n,t){var r,i=null==(r=t.kd_1.error)?null:Jo(r);null==i||n.d(i)}function Ko(n){return function(n,t,r){var i=null==n.error?null:new Ru(t,r);return null==i?new Hu(t,r):i}(n.kd_1,new $u(n.ld_1),rf(n.kd_1))}function Xo(n){var t;switch(n.kind){case"Project":t=new io(n.path);break;case"Task":t=new eo(n.path,n.type);break;case"TaskPath":t=new uo(n.path);break;case"Bean":t=new oo(n.type);break;case"Field":t=new so("field",n.name,n.declaringType);break;case"InputProperty":t=new so("input property",n.name,n.task);break;case"OutputProperty":t=new so("output property",n.name,n.task);break;case"SystemProperty":t=new fo(n.name);break;case"PropertyUsage":t=new so("property",n.name,n.from);break;case"BuildLogic":t=new co(n.location);break;case"BuildLogicClass":t=new ao(n.type);break;default:t=new Qu("Gradle runtime")}return t}function Jo(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new $u(_f(r))}for(var i=n.summary,e=null==i?null:_f(i),u=Tr(),o=Oi(t);o.g();){var f=tf(o.h());null==f||u.d(f)}for(var s=Mn(u,"\n"),c=Tr(),a=Oi(t);a.g();){var h=nf(a.h());null==h||c.d(h)}return new Du(e,s,c)}function nf(n){var t=tf(n);if(null==t)return null;var r,i,e=Jn(new Lt(function(n,t,r,i){var e;return Xn(Jt(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return Xt(e,n)}))}(t),!0,hf));return new Ou(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?bs():null))}function tf(n){var t=n.text;return null==t?n.internalText:t}function rf(n){var t=n.documentationLink;return null==t?null:new Vu(t,"")}function ef(n,t){return new ss(uf(n,xf().sd(t),bs()))}function uf(n,t,r){return new ms(n,function(n,t){var r,i=Xn(On(n.o()),Pf);return Jn(Xn(new tt(i,new of(lf)),(r=t,function(n){return uf(n.v3(),n.w3().wd_1,r)})))}(t,1===jf(t)?ps():bs()),0===jf(t)?bs():r)}function of(n){this.td_1=n}function ff(n){var t=Tr(),r=n.ld_1,i=Dn(r.ca_1).fa_1,e=re(Kt(Qe(i)?i:le())),u=r.vd(function(n,t){var r;if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return Rn(n);if(Ge(n,Ei)){var i=n.k()-t|0;if(i<=0)return bt();if(1===i)return dr(function(n){if(Ge(n,zi))return Vn(n);var t=n.f();if(!t.g())throw pu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Lr(),Ge(n,zi)){if(Ge(n,hi)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Tr();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return pt(r)}(r.ca_1,1));return t.d(new ro(new Qu(e),rf(n.kd_1))),t.d(new $u(u)),t.m(n.md_1),t.j5()}function sf(n){var t=Tr(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new Hu(new $u(i),rf(n.kd_1))),t.j5()}function cf(n){var t=Tr();return t.d(Ko(n)),t.m(n.md_1),Wo(t,n),t.j5()}function af(n){var t=Tr();return t.m(new It(n.md_1)),t.d(Ko(n)),Wo(t,n),t.j5()}function hf(n){return Yi(n)>0}function lf(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:Xi(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof ve}(r)||Ge(r,sr))?n:le(),t);var r,i}(Di(n.v3()),Di(t.v3()))}function _f(n){var t;return yf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),hr())}return hr()}))}function vf(n,t){return(0!==(r=n)?r.toString():"No")+" "+df(t,n)+" "+gf(n)+" found";var r}function df(n,t){return t<2?n:n+"s"}function gf(n){return n<=1?"was":"were"}function wf(n,t){this.sc_1=n,this.tc_1=t}function bf(n){mf.call(this),this.fa_1=n}function pf(n,t){mf.call(this),this.da_1=n,this.ea_1=t}function mf(){}function kf(){this.dd_1=Tr()}function qf(){W=this}function yf(){return null==W&&new qf,W}function Bf(n){yf(),this.ca_1=n}function Cf(){K=this}function xf(){return null==K&&new Cf,K}function jf(n){return n.k()}function Pf(n){var t=n.j1(),r=n.i1();return or(t,new If(Ge(r,Li)?r:le()))}function If(n){xf(),this.wd_1=n}function Sf(n,t,r){var i;Ef(t,n,r),i="Component mounted at #"+n.id+".",gi(),(gi(),g).j7(i)}function zf(n){var t=document.getElementById(n);if(null==t)throw au("'"+n+"' element missing");return t}function Ef(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Ef(n,r,n.ba(i,t)),hr()}}(n,r,t),os(),e.innerHTML="",es(e,i,u)}function Tf(){return os(),X}function Lf(){return os(),J}function Nf(){return os(),nn}function Af(){return os(),tn}function Mf(){return os(),rn}function Ff(){return os(),en}function Df(){return os(),un}function Of(){return os(),on}function Rf(){return os(),fn}function Hf(){return os(),sn}function $f(){return os(),cn}function Gf(n){this.x9_1=n}function Uf(){an=this}function Vf(){return null==an&&new Uf,an}function Qf(){hn=this,Kf.call(this)}function Zf(){return null==hn&&new Qf,hn}function Yf(n,t,r,i){t=t===A?bt():t,r=r===A?null:r,i=i===A?bt():i,Kf.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function Wf(){}function Kf(){Vf()}function Xf(n){os();var t,r=Tr();return n(new Jf((t=r,function(n){return t.d(n),hr()}))),r}function Jf(n){this.r9_1=n}function ns(n,t){is.call(this),this.fe_1=n,this.ge_1=t}function ts(n){is.call(this),this.he_1=n}function rs(n,t){is.call(this),this.ie_1=n,this.je_1=t}function is(){}function es(n,t,r){if(os(),t instanceof Yf)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(ae(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)us(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(ae(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)es(n,i.h(),u);return hr()}));else if(t instanceof Wf){var i=t instanceof Wf?t:le();es(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),hr()}}(r,i))}else if(ue(t,Zf()))return hr();var e,u}function us(n,t,r){var i,e;os(),t instanceof rs?n.setAttribute(t.ie_1,t.je_1):t instanceof ts?function(n,t){for(var r=Tr(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Lu(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=re(Kt(Qe(f)?f:le())),c=wi();c.p7(s),0!==Yi(s)&&c.p7(" "),Fn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof ns&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),hr()}))}function os(){ln||(ln=!0,X=Zf(),new Gf("hr"),J=new Gf("h1"),new Gf("h2"),nn=new Gf("div"),new Gf("pre"),tn=new Gf("code"),rn=new Gf("span"),en=new Gf("small"),un=new Gf("ol"),on=new Gf("ul"),fn=new Gf("li"),sn=new Gf("a"),cn=new Gf("br"),new Gf("p"))}function fs(n){cs.call(this),this.ne_1=n}function ss(n){this.xb_1=n}function cs(){}function as(n){return n.me(A,A,n.wb_1.ad())}function hs(){_n=this}function ls(){return null==_n&&new hs,_n}function _s(){if(gn)return hr();gn=!0,vn=new gs("Collapsed",0),dn=new gs("Expanded",1)}function vs(n){ws.call(this),this.ve_1=n}function ds(n,t,r){ws.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function gs(n,t){Fi.call(this,n,t)}function ws(){}function bs(){return _s(),vn}function ps(){return _s(),dn}function ms(n,t,r){t=t===A?bt():t,r=r===A?bs():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function ks(n,t){return Jn(Xn(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Rf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(ps())&&!o.i()?o:null)?null:function(n,t){return Of().ha(function(n,t){return ks(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Tf():f])}(n,r)})));var r}function qs(){if(kn)return hr();kn=!0,bn=new ys("ByMessage",0,"Messages"),pn=new ys("ByGroup",1,"Group"),mn=new ys("ByFileLocation",2,"Locations")}function ys(n,t,r){Fi.call(this,n,t),this.cf_1=r}function Bs(n,t,r,i){var e,u,o=n.v1(t);if(null==o){var f=Tr(),s=or(new ms(new Hs(yf().qd((u=t,function(n){return n.fd(u),hr()}))),f,ps()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Ps(r,i))}function Cs(n,t,r,i){var e;if(t=t===A?Tr():t,r=r===A?ui():r,i===A){var u=wn;wn=u+1|0,e=u}else e=i;i=e,this.df_1=n,this.ef_1=t,this.ff_1=r,this.gf_1=i}function xs(n,t){if(t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.displayName+" ("+o.name+")",a=s.v1(c);if(null==a){var h=Tr(),l=new Cs(new ms(new Hs(yf().qd(Ls(o))),h,ps()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||ae(r).ef_1.u(ae(e).df_1)||ae(r).ef_1.d(ae(e).df_1),i=ae(e).ff_1}return e}function js(n){for(var t=n.problemId,r=Lr(t.length),i=0,e=t.length;i<e;){var u,o=t[i];i=i+1|0,u=o.name,r.d(u)}return Mn(r,":")}function Ps(n,t,r){var i=function(n,t,r){t=t===A?null:t;var i=zs(function(n,t){return n&&null!=t.contextualLabel?ae(t.contextualLabel):Is(t)}(r=r!==A&&r,n),t).j5();return Ss(n,new $u(i))}(n,t=t===A?null:t,r=r!==A&&r),e=function(n,t,r){r=r!==A&&r;var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==Yi(e))return function(n,t,r,i){tr(i);var e=0,u=Yt(n,t,e,r);if(-1===u||1===i)return dr(re(n));var o,f=i>0,s=Lr(f&&Yn(i,10));n:do{var c;if(c=re(Wi(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=Yt(n,t,e,r)}while(-1!==u);return o=re(Wi(n,e,Yi(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new nt(n)}(Jt(n,t,A,r,i)),o=Lr(Ct(u,10)),f=u.f();f.g();){var s;s=Xt(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Lr(Ct(f,10)),c=f.f();c.g();){var a,h=c.h();a=Ts(n)?yf().qd(Ns(h)):yf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Lr(Ct(_,10)),d=_.f();d.g();){var g;g=new ms(new $u(d.h())),v.d(g)}l=v}var w=null==l?null:$n(l);i=null==w?Tr():w}var b=i,p=null==b?Tr():b;r||null==n.contextualLabel||p.d(new ms(new $u(yf().rd(ae(n.contextualLabel)))));var m=function(n){var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Uu(yf().rd("Solutions")),i=ae(n.solutions),e=Lr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new ms(new Gu(_f(s))),e.d(f)}return new ms(r,e)}(n);null==m||p.d(m);var k=n.error,q=null==k?null:Jo(k);null==q||p.d(new ms(q));var y,B=function(n){for(var t=null,r=function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();var r=n.length;if(t>=r)return An(n);if(1===t)return dr(n[r-1|0]);var i=Lr(),e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n[u])}while(e<r);return i}(n,Wn(n.length-t|0,0))}(n.problemId.slice(),1).f();r.g();){var i=r.h(),e=t,u=new Hs(yf().qd(Ms(i))),o=null==e?null:dr(e);t=new ms(u,null==o?bt():o)}return t}(n);if(null==B||p.d(B),t){var C=n.locations;y=!(null==C||0===C.length)}else y=!1;return y&&p.d(function(n){var t,r=n.locations;if(null==r)t=null;else{for(var i=Lr(r.length),e=Oi(r);e.g();){var u,o=e.h();u=new ms(new $u(yf().qd(As(o)))),i.d(u)}t=i}var f=t;return new ms(new Qu("Locations"),null==f?bt():f)}(n)),p}(n,null==t,r);return new ms(i,e)}function Is(n){return function(n){if(0===n.length)throw pu("Array is empty.");return n[Ln(n)]}(n.problemId).displayName}function Ss(n,t){var r;switch(n.severity){case"WARNING":var i=n.documentationLink;r=new Hu(t,null==i?null:new Vu(i,""));break;case"ERROR":var e=n.documentationLink;r=new Ru(t,null==e?null:new Vu(e,""));break;case"ADVICE":var u=n.documentationLink;r=new $s(t,null==u?null:new Vu(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function zs(n,t){t=t===A?null:t;var r,i=new kf;if(i.ed(n),null==t);else{if(null!=t.line){var e=Es(t);i.xd(e+(null==(r=t).line||null==r.length?"":"-"+r.length),""+t.path+e)}var u=t.taskPath;null==u||i.fd(u);var o=t.pluginId;null!=o&&i.fd(o)}return i}function Es(n){var t;if(null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Ts(n){var t,r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Ls(n){return function(t){return t.ed(n.displayName),t.fd(n.name),hr()}}function Ns(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(qi().t7(" "),i?"gui":"gu"),u=qi().u7(" ");return n.replace(e,u)}(n),""),hr()}}function As(n){return function(t){return t.ed("- "),t.fd(""+n.path+Es(n)),hr()}}function Ms(n){return function(t){return t.ed(n.displayName),t.fd(n.name),hr()}}function Fs(){return qs(),bn}function Ds(){return qs(),pn}function Os(){return qs(),mn}function Rs(n){Gs.call(this),this.hf_1=n}function Hs(n,t){t=t!==A&&t,Gs.call(this),this.if_1=n,this.jf_1=t}function $s(n,t){Zu.call(this),this.kf_1=n,this.lf_1=t}function Gs(){Zu.call(this)}function Us(n){bc.call(this),this.mf_1=n}function Vs(n){bc.call(this),this.nf_1=n}function Qs(n){bc.call(this),this.of_1=n}function Zs(n){Ws.call(this),this.pf_1=n}function Ys(n,t,r,i,e,u,o,f){this.qf_1=n,this.rf_1=t,this.sf_1=r,this.tf_1=i,this.uf_1=e,this.vf_1=u,this.wf_1=o,this.xf_1=f}function Ws(){mc.call(this)}function Ks(n,t){var r=Tr();ho(t.tf_1)>0&&r.d(ic(0,Fs(),t.xf_1,t.wf_1)),ho(t.uf_1)>0&&r.d(ic(0,Ds(),t.xf_1,t.wf_1)),ho(t.vf_1)>0&&r.d(ic(0,Os(),t.xf_1,t.wf_1));var i=Nf(),e=Xf(fc),u=Nf().y9(Xf(sc),[]),o=function(n,t){var r,i=Nf(),e=Xf(_c),u=Mf().ga("Learn more about "),o=Hf();return i.y9(e,[u,o.fb(Xf((r=t,function(n){return n.bd(r.tc_1),hr()})),t.sc_1),Mf().ga(".")])}(0,t.sf_1),f=Nf().y9(Xf(cc),[Js(0,t)]),s=Nf();return i.y9(e,[u,o,f,s.zd(Xf(ac),r)])}function Xs(n,t){var r,i,e=Nf(),u=Xf(hc);switch(t.xf_1.q8_1){case 0:r=ec(0,t.tf_1,((i=function(n){return new Us(n)}).callableName="<init>",i));break;case 1:r=ec(0,t.uf_1,function(){var n=function(n){return new Vs(n)};return n.callableName="<init>",n}());break;case 2:r=ec(0,t.vf_1,function(){var n=function(n){return new Qs(n)};return n.callableName="<init>",n}());break;default:he()}return e.y9(u,[r])}function Js(n,t){return Nf().ja([rc(0,t),nc(0,t)])}function nc(n,t){for(var r=Nf(),i=t.rf_1,e=Tr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,xt(e,0===gr(s)?dr(tc(dc(),f)):wt([$f().ja([]),tc(dc(),f)]))}return r.ha(e)}function tc(n,t){return Ff().ja([Cc(t)])}function rc(n,t){return Lf().ja([yc().ka(t.qf_1)])}function ic(n,t,r,i){var e,u,o,f;return Nf().y9(Xf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),hr()):u.equals(o)?(n.t9("group-selector--active"),hr()):(n.u9(function(n){return function(t){return new Zs(n)}}(u)),hr()),hr()})),[Mf().rc(t.cf_1,[(f=i,Mf().y9(Xf(lc),[Wu(),Ku(),Mf().ga(""+f),Xu()]))])])}function ec(n,t,r){return function(n,t,r){var i,e=Nf(),u=Df();return e.ja([u.ha(ks(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof Rs?Cc(yf().rd(t.hf_1)):t instanceof Hs?Nf().y9(Xf((u=t,function(n){return u.jf_1&&(n.t9("uncategorized"),hr()),hr()})),[Nf().ja([jc(r,i),Cc(t.if_1)])]):t instanceof Du?Sc(i,r,t):t instanceof $u?Cc(t.za_1):t instanceof Gu?Nf().ja([(Hc(),xn),Cc(t.ab_1)]):t instanceof Uu?Nf().ja([jc(r,i),Cc(t.bb_1)]):t instanceof Ru?zc(i,((e=function(n){return uc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,kc()):t instanceof $s?zc(i,function(){var n=function(n){return uc(0,n)};return n.callableName="viewIt",n}(),r,t.kf_1,t.lf_1,(Hc(),Bn)):t instanceof Hu?zc(i,function(){var n=function(n){return uc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,qc()):t instanceof Qu?Nf().ja([jc(r,i),Cc(yf().rd(t.eb_1))]):Mf().ga("Unknown node type viewNode: "+t)}(dc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function uc(n,t){var r;if(t instanceof Vu)r=Vo(t);else if(t instanceof Qu)r=Cc(yf().rd(t.eb_1));else if(t instanceof $u)r=Cc(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Mf().ga(i)}return r}function oc(n){return n.t9("report-wrapper"),hr()}function fc(n){return n.t9("header"),hr()}function sc(n){return n.t9("gradle-logo"),hr()}function cc(n){return n.t9("title"),hr()}function ac(n){return n.t9("groups"),hr()}function hc(n){return n.t9("content"),hr()}function lc(n){return n.t9("group-selector__count"),hr()}function _c(n){return n.t9("learn-more"),hr()}function vc(){qn=this,document.title="Gradle Problem Report"}function dc(){return null==qn&&new vc,qn}function gc(n,t,r){return n.pe(t.zb().oe(),r)}function wc(n){mc.call(this),this.hd_1=n}function bc(){mc.call(this)}function pc(n,t){mc.call(this),this.wc_1=n,this.xc_1=t}function mc(){}function kc(){return Hc(),yn}function qc(){return Hc(),Cn}function yc(){return Hc(),jn}function Bc(){return Hc(),Pn}function Cc(n){return Hc(),Bc().ka(n)}function xc(n){return Hc(),Bc().ka(yf().qd(n))}function jc(n,t){return Hc(),n.cd().ye()?Ec(n,t):function(n){return Hc(),Mf().fb(Xf(Oc),Tc(n))}(n)}function Pc(n,t,r,i){var e,u,o;return Hc(),Mf().fb(Xf((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new pc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:he()}return t}(e)),hr()})),"("+n+" internal "+df("line",n)+" "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:he()}return t}(r)+")")}function Ic(n,t){t=t===A?Tf():t,Hc();for(var r=Of(),i=Lr(Ct(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===gr(f)?t:Tf())===A?Tf():c,Hc(),o=Rf().ja([Af().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Sc(n,t,r){Hc();var i,e,u,o=Nf(),f=Ec(t,n),s=Mf().ga("Exception"),c=Mf().ja([(Hc(),In).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Mf().ga(" "),h=null==a?Tf():a,l=r.ma_1,_=null==l?null:Cc(l),v=null==_?Tf():_;switch(t.cd().wb_1.q8_1){case 0:i=Tf();break;case 1:i=function(n,t){Hc();for(var r=Nf(),i=Xf(Rc),e=n.oa_1,u=Lr(Ct(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=gr(a);if(null!=c.sa_1){var _,v=Pc(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Ic(Gn(c.ra_1,1),v);break;case 1:_=Ic(c.ra_1,v);break;default:he()}h=_}else h=Ic(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new fs(u))}));break;default:he()}return o.ja([f,s,c,h,v,i])}function zc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Tf():u,o=o===A?Tf():o,Hc();var f=Nf(),s=jc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Tf():a,o])}function Ec(n,t){var r,i;return Hc(),Mf().fb(Xf((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===bs()&&(n.t9("collapsed"),hr()),r.cd().wb_1===ps()&&(n.t9("expanded"),hr()),n.s9("Click to "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:he()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new fs(t))}}(i,r)),hr()})),Tc(n))}function Tc(n){return Hc(),function(n,t){var r;if(!(t>=0))throw ou(re("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=re(n);break;default:var i="";if(0!==Yi(n))for(var e=re(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function Lc(n){return Hc(),n.gb(["invisible-text","error-icon"]),hr()}function Nc(n){return Hc(),n.gb(["invisible-text","advice-icon"]),hr()}function Ac(n){return Hc(),n.gb(["invisible-text","warning-icon"]),hr()}function Mc(n){return Hc(),n.gb(["invisible-text","enum-icon"]),hr()}function Fc(n){return Hc(),new wc(n)}function Dc(n){return Hc(),new wc(n)}function Oc(n){return Hc(),n.gb(["invisible-text","leaf-icon"]),hr()}function Rc(n){return Hc(),n.t9("java-exception"),hr()}function Hc(){if(!Sn){Sn=!0;var n=Mf();yn=n.fb(Xf(Lc),"[error] ");var t=Mf();Bn=t.fb(Xf(Nc),"[advice] ");var r=Mf();Cn=r.fb(Xf(Ac),"[warn]  ");var i=Mf();xn=i.fb(Xf(Mc),"[enum]  "),jn=new Fu,Pn=new Fu(Fc),In=new Au(Dc)}}return $e(Zn,A,Oe),$e(nt,A,Oe),$e(tt,A,Oe),$e(Ei,"Collection",Ze),$e(rt,"AbstractCollection",Oe,A,[Ei]),$e(it,"IteratorImpl",Oe),$e(et,"ListIteratorImpl",Oe,it),$e(ut,"Companion",We),$e(zi,"List",Ze,A,[Ei]),$e(ft,"AbstractList",Oe,rt,[rt,zi]),$e(st,A,Oe),$e(ht,"Companion",We),$e(_t,A,Oe,rt),$e(Li,"Map",Ze),$e(vt,"AbstractMap",Oe,A,[Li]),$e(dt,"Companion",We),$e(hi,"RandomAccess",Ze),$e(kt,"EmptyList",We,A,[zi,hi]),$e(qt,"ArrayAsCollection",Oe,A,[Ei]),$e(yt,"EmptyIterator",We),$e(jt,"IntIterator",Oe),$e(Pt,A,Oe),$e(It,"ReversedListReadOnly",Oe,ft),$e(St,A,Oe),$e(zt,"TransformingSequence",Oe),$e(Tt,A,Oe),$e(Lt,"FilteringSequence",Oe),$e(Ai,"Set",Ze,A,[Ei]),$e(At,"EmptySet",We,A,[Ai]),$e(Dt,"Companion",We),$e(Ut,"IntProgression",Oe),$e(Rt,"IntRange",Oe,Ut),$e(Ht,"IntProgressionIterator",Oe,jt),$e($t,"Companion",We),$e(ir,A,Oe),$e(er,"DelimitedRangesSequence",Oe),$e(ur,"Pair",Oe),$e(fr,"CharSequence",Ze),$e(sr,"Comparable",Ze),$e(cr,"Number",Oe),$e(ar,"Unit",We),$e(lr,"IntCompanionObject",We),$e(pr,"AbstractMutableCollection",Oe,rt,[rt,Ei]),$e(mr,"IteratorImpl",Oe),$e(kr,"ListIteratorImpl",Oe,mr),$e(qr,"AbstractMutableList",Oe,pr,[pr,Ei,zi]),$e(yr,A,Oe),$e(Br,A,Oe),$e(Ti,"Entry",Ze),$e(Ni,"MutableEntry",Ze,A,[Ti]),$e(Cr,"SimpleEntry",Oe,A,[Ni]),$e(Sr,"AbstractMutableSet",Oe,pr,[pr,Ei,Ai]),$e(xr,"AbstractEntrySet",Oe,Sr),$e(jr,A,Oe,Sr),$e(Pr,A,Oe,pr),$e(Ir,"AbstractMutableMap",Oe,vt,[vt,Li]),$e(zr,"Companion",We),$e(Mr,"ArrayList",Oe,qr,[qr,Ei,zi,hi]),$e(Or,"HashCode",We),$e(Rr,"EntrySet",Oe,xr),$e(Ur,"HashMap",Oe,Ir,[Ir,Li]),$e(Qr,"HashSet",Oe,Sr,[Sr,Ei,Ai]),$e(Kr,A,Oe),$e(Jr,"InternalMap",Ze),$e(Xr,"InternalHashCodeMap",Oe,A,[Jr]),$e(ni,"EntryIterator",Oe),$e(ti,"Companion",We),$e(ii,"ChainEntry",Oe,Cr),$e(ei,"EntrySet",Oe,xr),$e(fi,"LinkedHashMap",Oe,Ur,[Ur,Li]),$e(si,"Companion",We),$e(ai,"LinkedHashSet",Oe,Qr,[Qr,Ei,Ai]),$e(li,"BaseOutput",Oe),$e(_i,"NodeJsOutput",Oe,li),$e(di,"BufferedOutput",Oe,li),$e(vi,"BufferedOutputToConsoleLog",Oe,di),$e(bi,"StringBuilder",Oe,A,[fr]),$e(ki,"Companion",We),$e(yi,"Regex",Oe),$e(Pi,"Companion",We),$e(Si,"Char",Oe,A,[sr]),$e(Mi,"Companion",We),$e(Fi,"Enum",Oe,A,[sr]),$e(Ri,A,Oe),$e(_e,"Companion",We),$e(ve,"Long",Oe,cr,[cr,sr]),$e(ru,"Letter",We),$e(eu,"OtherLowercase",We),$e(vu,"Exception",Oe,Error),$e(wu,"RuntimeException",Oe,vu),$e(fu,"IllegalArgumentException",Oe,wu),$e(cu,"IndexOutOfBoundsException",Oe,wu),$e(hu,"IllegalStateException",Oe,wu),$e(mu,"NoSuchElementException",Oe,wu),$e(qu,"ArithmeticException",Oe,wu),$e(Cu,"UnsupportedOperationException",Oe,wu),$e(ju,"NullPointerException",Oe,wu),$e(Iu,"NoWhenBranchMatchedException",Oe,wu),$e(zu,"ClassCastException",Oe,wu),$e(Tu,"UninitializedPropertyAccessException",Oe,wu),$e(Nu,"Model",Oe),$e(Au,"CopyButtonComponent",Oe),$e(Fu,"PrettyTextComponent",Oe),$e(Zu,"ProblemNode",Oe),$e(Du,"Exception",Oe,Zu),$e(Ou,"StackTracePart",Oe),$e(Ru,"Error",Oe,Zu),$e(Hu,"Warning",Oe,Zu),$e($u,"Message",Oe,Zu),$e(Gu,"ListElement",Oe,Zu),$e(Uu,"TreeNode",Oe,Zu),$e(Vu,"Link",Oe,Zu),$e(Qu,"Label",Oe,Zu),$e(ro,"Info",Oe,Zu),$e(io,"Project",Oe,Zu),$e(eo,"Task",Oe,Zu),$e(uo,"TaskPath",Oe,Zu),$e(oo,"Bean",Oe,Zu),$e(fo,"SystemProperty",Oe,Zu),$e(so,"Property",Oe,Zu),$e(co,"BuildLogic",Oe,Zu),$e(ao,"BuildLogicClass",Oe,Zu),$e(mc,"BaseIntent",Oe),$e(bc,"TreeIntent",Oe,mc),$e(_o,"TaskTreeIntent",Oe,bc),$e(vo,"MessageTreeIntent",Oe,bc),$e(go,"InputTreeIntent",Oe,bc),$e(wo,"IncompatibleTaskTreeIntent",Oe,bc),$e(ko,"Intent",Oe,mc),$e(bo,"SetTab",Oe,ko),$e(po,"Model",Oe),$e(mo,"Tab",Oe,Fi),$e(Go,"ConfigurationCacheReportPage",We),$e(Qo,"ImportedProblem",Oe),$e(Zo,"ImportedDiagnostics",Oe),$e(of,"sam$kotlin_Comparator$0",Oe),$e(wf,"LearnMore",Oe),$e(mf,"Fragment",Oe),$e(bf,"Text",Oe,mf),$e(pf,"Reference",Oe,mf),$e(kf,"Builder",Oe),$e(qf,"Companion",We),$e(Bf,"PrettyText",Oe),$e(Cf,"Companion",We),$e(If,"Trie",Oe),$e(Gf,"ViewFactory",Oe),$e(Uf,"Companion",We),$e(Kf,"View",Oe),$e(Qf,"Empty",We,Kf),$e(Yf,"Element",Oe,Kf),$e(Wf,"MappedView",Oe,Kf),$e(Jf,"Attributes",Oe),$e(is,"Attribute",Oe),$e(ns,"OnEvent",Oe,is),$e(ts,"ClassName",Oe,is),$e(rs,"Named",Oe,is),$e(cs,"Intent",Oe),$e(fs,"Toggle",Oe,cs),$e(ss,"Model",Oe),$e(hs,"TreeView",We),$e(ws,"Focus",Oe),$e(vs,"Original",Oe,ws),$e(ds,"Child",Oe,ws),$e(gs,"ViewState",Oe,Fi),$e(ms,"Tree",Oe),$e(ys,"Tab",Oe,Fi),$e(Cs,"ProblemNodeGroup",Oe),$e(Gs,"ProblemApiNode",Oe,Zu),$e(Rs,"Text",Oe,Gs),$e(Hs,"ProblemId",Oe,Gs),$e($s,"Advice",Oe,Zu),$e(Us,"MessageTreeIntent",Oe,bc),$e(Vs,"ProblemIdTreeIntent",Oe,bc),$e(Qs,"FileLocationTreeIntent",Oe,bc),$e(Ws,"Intent",Oe,mc),$e(Zs,"SetTab",Oe,Ws),$e(Ys,"Model",Oe),$e(vc,"ProblemsReportPage",We),$e(wc,"Copy",Oe,mc),$e(pc,"ToggleStackTracePart",Oe,mc),fe(Zn).f=function(){return this.n_1.f()},fe(nt).f=function(){return this.r_1.f()},fe(tt).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Tr());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return hr();var r=wr(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Dr;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Fr(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Ln(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},fe(rt).u=function(n){var t;n:if(Ge(this,Ei)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(ue(r.h(),n)){t=!0;break n}t=!1}return t},fe(rt).v=function(n){var t;n:if(Ge(n,Ei)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},fe(rt).i=function(){return 0===this.k()},fe(rt).toString=function(){return Mn(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Di(t)}));var n},fe(rt).toArray=function(){return vr(this)},fe(it).g=function(){return this.w_1<this.x_1.k()},fe(it).h=function(){if(!this.g())throw bu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},fe(et).c1=function(){return this.w_1>0},fe(et).d1=function(){if(!this.c1())throw bu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},fe(ut).e1=function(n,t){if(n<0||n>=t)throw su("index: "+n+", size: "+t)},fe(ut).b1=function(n,t){if(n<0||n>t)throw su("index: "+n+", size: "+t)},fe(ut).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=zn(31,t),u=null==i?null:ie(i);t=e+(null==u?0:u)|0}return t},fe(ut).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!ue(i.h(),r.h()))return!1;return!0},fe(ft).f=function(){return new it(this)},fe(ft).l=function(n){return new et(this,n)},fe(ft).equals=function(n){return n===this||!(null==n||!Ge(n,zi))&&ot().g1(this,n)},fe(ft).hashCode=function(){return ot().f1(this)},fe(st).g=function(){return this.h1_1.g()},fe(st).h=function(){return this.h1_1.h().i1()},fe(ht).k1=function(n){var t=n.j1(),r=null==t?null:ie(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ie(e);return i^(null==u?0:u)},fe(ht).l1=function(n){return Di(n.j1())+"="+Di(n.i1())},fe(ht).m1=function(n,t){return!(null==t||!Ge(t,Ti))&&!!ue(n.j1(),t.j1())&&ue(n.i1(),t.i1())},fe(_t).r1=function(n){return this.q1_1.s1(n)},fe(_t).u=function(n){return!(null!=n&&!Ve(n))&&this.r1(null==n||Ve(n)?n:le())},fe(_t).f=function(){return new st(this.q1_1.o().f())},fe(_t).k=function(){return this.q1_1.k()},fe(vt).t1=function(n){return!(null==at(this,n))},fe(vt).s1=function(n){var t;n:{var r=this.o();if(Ge(r,Ei)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(ue(i.h().i1(),n)){t=!0;break n}t=!1}}return t},fe(vt).u1=function(n){if(null==n||!Ge(n,Ti))return!1;var t=n.j1(),r=n.i1(),i=(Ge(this,Li)?this:le()).v1(t);return!(!ue(r,i)||null==i&&!(Ge(this,Li)?this:le()).t1(t))},fe(vt).equals=function(n){if(n===this)return!0;if(null==n||!Ge(n,Li))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ge(r,Ei)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},fe(vt).v1=function(n){var t=at(this,n);return null==t?null:t.i1()},fe(vt).hashCode=function(){return ie(this.o())},fe(vt).i=function(){return 0===this.k()},fe(vt).k=function(){return this.o().k()},fe(vt).toString=function(){var n;return Mn(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},fe(vt).p1=function(n){return ct(this,n.j1())+"="+ct(this,n.i1())},fe(vt).w1=function(){return null==this.o1_1&&(this.o1_1=new _t(this)),ae(this.o1_1)},fe(dt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ie(i);t=e+(null==u?0:u)|0}return t},fe(dt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},fe(kt).equals=function(n){return!(null==n||!Ge(n,zi))&&n.i()},fe(kt).hashCode=function(){return 1},fe(kt).toString=function(){return"[]"},fe(kt).k=function(){return 0},fe(kt).i=function(){return!0},fe(kt).a2=function(n){return n.i()},fe(kt).v=function(n){return this.a2(n)},fe(kt).j=function(n){throw su("Empty list doesn't contain element at index "+n+".")},fe(kt).f=function(){return Bt()},fe(kt).l=function(n){if(0!==n)throw su("Index: "+n);return Bt()},fe(qt).k=function(){return this.b2_1.length},fe(qt).i=function(){return 0===this.b2_1.length},fe(qt).d2=function(n){return function(n,t){return Nn(n,t)>=0}(this.b2_1,n)},fe(qt).e2=function(n){var t;n:if(Ge(n,Ei)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},fe(qt).v=function(n){return this.e2(n)},fe(qt).f=function(){return Oi(this.b2_1)},fe(yt).g=function(){return!1},fe(yt).c1=function(){return!1},fe(yt).h=function(){throw bu()},fe(yt).d1=function(){throw bu()},fe(jt).h=function(){return this.f2()},fe(Pt).g=function(){return this.g2_1.c1()},fe(Pt).c1=function(){return this.g2_1.g()},fe(Pt).h=function(){return this.g2_1.d1()},fe(Pt).d1=function(){return this.g2_1.h()},fe(It).k=function(){return this.i2_1.k()},fe(It).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=mt(n)))throw su("Element index "+t+" must be in range ["+De(0,mt(n))+"].");return mt(n)-t|0}(this,n))},fe(It).f=function(){return this.l(0)},fe(It).l=function(n){return new Pt(this,n)},fe(St).h=function(){return this.k2_1.m2_1(this.j2_1.h())},fe(St).g=function(){return this.j2_1.g()},fe(zt).f=function(){return new St(this)},fe(Tt).h=function(){if(-1===this.o2_1&&Et(this),0===this.o2_1)throw bu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Ve(n)?n:le()},fe(Tt).g=function(){return-1===this.o2_1&&Et(this),1===this.o2_1},fe(Lt).f=function(){return new Tt(this)},fe(At).equals=function(n){return!(null==n||!Ge(n,Ai))&&n.i()},fe(At).hashCode=function(){return 0},fe(At).toString=function(){return"[]"},fe(At).k=function(){return 0},fe(At).i=function(){return!0},fe(At).a2=function(n){return n.i()},fe(At).v=function(n){return this.a2(n)},fe(At).f=function(){return Bt()},fe(Rt).y2=function(){return this.z2_1},fe(Rt).c3=function(){return this.a3_1},fe(Rt).i=function(){return this.z2_1>this.a3_1},fe(Rt).equals=function(n){return n instanceof Rt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},fe(Rt).hashCode=function(){return this.i()?-1:zn(31,this.z2_1)+this.a3_1|0},fe(Rt).toString=function(){return this.z2_1+".."+this.a3_1},fe(Ht).g=function(){return this.f3_1},fe(Ht).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw bu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},fe($t).q=function(n,t,r){return new Ut(n,t,r)},fe(Ut).f=function(){return new Ht(this.z2_1,this.a3_1,this.b3_1)},fe(Ut).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},fe(Ut).equals=function(n){return n instanceof Ut&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},fe(Ut).hashCode=function(){return this.i()?-1:zn(31,zn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},fe(Ut).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},fe(ir).h=function(){if(-1===this.j3_1&&rr(this),0===this.j3_1)throw bu();var n=this.m3_1,t=n instanceof Rt?n:le();return this.m3_1=null,this.j3_1=-1,t},fe(ir).g=function(){return-1===this.j3_1&&rr(this),1===this.j3_1},fe(er).f=function(){return new ir(this)},fe(ur).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},fe(ur).v3=function(){return this.t3_1},fe(ur).w3=function(){return this.u3_1},fe(ur).hashCode=function(){var n=null==this.t3_1?0:ie(this.t3_1);return zn(n,31)+(null==this.u3_1?0:ie(this.u3_1))|0},fe(ur).equals=function(n){if(this===n)return!0;if(!(n instanceof ur))return!1;var t=n instanceof ur?n:le();return!!ue(this.t3_1,t.t3_1)&&!!ue(this.u3_1,t.u3_1)},fe(ar).toString=function(){return"kotlin.Unit"},fe(lr).b4=function(){return this.MIN_VALUE},fe(lr).c4=function(){return this.MAX_VALUE},fe(lr).d4=function(){return this.SIZE_BYTES},fe(lr).e4=function(){return this.SIZE_BITS},fe(pr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},fe(pr).toJSON=function(){return this.toArray()},fe(pr).g4=function(){},fe(mr).g=function(){return this.h4_1<this.j4_1.k()},fe(mr).h=function(){if(!this.g())throw bu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},fe(kr).c1=function(){return this.h4_1>0},fe(kr).d1=function(){if(!this.c1())throw bu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},fe(qr).d=function(n){return this.g4(),this.p4(this.k(),n),!0},fe(qr).f=function(){return new mr(this)},fe(qr).u=function(n){return this.q4(n)>=0},fe(qr).q4=function(n){var t=0,r=mt(this);if(t<=r)do{var i=t;if(t=t+1|0,ue(this.j(i),n))return i}while(i!==r);return-1},fe(qr).l=function(n){return new kr(this,n)},fe(qr).equals=function(n){return n===this||!(null==n||!Ge(n,zi))&&ot().g1(this,n)},fe(qr).hashCode=function(){return ot().f1(this)},fe(yr).g=function(){return this.r4_1.g()},fe(yr).h=function(){return this.r4_1.h().j1()},fe(Br).g=function(){return this.s4_1.g()},fe(Br).h=function(){return this.s4_1.h().i1()},fe(Cr).j1=function(){return this.t4_1},fe(Cr).i1=function(){return this.u4_1},fe(Cr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},fe(Cr).hashCode=function(){return lt().k1(this)},fe(Cr).toString=function(){return lt().l1(this)},fe(Cr).equals=function(n){return lt().m1(this,n)},fe(xr).u=function(n){return this.w4(n)},fe(jr).y4=function(n){throw Bu("Add is not supported on keys")},fe(jr).d=function(n){return this.y4(null==n||Ve(n)?n:le())},fe(jr).z4=function(n){return this.x4_1.t1(n)},fe(jr).u=function(n){return!(null!=n&&!Ve(n))&&this.z4(null==n||Ve(n)?n:le())},fe(jr).f=function(){return new yr(this.x4_1.o().f())},fe(jr).k=function(){return this.x4_1.k()},fe(jr).g4=function(){return this.x4_1.g4()},fe(Pr).f5=function(n){throw Bu("Add is not supported on values")},fe(Pr).d=function(n){return this.f5(null==n||Ve(n)?n:le())},fe(Pr).r1=function(n){return this.e5_1.s1(n)},fe(Pr).u=function(n){return!(null!=n&&!Ve(n))&&this.r1(null==n||Ve(n)?n:le())},fe(Pr).f=function(){return new Br(this.e5_1.o().f())},fe(Pr).k=function(){return this.e5_1.k()},fe(Pr).g4=function(){return this.e5_1.g4()},fe(Ir).g5=function(){return null==this.c5_1&&(this.c5_1=new jr(this)),ae(this.c5_1)},fe(Ir).w1=function(){return null==this.d5_1&&(this.d5_1=new Pr(this)),ae(this.d5_1)},fe(Ir).g4=function(){},fe(Sr).equals=function(n){return n===this||!(null==n||!Ge(n,Ai))&&gt().y1(this,n)},fe(Sr).hashCode=function(){return gt().x1(this)},fe(Mr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Er().i5_1},fe(Mr).k=function(){return this.b_1.length},fe(Mr).j=function(n){var t=this.b_1[Ar(this,n)];return null==t||Ve(t)?t:le()},fe(Mr).f4=function(n,t){this.g4(),Ar(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Ve(i)?i:le()},fe(Mr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},fe(Mr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return ot().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},fe(Mr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=gr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},fe(Mr).q4=function(n){return Nn(this.b_1,n)},fe(Mr).toString=function(){return n=this.b_1,t=(t=", ")===A?", ":t,r=(r="[")===A?"":r,i=(i="]")===A?"":i,e=(e=A)===A?-1:e,u=(u=A)===A?"...":u,o=(o=Ki)===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Vt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,wi(),t,r,i,e,u,o).toString();var n,t,r,i,e,u,o},fe(Mr).k5=function(){return[].slice.call(this.b_1)},fe(Mr).toArray=function(){return this.k5()},fe(Mr).g4=function(){if(this.c_1)throw yu()},fe(Or).l5=function(n,t){return ue(n,t)},fe(Or).m5=function(n){var t=null==n?null:ie(n);return null==t?0:t},fe(Rr).o5=function(n){throw Bu("Add is not supported on entries")},fe(Rr).d=function(n){return this.o5(null!=n&&Ge(n,Ni)?n:le())},fe(Rr).w4=function(n){return this.n5_1.u1(n)},fe(Rr).f=function(){return this.n5_1.t5_1.f()},fe(Rr).k=function(){return this.n5_1.k()},fe(Ur).t1=function(n){return this.t5_1.z4(n)},fe(Ur).s1=function(n){var t;n:{var r=this.t5_1;if(Ge(r,Ei)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},fe(Ur).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),ae(this.v5_1)},fe(Ur).x5=function(){return new Rr(this)},fe(Ur).v1=function(n){return this.t5_1.v1(n)},fe(Ur).h5=function(n,t){return this.t5_1.h5(n,t)},fe(Ur).k=function(){return this.t5_1.k()},fe(Qr).d=function(n){return null==this.y5_1.h5(n,this)},fe(Qr).u=function(n){return this.y5_1.t1(n)},fe(Qr).i=function(){return this.y5_1.i()},fe(Qr).f=function(){return this.y5_1.g5().f()},fe(Qr).k=function(){return this.y5_1.k()},fe(Kr).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Ue(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},fe(Kr).h=function(){if(!this.g())throw bu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},fe(Xr).w5=function(){return this.h6_1},fe(Xr).k=function(){return this.j6_1},fe(Xr).h5=function(n,t){var r=this.h6_1.m5(n),i=Wr(this,r);if(null==i)this.i6_1[r]=new Cr(n,t);else{if(null==i||!Ue(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new Cr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=Yr(o,this,n);if(null!=f)return f.v4(t);o.push(new Cr(n,t))}return this.j6_1=this.j6_1+1|0,null},fe(Xr).z4=function(n){return!(null==Zr(this,n))},fe(Xr).v1=function(n){var t=Zr(this,n);return null==t?null:t.i1()},fe(Xr).f=function(){return new Kr(this)},fe(ni).g=function(){return!(null===this.m6_1)},fe(ni).h=function(){if(!this.g())throw bu();var n=ae(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},fe(ii).v4=function(n){return this.d7_1.g4(),fe(Cr).v4.call(this,n)},fe(ei).o5=function(n){throw Bu("Add is not supported on entries")},fe(ei).d=function(n){return this.o5(null!=n&&Ge(n,Ni)?n:le())},fe(ei).w4=function(n){return this.y6_1.u1(n)},fe(ei).f=function(){return new ni(this)},fe(ei).k=function(){return this.y6_1.k()},fe(ei).g4=function(){return this.y6_1.g4()},fe(fi).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ri().e7_1;n=Ge(t,Li)?t:le()}return n},fe(fi).t1=function(n){return this.w6_1.t1(n)},fe(fi).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(ue(r.i1(),n))return!0;r=ae(r.b7_1)}while(r!==this.v6_1);return!1},fe(fi).x5=function(){return new ei(this)},fe(fi).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},fe(fi).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ii(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw au(re("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw au(re("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},fe(fi).k=function(){return this.w6_1.k()},fe(fi).g4=function(){if(this.x6_1)throw yu()},fe(ai).g4=function(){return this.y5_1.g4()},fe(li).h7=function(){this.i7("\n")},fe(li).j7=function(n){this.i7(n),this.h7()},fe(_i).i7=function(n){var t=String(n);this.k7_1.write(t)},fe(vi).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},fe(vi).n7=function(){console.log(this.m7_1),this.m7_1=""},fe(di).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},fe(bi).x3=function(){return this.o7_1.length},fe(bi).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=Zt(t)))throw su("index: "+n+", length: "+this.x3()+"}");return Qi(t,n)},fe(bi).z3=function(n,t){return this.o7_1.substring(n,t)},fe(bi).i3=function(n){return this.o7_1=this.o7_1+new Si(n),this},fe(bi).e=function(n){return this.o7_1=this.o7_1+Di(n),this},fe(bi).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},fe(bi).toString=function(){return this.o7_1},fe(ki).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},fe(ki).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},fe(yi).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(re(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===Yi(n)},fe(yi).toString=function(){return this.x7_1.toString()},fe(Si).o8=function(n){return xi(this.h3_1,n)},fe(Si).a4=function(n){return function(n,t){return xi(n.h3_1,t instanceof Si?t.h3_1:le())}(this,n)},fe(Si).equals=function(n){return function(n,t){return t instanceof Si&&n===t.h3_1}(this.h3_1,n)},fe(Si).hashCode=function(){return this.h3_1},fe(Si).toString=function(){return ji(this.h3_1)},fe(Fi).r8=function(n){return Xi(this.q8_1,n.q8_1)},fe(Fi).a4=function(n){return this.r8(n instanceof Fi?n:le())},fe(Fi).equals=function(n){return this===n},fe(Fi).hashCode=function(){return te(this)},fe(Fi).toString=function(){return this.p8_1},fe(Ri).g=function(){return!(this.s8_1===this.t8_1.length)},fe(Ri).h=function(){if(this.s8_1===this.t8_1.length)throw pu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},fe(ve).b9=function(n){return me(this,n)},fe(ve).a4=function(n){return this.b9(n instanceof ve?n:le())},fe(ve).c9=function(n){return ke(this,n)},fe(ve).d9=function(n){return function(n,t){if(Ae(),Ie(t))throw _u("division by zero");if(Ie(n))return de();if(Ce(n,be())){if(Ce(t,ge())||Ce(t,we()))return be();if(Ce(t,be()))return ge();var r=function(n){Ae();return new ve(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){Ae();return new ve(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return Ce(i,de())?Pe(t)?ge():we():ke(i,qe(n,ye(t,i)).d9(t))}if(Ce(t,be()))return de();if(Pe(n))return Pe(t)?ze(n).d9(ze(t)):ze(ze(n).d9(t));if(Pe(t))return ze(n.d9(ze(t)));for(var e=de(),u=n;Ne(u,t);){for(var o=Be(u)/Be(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Te(f),h=ye(a,t);Pe(h)||Le(h,u);)h=ye(a=Te(f-=c),t);Ie(a)&&(a=ge()),e=ke(e,a),u=qe(u,h)}return e}(this,n)},fe(ve).e9=function(){return this.f9().c9(new ve(1,0))},fe(ve).f9=function(){return new ve(~this.u8_1,~this.v8_1)},fe(ve).g9=function(){return this.u8_1},fe(ve).w8=function(){return Be(this)},fe(ve).valueOf=function(){return this.w8()},fe(ve).equals=function(n){return n instanceof ve&&Ce(this,n)},fe(ve).hashCode=function(){return Ae(),this.u8_1^this.v8_1},fe(ve).toString=function(){return xe(this,10)},fe(Nu).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},fe(Nu).hashCode=function(){var n=ee(this.o9_1);return zn(n,31)+ee(this.p9_1)|0},fe(Nu).equals=function(n){if(this===n)return!0;if(!(n instanceof Nu))return!1;var t=n instanceof Nu?n:le();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},fe(Au).v9=function(n,t){return this.w9(new Nu(n,t))},fe(Au).w9=function(n){var t,r;return Ff().y9(Xf((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),hr()})),[])},fe(Au).z9=function(n){return this.w9(n instanceof Nu?n:le())},fe(Au).aa=function(n,t){return t},fe(Au).ba=function(n,t){var r=null==n||Ve(n)?n:le();return this.aa(r,t instanceof Nu?t:le())},fe(Fu).ka=function(n){return function(n,t){for(var r=Mf(),i=t.ca_1,e=Lr(Ct(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof bf?f=Mf().ga(s.fa_1):s instanceof pf?f=Mu(n,s.da_1,s.ea_1):he(),o=f,e.d(o)}return r.ha(e)}(this,n)},fe(Fu).z9=function(n){return this.ka(n instanceof Bf?n:le())},fe(Fu).la=function(n,t){return t},fe(Fu).ba=function(n,t){var r=null==n||Ve(n)?n:le();return this.la(r,t instanceof Bf?t:le())},fe(Du).pa=function(n,t,r){return new Du(n,t,r)},fe(Du).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},fe(Du).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},fe(Du).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=zn(n,31)+ee(this.na_1)|0,zn(n,31)+ie(this.oa_1)|0},fe(Du).equals=function(n){if(this===n)return!0;if(!(n instanceof Du))return!1;var t=n instanceof Du?n:le();return!!ue(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!ue(this.oa_1,t.oa_1)},fe(Ou).ta=function(n,t){return new Ou(n,t)},fe(Ou).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},fe(Ou).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},fe(Ou).hashCode=function(){var n=ie(this.ra_1);return zn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},fe(Ou).equals=function(n){if(this===n)return!0;if(!(n instanceof Ou))return!1;var t=n instanceof Ou?n:le();return!!ue(this.ra_1,t.ra_1)&&!!ue(this.sa_1,t.sa_1)},fe(Ru).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},fe(Ru).hashCode=function(){var n=ie(this.va_1);return zn(n,31)+(null==this.wa_1?0:ie(this.wa_1))|0},fe(Ru).equals=function(n){if(this===n)return!0;if(!(n instanceof Ru))return!1;var t=n instanceof Ru?n:le();return!!ue(this.va_1,t.va_1)&&!!ue(this.wa_1,t.wa_1)},fe(Hu).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},fe(Hu).hashCode=function(){var n=ie(this.xa_1);return zn(n,31)+(null==this.ya_1?0:ie(this.ya_1))|0},fe(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:le();return!!ue(this.xa_1,t.xa_1)&&!!ue(this.ya_1,t.ya_1)},fe($u).toString=function(){return"Message(prettyText="+this.za_1+")"},fe($u).hashCode=function(){return this.za_1.hashCode()},fe($u).equals=function(n){if(this===n)return!0;if(!(n instanceof $u))return!1;var t=n instanceof $u?n:le();return!!this.za_1.equals(t.za_1)},fe(Gu).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},fe(Gu).hashCode=function(){return this.ab_1.hashCode()},fe(Gu).equals=function(n){if(this===n)return!0;if(!(n instanceof Gu))return!1;var t=n instanceof Gu?n:le();return!!this.ab_1.equals(t.ab_1)},fe(Uu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},fe(Uu).hashCode=function(){return this.bb_1.hashCode()},fe(Uu).equals=function(n){if(this===n)return!0;if(!(n instanceof Uu))return!1;var t=n instanceof Uu?n:le();return!!this.bb_1.equals(t.bb_1)},fe(Vu).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},fe(Vu).hashCode=function(){var n=ee(this.cb_1);return zn(n,31)+ee(this.db_1)|0},fe(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:le();return this.cb_1===t.cb_1&&this.db_1===t.db_1},fe(Qu).toString=function(){return"Label(text="+this.eb_1+")"},fe(Qu).hashCode=function(){return ee(this.eb_1)},fe(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:le();return this.eb_1===t.eb_1},fe(ro).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},fe(ro).hashCode=function(){var n=ie(this.hb_1);return zn(n,31)+(null==this.ib_1?0:ie(this.ib_1))|0},fe(ro).equals=function(n){if(this===n)return!0;if(!(n instanceof ro))return!1;var t=n instanceof ro?n:le();return!!ue(this.hb_1,t.hb_1)&&!!ue(this.ib_1,t.ib_1)},fe(io).toString=function(){return"Project(path="+this.jb_1+")"},fe(io).hashCode=function(){return ee(this.jb_1)},fe(io).equals=function(n){if(this===n)return!0;if(!(n instanceof io))return!1;var t=n instanceof io?n:le();return this.jb_1===t.jb_1},fe(eo).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},fe(eo).hashCode=function(){var n=ee(this.kb_1);return zn(n,31)+ee(this.lb_1)|0},fe(eo).equals=function(n){if(this===n)return!0;if(!(n instanceof eo))return!1;var t=n instanceof eo?n:le();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},fe(uo).toString=function(){return"TaskPath(path="+this.mb_1+")"},fe(uo).hashCode=function(){return ee(this.mb_1)},fe(uo).equals=function(n){if(this===n)return!0;if(!(n instanceof uo))return!1;var t=n instanceof uo?n:le();return this.mb_1===t.mb_1},fe(oo).toString=function(){return"Bean(type="+this.nb_1+")"},fe(oo).hashCode=function(){return ee(this.nb_1)},fe(oo).equals=function(n){if(this===n)return!0;if(!(n instanceof oo))return!1;var t=n instanceof oo?n:le();return this.nb_1===t.nb_1},fe(fo).toString=function(){return"SystemProperty(name="+this.ob_1+")"},fe(fo).hashCode=function(){return ee(this.ob_1)},fe(fo).equals=function(n){if(this===n)return!0;if(!(n instanceof fo))return!1;var t=n instanceof fo?n:le();return this.ob_1===t.ob_1},fe(so).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},fe(so).hashCode=function(){var n=ee(this.pb_1);return n=zn(n,31)+ee(this.qb_1)|0,zn(n,31)+ee(this.rb_1)|0},fe(so).equals=function(n){if(this===n)return!0;if(!(n instanceof so))return!1;var t=n instanceof so?n:le();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},fe(co).toString=function(){return"BuildLogic(location="+this.sb_1+")"},fe(co).hashCode=function(){return ee(this.sb_1)},fe(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:le();return this.sb_1===t.sb_1},fe(ao).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},fe(ao).hashCode=function(){return ee(this.tb_1)},fe(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:le();return this.tb_1===t.tb_1},fe(_o).zb=function(){return this.yb_1},fe(_o).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},fe(_o).hashCode=function(){return ie(this.yb_1)},fe(_o).equals=function(n){if(this===n)return!0;if(!(n instanceof _o))return!1;var t=n instanceof _o?n:le();return!!ue(this.yb_1,t.yb_1)},fe(vo).zb=function(){return this.ac_1},fe(vo).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},fe(vo).hashCode=function(){return ie(this.ac_1)},fe(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:le();return!!ue(this.ac_1,t.ac_1)},fe(go).zb=function(){return this.bc_1},fe(go).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},fe(go).hashCode=function(){return ie(this.bc_1)},fe(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:le();return!!ue(this.bc_1,t.bc_1)},fe(wo).zb=function(){return this.cc_1},fe(wo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},fe(wo).hashCode=function(){return ie(this.cc_1)},fe(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:le();return!!ue(this.cc_1,t.cc_1)},fe(bo).toString=function(){return"SetTab(tab="+this.dc_1+")"},fe(bo).hashCode=function(){return this.dc_1.hashCode()},fe(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:le();return!!this.dc_1.equals(t.dc_1)},fe(po).mc=function(n,t,r,i,e,u,o,f){return new po(n,t,r,i,e,u,o,f)},fe(po).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},fe(po).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},fe(po).hashCode=function(){var n=this.ec_1.hashCode();return n=zn(n,31)+ie(this.fc_1)|0,n=zn(n,31)+this.gc_1.hashCode()|0,n=zn(n,31)+this.hc_1.hashCode()|0,n=zn(n,31)+this.ic_1.hashCode()|0,n=zn(n,31)+this.jc_1.hashCode()|0,n=zn(n,31)+this.kc_1.hashCode()|0,zn(n,31)+this.lc_1.hashCode()|0},fe(po).equals=function(n){if(this===n)return!0;if(!(n instanceof po))return!1;var t=n instanceof po?n:le();return!!(this.ec_1.equals(t.ec_1)&&ue(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},fe(Go).gd=function(n,t){var r,i;return n instanceof _o?r=t.nc(A,A,A,A,ls().id(n.yb_1,t.ic_1)):n instanceof vo?r=t.nc(A,A,A,ls().id(n.ac_1,t.hc_1)):n instanceof go?r=t.nc(A,A,A,A,A,ls().id(n.bc_1,t.jc_1)):n instanceof wo?r=t.nc(A,A,A,A,A,A,ls().id(n.cc_1,t.kc_1)):n instanceof pc?r=function(n,t,r,i){var e;return r instanceof vo?e=n.nc(A,A,A,gc(n.hc_1,r,i)):r instanceof _o?e=n.nc(A,A,A,A,gc(n.ic_1,r,i)):r instanceof go?e=n.nc(A,A,A,A,A,gc(n.jc_1,r,i)):r instanceof wo?e=n.nc(A,A,A,A,A,A,gc(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Du))throw ou(re("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Lr(Ct(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===gr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof wc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof bo?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},fe(Go).ba=function(n,t){var r=n instanceof mc?n:le();return this.gd(r,t instanceof po?t:le())},fe(Go).jd=function(n){return Nf().y9(Xf(Eo),[qo(0,n),yo(0,n)])},fe(Go).z9=function(n){return this.jd(n instanceof po?n:le())},fe(Qo).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},fe(Qo).hashCode=function(){var n=ie(this.kd_1);return n=zn(n,31)+this.ld_1.hashCode()|0,zn(n,31)+ie(this.md_1)|0},fe(Qo).equals=function(n){if(this===n)return!0;if(!(n instanceof Qo))return!1;var t=n instanceof Qo?n:le();return!!ue(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!ue(this.md_1,t.md_1)},fe(of).ud=function(n,t){return this.td_1(n,t)},fe(of).compare=function(n,t){return this.ud(n,t)},fe(wf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},fe(wf).hashCode=function(){var n=ee(this.sc_1);return zn(n,31)+ee(this.tc_1)|0},fe(wf).equals=function(n){if(this===n)return!0;if(!(n instanceof wf))return!1;var t=n instanceof wf?n:le();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},fe(bf).toString=function(){return"Text(text="+this.fa_1+")"},fe(bf).hashCode=function(){return ee(this.fa_1)},fe(bf).equals=function(n){if(this===n)return!0;if(!(n instanceof bf))return!1;var t=n instanceof bf?n:le();return this.fa_1===t.fa_1},fe(pf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},fe(pf).hashCode=function(){var n=ee(this.da_1);return zn(n,31)+ee(this.ea_1)|0},fe(pf).equals=function(n){if(this===n)return!0;if(!(n instanceof pf))return!1;var t=n instanceof pf?n:le();return this.da_1===t.da_1&&this.ea_1===t.ea_1},fe(kf).ed=function(n){return this.dd_1.d(new bf(n)),this},fe(kf).xd=function(n,t){return this.dd_1.d(new pf(n,t)),this},fe(kf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},fe(kf).j5=function(){return new Bf(Rn(this.dd_1))},fe(qf).rd=function(n){return new Bf(dr(new bf(n)))},fe(qf).qd=function(n){var t=new kf;return n(t),t.j5()},fe(Bf).vd=function(n){return new Bf(n)},fe(Bf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},fe(Bf).hashCode=function(){return ie(this.ca_1)},fe(Bf).equals=function(n){if(this===n)return!0;if(!(n instanceof Bf))return!1;var t=n instanceof Bf?n:le();return!!ue(this.ca_1,t.ca_1)},fe(Cf).sd=function(n){return function(n){for(var t=$r(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=$r();f.h5(o,c),u=c}else u=s;i=u instanceof Ur?u:le()}return t}(n)},fe(If).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},fe(If).hashCode=function(){return ie(this.wd_1)},fe(If).equals=function(n){return function(n,t){return t instanceof If&&!!ue(n,t instanceof If?t.wd_1:le())}(this.wd_1,n)},fe(Gf).ga=function(n){return Vf().yd(this.x9_1,A,n)},fe(Gf).ha=function(n){return Vf().yd(this.x9_1,A,A,n)},fe(Gf).ja=function(n){return Vf().yd(this.x9_1,A,A,Je(n))},fe(Gf).y9=function(n,t){return Vf().yd(this.x9_1,n,A,Je(t))},fe(Gf).zd=function(n,t){return Vf().yd(this.x9_1,n,A,t)},fe(Gf).fb=function(n,t){return Vf().yd(this.x9_1,n,t)},fe(Gf).rc=function(n,t){return Vf().yd(this.x9_1,A,n,Je(t))},fe(Gf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},fe(Gf).hashCode=function(){return ee(this.x9_1)},fe(Gf).equals=function(n){if(this===n)return!0;if(!(n instanceof Gf))return!1;var t=n instanceof Gf?n:le();return this.x9_1===t.x9_1},fe(Uf).ae=function(n,t,r,i){return new Yf(n,t,r,i)},fe(Uf).yd=function(n,t,r,i,e){return t=t===A?bt():t,r=r===A?null:r,i=i===A?bt():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},fe(Yf).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},fe(Yf).hashCode=function(){var n=ee(this.be_1);return n=zn(n,31)+ie(this.ce_1)|0,n=zn(n,31)+(null==this.de_1?0:ee(this.de_1))|0,zn(n,31)+ie(this.ee_1)|0},fe(Yf).equals=function(n){if(this===n)return!0;if(!(n instanceof Yf))return!1;var t=n instanceof Yf?n:le();return this.be_1===t.be_1&&!!ue(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!ue(this.ee_1,t.ee_1)},fe(Jf).u9=function(n){return this.r9_1(new ns("click",n))},fe(Jf).t9=function(n){return this.r9_1(new ts(n))},fe(Jf).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new ts(i))}return hr()},fe(Jf).s9=function(n){return this.r9_1(new rs("title",n))},fe(Jf).bd=function(n){return this.r9_1(new rs("href",n))},fe(fs).oe=function(){return this.ne_1},fe(fs).toString=function(){return"Toggle(focus="+this.ne_1+")"},fe(fs).hashCode=function(){return ie(this.ne_1)},fe(fs).equals=function(n){if(this===n)return!0;if(!(n instanceof fs))return!1;var t=n instanceof fs?n:le();return!!ue(this.ne_1,t.ne_1)},fe(ss).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},fe(ss).re=function(n){return new ss(n)},fe(ss).toString=function(){return"Model(tree="+this.xb_1+")"},fe(ss).hashCode=function(){return this.xb_1.hashCode()},fe(ss).equals=function(n){if(this===n)return!0;if(!(n instanceof ss))return!1;var t=n instanceof ss?n:le();return!!this.xb_1.equals(t.xb_1)},fe(hs).id=function(n,t){var r;if(n instanceof fs){var i=n.oe();r=t.re(i.qe(as))}else he();return r},fe(vs).cd=function(){return this.ve_1},fe(vs).we=function(){return 0},fe(vs).qe=function(n){return n(this.ve_1)},fe(vs).toString=function(){return"Original(tree="+this.ve_1+")"},fe(vs).hashCode=function(){return this.ve_1.hashCode()},fe(vs).equals=function(n){if(this===n)return!0;if(!(n instanceof vs))return!1;var t=n instanceof vs?n:le();return!!this.ve_1.equals(t.ve_1)},fe(ds).cd=function(){return this.ue_1},fe(ds).we=function(){return this.se_1.we()+1|0},fe(ds).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Lr(Ct(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===gr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},fe(ds).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},fe(ds).hashCode=function(){var n=ie(this.se_1);return n=zn(n,31)+this.te_1|0,zn(n,31)+this.ue_1.hashCode()|0},fe(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:le();return!!ue(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},fe(gs).ad=function(){var n;switch(this.q8_1){case 0:n=ps();break;case 1:n=bs();break;default:he()}return n},fe(ws).vc=function(){var n,t;return Xn(On(De(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},fe(ws).xe=function(n){return new ds(this,n,this.cd().vb_1.j(n))},fe(ms).uc=function(){return new vs(this)},fe(ms).ye=function(){return!this.vb_1.i()},fe(ms).ze=function(n,t,r){return new ms(n,t,r)},fe(ms).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},fe(ms).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},fe(ms).hashCode=function(){var n=null==this.ub_1?0:ie(this.ub_1);return n=zn(n,31)+ie(this.vb_1)|0,zn(n,31)+this.wb_1.hashCode()|0},fe(ms).equals=function(n){if(this===n)return!0;if(!(n instanceof ms))return!1;var t=n instanceof ms?n:le();return!!ue(this.ub_1,t.ub_1)&&!!ue(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},fe(Cs).toString=function(){return"ProblemNodeGroup(tree="+this.df_1+", children="+this.ef_1+", childGroups="+this.ff_1+", id="+this.gf_1+")"},fe(Cs).hashCode=function(){var n=this.df_1.hashCode();return n=zn(n,31)+ie(this.ef_1)|0,n=zn(n,31)+ie(this.ff_1)|0,zn(n,31)+this.gf_1|0},fe(Cs).equals=function(n){if(this===n)return!0;if(!(n instanceof Cs))return!1;var t=n instanceof Cs?n:le();return!!this.df_1.equals(t.df_1)&&!!ue(this.ef_1,t.ef_1)&&!!ue(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},fe(Rs).toString=function(){return"Text(text="+this.hf_1+")"},fe(Rs).hashCode=function(){return ee(this.hf_1)},fe(Rs).equals=function(n){if(this===n)return!0;if(!(n instanceof Rs))return!1;var t=n instanceof Rs?n:le();return this.hf_1===t.hf_1},fe(Hs).toString=function(){return"ProblemId(prettyText="+this.if_1+", separator="+this.jf_1+")"},fe(Hs).hashCode=function(){var n=this.if_1.hashCode();return zn(n,31)+(0|this.jf_1)|0},fe(Hs).equals=function(n){if(this===n)return!0;if(!(n instanceof Hs))return!1;var t=n instanceof Hs?n:le();return!!this.if_1.equals(t.if_1)&&this.jf_1===t.jf_1},fe($s).toString=function(){return"Advice(label="+this.kf_1+", docLink="+this.lf_1+")"},fe($s).hashCode=function(){var n=ie(this.kf_1);return zn(n,31)+(null==this.lf_1?0:ie(this.lf_1))|0},fe($s).equals=function(n){if(this===n)return!0;if(!(n instanceof $s))return!1;var t=n instanceof $s?n:le();return!!ue(this.kf_1,t.kf_1)&&!!ue(this.lf_1,t.lf_1)},fe(Us).zb=function(){return this.mf_1},fe(Us).toString=function(){return"MessageTreeIntent(delegate="+this.mf_1+")"},fe(Us).hashCode=function(){return ie(this.mf_1)},fe(Us).equals=function(n){if(this===n)return!0;if(!(n instanceof Us))return!1;var t=n instanceof Us?n:le();return!!ue(this.mf_1,t.mf_1)},fe(Vs).zb=function(){return this.nf_1},fe(Vs).toString=function(){return"ProblemIdTreeIntent(delegate="+this.nf_1+")"},fe(Vs).hashCode=function(){return ie(this.nf_1)},fe(Vs).equals=function(n){if(this===n)return!0;if(!(n instanceof Vs))return!1;var t=n instanceof Vs?n:le();return!!ue(this.nf_1,t.nf_1)},fe(Qs).zb=function(){return this.of_1},fe(Qs).toString=function(){return"FileLocationTreeIntent(delegate="+this.of_1+")"},fe(Qs).hashCode=function(){return ie(this.of_1)},fe(Qs).equals=function(n){if(this===n)return!0;if(!(n instanceof Qs))return!1;var t=n instanceof Qs?n:le();return!!ue(this.of_1,t.of_1)},fe(Zs).toString=function(){return"SetTab(tab="+this.pf_1+")"},fe(Zs).hashCode=function(){return this.pf_1.hashCode()},fe(Zs).equals=function(n){if(this===n)return!0;if(!(n instanceof Zs))return!1;var t=n instanceof Zs?n:le();return!!this.pf_1.equals(t.pf_1)},fe(Ys).yf=function(n,t,r,i,e,u,o,f){return new Ys(n,t,r,i,e,u,o,f)},fe(Ys).zf=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.qf_1:n,t=t===A?this.rf_1:t,r=r===A?this.sf_1:r,i=i===A?this.tf_1:i,e=e===A?this.uf_1:e,u=u===A?this.vf_1:u,o=o===A?this.wf_1:o,f=f===A?this.xf_1:f,s===A?this.yf(n,t,r,i,e,u,o,f):s.yf.call(this,n,t,r,i,e,u,o,f)},fe(Ys).toString=function(){return"Model(heading="+this.qf_1+", summary="+this.rf_1+", learnMore="+this.sf_1+", messageTree="+this.tf_1+", problemIdTree="+this.uf_1+", fileLocationTree="+this.vf_1+", problemCount="+this.wf_1+", tab="+this.xf_1+")"},fe(Ys).hashCode=function(){var n=this.qf_1.hashCode();return n=zn(n,31)+ie(this.rf_1)|0,n=zn(n,31)+this.sf_1.hashCode()|0,n=zn(n,31)+this.tf_1.hashCode()|0,n=zn(n,31)+this.uf_1.hashCode()|0,n=zn(n,31)+this.vf_1.hashCode()|0,n=zn(n,31)+this.wf_1|0,zn(n,31)+this.xf_1.hashCode()|0},fe(Ys).equals=function(n){if(this===n)return!0;if(!(n instanceof Ys))return!1;var t=n instanceof Ys?n:le();return!!(this.qf_1.equals(t.qf_1)&&ue(this.rf_1,t.rf_1)&&this.sf_1.equals(t.sf_1)&&this.tf_1.equals(t.tf_1)&&this.uf_1.equals(t.uf_1)&&this.vf_1.equals(t.vf_1)&&this.wf_1===t.wf_1&&this.xf_1.equals(t.xf_1))},fe(vc).ag=function(n,t){var r,i;return n instanceof Qs?r=t.zf(A,A,A,A,A,ls().id(n.of_1,t.vf_1)):n instanceof Vs?r=t.zf(A,A,A,A,ls().id(n.nf_1,t.uf_1)):n instanceof Us?r=t.zf(A,A,A,ls().id(n.mf_1,t.tf_1)):n instanceof pc?r=function(n,t,r,i){var e;return r instanceof Us?e=n.zf(A,A,A,gc(n.tf_1,r,i)):r instanceof Vs?e=n.zf(A,A,A,A,gc(n.uf_1,r,i)):r instanceof Qs?e=n.zf(A,A,A,A,A,gc(n.vf_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Du))throw ou(re("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Lr(Ct(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===gr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof wc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Zs?r=t.zf(A,A,A,A,A,A,A,n.pf_1):(console.error("Unhandled intent: "+n),r=t),r},fe(vc).ba=function(n,t){var r=n instanceof mc?n:le();return this.ag(r,t instanceof Ys?t:le())},fe(vc).bg=function(n){return Nf().y9(Xf(oc),[Ks(0,n),Xs(0,n)])},fe(vc).z9=function(n){return this.bg(n instanceof Ys?n:le())},fe(wc).toString=function(){return"Copy(text="+this.hd_1+")"},fe(wc).hashCode=function(){return ee(this.hd_1)},fe(wc).equals=function(n){if(this===n)return!0;if(!(n instanceof wc))return!1;var t=n instanceof wc?n:le();return this.hd_1===t.hd_1},fe(pc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},fe(pc).hashCode=function(){var n=this.wc_1;return zn(n,31)+ie(this.xc_1)|0},fe(pc).equals=function(n){if(this===n)return!0;if(!(n instanceof pc))return!1;var t=n instanceof pc?n:le();return this.wc_1===t.wc_1&&!!ue(this.xc_1,t.xc_1)},fe(Xr).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,hr(),n},l=null,wn=0,function(){var n=configurationCacheProblems();if(null==n.problemsReport)Sf(zf("report"),Uo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Tr(),r=Tr(),i=Tr(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(Yo(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(Yo(a,o))}else f=c;if(null==f){var h=ae(o.problem);t.d(Yo(h,o))}}return new Zo(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new po((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:Yt(s," ",A,r=r!==A&&r)>=0,a=null==c||c,yf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(Yi(n)>0){var r,i=Qi(n,0);r=function(n){return 97<=n&&n<=122||!(xi(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=tu(iu().h9_1,t),i=iu().h9_1[r],e=(i+iu().i9_1[r]|0)-1|0,u=iu().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>zn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=tu(uu().k9_1,n);return t>=0&&n<(uu().k9_1[t]+uu().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=ji(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=Qi(t,0),e=t.substring(1).toLowerCase();r=ji(i)+e}return r}return ji(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?Fe(zn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:pi(n)}(n)}(n))}(n)}(i):ji(i),t=re(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),hr()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:_f(r),e=yf().rd(function(n){var t=n.od_1.k(),r=vf(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=yf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=vf(r,"problem");return r>i?e+", only the first "+i+" "+gf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Tr())}(n,h),new wf("Gradle Configuration Cache",n.documentationLink),ef(new Qu(Ro().qc_1),Xn(On(h.nd_1),cf)),ef(new Qu(Ho().qc_1),function(n){return Xn(On(n),af)}(h.nd_1)),ef(new Qu(Oo().qc_1),Xn(On(h.od_1),ff)),ef(new Qu($o().qc_1),Xn(On(h.pd_1),sf)),0===l?Oo():Ro())}(n));else{var t=n.problemsReport;Sf(zf("report"),dc(),function(n,t){var r=function(n){for(var t=ui(),r=0,i=n.length;r<i;){var e=n[r];r=r+1|0;var u,o=js(e),f=t.v1(o);if(null==f){var s=Tr();t.h5(o,s),u=s}else u=f;u.d(e)}for(var c=t.o(),a=Lr(Ct(c,10)),h=c.f();h.g();){for(var l,_=h.h(),v=_.i1(),d=Lr(Ct(v,10)),g=v.f();g.g();){var w;w=Ps(g.h(),null,!0),d.d(w)}var b=d,p=Dn(_.i1());l=new ms(Ss(p,new $u(zs(Is(p)).ed(" ("+_.i1().k()+")").j5())),b),a.d(l)}var m=a;return new ss(new ms(new Rs("text"),m))}(t),i=function(n){for(var t=function(){var n=Tr();return new Cs(new ms(new Hs(yf().rd("Ungrouped"),!0),n),n,ui())}(),r=ui(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=xs(r,Hn(Tn(u.problemId.slice(),1))),f=Ps(u);null==o?t.ef_1.d(f):o.ef_1.d(f)}for(var s=r.w1(),c=Lr(Ct(s,10)),a=s.f();a.g();){var h;h=a.h().df_1,c.d(h)}var l=$n(c);return l.d(t.df_1),new ss(new ms(new Rs("text"),l))}(t),e=function(n){for(var t=Tr(),r=ui(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=u.locations;if(null==o||0===o.length)t.d(Ps(u));else{var f,s=u.locations;if(null==s)f=null;else{for(var c=Tr(),a=Oi(s);a.g();){var h=a.h();null!=h.path&&c.d(h)}f=c}if(null==f);else for(var l=f.f();l.g();){var _=l.h();Bs(r,ae(_.path),u,_)}var v,d=u.locations;if(null==d)v=null;else{for(var g=Tr(),w=Oi(d);w.g();){var b=w.h();null!=b.pluginId&&g.d(b)}v=g}if(null==v);else for(var p=v.f();p.g();){var m=p.h();Bs(r,ae(m.pluginId),u,m)}var k,q=u.locations;if(null==q)k=null;else{for(var y=Tr(),B=Oi(q);B.g();){var C=B.h();null!=C.taskPath&&y.d(C)}k=y}if(null==k);else for(var x=k.f();x.g();){var j=x.h();Bs(r,ae(j.taskPath),u,j)}}}var P=function(n,t){for(var r=n.w1(),i=Lr(Ct(r,10)),e=r.f();e.g();){var u;u=e.h().t3_1,i.d(u)}var o=i;return t.i()?o:function(n,t){var r=Lr(n.k());return r.m(n),r.d(t),r}(o,new ms(new Hs(yf().rd("no location"),!0),t))}(r,t);return new ss(new ms(new Rs("text"),P))}(t);return new Ys(yf().rd("Problems Report"),function(n,t){var r,i,e,u=n.description,o=null==u?null:dr(_f(u));return r=null==o?dr(yf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),hr()),hr()}))):o,r}(n,t),new wf("reporting problems",n.documentationLink),r,i,e,t.length,function(n,t,r){return ho(r)>0?Os():ho(n)>0?Fs():ho(t)>0?Ds():Fs()}(r,i,e))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
+                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,y,q,B,C,x,j,P,I,S,z,E,T,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,yn,qn,Bn,Cn,xn,jn,Pn,In,Sn,zn=Math.imul,En=ArrayBuffer.isView;function Tn(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();if(t>=n.length)return function(n){switch(n.length){case 0:return pt();case 1:return gr(n[0]);default:return function(n){return Ar(function(n){return new qt(n,!1)}(n))}(n)}}(n);if(1===t)return gr(n[0]);var r=0,i=Nr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,Wn(n.length-t|0,0))}function Ln(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Qt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,bi(),t,r,i,e,u,o).toString()}function Nn(n){return n.length-1|0}function An(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,oe(t,n[f]))return f}while(u<=o)}return-1}function Mn(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Fn(n,bi(),t,r,i,e,u,o).toString()}function Fn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Qt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Dn(n){if(n.i())throw mu("List is empty.");return n.j(0)}function On(n){return new Yn(n)}function Rn(n){if(Ue(n,Ti)){var t;switch(n.k()){case 0:t=pt();break;case 1:t=gr(Ue(n,Ei)?n.j(0):n.f().h());break;default:t=Hn(n)}return t}return mt(Vn(n))}function Hn(n){return Ar(n)}function $n(n){if(Ue(n,Ti)&&n.k()<=1)return Rn(n);var t=Vn(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return lr();var r=kt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function Gn(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();if(Ue(n,Ti)){if(t>=n.k())return Rn(n);if(1===t)return gr(function(n){if(Ue(n,Ei))return Dn(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");return t.h()}(n))}var r=0,i=Nr(),e=n.f();n:for(;e.g();){var u=e.h();if(i.d(u),(r=r+1|0)===t)break n}return mt(i)}(n,Wn(n.k()-t|0,0))}function Un(n,t){if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return pt();var r=n.k();if(t>=r)return Rn(n);if(1===t)return gr(Qn(n));var i=Nr();if(Ue(n,li)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Vn(n){return Ue(n,Ti)?Hn(n):Zn(n,Lr())}function Qn(n){if(n.i())throw mu("List is empty.");return n.j(kt(n))}function Zn(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function Yn(n){this.n_1=n}function Wn(n,t){return n<t?t:n}function Kn(n,t){return n>t?t:n}function Xn(n,t){return Ut().q(n,t,-1)}function Jn(n,t){return new Et(n,t)}function nt(n){var t=n.f();if(!t.g())return pt();var r=t.h();if(!t.g())return gr(r);var i=Lr();for(i.d(r);t.g();)i.d(t.h());return i}function tt(n){this.r_1=n}function rt(n,t){this.s_1=n,this.t_1=t}function it(){}function et(n){this.x_1=n,this.w_1=0}function ut(n,t){this.a1_1=n,et.call(this,n),ft().b1(t,this.a1_1.k()),this.w_1=t}function ot(){t=this}function ft(){return null==t&&new ot,t}function st(){ft(),it.call(this)}function ct(n){this.h1_1=n}function at(n,t){return t===n?"(this Map)":Oi(t)}function ht(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(oe(e.j1(),t)){r=e;break n}}r=null}return r}function lt(){r=this}function _t(){return null==r&&new lt,r}function vt(n){this.q1_1=n,it.call(this)}function dt(){_t(),this.n1_1=null,this.o1_1=null}function gt(){i=this}function wt(){return null==i&&new gt,i}function bt(n){return n.length>0?nu(n):pt()}function pt(){return null==e&&new yt,e}function mt(n){switch(n.k()){case 0:return pt();case 1:return gr(n.j(0));default:return n}}function kt(n){return n.k()-1|0}function yt(){e=this,this.z1_1=new de(-1478467534,-1720727600)}function qt(n,t){this.b2_1=n,this.c2_1=t}function Bt(){u=this}function Ct(){return null==u&&new Bt,u}function xt(n,t){return Ue(n,Ti)?n.k():t}function jt(n,t){if(Ue(t,Ti))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function Pt(){}function It(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw cu("Position index "+t+" must be in range ["+Oe(0,n.k())+"].");return n.k()-t|0}(n,t))}function St(n){st.call(this),this.i2_1=n}function zt(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function Et(n,t){this.l2_1=n,this.m2_1=t}function Tt(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,lr()}n.o2_1=0}function Lt(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Nt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function At(){return null==o&&new Mt,o}function Mt(){o=this,this.u2_1=new de(1993859828,793161749)}function Ft(n,t,r){return Dt(Dt(n,r)-Dt(t,r)|0,r)}function Dt(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Ot(){f=this,this.p_1=new Ht(1,0)}function Rt(){return null==f&&new Ot,f}function Ht(n,t){Rt(),Vt.call(this,n,t,1)}function $t(n,t,r){Pt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function Gt(){s=this}function Ut(){return null==s&&new Gt,s}function Vt(n,t,r){if(Ut(),0===r)throw fu("Step must be non-zero.");if(r===vr().MIN_VALUE)throw fu("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Ft(t,n,r)|0;else{if(!(r<0))throw fu("Step is zero.");i=n<=t?t:t+Ft(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Qt(n,t,r){null!=r?n.e(r(t)):null==t||Ze(t)?n.e(t):t instanceof zi?n.i3(t.h3_1):n.e(Oi(t))}function Zt(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=mi(n),e=mi(t);return i===e||oe(new zi(Zi(Pi(i).toLowerCase(),0)),new zi(Zi(Pi(e).toLowerCase(),0)))}function Yt(n){return Wi(n)-1|0}function Wt(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?Kt(n,t,r,Wi(n),i):n.indexOf(t,r)}function Kt(n,t,r,i,e,u){var o=(u=u!==A&&u)?Xn(Kn(r,Yt(n)),Wn(i,0)):Oe(Wn(r,0),Kn(i,Wi(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,xi(t,0,n,a,Wi(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,tr(t,0,n,v,Wi(t),e))return v}while(v!==l)}return-1}function Xt(n){var t=0,r=Wi(n)-1|0,i=!1;n:for(;t<=r;){var e=ki(Zi(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return Ki(n,t,r+1|0)}function Jt(n,t){return ie(Ki(n,t.y2(),t.c3()+1|0))}function nr(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,rr(e=e===A?0:e);var u,o,f=nu(t);return new ur(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ue(n,Ei))return function(n){var t;switch(n.k()){case 0:throw mu("List is empty.");case 1:t=n.j(0);break;default:throw fu("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");var r=t.h();if(t.g())throw fu("Collection has more than one element.");return r}(t),u=Wt(n,e,r);return u<0?null:fr(u,e)}var o=Oe(Wn(r,0),Wi(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(xi(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return fr(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(tr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return fr(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:fr(r.t3_1,r.u3_1.length)}))}function tr(n,t,r,i,e,u){if(i<0||t<0||t>(Wi(n)-e|0)||i>(Wi(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!Zt(Zi(n,t+f|0),Zi(r,i+f|0),u))return!1}while(o<e);return!0}function rr(n){if(!(n>=0))throw fu(ie("Limit must be non-negative, but was "+n))}function ir(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>Wi(n.o3_1.p3_1))n.m3_1=Oe(n.k3_1,Yt(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=Oe(n.k3_1,Yt(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=vr().MIN_VALUE?Rt().p_1:Oe(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function er(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw fu("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,Wi(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function ur(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function or(n,t){this.t3_1=n,this.u3_1=t}function fr(n,t){return new or(n,t)}function sr(){}function cr(){}function ar(){}function hr(){c=this}function lr(){return null==c&&new hr,c}function _r(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function vr(){return null==a&&new _r,a}function dr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function gr(n){return 0===(t=[n]).length?Lr():Ar(new qt(t,!0));var t}function wr(n){return n<0&&function(){throw yu("Index overflow has happened.")}(),n}function br(n){return void 0!==n.toArray?n.toArray():dr(n)}function pr(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=ce(se(Zr)),function(n,t,r){zr.call(r),Zr.call(r),r.y5_1=function(n){return Ur(n,0,ce(se(Vr)))}(n)}(r,0,i),i));var t,r,i}function mr(){it.call(this)}function kr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function yr(n,t){this.n4_1=n,kr.call(this,n),ft().b1(t,this.n4_1.k()),this.h4_1=t}function qr(){mr.call(this),this.o4_1=0}function Br(n){this.r4_1=n}function Cr(n){this.s4_1=n}function xr(n,t){this.t4_1=n,this.u4_1=t}function jr(){zr.call(this)}function Pr(n){this.x4_1=n,zr.call(this)}function Ir(n){this.e5_1=n,mr.call(this)}function Sr(){dt.call(this),this.c5_1=null,this.d5_1=null}function zr(){mr.call(this)}function Er(){h=this;var n=Nr();n.c_1=!0,this.i5_1=n}function Tr(){return null==h&&new Er,h}function Lr(){return n=ce(se(Fr)),t=[],Fr.call(n,t),n;var n,t}function Nr(n){return t=ce(se(Fr)),r=[],Fr.call(t,r),t;var t,r}function Ar(n){return function(n,t){var r;return r=br(n),Fr.call(t,r),t}(n,ce(se(Fr)))}function Mr(n,t){return ft().e1(t,n.k()),t}function Fr(n){Tr(),qr.call(this),this.b_1=n,this.c_1=!1}function Dr(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Dr(n,t,r,u,e),f=Dr(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Or(n,t){return(3&n)-(3&t)|0}function Rr(){_=this}function Hr(n){this.n5_1=n,jr.call(this)}function $r(n){return function(n,t){Sr.call(t),Vr.call(t),t.t5_1=n,t.u5_1=n.w5()}(new Jr((null==_&&new Rr,_)),n),n}function Gr(){return $r(ce(se(Vr)))}function Ur(n,t,r){if($r(r),!(n>=0))throw fu(ie("Negative initial capacity: "+n));if(!(t>=0))throw fu(ie("Non-positive load factor: "+t));return r}function Vr(){this.v5_1=null}function Qr(n,t){return zr.call(t),Zr.call(t),t.y5_1=n,t}function Zr(){}function Yr(n,t){var r=Kr(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Ve(i))return Wr(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function Wr(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function Kr(n,t){var r=n.i6_1[t];return void 0===r?null:r}function Xr(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function Jr(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function ni(){}function ti(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function ri(){v=this;var n,t=(fi(0,0,n=ce(se(si))),n);t.x6_1=!0,this.e7_1=t}function ii(){return null==v&&new ri,v}function ei(n,t,r){this.d7_1=n,xr.call(this,t,r),this.b7_1=null,this.c7_1=null}function ui(n){this.y6_1=n,jr.call(this)}function oi(){return $r(n=ce(se(si))),si.call(n),n.w6_1=Gr(),n;var n}function fi(n,t,r){return Ur(n,t,r),si.call(r),r.w6_1=Gr(),r}function si(){ii(),this.v6_1=null,this.x6_1=!1}function ci(){d=this;var n=ai(0),t=n.y5_1;(t instanceof si?t:_e()).j5(),this.f7_1=n}function ai(n){return function(n,t){return function(n,t,r){Qr(function(n,t){return fi(n,t,ce(se(si)))}(n,t),r),hi.call(r)}(n,0,t),t}(n,ce(se(hi)))}function hi(){null==d&&new ci}function li(){}function _i(){}function vi(n){_i.call(this),this.k7_1=n}function di(){gi.call(this)}function gi(){_i.call(this),this.m7_1=""}function wi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new vi(process.stdout):new di}}function bi(){return n=ce(se(pi)),pi.call(n,""),n;var n}function pi(n){this.o7_1=void 0!==n?n:""}function mi(n){var t=Pi(n).toUpperCase();return t.length>1?n:Zi(t,0)}function ki(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function yi(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function qi(){return null==b&&new yi,b}function Bi(n,t){qi(),this.v7_1=n,this.w7_1=function(n){if(Ue(n,Ti)){var t;switch(n.k()){case 0:t=At();break;case 1:t=pr(Ue(n,Ei)?n.j(0):n.f().h());break;default:t=Zn(n,ai(n.k()))}return t}return function(n){switch(n.k()){case 0:return At();case 1:return pr(n.f().h());default:return n}}(Zn(n,(r=ce(se(hi)),Qr(oi(),r),hi.call(r),r)));var r}(t),this.x7_1=new RegExp(n,Mn(t,"","gu",A,A,A,Ci)),this.y7_1=null,this.z7_1=null}function Ci(n){return n.d8_1}function xi(n,t,r,i,e,u){return tr(n,t,r,i,e,u=u!==A&&u)}function ji(n,t){return n-t|0}function Pi(n){return String.fromCharCode(n)}function Ii(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Si(){return null==p&&new Ii,p}function zi(n){Si(),this.h3_1=n}function Ei(){}function Ti(){}function Li(){}function Ni(){}function Ai(){}function Mi(){}function Fi(){m=this}function Di(n,t){null==m&&new Fi,this.p8_1=n,this.q8_1=t}function Oi(n){var t=null==n?null:ie(n);return null==t?"null":t}function Ri(n){return new Hi(n)}function Hi(n){this.t8_1=n,this.s8_1=0}function $i(){return Qi(),k}function Gi(){return Qi(),y}function Ui(){return Qi(),q}function Vi(){return Qi(),B}function Qi(){x||(x=!0,k=new ArrayBuffer(8),y=new Float64Array($i()),new Float32Array($i()),q=new Int32Array($i()),Gi()[0]=-1,B=0!==Ui()[0]?1:0,C=1-Vi()|0)}function Zi(n,t){var r;if(Yi(n)){var i,e=n.charCodeAt(t);if(Si(),e<0?i=!0:(Si(),i=e>65535),i)throw fu("Invalid Char code: "+e);r=De(e)}else r=n.y3(t);return r}function Yi(n){return"string"==typeof n}function Wi(n){return Yi(n)?n.length:n.x3()}function Ki(n,t,r){return Yi(n)?n.substring(t,r):n.z3(t,r)}function Xi(n){return ie(n)}function Ji(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?ne(n,t):t instanceof de?ne(n,t.w8()):te(n,t);break;case"string":case"boolean":r=te(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function ne(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function te(n,t){return n<t?-1:n>t?1:0}function re(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function ie(n){return null==n?"null":function(n){return!!$e(n)||En(n)}(n)?"[...]":n.toString()}function ee(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():re(n);break;case"function":t=re(n);break;case"number":t=function(n){return Qi(),(0|n)===n?Fe(n):(Gi()[0]=n,zn(Ui()[(Qi(),C)],31)+Ui()[Vi()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=ue(String(n))}return t}function ue(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=zn(t,31)+u|0}while(e!==i);return t}function oe(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function fe(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function se(n){return n.prototype}function ce(n){return Object.create(n)}function ae(n,t,r){Error.call(n),function(n,t,r){var i=Xe(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function he(n){var t;return null==n?function(){throw ju()}():t=n,t}function le(){throw Iu()}function _e(){throw zu()}function ve(){j=this,this.x8_1=new de(0,-2147483648),this.y8_1=new de(-1,2147483647),this.z8_1=8,this.a9_1=64}function de(n,t){null==j&&new ve,ar.call(this),this.u8_1=n,this.v8_1=t}function ge(){return Me(),P}function we(){return Me(),I}function be(){return Me(),S}function pe(){return Me(),E}function me(){return Me(),T}function ke(n,t){if(Me(),xe(n,t))return 0;var r=Ie(n),i=Ie(t);return r&&!i?-1:!r&&i?1:Ie(qe(n,t))?-1:1}function ye(n,t){Me();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new de((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function qe(n,t){return Me(),ye(n,t.e9())}function Be(n,t){if(Me(),Se(n))return ge();if(Se(t))return ge();if(xe(n,pe()))return ze(t)?pe():ge();if(xe(t,pe()))return ze(n)?pe():ge();if(Ie(n))return Ie(t)?Be(Ee(n),Ee(t)):Ee(Be(Ee(n),t));if(Ie(t))return Ee(Be(n,Ee(t)));if(Te(n,me())&&Te(t,me()))return Le(Ce(n)*Ce(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+zn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+zn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+zn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+zn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+zn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+zn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((zn(r,c)+zn(i,s)|0)+zn(e,f)|0)+zn(u,o)|0)|0,new de(l<<16|_,(a&=65535)<<16|h)}function Ce(n){return Me(),4294967296*n.v8_1+function(n){return Me(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function xe(n,t){return Me(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function je(n,t){if(Me(),t<2||36<t)throw vu("radix out of range: "+t);if(Se(n))return"0";if(Ie(n)){if(xe(n,pe())){var r=Pe(t),i=n.d9(r),e=qe(Be(i,r),n).g9();return je(i,t)+e.toString(t)}return"-"+je(Ee(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Le(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=qe(f,Be(c,o)).g9().toString(t);if(Se(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function Pe(n){return Me(),new de(n,n<0?-1:0)}function Ie(n){return Me(),n.v8_1<0}function Se(n){return Me(),0===n.v8_1&&0===n.u8_1}function ze(n){return Me(),!(1&~n.u8_1)}function Ee(n){return Me(),n.e9()}function Te(n,t){return Me(),ke(n,t)<0}function Le(n){if(Me(),(t=n)!=t)return ge();if(n<=-0x8000000000000000)return pe();if(n+1>=0x8000000000000000)return Me(),z;if(n<0)return Ee(Le(-n));var t,r=4294967296;return new de(n%r|0,n/r|0)}function Ne(n,t){return Me(),ke(n,t)>0}function Ae(n,t){return Me(),ke(n,t)>=0}function Me(){L||(L=!0,P=Pe(0),I=Pe(1),S=Pe(-1),z=new de(-1,2147483647),E=new de(0,-2147483648),T=Pe(16777216))}function Fe(n){return n instanceof de?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function De(n){var t;return t=function(n){return n<<16>>16}(Fe(n)),function(n){return 65535&n}(t)}function Oe(n,t){return new Ht(n,t)}function Re(n,t,r,i){return He("class",n,t,r,i,null)}function He(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function $e(n){return Array.isArray(n)}function Ge(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ue(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!!(n[r]&i)}(r,t)}(n,t.$metadata$.iid)}function Ve(n){return!!$e(n)&&!n.$type$}function Qe(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function Ze(n){return"string"==typeof n||Ue(n,sr)}function Ye(n,t,r,i){return He("interface",n,t,r,i,(null==N&&(N=0),N=We()+1|0,We()))}function We(){if(null!=N)return N;!function(){throw Tu("lateinit property iid has not been initialized")}()}function Ke(n,t,r,i){return He("object",n,t,r,i,null)}function Xe(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(Je(n,"message")&&(u|=1),Je(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=Xe(o))}return null!=r&&(r.errorInfo=u),u}function Je(n,t){return n.hasOwnProperty(t)}function nu(n){return new Fr(n)}function tu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=Zi(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function ru(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function iu(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=Wi(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[Zi(n,e)]=e}while(r<=i);var u=tu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=tu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=tu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function eu(){return null==M&&new iu,M}function uu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function ou(){return null==F&&new uu,F}function fu(n){var t=function(n,t){return wu(n,t),su.call(t),t}(n,ce(se(su)));return fe(t,fu),t}function su(){fe(this,su)}function cu(n){var t=function(n,t){return wu(n,t),au.call(t),t}(n,ce(se(au)));return fe(t,cu),t}function au(){fe(this,au)}function hu(n){var t=function(n,t){return wu(n,t),lu.call(t),t}(n,ce(se(lu)));return fe(t,hu),t}function lu(){fe(this,lu)}function _u(n,t){return ae(t,n),du.call(t),t}function vu(n){var t=_u(n,ce(se(du)));return fe(t,vu),t}function du(){fe(this,du)}function gu(n){return function(n){ae(n),du.call(n)}(n),bu.call(n),n}function wu(n,t){return _u(n,t),bu.call(t),t}function bu(){fe(this,bu)}function pu(){var n,t=(gu(n=ce(se(ku))),ku.call(n),n);return fe(t,pu),t}function mu(n){var t=function(n,t){return wu(n,t),ku.call(t),t}(n,ce(se(ku)));return fe(t,mu),t}function ku(){fe(this,ku)}function yu(n){var t=function(n,t){return wu(n,t),qu.call(t),t}(n,ce(se(qu)));return fe(t,yu),t}function qu(){fe(this,qu)}function Bu(){var n,t=(gu(n=ce(se(xu))),xu.call(n),n);return fe(t,Bu),t}function Cu(n){var t=function(n,t){return wu(n,t),xu.call(t),t}(n,ce(se(xu)));return fe(t,Cu),t}function xu(){fe(this,xu)}function ju(){var n,t=(gu(n=ce(se(Pu))),Pu.call(n),n);return fe(t,ju),t}function Pu(){fe(this,Pu)}function Iu(){var n,t=(gu(n=ce(se(Su))),Su.call(n),n);return fe(t,Iu),t}function Su(){fe(this,Su)}function zu(){var n,t=(gu(n=ce(se(Eu))),Eu.call(n),n);return fe(t,zu),t}function Eu(){fe(this,Eu)}function Tu(n){var t=function(n,t){return wu(n,t),Lu.call(t),t}(n,ce(se(Lu)));return fe(t,Tu),t}function Lu(){fe(this,Lu)}function Nu(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return Bi.call(t,n,At()),t}(r,ce(se(Bi)))).a8(i)}function Au(n,t){this.o9_1=n,this.p9_1=t}function Mu(n){this.q9_1=n}function Fu(n,t,r){var i,e=Ff(),u=Wu(),o=Mf().ga(t),f=Wu();if(0===Wi(r))i=Lf();else{var s=n.ia_1,c=null==s?null:new Mu(s).v9(r,"Copy reference to the clipboard");i=null==c?Lf():c}return e.ja([u,o,f,i])}function Du(n){n=n===A?null:n,this.ia_1=n}function Ou(n,t,r){Yu.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Ru(n,t){this.ra_1=n,this.sa_1=t}function Hu(n,t){Yu.call(this),this.va_1=n,this.wa_1=t}function $u(n,t){Yu.call(this),this.xa_1=n,this.ya_1=t}function Gu(n){Yu.call(this),this.za_1=n}function Uu(n){Yu.call(this),this.ab_1=n}function Vu(n){Yu.call(this),this.bb_1=n}function Qu(n,t){Yu.call(this),this.cb_1=n,this.db_1=t}function Zu(n){Yu.call(this),this.eb_1=n}function Yu(){}function Wu(){return ro(),D}function Ku(){return ro(),O}function Xu(){return ro(),R}function Ju(){return ro(),H}function no(n){return ro(),Ff().fb(Jf(to),n)}function to(n){return ro(),n.gb(["invisible-text","text-for-copy"]),lr()}function ro(){$||($=!0,D=no("`"),O=no(" "),R=no("("),H=no(")"))}function io(n,t){Yu.call(this),this.hb_1=n,this.ib_1=t}function eo(n){Yu.call(this),this.jb_1=n}function uo(n,t){Yu.call(this),this.kb_1=n,this.lb_1=t}function oo(n){Yu.call(this),this.mb_1=n}function fo(n){Yu.call(this),this.nb_1=n}function so(n){Yu.call(this),this.ob_1=n}function co(n,t,r){Yu.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function ao(n){Yu.call(this),this.sb_1=n}function ho(n){Yu.call(this),this.tb_1=n}function lo(n){return n.xb_1.vb_1.k()}function _o(){if(Z)return lr();Z=!0,G=new ko("Inputs",0,"Build configuration inputs"),U=new ko("ByMessage",1,"Problems grouped by message"),V=new ko("ByLocation",2,"Problems grouped by location"),Q=new ko("IncompatibleTasks",3,"Incompatible tasks")}function vo(n){yc.call(this),this.yb_1=n}function go(n){yc.call(this),this.ac_1=n}function wo(n){yc.call(this),this.bc_1=n}function bo(n){yc.call(this),this.cc_1=n}function po(n){yo.call(this),this.dc_1=n}function mo(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function ko(n,t,r){Di.call(this,n,t),this.qc_1=r}function yo(){Bc.call(this)}function qo(n,t){var r=Af(),i=Jf(Lo),e=Af().y9(Jf(No),[]),u=function(n,t){var r,i=Af(),e=Jf(Oo),u=Ff().ga("Learn more about the "),o=$f();return i.y9(e,[u,o.fb(Jf((r=t,function(n){return n.bd(r.tc_1),lr()})),t.sc_1),Ff().ga(".")])}(0,t.gc_1),o=Af().y9(Jf(Ao),[Co(0,t)]),f=Af();return r.y9(i,[e,u,o,f.y9(Jf(Mo),[Io(0,Ro(),t.lc_1,lo(t.jc_1)),Io(0,Ho(),t.lc_1,lo(t.hc_1)),Io(0,$o(),t.lc_1,lo(t.ic_1)),Io(0,Go(),t.lc_1,lo(t.kc_1))])])}function Bo(n,t){var r,i,e=Af(),u=Jf(Fo);switch(t.lc_1.q8_1){case 0:r=zo(0,t.jc_1,((i=function(n){return new wo(n)}).callableName="<init>",i));break;case 3:r=zo(0,t.kc_1,function(){var n=function(n){return new bo(n)};return n.callableName="<init>",n}());break;case 1:r=zo(0,t.hc_1,function(){var n=function(n){return new go(n)};return n.callableName="<init>",n}());break;case 2:r=zo(0,t.ic_1,function(){var n=function(n){return new vo(n)};return n.callableName="<init>",n}());break;default:le()}return e.y9(u,[r])}function Co(n,t){return Af().ja([Po(0,t),xo(0,t)])}function xo(n,t){for(var r=Af(),i=t.fc_1,e=Lr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,jt(e,0===wr(s)?gr(jo(Vo(),f)):bt([Gf().ja([]),jo(Vo(),f)]))}return r.ha(e)}function jo(n,t){return Df().ja([Ic(t)])}function Po(n,t){return Nf().ja([jc().ka(t.ec_1)])}function Io(n,t,r,i){var e,u,o;return Af().y9(Jf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),lr()):u.equals(o)?(n.t9("group-selector--active"),lr()):(n.u9(function(n){return function(t){return new po(n)}}(u)),lr()),lr()})),[Ff().rc(t.qc_1,[So(0,i)])])}function So(n,t){return Ff().y9(Jf(Do),[Ku(),Xu(),Ff().ga(""+t),Ju()])}function zo(n,t,r){return function(n,t,r){var i,e=Af(),u=Of();return e.ja([u.ha(ys(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Hu?Nc(i,(Vo(),(t=function(n){return Eo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,Cc()):r instanceof $u?Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r.xa_1,r.ya_1,xc()):r instanceof io?Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r.hb_1,r.ib_1,A,So(Vo(),n.cd().vb_1.k())):r instanceof Ou?Lc(i,n,r):Nc(i,function(){var n=function(n){return Eo(0,n)};return n.callableName="viewNode",n}(Vo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function Eo(n,t){var r;return t instanceof eo?Sc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),lr()})):t instanceof co?Sc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),lr()}}(t)):t instanceof so?Sc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),lr()}}(t)):t instanceof uo?Sc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),lr()}}(t)):t instanceof fo?Sc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),lr()}}(t)):t instanceof ao?Sc(function(n){return function(t){return t.ed(n.sb_1),lr()}}(t)):t instanceof ho?Sc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),lr()}}(t)):t instanceof Zu?Sc(function(n){return function(t){return t.ed(n.eb_1),lr()}}(t)):t instanceof Gu?Ic(t.za_1):t instanceof Qu?Qo(t):Ff().ga(ie(t))}function To(n){return n.t9("report-wrapper"),lr()}function Lo(n){return n.t9("header"),lr()}function No(n){return n.t9("gradle-logo"),lr()}function Ao(n){return n.t9("title"),lr()}function Mo(n){return n.t9("groups"),lr()}function Fo(n){return n.t9("content"),lr()}function Do(n){return n.t9("group-selector__count"),lr()}function Oo(n){return n.t9("learn-more"),lr()}function Ro(){return _o(),G}function Ho(){return _o(),U}function $o(){return _o(),V}function Go(){return _o(),Q}function Uo(){Y=this}function Vo(){return null==Y&&new Uo,Y}function Qo(n){var t;return $f().fb(Jf((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),lr()})),n.db_1)}function Zo(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function Yo(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function Wo(n,t){for(var r=vf(n),i=t.trace,e=Nr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=Jo(s),e.d(f)}return new Zo(t,r,e)}function Ko(n,t){var r,i=null==(r=t.kd_1.error)?null:nf(r);null==i||n.d(i)}function Xo(n){return function(n,t,r){var i=null==n.error?null:new Hu(t,r);return null==i?new $u(t,r):i}(n.kd_1,new Gu(n.ld_1),ef(n.kd_1))}function Jo(n){var t;switch(n.kind){case"Project":t=new eo(n.path);break;case"Task":t=new uo(n.path,n.type);break;case"TaskPath":t=new oo(n.path);break;case"Bean":t=new fo(n.type);break;case"Field":t=new co("field",n.name,n.declaringType);break;case"InputProperty":t=new co("input property",n.name,n.task);break;case"OutputProperty":t=new co("output property",n.name,n.task);break;case"SystemProperty":t=new so(n.name);break;case"PropertyUsage":t=new co("property",n.name,n.from);break;case"BuildLogic":t=new ao(n.location);break;case"BuildLogicClass":t=new ho(n.type);break;default:t=new Zu("Gradle runtime")}return t}function nf(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new Gu(vf(r))}for(var i=n.summary,e=null==i?null:vf(i),u=Lr(),o=Ri(t);o.g();){var f=rf(o.h());null==f||u.d(f)}for(var s=Mn(u,"\n"),c=Lr(),a=Ri(t);a.g();){var h=tf(a.h());null==h||c.d(h)}return new Ou(e,s,c)}function tf(n){var t=rf(n);if(null==t)return null;var r,i,e=nt(new Nt(function(n,t,r,i){var e;return Jn(nr(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return Jt(e,n)}))}(t),!0,lf));return new Ru(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?ps():null))}function rf(n){var t=n.text;return null==t?n.internalText:t}function ef(n){var t=n.documentationLink;return null==t?null:new Qu(t,"")}function uf(n,t){return new cs(of(n,jf().sd(t),ps()))}function of(n,t,r){return new ks(n,function(n,t){var r,i=Jn(On(n.o()),If);return nt(Jn(new rt(i,new ff(_f)),(r=t,function(n){return of(n.v3(),n.w3().wd_1,r)})))}(t,1===Pf(t)?ms():ps()),0===Pf(t)?ps():r)}function ff(n){this.td_1=n}function sf(n){var t=Lr(),r=n.ld_1,i=Dn(r.ca_1).fa_1,e=ie(Xt(Ze(i)?i:_e())),u=r.vd(function(n,t){var r;if(!(t>=0))throw fu(ie("Requested element count "+t+" is less than zero."));if(0===t)return Rn(n);if(Ue(n,Ti)){var i=n.k()-t|0;if(i<=0)return pt();if(1===i)return gr(function(n){if(Ue(n,Ei))return Qn(n);var t=n.f();if(!t.g())throw mu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Nr(),Ue(n,Ei)){if(Ue(n,li)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Lr();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return mt(r)}(r.ca_1,1));return t.d(new io(new Zu(e),ef(n.kd_1))),t.d(new Gu(u)),t.m(n.md_1),t.j5()}function cf(n){var t=Lr(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new $u(new Gu(i),ef(n.kd_1))),t.j5()}function af(n){var t=Lr();return t.d(Xo(n)),t.m(n.md_1),Ko(t,n),t.j5()}function hf(n){var t=Lr();return t.m(new St(n.md_1)),t.d(Xo(n)),Ko(t,n),t.j5()}function lf(n){return Wi(n)>0}function _f(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:Ji(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof de}(r)||Ue(r,cr))?n:_e(),t);var r,i}(Oi(n.v3()),Oi(t.v3()))}function vf(n){var t;return Bf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),lr())}return lr()}))}function df(n,t){return(0!==(r=n)?r.toString():"No")+" "+gf(t,n)+" "+wf(n)+" found";var r}function gf(n,t){return t<2?n:n+"s"}function wf(n){return n<=1?"was":"were"}function bf(n,t){this.sc_1=n,this.tc_1=t}function pf(n){kf.call(this),this.fa_1=n}function mf(n,t){kf.call(this),this.da_1=n,this.ea_1=t}function kf(){}function yf(){this.dd_1=Lr()}function qf(){W=this}function Bf(){return null==W&&new qf,W}function Cf(n){Bf(),this.ca_1=n}function xf(){K=this}function jf(){return null==K&&new xf,K}function Pf(n){return n.k()}function If(n){var t=n.j1(),r=n.i1();return fr(t,new Sf(Ue(r,Ni)?r:_e()))}function Sf(n){jf(),this.wd_1=n}function zf(n,t,r){var i;Tf(t,n,r),i="Component mounted at #"+n.id+".",wi(),(wi(),g).j7(i)}function Ef(n){var t=document.getElementById(n);if(null==t)throw hu("'"+n+"' element missing");return t}function Tf(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Tf(n,r,n.ba(i,t)),lr()}}(n,r,t),fs(),e.innerHTML="",us(e,i,u)}function Lf(){return fs(),X}function Nf(){return fs(),J}function Af(){return fs(),nn}function Mf(){return fs(),tn}function Ff(){return fs(),rn}function Df(){return fs(),en}function Of(){return fs(),un}function Rf(){return fs(),on}function Hf(){return fs(),fn}function $f(){return fs(),sn}function Gf(){return fs(),cn}function Uf(n){this.x9_1=n}function Vf(){an=this}function Qf(){return null==an&&new Vf,an}function Zf(){hn=this,Xf.call(this)}function Yf(){return null==hn&&new Zf,hn}function Wf(n,t,r,i){t=t===A?pt():t,r=r===A?null:r,i=i===A?pt():i,Xf.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function Kf(){}function Xf(){Qf()}function Jf(n){fs();var t,r=Lr();return n(new ns((t=r,function(n){return t.d(n),lr()}))),r}function ns(n){this.r9_1=n}function ts(n,t){es.call(this),this.fe_1=n,this.ge_1=t}function rs(n){es.call(this),this.he_1=n}function is(n,t){es.call(this),this.ie_1=n,this.je_1=t}function es(){}function us(n,t,r){if(fs(),t instanceof Wf)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(he(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)os(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(he(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)us(n,i.h(),u);return lr()}));else if(t instanceof Kf){var i=t instanceof Kf?t:_e();us(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),lr()}}(r,i))}else if(oe(t,Yf()))return lr();var e,u}function os(n,t,r){var i,e;fs(),t instanceof is?n.setAttribute(t.ie_1,t.je_1):t instanceof rs?function(n,t){for(var r=Lr(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Nu(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=ie(Xt(Ze(f)?f:_e())),c=bi();c.p7(s),0!==Wi(s)&&c.p7(" "),Fn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof ts&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),lr()}))}function fs(){ln||(ln=!0,X=Yf(),new Uf("hr"),J=new Uf("h1"),new Uf("h2"),nn=new Uf("div"),new Uf("pre"),tn=new Uf("code"),rn=new Uf("span"),en=new Uf("small"),un=new Uf("ol"),on=new Uf("ul"),fn=new Uf("li"),sn=new Uf("a"),cn=new Uf("br"),new Uf("p"))}function ss(n){as.call(this),this.ne_1=n}function cs(n){this.xb_1=n}function as(){}function hs(n){return n.me(A,A,n.wb_1.ad())}function ls(){_n=this}function _s(){return null==_n&&new ls,_n}function vs(){if(gn)return lr();gn=!0,vn=new ws("Collapsed",0),dn=new ws("Expanded",1)}function ds(n){bs.call(this),this.ve_1=n}function gs(n,t,r){bs.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function ws(n,t){Di.call(this,n,t)}function bs(){}function ps(){return vs(),vn}function ms(){return vs(),dn}function ks(n,t,r){t=t===A?pt():t,r=r===A?ps():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function ys(n,t){return nt(Jn(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Hf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(ms())&&!o.i()?o:null)?null:function(n,t){return Rf().ha(function(n,t){return ys(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Lf():f])}(n,r)})));var r}function qs(){if(kn)return lr();kn=!0,bn=new Bs("ByMessage",0,"Messages"),pn=new Bs("ByGroup",1,"Group"),mn=new Bs("ByFileLocation",2,"Locations")}function Bs(n,t,r){Di.call(this,n,t),this.cf_1=r}function Cs(n,t){this.df_1=n,this.ef_1=t}function xs(n,t){this.ff_1=n,this.gf_1=t}function js(n){return new ks(new Gu(Bf().rd(n+" more problem"+(n>1?"s have":" has")+" been skipped")))}function Ps(n,t,r,i){var e,u,o=n.v1(t);if(null==o){var f=Lr(),s=fr(new ks(new Vs(Bf().qd((u=t,function(n){return n.fd(u),lr()}))),f,ms()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Es(r,i))}function Is(n,t,r,i){var e;if(t=t===A?Lr():t,r=r===A?oi():r,i===A){var u=wn;wn=u+1|0,e=u}else e=i;i=e,this.hf_1=n,this.if_1=t,this.jf_1=r,this.kf_1=i}function Ss(n,t){if(t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.ef_1+" ("+o.df_1+")",a=s.v1(c);if(null==a){var h=Lr(),l=new Is(new ks(new Vs(Bf().qd(Fs(o))),h,ms()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||he(r).if_1.u(he(e).hf_1)||he(r).if_1.d(he(e).hf_1),i=he(e).jf_1}return e}function zs(n,t){if(n.k()===t.length){var r;n:{var i=function(n,t){var r=t.length,i=xt(n,10),e=Nr(Math.min(i,r)),u=0,o=n.f();t:for(;o.g();){var f,s=o.h();if(u>=r)break t;var c=u;u=c+1|0,f=fr(s,t[c]),e.d(f)}return e}(n,t);if(Ue(i,Ti)&&i.i())r=!0;else{for(var e=i.f();e.g();){var u=e.h();if(u.t3_1.df_1!==u.u3_1.name||u.t3_1.ef_1!==u.u3_1.displayName){r=!1;break n}}r=!0}}return r}return!1}function Es(n,t,r){var i=function(n,t,r){t=t===A?null:t;var i=Ns(function(n,t){return n&&null!=t.contextualLabel?he(t.contextualLabel):Ts(t)}(r=r!==A&&r,n),t).j5();return Ls(n,new Gu(i))}(n,t=t===A?null:t,r=r!==A&&r),e=function(n,t,r){r=r!==A&&r;var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==Wi(e))return function(n,t,r,i){rr(i);var e=0,u=Wt(n,t,e,r);if(-1===u||1===i)return gr(ie(n));var o,f=i>0,s=Nr(f&&Kn(i,10));n:do{var c;if(c=ie(Ki(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=Wt(n,t,e,r)}while(-1!==u);return o=ie(Ki(n,e,Wi(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new tt(n)}(nr(n,t,A,r,i)),o=Nr(xt(u,10)),f=u.f();f.g();){var s;s=Jt(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Nr(xt(f,10)),c=f.f();c.g();){var a,h=c.h();a=Ms(n)?Bf().qd(Os(h)):Bf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Nr(xt(_,10)),d=_.f();d.g();){var g;g=new ks(new Gu(d.h())),v.d(g)}l=v}var w=null==l?null:Hn(l);i=null==w?Lr():w}var b=i,p=null==b?Lr():b;r||null==n.contextualLabel||p.d(new ks(new Gu(Bf().rd(he(n.contextualLabel)))));var m=function(n){var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Vu(Bf().rd("Solutions")),i=he(n.solutions),e=Nr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new ks(new Uu(vf(s))),e.d(f)}return new ks(r,e)}(n);null==m||p.d(m);var k,y=n.error,q=null==y?null:nf(y);if(null==q||p.d(new ks(q)),t){var B=n.locations;k=!(null==B||0===B.length)}else k=!1;return k&&p.d(function(n){var t,r=n.locations;if(null==r)t=null;else{for(var i=Nr(r.length),e=Ri(r);e.g();){var u,o=e.h();u=new ks(new Gu(Bf().qd(Rs(o)))),i.d(u)}t=i}var f=t;return new ks(new Zu("Locations"),null==f?pt():f)}(n)),p}(n,null==t,r);return new ks(i,e)}function Ts(n){return function(n){if(0===n.length)throw mu("Array is empty.");return n[Nn(n)]}(n.problemId).displayName}function Ls(n,t){var r;switch(n.severity){case"WARNING":var i=n.documentationLink;r=new $u(t,null==i?null:new Qu(i,""));break;case"ERROR":var e=n.documentationLink;r=new Hu(t,null==e?null:new Qu(e,""));break;case"ADVICE":var u=n.documentationLink;r=new Qs(t,null==u?null:new Qu(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function Ns(n,t){t=t===A?null:t;var r,i=new yf;if(i.ed(n),null==t);else{if(null!=t.line){var e=As(t);i.xd(e+(null==(r=t).line||null==r.length?"":"-"+r.length),""+t.path+e)}var u=t.taskPath;null==u||i.fd(u);var o=t.pluginId;null!=o&&i.fd(o)}return i}function As(n){var t;if(null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Ms(n){var t,r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Fs(n){return function(t){return t.ed(n.ef_1),t.fd(n.df_1),lr()}}function Ds(n){return n.name}function Os(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(qi().t7(" "),i?"gui":"gu"),u=qi().u7(" ");return n.replace(e,u)}(n),""),lr()}}function Rs(n){return function(t){return t.ed("- "),t.fd(""+n.path+As(n)),lr()}}function Hs(){return qs(),bn}function $s(){return qs(),pn}function Gs(){return qs(),mn}function Us(n){Zs.call(this),this.lf_1=n}function Vs(n,t){t=t!==A&&t,Zs.call(this),this.mf_1=n,this.nf_1=t}function Qs(n,t){t=t===A?null:t,Yu.call(this),this.of_1=n,this.pf_1=t}function Zs(){Yu.call(this)}function Ys(n){yc.call(this),this.qf_1=n}function Ws(n){yc.call(this),this.rf_1=n}function Ks(n){yc.call(this),this.sf_1=n}function Xs(n){nc.call(this),this.tf_1=n}function Js(n,t,r,i,e,u,o,f){this.uf_1=n,this.vf_1=t,this.wf_1=r,this.xf_1=i,this.yf_1=e,this.zf_1=u,this.ag_1=o,this.bg_1=f}function nc(){Bc.call(this)}function tc(n,t){var r=Lr();lo(t.xf_1)>0&&r.d(fc(0,Hs(),t.bg_1,t.ag_1)),lo(t.yf_1)>0&&r.d(fc(0,$s(),t.bg_1,t.ag_1)),lo(t.zf_1)>0&&r.d(fc(0,Gs(),t.bg_1,t.ag_1));var i=Af(),e=Jf(hc),u=Af().y9(Jf(lc),[]),o=function(n,t){var r,i=Af(),e=Jf(wc),u=Ff().ga("Learn more about "),o=$f();return i.y9(e,[u,o.fb(Jf((r=t,function(n){return n.bd(r.tc_1),lr()})),t.sc_1),Ff().ga(".")])}(0,t.wf_1),f=Af().y9(Jf(_c),[ic(0,t)]),s=Af();return i.y9(e,[u,o,f,s.zd(Jf(vc),r)])}function rc(n,t){var r,i,e=Af(),u=Jf(dc);switch(t.bg_1.q8_1){case 0:r=sc(0,t.xf_1,((i=function(n){return new Ys(n)}).callableName="<init>",i));break;case 1:r=sc(0,t.yf_1,function(){var n=function(n){return new Ws(n)};return n.callableName="<init>",n}());break;case 2:r=sc(0,t.zf_1,function(){var n=function(n){return new Ks(n)};return n.callableName="<init>",n}());break;default:le()}return e.y9(u,[r])}function ic(n,t){return Af().ja([oc(0,t),ec(0,t)])}function ec(n,t){for(var r=Af(),i=t.vf_1,e=Lr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,jt(e,0===wr(s)?gr(uc(pc(),f)):bt([Gf().ja([]),uc(pc(),f)]))}return r.ha(e)}function uc(n,t){return Df().ja([Ic(t)])}function oc(n,t){return Nf().ja([jc().ka(t.uf_1)])}function fc(n,t,r,i){var e,u,o,f;return Af().y9(Jf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),lr()):u.equals(o)?(n.t9("group-selector--active"),lr()):(n.u9(function(n){return function(t){return new Xs(n)}}(u)),lr()),lr()})),[Ff().rc(t.cf_1,[(f=i,Ff().y9(Jf(gc),[Ku(),Xu(),Ff().ga(""+f),Ju()]))])])}function sc(n,t,r){return function(n,t,r){var i,e=Af(),u=Of();return e.ja([u.ha(ys(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof Us?Ic(Bf().rd(t.lf_1)):t instanceof Vs?Af().y9(Jf((u=t,function(n){return u.nf_1&&(n.t9("uncategorized"),lr()),lr()})),[Af().ja([zc(r,i),Ic(t.mf_1)])]):t instanceof Ou?Lc(i,r,t):t instanceof Gu?Ic(t.za_1):t instanceof Uu?Af().ja([(Vc(),xn),Ic(t.ab_1)]):t instanceof Vu?Af().ja([zc(r,i),Ic(t.bb_1)]):t instanceof Hu?Nc(i,((e=function(n){return cc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,Cc()):t instanceof Qs?Nc(i,function(){var n=function(n){return cc(0,n)};return n.callableName="viewIt",n}(),r,t.of_1,t.pf_1,(Vc(),Bn)):t instanceof $u?Nc(i,function(){var n=function(n){return cc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,xc()):t instanceof Zu?Af().ja([zc(r,i),Ic(Bf().rd(t.eb_1))]):Ff().ga("Unknown node type viewNode: "+t)}(pc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function cc(n,t){var r;if(t instanceof Qu)r=Qo(t);else if(t instanceof Zu)r=Ic(Bf().rd(t.eb_1));else if(t instanceof Gu)r=Ic(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Ff().ga(i)}return r}function ac(n){return n.t9("report-wrapper"),lr()}function hc(n){return n.t9("header"),lr()}function lc(n){return n.t9("gradle-logo"),lr()}function _c(n){return n.t9("title"),lr()}function vc(n){return n.t9("groups"),lr()}function dc(n){return n.t9("content"),lr()}function gc(n){return n.t9("group-selector__count"),lr()}function wc(n){return n.t9("learn-more"),lr()}function bc(){yn=this,document.title="Gradle - Problems Report"}function pc(){return null==yn&&new bc,yn}function mc(n,t,r){return n.pe(t.zb().oe(),r)}function kc(n){Bc.call(this),this.hd_1=n}function yc(){Bc.call(this)}function qc(n,t){Bc.call(this),this.wc_1=n,this.xc_1=t}function Bc(){}function Cc(){return Vc(),qn}function xc(){return Vc(),Cn}function jc(){return Vc(),jn}function Pc(){return Vc(),Pn}function Ic(n){return Vc(),Pc().ka(n)}function Sc(n){return Vc(),Pc().ka(Bf().qd(n))}function zc(n,t){return Vc(),n.cd().ye()?Ac(n,t):function(n){return Vc(),Ff().fb(Jf(Gc),Mc(n))}(n)}function Ec(n,t,r,i){var e,u,o;return Vc(),Ff().fb(Jf((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new qc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:le()}return t}(e)),lr()})),"("+n+" internal "+gf("line",n)+" "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:le()}return t}(r)+")")}function Tc(n,t){t=t===A?Lf():t,Vc();for(var r=Rf(),i=Nr(xt(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===wr(f)?t:Lf())===A?Lf():c,Vc(),o=Hf().ja([Mf().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Lc(n,t,r){Vc();var i,e,u,o=Af(),f=Ac(t,n),s=Ff().ga("Exception"),c=Ff().ja([(Vc(),In).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Ff().ga(" "),h=null==a?Lf():a,l=r.ma_1,_=null==l?null:Ic(l),v=null==_?Lf():_;switch(t.cd().wb_1.q8_1){case 0:i=Lf();break;case 1:i=function(n,t){Vc();for(var r=Af(),i=Jf(Uc),e=n.oa_1,u=Nr(xt(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=wr(a);if(null!=c.sa_1){var _,v=Ec(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Tc(Un(c.ra_1,1),v);break;case 1:_=Tc(c.ra_1,v);break;default:le()}h=_}else h=Tc(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new ss(u))}));break;default:le()}return o.ja([f,s,c,h,v,i])}function Nc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Lf():u,o=o===A?Lf():o,Vc();var f=Af(),s=zc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Lf():a,o])}function Ac(n,t){var r,i;return Vc(),Ff().fb(Jf((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===ps()&&(n.t9("collapsed"),lr()),r.cd().wb_1===ms()&&(n.t9("expanded"),lr()),n.s9("Click to "+function(n){var t;switch(Vc(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:le()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new ss(t))}}(i,r)),lr()})),Mc(n))}function Mc(n){return Vc(),function(n,t){var r;if(!(t>=0))throw fu(ie("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=ie(n);break;default:var i="";if(0!==Wi(n))for(var e=ie(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function Fc(n){return Vc(),n.gb(["invisible-text","error-icon"]),lr()}function Dc(n){return Vc(),n.gb(["invisible-text","advice-icon"]),lr()}function Oc(n){return Vc(),n.gb(["invisible-text","warning-icon"]),lr()}function Rc(n){return Vc(),n.gb(["invisible-text","enum-icon"]),lr()}function Hc(n){return Vc(),new kc(n)}function $c(n){return Vc(),new kc(n)}function Gc(n){return Vc(),n.gb(["invisible-text","leaf-icon"]),lr()}function Uc(n){return Vc(),n.t9("java-exception"),lr()}function Vc(){if(!Sn){Sn=!0;var n=Ff();qn=n.fb(Jf(Fc),"[error] ");var t=Ff();Bn=t.fb(Jf(Dc),"[advice] ");var r=Ff();Cn=r.fb(Jf(Oc),"[warn]  ");var i=Ff();xn=i.fb(Jf(Rc),"[enum]  "),jn=new Du,Pn=new Du(Hc),In=new Mu($c)}}return Ge(Yn,A,Re),Ge(tt,A,Re),Ge(rt,A,Re),Ge(Ti,"Collection",Ye),Ge(it,"AbstractCollection",Re,A,[Ti]),Ge(et,"IteratorImpl",Re),Ge(ut,"ListIteratorImpl",Re,et),Ge(ot,"Companion",Ke),Ge(Ei,"List",Ye,A,[Ti]),Ge(st,"AbstractList",Re,it,[it,Ei]),Ge(ct,A,Re),Ge(lt,"Companion",Ke),Ge(vt,A,Re,it),Ge(Ni,"Map",Ye),Ge(dt,"AbstractMap",Re,A,[Ni]),Ge(gt,"Companion",Ke),Ge(li,"RandomAccess",Ye),Ge(yt,"EmptyList",Ke,A,[Ei,li]),Ge(qt,"ArrayAsCollection",Re,A,[Ti]),Ge(Bt,"EmptyIterator",Ke),Ge(Pt,"IntIterator",Re),Ge(It,A,Re),Ge(St,"ReversedListReadOnly",Re,st),Ge(zt,A,Re),Ge(Et,"TransformingSequence",Re),Ge(Lt,A,Re),Ge(Nt,"FilteringSequence",Re),Ge(Mi,"Set",Ye,A,[Ti]),Ge(Mt,"EmptySet",Ke,A,[Mi]),Ge(Ot,"Companion",Ke),Ge(Vt,"IntProgression",Re),Ge(Ht,"IntRange",Re,Vt),Ge($t,"IntProgressionIterator",Re,Pt),Ge(Gt,"Companion",Ke),Ge(er,A,Re),Ge(ur,"DelimitedRangesSequence",Re),Ge(or,"Pair",Re),Ge(sr,"CharSequence",Ye),Ge(cr,"Comparable",Ye),Ge(ar,"Number",Re),Ge(hr,"Unit",Ke),Ge(_r,"IntCompanionObject",Ke),Ge(mr,"AbstractMutableCollection",Re,it,[it,Ti]),Ge(kr,"IteratorImpl",Re),Ge(yr,"ListIteratorImpl",Re,kr),Ge(qr,"AbstractMutableList",Re,mr,[mr,Ti,Ei]),Ge(Br,A,Re),Ge(Cr,A,Re),Ge(Li,"Entry",Ye),Ge(Ai,"MutableEntry",Ye,A,[Li]),Ge(xr,"SimpleEntry",Re,A,[Ai]),Ge(zr,"AbstractMutableSet",Re,mr,[mr,Mi,Ti]),Ge(jr,"AbstractEntrySet",Re,zr),Ge(Pr,A,Re,zr),Ge(Ir,A,Re,mr),Ge(Sr,"AbstractMutableMap",Re,dt,[dt,Ni]),Ge(Er,"Companion",Ke),Ge(Fr,"ArrayList",Re,qr,[qr,Ti,Ei,li]),Ge(Rr,"HashCode",Ke),Ge(Hr,"EntrySet",Re,jr),Ge(Vr,"HashMap",Re,Sr,[Sr,Ni]),Ge(Zr,"HashSet",Re,zr,[zr,Mi,Ti]),Ge(Xr,A,Re),Ge(ni,"InternalMap",Ye),Ge(Jr,"InternalHashCodeMap",Re,A,[ni]),Ge(ti,"EntryIterator",Re),Ge(ri,"Companion",Ke),Ge(ei,"ChainEntry",Re,xr),Ge(ui,"EntrySet",Re,jr),Ge(si,"LinkedHashMap",Re,Vr,[Vr,Ni]),Ge(ci,"Companion",Ke),Ge(hi,"LinkedHashSet",Re,Zr,[Zr,Mi,Ti]),Ge(_i,"BaseOutput",Re),Ge(vi,"NodeJsOutput",Re,_i),Ge(gi,"BufferedOutput",Re,_i),Ge(di,"BufferedOutputToConsoleLog",Re,gi),Ge(pi,"StringBuilder",Re,A,[sr]),Ge(yi,"Companion",Ke),Ge(Bi,"Regex",Re),Ge(Ii,"Companion",Ke),Ge(zi,"Char",Re,A,[cr]),Ge(Fi,"Companion",Ke),Ge(Di,"Enum",Re,A,[cr]),Ge(Hi,A,Re),Ge(ve,"Companion",Ke),Ge(de,"Long",Re,ar,[ar,cr]),Ge(iu,"Letter",Ke),Ge(uu,"OtherLowercase",Ke),Ge(du,"Exception",Re,Error),Ge(bu,"RuntimeException",Re,du),Ge(su,"IllegalArgumentException",Re,bu),Ge(au,"IndexOutOfBoundsException",Re,bu),Ge(lu,"IllegalStateException",Re,bu),Ge(ku,"NoSuchElementException",Re,bu),Ge(qu,"ArithmeticException",Re,bu),Ge(xu,"UnsupportedOperationException",Re,bu),Ge(Pu,"NullPointerException",Re,bu),Ge(Su,"NoWhenBranchMatchedException",Re,bu),Ge(Eu,"ClassCastException",Re,bu),Ge(Lu,"UninitializedPropertyAccessException",Re,bu),Ge(Au,"Model",Re),Ge(Mu,"CopyButtonComponent",Re),Ge(Du,"PrettyTextComponent",Re),Ge(Yu,"ProblemNode",Re),Ge(Ou,"Exception",Re,Yu),Ge(Ru,"StackTracePart",Re),Ge(Hu,"Error",Re,Yu),Ge($u,"Warning",Re,Yu),Ge(Gu,"Message",Re,Yu),Ge(Uu,"ListElement",Re,Yu),Ge(Vu,"TreeNode",Re,Yu),Ge(Qu,"Link",Re,Yu),Ge(Zu,"Label",Re,Yu),Ge(io,"Info",Re,Yu),Ge(eo,"Project",Re,Yu),Ge(uo,"Task",Re,Yu),Ge(oo,"TaskPath",Re,Yu),Ge(fo,"Bean",Re,Yu),Ge(so,"SystemProperty",Re,Yu),Ge(co,"Property",Re,Yu),Ge(ao,"BuildLogic",Re,Yu),Ge(ho,"BuildLogicClass",Re,Yu),Ge(Bc,"BaseIntent",Re),Ge(yc,"TreeIntent",Re,Bc),Ge(vo,"TaskTreeIntent",Re,yc),Ge(go,"MessageTreeIntent",Re,yc),Ge(wo,"InputTreeIntent",Re,yc),Ge(bo,"IncompatibleTaskTreeIntent",Re,yc),Ge(yo,"Intent",Re,Bc),Ge(po,"SetTab",Re,yo),Ge(mo,"Model",Re),Ge(ko,"Tab",Re,Di),Ge(Uo,"ConfigurationCacheReportPage",Ke),Ge(Zo,"ImportedProblem",Re),Ge(Yo,"ImportedDiagnostics",Re),Ge(ff,"sam$kotlin_Comparator$0",Re),Ge(bf,"LearnMore",Re),Ge(kf,"Fragment",Re),Ge(pf,"Text",Re,kf),Ge(mf,"Reference",Re,kf),Ge(yf,"Builder",Re),Ge(qf,"Companion",Ke),Ge(Cf,"PrettyText",Re),Ge(xf,"Companion",Ke),Ge(Sf,"Trie",Re),Ge(Uf,"ViewFactory",Re),Ge(Vf,"Companion",Ke),Ge(Xf,"View",Re),Ge(Zf,"Empty",Ke,Xf),Ge(Wf,"Element",Re,Xf),Ge(Kf,"MappedView",Re,Xf),Ge(ns,"Attributes",Re),Ge(es,"Attribute",Re),Ge(ts,"OnEvent",Re,es),Ge(rs,"ClassName",Re,es),Ge(is,"Named",Re,es),Ge(as,"Intent",Re),Ge(ss,"Toggle",Re,as),Ge(cs,"Model",Re),Ge(ls,"TreeView",Ke),Ge(bs,"Focus",Re),Ge(ds,"Original",Re,bs),Ge(gs,"Child",Re,bs),Ge(ws,"ViewState",Re,Di),Ge(ks,"Tree",Re),Ge(Bs,"Tab",Re,Di),Ge(Cs,"ProblemIdElement",Re),Ge(xs,"ProblemSummary",Re),Ge(Is,"ProblemNodeGroup",Re),Ge(Zs,"ProblemApiNode",Re,Yu),Ge(Us,"Text",Re,Zs),Ge(Vs,"ProblemIdNode",Re,Zs),Ge(Qs,"Advice",Re,Yu),Ge(Ys,"MessageTreeIntent",Re,yc),Ge(Ws,"ProblemIdTreeIntent",Re,yc),Ge(Ks,"FileLocationTreeIntent",Re,yc),Ge(nc,"Intent",Re,Bc),Ge(Xs,"SetTab",Re,nc),Ge(Js,"Model",Re),Ge(bc,"ProblemsReportPage",Ke),Ge(kc,"Copy",Re,Bc),Ge(qc,"ToggleStackTracePart",Re,Bc),se(Yn).f=function(){return this.n_1.f()},se(tt).f=function(){return this.r_1.f()},se(rt).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Lr());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return lr();var r=br(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Or;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Dr(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Nn(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},se(it).u=function(n){var t;n:if(Ue(this,Ti)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(oe(r.h(),n)){t=!0;break n}t=!1}return t},se(it).v=function(n){var t;n:if(Ue(n,Ti)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},se(it).i=function(){return 0===this.k()},se(it).toString=function(){return Mn(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Oi(t)}));var n},se(it).toArray=function(){return dr(this)},se(et).g=function(){return this.w_1<this.x_1.k()},se(et).h=function(){if(!this.g())throw pu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},se(ut).c1=function(){return this.w_1>0},se(ut).d1=function(){if(!this.c1())throw pu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},se(ot).e1=function(n,t){if(n<0||n>=t)throw cu("index: "+n+", size: "+t)},se(ot).b1=function(n,t){if(n<0||n>t)throw cu("index: "+n+", size: "+t)},se(ot).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=zn(31,t),u=null==i?null:ee(i);t=e+(null==u?0:u)|0}return t},se(ot).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!oe(i.h(),r.h()))return!1;return!0},se(st).f=function(){return new et(this)},se(st).l=function(n){return new ut(this,n)},se(st).equals=function(n){return n===this||!(null==n||!Ue(n,Ei))&&ft().g1(this,n)},se(st).hashCode=function(){return ft().f1(this)},se(ct).g=function(){return this.h1_1.g()},se(ct).h=function(){return this.h1_1.h().i1()},se(lt).k1=function(n){var t=n.j1(),r=null==t?null:ee(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ee(e);return i^(null==u?0:u)},se(lt).l1=function(n){return Oi(n.j1())+"="+Oi(n.i1())},se(lt).m1=function(n,t){return!(null==t||!Ue(t,Li))&&!!oe(n.j1(),t.j1())&&oe(n.i1(),t.i1())},se(vt).r1=function(n){return this.q1_1.s1(n)},se(vt).u=function(n){return!(null!=n&&!Qe(n))&&this.r1(null==n||Qe(n)?n:_e())},se(vt).f=function(){return new ct(this.q1_1.o().f())},se(vt).k=function(){return this.q1_1.k()},se(dt).t1=function(n){return!(null==ht(this,n))},se(dt).s1=function(n){var t;n:{var r=this.o();if(Ue(r,Ti)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(oe(i.h().i1(),n)){t=!0;break n}t=!1}}return t},se(dt).u1=function(n){if(null==n||!Ue(n,Li))return!1;var t=n.j1(),r=n.i1(),i=(Ue(this,Ni)?this:_e()).v1(t);return!(!oe(r,i)||null==i&&!(Ue(this,Ni)?this:_e()).t1(t))},se(dt).equals=function(n){if(n===this)return!0;if(null==n||!Ue(n,Ni))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ue(r,Ti)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},se(dt).v1=function(n){var t=ht(this,n);return null==t?null:t.i1()},se(dt).hashCode=function(){return ee(this.o())},se(dt).i=function(){return 0===this.k()},se(dt).k=function(){return this.o().k()},se(dt).toString=function(){var n;return Mn(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},se(dt).p1=function(n){return at(this,n.j1())+"="+at(this,n.i1())},se(dt).w1=function(){return null==this.o1_1&&(this.o1_1=new vt(this)),he(this.o1_1)},se(gt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ee(i);t=e+(null==u?0:u)|0}return t},se(gt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},se(yt).equals=function(n){return!(null==n||!Ue(n,Ei))&&n.i()},se(yt).hashCode=function(){return 1},se(yt).toString=function(){return"[]"},se(yt).k=function(){return 0},se(yt).i=function(){return!0},se(yt).a2=function(n){return n.i()},se(yt).v=function(n){return this.a2(n)},se(yt).j=function(n){throw cu("Empty list doesn't contain element at index "+n+".")},se(yt).f=function(){return Ct()},se(yt).l=function(n){if(0!==n)throw cu("Index: "+n);return Ct()},se(qt).k=function(){return this.b2_1.length},se(qt).i=function(){return 0===this.b2_1.length},se(qt).d2=function(n){return function(n,t){return An(n,t)>=0}(this.b2_1,n)},se(qt).e2=function(n){var t;n:if(Ue(n,Ti)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},se(qt).v=function(n){return this.e2(n)},se(qt).f=function(){return Ri(this.b2_1)},se(Bt).g=function(){return!1},se(Bt).c1=function(){return!1},se(Bt).h=function(){throw pu()},se(Bt).d1=function(){throw pu()},se(Pt).h=function(){return this.f2()},se(It).g=function(){return this.g2_1.c1()},se(It).c1=function(){return this.g2_1.g()},se(It).h=function(){return this.g2_1.d1()},se(It).d1=function(){return this.g2_1.h()},se(St).k=function(){return this.i2_1.k()},se(St).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=kt(n)))throw cu("Element index "+t+" must be in range ["+Oe(0,kt(n))+"].");return kt(n)-t|0}(this,n))},se(St).f=function(){return this.l(0)},se(St).l=function(n){return new It(this,n)},se(zt).h=function(){return this.k2_1.m2_1(this.j2_1.h())},se(zt).g=function(){return this.j2_1.g()},se(Et).f=function(){return new zt(this)},se(Lt).h=function(){if(-1===this.o2_1&&Tt(this),0===this.o2_1)throw pu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Qe(n)?n:_e()},se(Lt).g=function(){return-1===this.o2_1&&Tt(this),1===this.o2_1},se(Nt).f=function(){return new Lt(this)},se(Mt).equals=function(n){return!(null==n||!Ue(n,Mi))&&n.i()},se(Mt).hashCode=function(){return 0},se(Mt).toString=function(){return"[]"},se(Mt).k=function(){return 0},se(Mt).i=function(){return!0},se(Mt).a2=function(n){return n.i()},se(Mt).v=function(n){return this.a2(n)},se(Mt).f=function(){return Ct()},se(Ht).y2=function(){return this.z2_1},se(Ht).c3=function(){return this.a3_1},se(Ht).i=function(){return this.z2_1>this.a3_1},se(Ht).equals=function(n){return n instanceof Ht&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},se(Ht).hashCode=function(){return this.i()?-1:zn(31,this.z2_1)+this.a3_1|0},se(Ht).toString=function(){return this.z2_1+".."+this.a3_1},se($t).g=function(){return this.f3_1},se($t).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw pu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},se(Gt).q=function(n,t,r){return new Vt(n,t,r)},se(Vt).f=function(){return new $t(this.z2_1,this.a3_1,this.b3_1)},se(Vt).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},se(Vt).equals=function(n){return n instanceof Vt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},se(Vt).hashCode=function(){return this.i()?-1:zn(31,zn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},se(Vt).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},se(er).h=function(){if(-1===this.j3_1&&ir(this),0===this.j3_1)throw pu();var n=this.m3_1,t=n instanceof Ht?n:_e();return this.m3_1=null,this.j3_1=-1,t},se(er).g=function(){return-1===this.j3_1&&ir(this),1===this.j3_1},se(ur).f=function(){return new er(this)},se(or).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},se(or).v3=function(){return this.t3_1},se(or).w3=function(){return this.u3_1},se(or).hashCode=function(){var n=null==this.t3_1?0:ee(this.t3_1);return zn(n,31)+(null==this.u3_1?0:ee(this.u3_1))|0},se(or).equals=function(n){if(this===n)return!0;if(!(n instanceof or))return!1;var t=n instanceof or?n:_e();return!!oe(this.t3_1,t.t3_1)&&!!oe(this.u3_1,t.u3_1)},se(hr).toString=function(){return"kotlin.Unit"},se(_r).b4=function(){return this.MIN_VALUE},se(_r).c4=function(){return this.MAX_VALUE},se(_r).d4=function(){return this.SIZE_BYTES},se(_r).e4=function(){return this.SIZE_BITS},se(mr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},se(mr).toJSON=function(){return this.toArray()},se(mr).g4=function(){},se(kr).g=function(){return this.h4_1<this.j4_1.k()},se(kr).h=function(){if(!this.g())throw pu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},se(yr).c1=function(){return this.h4_1>0},se(yr).d1=function(){if(!this.c1())throw pu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},se(qr).d=function(n){return this.g4(),this.p4(this.k(),n),!0},se(qr).f=function(){return new kr(this)},se(qr).u=function(n){return this.q4(n)>=0},se(qr).q4=function(n){var t=0,r=kt(this);if(t<=r)do{var i=t;if(t=t+1|0,oe(this.j(i),n))return i}while(i!==r);return-1},se(qr).l=function(n){return new yr(this,n)},se(qr).equals=function(n){return n===this||!(null==n||!Ue(n,Ei))&&ft().g1(this,n)},se(qr).hashCode=function(){return ft().f1(this)},se(Br).g=function(){return this.r4_1.g()},se(Br).h=function(){return this.r4_1.h().j1()},se(Cr).g=function(){return this.s4_1.g()},se(Cr).h=function(){return this.s4_1.h().i1()},se(xr).j1=function(){return this.t4_1},se(xr).i1=function(){return this.u4_1},se(xr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},se(xr).hashCode=function(){return _t().k1(this)},se(xr).toString=function(){return _t().l1(this)},se(xr).equals=function(n){return _t().m1(this,n)},se(jr).u=function(n){return this.w4(n)},se(Pr).y4=function(n){throw Cu("Add is not supported on keys")},se(Pr).d=function(n){return this.y4(null==n||Qe(n)?n:_e())},se(Pr).z4=function(n){return this.x4_1.t1(n)},se(Pr).u=function(n){return!(null!=n&&!Qe(n))&&this.z4(null==n||Qe(n)?n:_e())},se(Pr).f=function(){return new Br(this.x4_1.o().f())},se(Pr).k=function(){return this.x4_1.k()},se(Pr).g4=function(){return this.x4_1.g4()},se(Ir).f5=function(n){throw Cu("Add is not supported on values")},se(Ir).d=function(n){return this.f5(null==n||Qe(n)?n:_e())},se(Ir).r1=function(n){return this.e5_1.s1(n)},se(Ir).u=function(n){return!(null!=n&&!Qe(n))&&this.r1(null==n||Qe(n)?n:_e())},se(Ir).f=function(){return new Cr(this.e5_1.o().f())},se(Ir).k=function(){return this.e5_1.k()},se(Ir).g4=function(){return this.e5_1.g4()},se(Sr).g5=function(){return null==this.c5_1&&(this.c5_1=new Pr(this)),he(this.c5_1)},se(Sr).w1=function(){return null==this.d5_1&&(this.d5_1=new Ir(this)),he(this.d5_1)},se(Sr).g4=function(){},se(zr).equals=function(n){return n===this||!(null==n||!Ue(n,Mi))&&wt().y1(this,n)},se(zr).hashCode=function(){return wt().x1(this)},se(Fr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Tr().i5_1},se(Fr).k=function(){return this.b_1.length},se(Fr).j=function(n){var t=this.b_1[Mr(this,n)];return null==t||Qe(t)?t:_e()},se(Fr).f4=function(n,t){this.g4(),Mr(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Qe(i)?i:_e()},se(Fr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},se(Fr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return ft().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},se(Fr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=wr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},se(Fr).q4=function(n){return An(this.b_1,n)},se(Fr).toString=function(){return Ln(this.b_1,", ","[","]",A,A,Xi)},se(Fr).k5=function(){return[].slice.call(this.b_1)},se(Fr).toArray=function(){return this.k5()},se(Fr).g4=function(){if(this.c_1)throw Bu()},se(Rr).l5=function(n,t){return oe(n,t)},se(Rr).m5=function(n){var t=null==n?null:ee(n);return null==t?0:t},se(Hr).o5=function(n){throw Cu("Add is not supported on entries")},se(Hr).d=function(n){return this.o5(null!=n&&Ue(n,Ai)?n:_e())},se(Hr).w4=function(n){return this.n5_1.u1(n)},se(Hr).f=function(){return this.n5_1.t5_1.f()},se(Hr).k=function(){return this.n5_1.k()},se(Vr).t1=function(n){return this.t5_1.z4(n)},se(Vr).s1=function(n){var t;n:{var r=this.t5_1;if(Ue(r,Ti)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},se(Vr).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),he(this.v5_1)},se(Vr).x5=function(){return new Hr(this)},se(Vr).v1=function(n){return this.t5_1.v1(n)},se(Vr).h5=function(n,t){return this.t5_1.h5(n,t)},se(Vr).k=function(){return this.t5_1.k()},se(Zr).d=function(n){return null==this.y5_1.h5(n,this)},se(Zr).u=function(n){return this.y5_1.t1(n)},se(Zr).i=function(){return this.y5_1.i()},se(Zr).f=function(){return this.y5_1.g5().f()},se(Zr).k=function(){return this.y5_1.k()},se(Xr).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Ve(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},se(Xr).h=function(){if(!this.g())throw pu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},se(Jr).w5=function(){return this.h6_1},se(Jr).k=function(){return this.j6_1},se(Jr).h5=function(n,t){var r=this.h6_1.m5(n),i=Kr(this,r);if(null==i)this.i6_1[r]=new xr(n,t);else{if(null==i||!Ve(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new xr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=Wr(o,this,n);if(null!=f)return f.v4(t);o.push(new xr(n,t))}return this.j6_1=this.j6_1+1|0,null},se(Jr).z4=function(n){return!(null==Yr(this,n))},se(Jr).v1=function(n){var t=Yr(this,n);return null==t?null:t.i1()},se(Jr).f=function(){return new Xr(this)},se(ti).g=function(){return!(null===this.m6_1)},se(ti).h=function(){if(!this.g())throw pu();var n=he(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},se(ei).v4=function(n){return this.d7_1.g4(),se(xr).v4.call(this,n)},se(ui).o5=function(n){throw Cu("Add is not supported on entries")},se(ui).d=function(n){return this.o5(null!=n&&Ue(n,Ai)?n:_e())},se(ui).w4=function(n){return this.y6_1.u1(n)},se(ui).f=function(){return new ti(this)},se(ui).k=function(){return this.y6_1.k()},se(ui).g4=function(){return this.y6_1.g4()},se(si).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ii().e7_1;n=Ue(t,Ni)?t:_e()}return n},se(si).t1=function(n){return this.w6_1.t1(n)},se(si).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(oe(r.i1(),n))return!0;r=he(r.b7_1)}while(r!==this.v6_1);return!1},se(si).x5=function(){return new ui(this)},se(si).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},se(si).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ei(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw hu(ie("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw hu(ie("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},se(si).k=function(){return this.w6_1.k()},se(si).g4=function(){if(this.x6_1)throw Bu()},se(hi).g4=function(){return this.y5_1.g4()},se(_i).h7=function(){this.i7("\n")},se(_i).j7=function(n){this.i7(n),this.h7()},se(vi).i7=function(n){var t=String(n);this.k7_1.write(t)},se(di).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},se(di).n7=function(){console.log(this.m7_1),this.m7_1=""},se(gi).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},se(pi).x3=function(){return this.o7_1.length},se(pi).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=Yt(t)))throw cu("index: "+n+", length: "+this.x3()+"}");return Zi(t,n)},se(pi).z3=function(n,t){return this.o7_1.substring(n,t)},se(pi).i3=function(n){return this.o7_1=this.o7_1+new zi(n),this},se(pi).e=function(n){return this.o7_1=this.o7_1+Oi(n),this},se(pi).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},se(pi).toString=function(){return this.o7_1},se(yi).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},se(yi).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},se(Bi).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(ie(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===Wi(n)},se(Bi).toString=function(){return this.x7_1.toString()},se(zi).o8=function(n){return ji(this.h3_1,n)},se(zi).a4=function(n){return function(n,t){return ji(n.h3_1,t instanceof zi?t.h3_1:_e())}(this,n)},se(zi).equals=function(n){return function(n,t){return t instanceof zi&&n===t.h3_1}(this.h3_1,n)},se(zi).hashCode=function(){return this.h3_1},se(zi).toString=function(){return Pi(this.h3_1)},se(Di).r8=function(n){return Ji(this.q8_1,n.q8_1)},se(Di).a4=function(n){return this.r8(n instanceof Di?n:_e())},se(Di).equals=function(n){return this===n},se(Di).hashCode=function(){return re(this)},se(Di).toString=function(){return this.p8_1},se(Hi).g=function(){return!(this.s8_1===this.t8_1.length)},se(Hi).h=function(){if(this.s8_1===this.t8_1.length)throw mu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},se(de).b9=function(n){return ke(this,n)},se(de).a4=function(n){return this.b9(n instanceof de?n:_e())},se(de).c9=function(n){return ye(this,n)},se(de).d9=function(n){return function(n,t){if(Me(),Se(t))throw vu("division by zero");if(Se(n))return ge();if(xe(n,pe())){if(xe(t,we())||xe(t,be()))return pe();if(xe(t,pe()))return we();var r=function(n){Me();return new de(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){Me();return new de(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return xe(i,ge())?Ie(t)?we():be():ye(i,qe(n,Be(t,i)).d9(t))}if(xe(t,pe()))return ge();if(Ie(n))return Ie(t)?Ee(n).d9(Ee(t)):Ee(Ee(n).d9(t));if(Ie(t))return Ee(n.d9(Ee(t)));for(var e=ge(),u=n;Ae(u,t);){for(var o=Ce(u)/Ce(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Le(f),h=Be(a,t);Ie(h)||Ne(h,u);)h=Be(a=Le(f-=c),t);Se(a)&&(a=we()),e=ye(e,a),u=qe(u,h)}return e}(this,n)},se(de).e9=function(){return this.f9().c9(new de(1,0))},se(de).f9=function(){return new de(~this.u8_1,~this.v8_1)},se(de).g9=function(){return this.u8_1},se(de).w8=function(){return Ce(this)},se(de).valueOf=function(){return this.w8()},se(de).equals=function(n){return n instanceof de&&xe(this,n)},se(de).hashCode=function(){return Me(),this.u8_1^this.v8_1},se(de).toString=function(){return je(this,10)},se(Au).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},se(Au).hashCode=function(){var n=ue(this.o9_1);return zn(n,31)+ue(this.p9_1)|0},se(Au).equals=function(n){if(this===n)return!0;if(!(n instanceof Au))return!1;var t=n instanceof Au?n:_e();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},se(Mu).v9=function(n,t){return this.w9(new Au(n,t))},se(Mu).w9=function(n){var t,r;return Df().y9(Jf((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),lr()})),[])},se(Mu).z9=function(n){return this.w9(n instanceof Au?n:_e())},se(Mu).aa=function(n,t){return t},se(Mu).ba=function(n,t){var r=null==n||Qe(n)?n:_e();return this.aa(r,t instanceof Au?t:_e())},se(Du).ka=function(n){return function(n,t){for(var r=Ff(),i=t.ca_1,e=Nr(xt(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof pf?f=Ff().ga(s.fa_1):s instanceof mf?f=Fu(n,s.da_1,s.ea_1):le(),o=f,e.d(o)}return r.ha(e)}(this,n)},se(Du).z9=function(n){return this.ka(n instanceof Cf?n:_e())},se(Du).la=function(n,t){return t},se(Du).ba=function(n,t){var r=null==n||Qe(n)?n:_e();return this.la(r,t instanceof Cf?t:_e())},se(Ou).pa=function(n,t,r){return new Ou(n,t,r)},se(Ou).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},se(Ou).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},se(Ou).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=zn(n,31)+ue(this.na_1)|0,zn(n,31)+ee(this.oa_1)|0},se(Ou).equals=function(n){if(this===n)return!0;if(!(n instanceof Ou))return!1;var t=n instanceof Ou?n:_e();return!!oe(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!oe(this.oa_1,t.oa_1)},se(Ru).ta=function(n,t){return new Ru(n,t)},se(Ru).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},se(Ru).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},se(Ru).hashCode=function(){var n=ee(this.ra_1);return zn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},se(Ru).equals=function(n){if(this===n)return!0;if(!(n instanceof Ru))return!1;var t=n instanceof Ru?n:_e();return!!oe(this.ra_1,t.ra_1)&&!!oe(this.sa_1,t.sa_1)},se(Hu).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},se(Hu).hashCode=function(){var n=ee(this.va_1);return zn(n,31)+(null==this.wa_1?0:ee(this.wa_1))|0},se(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:_e();return!!oe(this.va_1,t.va_1)&&!!oe(this.wa_1,t.wa_1)},se($u).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},se($u).hashCode=function(){var n=ee(this.xa_1);return zn(n,31)+(null==this.ya_1?0:ee(this.ya_1))|0},se($u).equals=function(n){if(this===n)return!0;if(!(n instanceof $u))return!1;var t=n instanceof $u?n:_e();return!!oe(this.xa_1,t.xa_1)&&!!oe(this.ya_1,t.ya_1)},se(Gu).toString=function(){return"Message(prettyText="+this.za_1+")"},se(Gu).hashCode=function(){return this.za_1.hashCode()},se(Gu).equals=function(n){if(this===n)return!0;if(!(n instanceof Gu))return!1;var t=n instanceof Gu?n:_e();return!!this.za_1.equals(t.za_1)},se(Uu).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},se(Uu).hashCode=function(){return this.ab_1.hashCode()},se(Uu).equals=function(n){if(this===n)return!0;if(!(n instanceof Uu))return!1;var t=n instanceof Uu?n:_e();return!!this.ab_1.equals(t.ab_1)},se(Vu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},se(Vu).hashCode=function(){return this.bb_1.hashCode()},se(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:_e();return!!this.bb_1.equals(t.bb_1)},se(Qu).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},se(Qu).hashCode=function(){var n=ue(this.cb_1);return zn(n,31)+ue(this.db_1)|0},se(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:_e();return this.cb_1===t.cb_1&&this.db_1===t.db_1},se(Zu).toString=function(){return"Label(text="+this.eb_1+")"},se(Zu).hashCode=function(){return ue(this.eb_1)},se(Zu).equals=function(n){if(this===n)return!0;if(!(n instanceof Zu))return!1;var t=n instanceof Zu?n:_e();return this.eb_1===t.eb_1},se(io).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},se(io).hashCode=function(){var n=ee(this.hb_1);return zn(n,31)+(null==this.ib_1?0:ee(this.ib_1))|0},se(io).equals=function(n){if(this===n)return!0;if(!(n instanceof io))return!1;var t=n instanceof io?n:_e();return!!oe(this.hb_1,t.hb_1)&&!!oe(this.ib_1,t.ib_1)},se(eo).toString=function(){return"Project(path="+this.jb_1+")"},se(eo).hashCode=function(){return ue(this.jb_1)},se(eo).equals=function(n){if(this===n)return!0;if(!(n instanceof eo))return!1;var t=n instanceof eo?n:_e();return this.jb_1===t.jb_1},se(uo).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},se(uo).hashCode=function(){var n=ue(this.kb_1);return zn(n,31)+ue(this.lb_1)|0},se(uo).equals=function(n){if(this===n)return!0;if(!(n instanceof uo))return!1;var t=n instanceof uo?n:_e();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},se(oo).toString=function(){return"TaskPath(path="+this.mb_1+")"},se(oo).hashCode=function(){return ue(this.mb_1)},se(oo).equals=function(n){if(this===n)return!0;if(!(n instanceof oo))return!1;var t=n instanceof oo?n:_e();return this.mb_1===t.mb_1},se(fo).toString=function(){return"Bean(type="+this.nb_1+")"},se(fo).hashCode=function(){return ue(this.nb_1)},se(fo).equals=function(n){if(this===n)return!0;if(!(n instanceof fo))return!1;var t=n instanceof fo?n:_e();return this.nb_1===t.nb_1},se(so).toString=function(){return"SystemProperty(name="+this.ob_1+")"},se(so).hashCode=function(){return ue(this.ob_1)},se(so).equals=function(n){if(this===n)return!0;if(!(n instanceof so))return!1;var t=n instanceof so?n:_e();return this.ob_1===t.ob_1},se(co).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},se(co).hashCode=function(){var n=ue(this.pb_1);return n=zn(n,31)+ue(this.qb_1)|0,zn(n,31)+ue(this.rb_1)|0},se(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:_e();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},se(ao).toString=function(){return"BuildLogic(location="+this.sb_1+")"},se(ao).hashCode=function(){return ue(this.sb_1)},se(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:_e();return this.sb_1===t.sb_1},se(ho).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},se(ho).hashCode=function(){return ue(this.tb_1)},se(ho).equals=function(n){if(this===n)return!0;if(!(n instanceof ho))return!1;var t=n instanceof ho?n:_e();return this.tb_1===t.tb_1},se(vo).zb=function(){return this.yb_1},se(vo).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},se(vo).hashCode=function(){return ee(this.yb_1)},se(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:_e();return!!oe(this.yb_1,t.yb_1)},se(go).zb=function(){return this.ac_1},se(go).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},se(go).hashCode=function(){return ee(this.ac_1)},se(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:_e();return!!oe(this.ac_1,t.ac_1)},se(wo).zb=function(){return this.bc_1},se(wo).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},se(wo).hashCode=function(){return ee(this.bc_1)},se(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:_e();return!!oe(this.bc_1,t.bc_1)},se(bo).zb=function(){return this.cc_1},se(bo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},se(bo).hashCode=function(){return ee(this.cc_1)},se(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:_e();return!!oe(this.cc_1,t.cc_1)},se(po).toString=function(){return"SetTab(tab="+this.dc_1+")"},se(po).hashCode=function(){return this.dc_1.hashCode()},se(po).equals=function(n){if(this===n)return!0;if(!(n instanceof po))return!1;var t=n instanceof po?n:_e();return!!this.dc_1.equals(t.dc_1)},se(mo).mc=function(n,t,r,i,e,u,o,f){return new mo(n,t,r,i,e,u,o,f)},se(mo).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},se(mo).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},se(mo).hashCode=function(){var n=this.ec_1.hashCode();return n=zn(n,31)+ee(this.fc_1)|0,n=zn(n,31)+this.gc_1.hashCode()|0,n=zn(n,31)+this.hc_1.hashCode()|0,n=zn(n,31)+this.ic_1.hashCode()|0,n=zn(n,31)+this.jc_1.hashCode()|0,n=zn(n,31)+this.kc_1.hashCode()|0,zn(n,31)+this.lc_1.hashCode()|0},se(mo).equals=function(n){if(this===n)return!0;if(!(n instanceof mo))return!1;var t=n instanceof mo?n:_e();return!!(this.ec_1.equals(t.ec_1)&&oe(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},se(Uo).gd=function(n,t){var r,i;return n instanceof vo?r=t.nc(A,A,A,A,_s().id(n.yb_1,t.ic_1)):n instanceof go?r=t.nc(A,A,A,_s().id(n.ac_1,t.hc_1)):n instanceof wo?r=t.nc(A,A,A,A,A,_s().id(n.bc_1,t.jc_1)):n instanceof bo?r=t.nc(A,A,A,A,A,A,_s().id(n.cc_1,t.kc_1)):n instanceof qc?r=function(n,t,r,i){var e;return r instanceof go?e=n.nc(A,A,A,mc(n.hc_1,r,i)):r instanceof vo?e=n.nc(A,A,A,A,mc(n.ic_1,r,i)):r instanceof wo?e=n.nc(A,A,A,A,A,mc(n.jc_1,r,i)):r instanceof bo?e=n.nc(A,A,A,A,A,A,mc(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Ou))throw fu(ie("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Nr(xt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===wr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof kc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof po?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},se(Uo).ba=function(n,t){var r=n instanceof Bc?n:_e();return this.gd(r,t instanceof mo?t:_e())},se(Uo).jd=function(n){return Af().y9(Jf(To),[qo(0,n),Bo(0,n)])},se(Uo).z9=function(n){return this.jd(n instanceof mo?n:_e())},se(Zo).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},se(Zo).hashCode=function(){var n=ee(this.kd_1);return n=zn(n,31)+this.ld_1.hashCode()|0,zn(n,31)+ee(this.md_1)|0},se(Zo).equals=function(n){if(this===n)return!0;if(!(n instanceof Zo))return!1;var t=n instanceof Zo?n:_e();return!!oe(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!oe(this.md_1,t.md_1)},se(ff).ud=function(n,t){return this.td_1(n,t)},se(ff).compare=function(n,t){return this.ud(n,t)},se(bf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},se(bf).hashCode=function(){var n=ue(this.sc_1);return zn(n,31)+ue(this.tc_1)|0},se(bf).equals=function(n){if(this===n)return!0;if(!(n instanceof bf))return!1;var t=n instanceof bf?n:_e();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},se(pf).toString=function(){return"Text(text="+this.fa_1+")"},se(pf).hashCode=function(){return ue(this.fa_1)},se(pf).equals=function(n){if(this===n)return!0;if(!(n instanceof pf))return!1;var t=n instanceof pf?n:_e();return this.fa_1===t.fa_1},se(mf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},se(mf).hashCode=function(){var n=ue(this.da_1);return zn(n,31)+ue(this.ea_1)|0},se(mf).equals=function(n){if(this===n)return!0;if(!(n instanceof mf))return!1;var t=n instanceof mf?n:_e();return this.da_1===t.da_1&&this.ea_1===t.ea_1},se(yf).ed=function(n){return this.dd_1.d(new pf(n)),this},se(yf).xd=function(n,t){return this.dd_1.d(new mf(n,t)),this},se(yf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},se(yf).j5=function(){return new Cf(Rn(this.dd_1))},se(qf).rd=function(n){return new Cf(gr(new pf(n)))},se(qf).qd=function(n){var t=new yf;return n(t),t.j5()},se(Cf).vd=function(n){return new Cf(n)},se(Cf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},se(Cf).hashCode=function(){return ee(this.ca_1)},se(Cf).equals=function(n){if(this===n)return!0;if(!(n instanceof Cf))return!1;var t=n instanceof Cf?n:_e();return!!oe(this.ca_1,t.ca_1)},se(xf).sd=function(n){return function(n){for(var t=Gr(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=Gr();f.h5(o,c),u=c}else u=s;i=u instanceof Vr?u:_e()}return t}(n)},se(Sf).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},se(Sf).hashCode=function(){return ee(this.wd_1)},se(Sf).equals=function(n){return function(n,t){return t instanceof Sf&&!!oe(n,t instanceof Sf?t.wd_1:_e())}(this.wd_1,n)},se(Uf).ga=function(n){return Qf().yd(this.x9_1,A,n)},se(Uf).ha=function(n){return Qf().yd(this.x9_1,A,A,n)},se(Uf).ja=function(n){return Qf().yd(this.x9_1,A,A,nu(n))},se(Uf).y9=function(n,t){return Qf().yd(this.x9_1,n,A,nu(t))},se(Uf).zd=function(n,t){return Qf().yd(this.x9_1,n,A,t)},se(Uf).fb=function(n,t){return Qf().yd(this.x9_1,n,t)},se(Uf).rc=function(n,t){return Qf().yd(this.x9_1,A,n,nu(t))},se(Uf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},se(Uf).hashCode=function(){return ue(this.x9_1)},se(Uf).equals=function(n){if(this===n)return!0;if(!(n instanceof Uf))return!1;var t=n instanceof Uf?n:_e();return this.x9_1===t.x9_1},se(Vf).ae=function(n,t,r,i){return new Wf(n,t,r,i)},se(Vf).yd=function(n,t,r,i,e){return t=t===A?pt():t,r=r===A?null:r,i=i===A?pt():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},se(Wf).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},se(Wf).hashCode=function(){var n=ue(this.be_1);return n=zn(n,31)+ee(this.ce_1)|0,n=zn(n,31)+(null==this.de_1?0:ue(this.de_1))|0,zn(n,31)+ee(this.ee_1)|0},se(Wf).equals=function(n){if(this===n)return!0;if(!(n instanceof Wf))return!1;var t=n instanceof Wf?n:_e();return this.be_1===t.be_1&&!!oe(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!oe(this.ee_1,t.ee_1)},se(ns).u9=function(n){return this.r9_1(new ts("click",n))},se(ns).t9=function(n){return this.r9_1(new rs(n))},se(ns).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new rs(i))}return lr()},se(ns).s9=function(n){return this.r9_1(new is("title",n))},se(ns).bd=function(n){return this.r9_1(new is("href",n))},se(ss).oe=function(){return this.ne_1},se(ss).toString=function(){return"Toggle(focus="+this.ne_1+")"},se(ss).hashCode=function(){return ee(this.ne_1)},se(ss).equals=function(n){if(this===n)return!0;if(!(n instanceof ss))return!1;var t=n instanceof ss?n:_e();return!!oe(this.ne_1,t.ne_1)},se(cs).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},se(cs).re=function(n){return new cs(n)},se(cs).toString=function(){return"Model(tree="+this.xb_1+")"},se(cs).hashCode=function(){return this.xb_1.hashCode()},se(cs).equals=function(n){if(this===n)return!0;if(!(n instanceof cs))return!1;var t=n instanceof cs?n:_e();return!!this.xb_1.equals(t.xb_1)},se(ls).id=function(n,t){var r;if(n instanceof ss){var i=n.oe();r=t.re(i.qe(hs))}else le();return r},se(ds).cd=function(){return this.ve_1},se(ds).we=function(){return 0},se(ds).qe=function(n){return n(this.ve_1)},se(ds).toString=function(){return"Original(tree="+this.ve_1+")"},se(ds).hashCode=function(){return this.ve_1.hashCode()},se(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:_e();return!!this.ve_1.equals(t.ve_1)},se(gs).cd=function(){return this.ue_1},se(gs).we=function(){return this.se_1.we()+1|0},se(gs).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Nr(xt(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===wr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},se(gs).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},se(gs).hashCode=function(){var n=ee(this.se_1);return n=zn(n,31)+this.te_1|0,zn(n,31)+this.ue_1.hashCode()|0},se(gs).equals=function(n){if(this===n)return!0;if(!(n instanceof gs))return!1;var t=n instanceof gs?n:_e();return!!oe(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},se(ws).ad=function(){var n;switch(this.q8_1){case 0:n=ms();break;case 1:n=ps();break;default:le()}return n},se(bs).vc=function(){var n,t;return Jn(On(Oe(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},se(bs).xe=function(n){return new gs(this,n,this.cd().vb_1.j(n))},se(ks).uc=function(){return new ds(this)},se(ks).ye=function(){return!this.vb_1.i()},se(ks).ze=function(n,t,r){return new ks(n,t,r)},se(ks).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},se(ks).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},se(ks).hashCode=function(){var n=null==this.ub_1?0:ee(this.ub_1);return n=zn(n,31)+ee(this.vb_1)|0,zn(n,31)+this.wb_1.hashCode()|0},se(ks).equals=function(n){if(this===n)return!0;if(!(n instanceof ks))return!1;var t=n instanceof ks?n:_e();return!!oe(this.ub_1,t.ub_1)&&!!oe(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},se(Cs).toString=function(){return"ProblemIdElement(name="+this.df_1+", displayName="+this.ef_1+")"},se(Cs).hashCode=function(){var n=ue(this.df_1);return zn(n,31)+ue(this.ef_1)|0},se(Cs).equals=function(n){if(this===n)return!0;if(!(n instanceof Cs))return!1;var t=n instanceof Cs?n:_e();return this.df_1===t.df_1&&this.ef_1===t.ef_1},se(xs).toString=function(){return"ProblemSummary(problemId="+this.ff_1+", count="+this.gf_1+")"},se(xs).hashCode=function(){var n=ee(this.ff_1);return zn(n,31)+this.gf_1|0},se(xs).equals=function(n){if(this===n)return!0;if(!(n instanceof xs))return!1;var t=n instanceof xs?n:_e();return!!oe(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},se(Is).toString=function(){return"ProblemNodeGroup(tree="+this.hf_1+", children="+this.if_1+", childGroups="+this.jf_1+", id="+this.kf_1+")"},se(Is).hashCode=function(){var n=this.hf_1.hashCode();return n=zn(n,31)+ee(this.if_1)|0,n=zn(n,31)+ee(this.jf_1)|0,zn(n,31)+this.kf_1|0},se(Is).equals=function(n){if(this===n)return!0;if(!(n instanceof Is))return!1;var t=n instanceof Is?n:_e();return!!this.hf_1.equals(t.hf_1)&&!!oe(this.if_1,t.if_1)&&!!oe(this.jf_1,t.jf_1)&&this.kf_1===t.kf_1},se(Us).toString=function(){return"Text(text="+this.lf_1+")"},se(Us).hashCode=function(){return ue(this.lf_1)},se(Us).equals=function(n){if(this===n)return!0;if(!(n instanceof Us))return!1;var t=n instanceof Us?n:_e();return this.lf_1===t.lf_1},se(Vs).toString=function(){return"ProblemIdNode(prettyText="+this.mf_1+", separator="+this.nf_1+")"},se(Vs).hashCode=function(){var n=this.mf_1.hashCode();return zn(n,31)+(0|this.nf_1)|0},se(Vs).equals=function(n){if(this===n)return!0;if(!(n instanceof Vs))return!1;var t=n instanceof Vs?n:_e();return!!this.mf_1.equals(t.mf_1)&&this.nf_1===t.nf_1},se(Qs).toString=function(){return"Advice(label="+this.of_1+", docLink="+this.pf_1+")"},se(Qs).hashCode=function(){var n=ee(this.of_1);return zn(n,31)+(null==this.pf_1?0:ee(this.pf_1))|0},se(Qs).equals=function(n){if(this===n)return!0;if(!(n instanceof Qs))return!1;var t=n instanceof Qs?n:_e();return!!oe(this.of_1,t.of_1)&&!!oe(this.pf_1,t.pf_1)},se(Ys).zb=function(){return this.qf_1},se(Ys).toString=function(){return"MessageTreeIntent(delegate="+this.qf_1+")"},se(Ys).hashCode=function(){return ee(this.qf_1)},se(Ys).equals=function(n){if(this===n)return!0;if(!(n instanceof Ys))return!1;var t=n instanceof Ys?n:_e();return!!oe(this.qf_1,t.qf_1)},se(Ws).zb=function(){return this.rf_1},se(Ws).toString=function(){return"ProblemIdTreeIntent(delegate="+this.rf_1+")"},se(Ws).hashCode=function(){return ee(this.rf_1)},se(Ws).equals=function(n){if(this===n)return!0;if(!(n instanceof Ws))return!1;var t=n instanceof Ws?n:_e();return!!oe(this.rf_1,t.rf_1)},se(Ks).zb=function(){return this.sf_1},se(Ks).toString=function(){return"FileLocationTreeIntent(delegate="+this.sf_1+")"},se(Ks).hashCode=function(){return ee(this.sf_1)},se(Ks).equals=function(n){if(this===n)return!0;if(!(n instanceof Ks))return!1;var t=n instanceof Ks?n:_e();return!!oe(this.sf_1,t.sf_1)},se(Xs).toString=function(){return"SetTab(tab="+this.tf_1+")"},se(Xs).hashCode=function(){return this.tf_1.hashCode()},se(Xs).equals=function(n){if(this===n)return!0;if(!(n instanceof Xs))return!1;var t=n instanceof Xs?n:_e();return!!this.tf_1.equals(t.tf_1)},se(Js).cg=function(n,t,r,i,e,u,o,f){return new Js(n,t,r,i,e,u,o,f)},se(Js).dg=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.uf_1:n,t=t===A?this.vf_1:t,r=r===A?this.wf_1:r,i=i===A?this.xf_1:i,e=e===A?this.yf_1:e,u=u===A?this.zf_1:u,o=o===A?this.ag_1:o,f=f===A?this.bg_1:f,s===A?this.cg(n,t,r,i,e,u,o,f):s.cg.call(this,n,t,r,i,e,u,o,f)},se(Js).toString=function(){return"Model(heading="+this.uf_1+", summary="+this.vf_1+", learnMore="+this.wf_1+", messageTree="+this.xf_1+", problemIdTree="+this.yf_1+", fileLocationTree="+this.zf_1+", problemCount="+this.ag_1+", tab="+this.bg_1+")"},se(Js).hashCode=function(){var n=this.uf_1.hashCode();return n=zn(n,31)+ee(this.vf_1)|0,n=zn(n,31)+this.wf_1.hashCode()|0,n=zn(n,31)+this.xf_1.hashCode()|0,n=zn(n,31)+this.yf_1.hashCode()|0,n=zn(n,31)+this.zf_1.hashCode()|0,n=zn(n,31)+this.ag_1|0,zn(n,31)+this.bg_1.hashCode()|0},se(Js).equals=function(n){if(this===n)return!0;if(!(n instanceof Js))return!1;var t=n instanceof Js?n:_e();return!!(this.uf_1.equals(t.uf_1)&&oe(this.vf_1,t.vf_1)&&this.wf_1.equals(t.wf_1)&&this.xf_1.equals(t.xf_1)&&this.yf_1.equals(t.yf_1)&&this.zf_1.equals(t.zf_1)&&this.ag_1===t.ag_1&&this.bg_1.equals(t.bg_1))},se(bc).eg=function(n,t){var r,i;return n instanceof Ks?r=t.dg(A,A,A,A,A,_s().id(n.sf_1,t.zf_1)):n instanceof Ws?r=t.dg(A,A,A,A,_s().id(n.rf_1,t.yf_1)):n instanceof Ys?r=t.dg(A,A,A,_s().id(n.qf_1,t.xf_1)):n instanceof qc?r=function(n,t,r,i){var e;return r instanceof Ys?e=n.dg(A,A,A,mc(n.xf_1,r,i)):r instanceof Ws?e=n.dg(A,A,A,A,mc(n.yf_1,r,i)):r instanceof Ks?e=n.dg(A,A,A,A,A,mc(n.zf_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Ou))throw fu(ie("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Nr(xt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===wr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof kc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Xs?r=t.dg(A,A,A,A,A,A,A,n.tf_1):(console.error("Unhandled intent: "+n),r=t),r},se(bc).ba=function(n,t){var r=n instanceof Bc?n:_e();return this.eg(r,t instanceof Js?t:_e())},se(bc).fg=function(n){return Af().y9(Jf(ac),[tc(0,n),rc(0,n)])},se(bc).z9=function(n){return this.fg(n instanceof Js?n:_e())},se(kc).toString=function(){return"Copy(text="+this.hd_1+")"},se(kc).hashCode=function(){return ue(this.hd_1)},se(kc).equals=function(n){if(this===n)return!0;if(!(n instanceof kc))return!1;var t=n instanceof kc?n:_e();return this.hd_1===t.hd_1},se(qc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},se(qc).hashCode=function(){var n=this.wc_1;return zn(n,31)+ee(this.xc_1)|0},se(qc).equals=function(n){if(this===n)return!0;if(!(n instanceof qc))return!1;var t=n instanceof qc?n:_e();return this.wc_1===t.wc_1&&!!oe(this.xc_1,t.xc_1)},se(Jr).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,lr(),n},l=null,wn=0,function(){var n=configurationCacheProblems();if(null==n.problemsReport)zf(Ef("report"),Vo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Lr(),r=Lr(),i=Lr(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(Wo(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(Wo(a,o))}else f=c;if(null==f){var h=he(o.problem);t.d(Wo(h,o))}}return new Yo(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new mo((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:Wt(s," ",A,r=r!==A&&r)>=0,a=null==c||c,Bf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(Wi(n)>0){var r,i=Zi(n,0);r=function(n){return 97<=n&&n<=122||!(ji(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=ru(eu().h9_1,t),i=eu().h9_1[r],e=(i+eu().i9_1[r]|0)-1|0,u=eu().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>zn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=ru(ou().k9_1,n);return t>=0&&n<(ou().k9_1[t]+ou().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=Pi(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=Zi(t,0),e=t.substring(1).toLowerCase();r=Pi(i)+e}return r}return Pi(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?De(zn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:mi(n)}(n)}(n))}(n)}(i):Pi(i),t=ie(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),lr()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:vf(r),e=Bf().rd(function(n){var t=n.od_1.k(),r=df(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=Bf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=df(r,"problem");return r>i?e+", only the first "+i+" "+wf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Lr())}(n,h),new bf("Gradle Configuration Cache",n.documentationLink),uf(new Zu(Ho().qc_1),Jn(On(h.nd_1),af)),uf(new Zu($o().qc_1),function(n){return Jn(On(n),hf)}(h.nd_1)),uf(new Zu(Ro().qc_1),Jn(On(h.od_1),sf)),uf(new Zu(Go().qc_1),Jn(On(h.pd_1),cf)),0===l?Ro():Ho())}(n));else{var t=n.problemsReport;zf(Ef("report"),pc(),function(n,t){for(var r=n.summaries,i=Nr(r.length),e=0,u=r.length;e<u;){var o,f=r[e];e=e+1|0;for(var s=f.problemId,c=Nr(s.length),a=0,h=s.length;a<h;){var l,_=s[a];a=a+1|0,l=new Cs(_.name,_.displayName),c.d(l)}o=new xs(c,f.count),i.d(o)}for(var v=i,d=function(n,t){for(var r=oi(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o,f=Ln(u.problemId,":",A,A,A,A,Ds),s=r.v1(f);if(null==s){var c=Lr();r.h5(f,c),o=c}else o=s;o.d(u)}for(var a=r.o(),h=Nr(xt(a,10)),l=a.f();l.g();){for(var _,v=l.h(),d=v.i1(),g=Nr(xt(d,10)),w=d.f();w.g();){var b;b=Es(w.h(),null,!0),g.d(b)}var p,m=Hn(g),k=Dn(v.i1()),y=Ls(k,new Gu(Ns(Ts(k)).ed(" ("+v.i1().k()+")").j5()));n:{for(var q=t.f();q.g();){var B=q.h();if(zs(B.ff_1,k.problemId)){p=B;break n}}p=null}var C=p;null==C||m.d(js(C.gf_1)),_=new ks(y,m),h.d(_)}var x=h;return new cs(new ks(new Us("message tree root"),x))}(t,v),g=function(n,t){for(var r=function(){var n=Lr();return new Is(new ks(new Vs(Bf().rd("Ungrouped"),!0),n),n,oi())}(),i=oi(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;for(var f=$n(Tn(o.problemId,1)),s=Nr(xt(f,10)),c=f.f();c.g();){var a,h=c.h();a=new Cs(h.name,h.displayName),s.d(a)}var l=Ss(i,s),_=Es(o);null==l?r.if_1.d(_):l.if_1.d(_)}for(var v=Nr(xt(t,10)),d=t.f();d.g();){var g,w=d.h();g=new xs($n(Gn(w.ff_1,1)),w.gf_1),v.d(g)}for(var b=oi(),p=v.f();p.g();){var m,k=p.h(),y=k.ff_1,q=b.v1(y);if(null==q){var B=Lr();b.h5(y,B),m=B}else m=q;m.d(k)}for(var C=b.o(),x=Nr(xt(C,10)),j=C.f();j.g();){for(var P,I=j.h(),S=I.j1(),z=0,E=I.i1().f();E.g();)z=z+E.h().gf_1|0;P=new xs(S,z),x.d(P)}for(var T=x.f();T.g();){var L=T.h(),N=Ss(i,L.ff_1),A=null==N?null:N.if_1;null==A||A.d(js(L.gf_1))}for(var M=i.w1(),F=Nr(xt(M,10)),D=M.f();D.g();){var O;O=D.h().hf_1,F.d(O)}var R=function(n,t){var r=Nr(n.k());return r.m(n),r.d(t),r}(F,r.hf_1);return new cs(new ks(new Us("group tree root"),R))}(t,v),w=0,b=v.f();b.g();)w=w+b.h().gf_1|0;var p=function(n,t){for(var r=Lr(),i=oi(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f=o.locations;if(null==f||0===f.length)r.d(Es(o));else{var s,c=o.locations;if(null==c)s=null;else{for(var a=Lr(),h=Ri(c);h.g();){var l=h.h();null!=l.path&&a.d(l)}s=a}if(null==s);else for(var _=s.f();_.g();){var v=_.h();Ps(i,he(v.path),o,v)}var d,g=o.locations;if(null==g)d=null;else{for(var w=Lr(),b=Ri(g);b.g();){var p=b.h();null!=p.pluginId&&w.d(p)}d=w}if(null==d);else for(var m=d.f();m.g();){var k=m.h();Ps(i,he(k.pluginId),o,k)}var y,q=o.locations;if(null==q)y=null;else{for(var B=Lr(),C=Ri(q);C.g();){var x=C.h();null!=x.taskPath&&B.d(x)}y=B}if(null==y);else for(var j=y.f();j.g();){var P=j.h();Ps(i,he(P.taskPath),o,P)}}}var I=function(n,t,r){for(var i=n.w1(),e=Nr(xt(i,10)),u=i.f();u.g();){var o;o=u.h().t3_1,e.d(o)}var f=Hn(e);return t.i()||f.d(new ks(new Vs(Bf().rd("no location"),!0),t)),r>0&&f.d(js(r)),f}(i,r,t);return new cs(new ks(new Us("text"),I))}(t,w);return new Js(Bf().rd("Problems Report"),function(n,t){var r,i,e,u=n.description,o=null==u?null:gr(vf(u));return r=null==o?gr(Bf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),lr()),lr()}))):o,r}(n,t),new bf("reporting problems",n.documentationLink),d,g,p,t.length,function(n,t,r){return lo(r)>0?Gs():lo(n)>0?Hs():lo(t)>0?$s():Hs()}(d,g,p))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
 //# sourceMappingURL=configuration-cache-report.js.map
                 </script>
 
diff --git a/buildLogic/plugin/src/main/kotlin/AndroidLibraryPlugin.kt b/buildLogic/plugin/src/main/kotlin/AndroidLibraryPlugin.kt
index c8c599e1f..9c90d4c6a 100644
--- a/buildLogic/plugin/src/main/kotlin/AndroidLibraryPlugin.kt
+++ b/buildLogic/plugin/src/main/kotlin/AndroidLibraryPlugin.kt
@@ -16,7 +16,7 @@ open class AndroidLibraryPlugin : Plugin<Project> {
         }
 
         target.extensions.configure<LibraryExtension> {
-            compileSdk = 34
+            compileSdk = 35
 
             defaultConfig {
                 minSdk = 24
diff --git a/buildSrc/src/main/kotlin/Build.kt b/buildSrc/src/main/kotlin/Build.kt
index 4cae253fd..243900263 100644
--- a/buildSrc/src/main/kotlin/Build.kt
+++ b/buildSrc/src/main/kotlin/Build.kt
@@ -1,6 +1,7 @@
 object Build {
-    const val compileSdkVersion = 35
+    const val compileSdkVersion = 36
     const val minSdkVersion = 24
+    const val ndkVersion = "29.0.13599879"
 
     fun namespacePrefix(name: String) = "com.tonapps.$name"
 }
diff --git a/buildSrc/src/main/kotlin/Dependence.kt b/buildSrc/src/main/kotlin/Dependence.kt
deleted file mode 100644
index afd55ea10..000000000
--- a/buildSrc/src/main/kotlin/Dependence.kt
+++ /dev/null
@@ -1,182 +0,0 @@
-object Dependence {
-
-    const val fresco = "com.facebook.fresco:fresco:3.6.0"
-    const val zxing = "com.google.zxing:core:3.5.3"
-    const val j2objc = "com.google.j2objc:j2objc-annotations:3.0.0"
-    const val cbor = "co.nstant.in:cbor:0.9"
-    const val ble = "no.nordicsemi.android:ble-ktx:2.9.0"
-    const val bcprovjdk = "org.bouncycastle:bcprov-jdk15to18:1.68"
-    const val web3j = "org.web3j:core:5.0.0"
-
-    object Analytics {
-        const val aptabase = "com.github.aptabase:aptabase-kotlin:0.0.8"
-    }
-
-    object TON {
-        const val version = "0.3.1"
-        const val tvm = "org.ton:ton-kotlin-tvm:$version"
-        const val crypto = "org.ton:ton-kotlin-crypto:$version"
-        const val tlb = "org.ton:ton-kotlin-tlb:$version"
-        const val blockTlb = "org.ton:ton-kotlin-block-tlb:$version"
-        const val tonapiTl = "org.ton:ton-kotlin-tonapi-tl:$version"
-        const val contract = "org.ton:ton-kotlin-contract:$version"
-    }
-
-    object KotlinX {
-        const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
-        const val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0"
-        const val serializationJSON = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
-        const val serializationCBOR = "org.jetbrains.kotlinx:kotlinx-serialization-cbor:1.8.0"
-        const val guava = "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.10.2"
-        const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.2"
-        const val io = "org.jetbrains.kotlinx:kotlinx-io-core:0.7.0"
-    }
-
-    object GooglePlay {
-        const val cronet = "com.google.android.gms:play-services-cronet:18.1.0"
-        const val review = "com.google.android.play:review-ktx:2.0.2"
-        const val billing = "com.android.billingclient:billing-ktx:7.1.1"
-        const val update = "com.google.android.play:app-update-ktx:2.1.0"
-        const val installreferrer = "com.android.installreferrer:installreferrer:2.2"
-    }
-
-    object UI {
-        const val material = "com.google.android.material:material:1.12.0"
-        const val flexbox = "com.google.android.flexbox:flexbox:3.0.0"
-    }
-
-    object Koin {
-        const val core = "io.insert-koin:koin-android:4.0.2"
-        const val workmanager = "io.insert-koin:koin-androidx-workmanager:4.0.2"
-    }
-
-    object ML {
-        const val barcode = "com.google.mlkit:barcode-scanning:17.3.0"
-    }
-
-    object AndroidX {
-        const val core = "androidx.core:core-ktx:1.15.0"
-        const val shortcuts = "androidx.core:core-google-shortcuts:1.1.0"
-        const val appCompat = "androidx.appcompat:appcompat:1.7.0"
-        const val activity = "androidx.activity:activity-ktx:1.10.1"
-        const val fragment = "androidx.fragment:fragment-ktx:1.8.6"
-        const val recyclerView = "androidx.recyclerview:recyclerview:1.4.0"
-        const val viewPager2 = "androidx.viewpager2:viewpager2:1.1.0"
-        const val security = "androidx.security:security-crypto:1.0.0"
-        const val workManager = "androidx.work:work-runtime-ktx:2.10.0"
-        const val biometric = "androidx.biometric:biometric:1.1.0"
-        const val annotation = "androidx.annotation:annotation:1.9.1"
-        const val splashscreen = "androidx.core:core-splashscreen:1.0.1"
-        const val constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1"
-        const val browser = "androidx.browser:browser:1.8.0"
-
-        const val swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-        const val profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.1"
-        const val webkit = "androidx.webkit:webkit:1.13.0"
-
-        const val concurrent = "androidx.concurrent:concurrent-futures:1.2.0"
-
-        const val lifecycle = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
-        const val lifecycleSavedState = "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7"
-
-        object Camera {
-            private const val version = "1.4.2"
-
-            const val base = "androidx.camera:camera-camera2:$version"
-            const val core = "androidx.camera:camera-core:$version"
-            const val lifecycle = "androidx.camera:camera-lifecycle:$version"
-            const val view = "androidx.camera:camera-view:$version"
-        }
-
-        object Emoji {
-            const val core = "androidx.emoji2:emoji2:1.5.0"
-        }
-
-        object Compose {
-            const val bom = "androidx.compose:compose-bom:2025.04.00"
-            const val foundation = "androidx.compose.foundation:foundation"
-            const val foundationLayout = "androidx.compose.foundation:foundation-layout"
-            const val ui = "androidx.compose.ui:ui"
-            const val material3 = "androidx.compose.material3:material3"
-            const val preview = "androidx.compose.ui:ui-tooling-preview"
-            const val debugTooling = "androidx.compose.ui:ui-tooling"
-            const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7"
-        }
-    }
-
-    object Squareup {
-        const val okhttp = "com.squareup.okhttp3:okhttp:4.12.0"
-        const val sse = "com.squareup.okhttp3:okhttp-sse:4.12.0"
-        const val moshi = "com.squareup.moshi:moshi-kotlin:1.15.0"
-        const val moshiAdapters = "com.squareup.moshi:moshi-adapters:1.15.0"
-        const val okio = "com.squareup.okio:okio:3.9.0"
-    }
-
-    object Firebase {
-        const val bom = "com.google.firebase:firebase-bom:33.10.0"
-        const val analytics = "com.google.firebase:firebase-analytics-ktx"
-        const val config = "com.google.firebase:firebase-config-ktx:21.6.1"
-        const val crashlytics = "com.google.firebase:firebase-crashlytics-ktx"
-        const val messaging = "com.google.firebase:firebase-messaging-ktx"
-        const val performance = "com.google.firebase:firebase-perf"
-    }
-
-    object LedgerHQ {
-        const val bleManager = "com.github.cosmostation:hw-transport-android-ble:0.0.8"
-    }
-
-    object Module {
-        const val tonApi = ":tonapi"
-
-        const val shimmer = ":ui:shimmer"
-        const val blur = ":ui:blur"
-    }
-
-    object Lib {
-        const val extensions = ":lib:extensions"
-        const val network = ":lib:network"
-        const val security = ":lib:security"
-        const val qr = ":lib:qr"
-        const val emoji = ":lib:emoji"
-        const val blockchain = ":lib:blockchain"
-        const val icu = ":lib:icu"
-        const val sqlite = ":lib:sqlite"
-        const val ledger = ":lib:ledger"
-        const val ur = ":lib:ur"
-        const val base64 = ":lib:base64"
-    }
-
-    object UIKit {
-        const val core = ":ui:uikit:core"
-        const val color = ":ui:uikit:color"
-        const val icon = ":ui:uikit:icon"
-        const val list = ":ui:uikit:list"
-        const val flag = ":ui:uikit:flag"
-    }
-
-    object Wallet {
-        const val localization = ":apps:wallet:localization"
-        const val api = ":apps:wallet:api"
-        const val app = ":apps:wallet:instance:app"
-
-        object Data {
-            const val core = ":apps:wallet:data:core"
-            const val account = ":apps:wallet:data:account"
-            const val settings = ":apps:wallet:data:settings"
-            const val rates = ":apps:wallet:data:rates"
-            const val tokens = ":apps:wallet:data:tokens"
-            const val collectibles = ":apps:wallet:data:collectibles"
-            const val events = ":apps:wallet:data:events"
-            const val browser = ":apps:wallet:data:browser"
-            const val backup = ":apps:wallet:data:backup"
-            const val rn = ":apps:wallet:data:rn"
-            const val passcode = ":apps:wallet:data:passcode"
-            const val staking = ":apps:wallet:data:staking"
-            const val purchase = ":apps:wallet:data:purchase"
-            const val battery = ":apps:wallet:data:battery"
-            const val dapps = ":apps:wallet:data:dapps"
-            const val contacts = ":apps:wallet:data:contacts"
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/ProjectModules.kt b/buildSrc/src/main/kotlin/ProjectModules.kt
new file mode 100644
index 000000000..4b3eb3674
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ProjectModules.kt
@@ -0,0 +1,57 @@
+class ProjectModules {
+    object Module {
+        const val tonApi = ":tonapi"
+
+        const val shimmer = ":ui:shimmer"
+        const val blur = ":ui:blur"
+    }
+
+    object Lib {
+        const val extensions = ":lib:extensions"
+        const val network = ":lib:network"
+        const val security = ":lib:security"
+        const val qr = ":lib:qr"
+        const val emoji = ":lib:emoji"
+        const val blockchain = ":lib:blockchain"
+        const val icu = ":lib:icu"
+        const val sqlite = ":lib:sqlite"
+        const val ledger = ":lib:ledger"
+        const val ur = ":lib:ur"
+        const val base64 = ":lib:base64"
+    }
+
+    object UIKit {
+        const val core = ":ui:uikit:core"
+        const val color = ":ui:uikit:color"
+        const val icon = ":ui:uikit:icon"
+        const val list = ":ui:uikit:list"
+        const val flag = ":ui:uikit:flag"
+    }
+
+    object Wallet {
+        const val localization = ":apps:wallet:localization"
+        const val api = ":apps:wallet:api"
+        const val app = ":apps:wallet:instance:app"
+
+        object Data {
+            const val core = ":apps:wallet:data:core"
+            const val account = ":apps:wallet:data:account"
+            const val settings = ":apps:wallet:data:settings"
+            const val rates = ":apps:wallet:data:rates"
+            const val tokens = ":apps:wallet:data:tokens"
+            const val collectibles = ":apps:wallet:data:collectibles"
+            const val events = ":apps:wallet:data:events"
+            const val browser = ":apps:wallet:data:browser"
+            const val backup = ":apps:wallet:data:backup"
+            const val rn = ":apps:wallet:data:rn"
+            const val passcode = ":apps:wallet:data:passcode"
+            const val staking = ":apps:wallet:data:staking"
+            const val purchase = ":apps:wallet:data:purchase"
+            const val battery = ":apps:wallet:data:battery"
+            const val dapps = ":apps:wallet:data:dapps"
+            const val contacts = ":apps:wallet:data:contacts"
+            const val swap = ":apps:wallet:data:swap"
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..8750ec6fa
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,132 @@
+[versions]
+# TON
+ton = "0.3.1"
+# KotlinX Serialization
+kotlinxSerialization = "1.9.0"
+# Koin
+koin = "4.1.0"
+# OkHttp
+okhttp = "5.1.0"
+# Compose
+compose = "2025.07.00"
+# CameraX
+cameraX = "1.4.2"
+
+
+[libraries]
+fresco = { module = "com.facebook.fresco:fresco", version = "3.6.0" }
+zxing = { module = "com.google.zxing:core", version = "3.5.3" }
+j2objc = { module = "com.google.j2objc:j2objc-annotations", version = "3.1" }
+cbor = { module = "co.nstant.in:cbor", version = "0.9" }
+ble = { module = "no.nordicsemi.android:ble-ktx", version = "2.10.2" }
+bcprovjdk = { module = "org.bouncycastle:bcprov-jdk15to18", version = "1.81" }
+web3j = { module = "org.web3j:core", version = "5.0.0" }
+aptabase = { module = "com.github.aptabase:aptabase-kotlin", version = "0.0.8" }
+okio = { module = "com.squareup.okio:okio", version = "3.16.0" }
+material = { module = "com.google.android.material:material", version = "1.12.0" }
+flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" }
+barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version = "17.3.0" }
+bleManager = { module = "com.github.cosmostation:hw-transport-android-ble", version = "0.0.8" }
+
+# TON
+ton-tvm = { module = "org.ton:ton-kotlin-tvm", version.ref = "ton" }
+ton-crypto = { module = "org.ton:ton-kotlin-crypto", version.ref = "ton" }
+ton-tlb = { module = "org.ton:ton-kotlin-tlb", version.ref = "ton" }
+ton-blockTlb = { module = "org.ton:ton-kotlin-block-tlb", version.ref = "ton" }
+ton-tonapiTl = { module = "org.ton:ton-kotlin-tonapi-tl", version.ref = "ton" }
+ton-contract = { module = "org.ton:ton-kotlin-contract", version.ref = "ton" }
+
+# KotlinX
+kotlinX-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.10.2" }
+kotlinX-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version = "1.10.2" }
+kotlinX-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.7.1" }
+kotlinX-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version = "0.8.0" }
+
+# KotlinX Serialization
+kotlinX-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
+kotlinX-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
+kotlinX-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kotlinxSerialization" }
+
+# Google Play
+google-play-base = { module = "com.google.android.gms:play-services-base", version = "18.7.2" }
+google-play-cronet = { module = "com.google.android.gms:play-services-cronet", version = "18.1.0" }
+google-play-review = { module = "com.google.android.play:review-ktx", version = "2.0.2" }
+google-play-billing = { module = "com.android.billingclient:billing-ktx", version = "8.0.0" }
+google-play-update = { module = "com.google.android.play:app-update-ktx", version = "2.1.0" }
+google-play-installreferrer = { module = "com.android.installreferrer:installreferrer", version = "2.2" }
+
+# Koin
+koin-core = { module = "io.insert-koin:koin-android", version.ref = "koin" }
+koin-workmanager = { module = "io.insert-koin:koin-androidx-workmanager", version.ref = "koin" }
+
+# OkHttp
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-sse = { module = "com.squareup.okhttp3:okhttp-sse", version.ref = "okhttp" }
+
+# Compose
+compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose" }
+compose-foundation = { module = "androidx.compose.foundation:foundation" }
+compose-foundationLayout = { module = "androidx.compose.foundation:foundation-layout" }
+compose-ui = { module = "androidx.compose.ui:ui" }
+compose-material3 = { module = "androidx.compose.material3:material3" }
+compose-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+compose-debugTooling = { module = "androidx.compose.ui:ui-tooling" }
+compose-viewModel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version = "2.9.2" }
+
+# Camera
+cameraX-base = { module = "androidx.camera:camera-camera2", version.ref = "cameraX" }
+cameraX-core = { module = "androidx.camera:camera-core", version.ref = "cameraX" }
+cameraX-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "cameraX" }
+cameraX-view = { module = "androidx.camera:camera-view", version.ref = "cameraX" }
+
+# AndroidX
+androidX-core = { module = "androidx.core:core-ktx", version = "1.17.0" }
+androidX-shortcuts = { module = "androidx.core:core-google-shortcuts", version = "1.1.0" }
+androidX-appCompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
+androidX-activity = { module = "androidx.activity:activity-ktx", version = "1.10.1" }
+androidX-fragment = { module = "androidx.fragment:fragment-ktx", version = "1.8.9" }
+androidX-recyclerView = { module = "androidx.recyclerview:recyclerview", version = "1.4.0" }
+androidX-viewPager2 = { module = "androidx.viewpager2:viewpager2", version = "1.1.0" }
+androidX-security = { module = "androidx.security:security-crypto", version = "1.1.0" }
+androidX-workManager = { module = "androidx.work:work-runtime-ktx", version = "2.10.3" }
+androidX-biometric = { module = "androidx.biometric:biometric", version = "1.1.0" }
+androidX-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
+androidX-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" }
+androidX-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
+androidX-browser = { module = "androidx.browser:browser", version = "1.9.0" }
+androidX-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version = "1.1.0" }
+androidX-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" }
+androidX-webkit = { module = "androidx.webkit:webkit", version = "1.14.0" }
+androidX-concurrent = { module = "androidx.concurrent:concurrent-futures", version = "1.3.0" }
+androidX-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.9.2" }
+androidX-lifecycleSavedState = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version = "2.9.2" }
+androidX-emoji = { module = "androidx.emoji2:emoji2", version = "1.5.0" }
+
+# Firebase
+firebase-bom = { module = "com.google.firebase:firebase-bom", version = "34.1.0" }
+firebase-analytics = { module = "com.google.firebase:firebase-analytics" }
+firebase-config = { module = "com.google.firebase:firebase-config", version = "23.0.0" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
+firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
+firebase-performance = { module = "com.google.firebase:firebase-perf" }
+
+[plugins]
+android-application = { id = "com.android.application", version = "8.12.1" }
+android-kotlin = { id = "org.jetbrains.kotlin.android", version = "2.2.10" }
+android-library = { id = "com.android.library", version = "8.12.1" }
+android-test = { id = "com.android.test", version = "8.12.1" }
+android-baselineprofile = { id = "androidx.baselineprofile", version = "1.4.0" }
+
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.2.10" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.2.10" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version = "2.2.10" }
+kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version = "8.12.1" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version = "2.2.10" }
+
+firebase-services = { id = "com.google.gms.google-services", version = "4.4.3" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.6" }
+firebase-performance = { id = "com.google.firebase.firebase-perf", version = "2.0.1" }
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 90b330cd7..84f7dd6ed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Aug 31 06:48:18 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/blockchain/build.gradle.kts b/lib/blockchain/build.gradle.kts
index 133752893..7dde09f60 100644
--- a/lib/blockchain/build.gradle.kts
+++ b/lib/blockchain/build.gradle.kts
@@ -26,20 +26,20 @@ android {
 }
 
 dependencies {
-    api(platform(Dependence.Firebase.bom))
-    api(Dependence.Firebase.crashlytics)
-
-    api(Dependence.TON.tvm)
-    api(Dependence.TON.crypto)
-    api(Dependence.TON.tlb)
-    api(Dependence.TON.blockTlb)
-    api(Dependence.TON.tonapiTl)
-    api(Dependence.TON.contract)
-    api(Dependence.KotlinX.io)
-    implementation(project(Dependence.Lib.extensions))
-    implementation(project(Dependence.Lib.base64))
-    implementation(Dependence.bcprovjdk)
-    implementation(Dependence.web3j) {
+    api(platform(libs.firebase.bom))
+    api(libs.firebase.crashlytics)
+
+    api(libs.ton.tvm)
+    api(libs.ton.crypto)
+    api(libs.ton.tlb)
+    api(libs.ton.blockTlb)
+    api(libs.ton.tonapiTl)
+    api(libs.ton.contract)
+    api(libs.kotlinX.io.core)
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(project(ProjectModules.Lib.base64))
+    implementation(libs.bcprovjdk)
+    implementation(libs.web3j) {
         exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
     }
     implementation("org.bitcoinj:bitcoinj-core:0.15.10") {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/TonAddressTags.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/TonAddressTags.kt
new file mode 100644
index 000000000..e38cde12e
--- /dev/null
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/TonAddressTags.kt
@@ -0,0 +1,59 @@
+package com.tonapps.blockchain.ton
+
+import android.util.Base64
+
+data class TonAddressTags(
+    val userFriendly: Boolean,
+    val isTestnet: Boolean?,
+    val isBounceable: Boolean,
+) {
+
+    companion object {
+
+        private const val BOUNCEABLE_TAG: Int = 0x11
+        private const val NON_BOUNCEABLE_TAG: Int = 0x51
+        private const val TEST_FLAG: Int = 0x80
+
+        @JvmStatic
+        val EMPTY = TonAddressTags(false, null, false)
+
+        private fun decodeUserFriendly(value: String): ByteArray? {
+            val normalizedValue = value
+                .replace("-", "+")
+                .replace("_", "/")
+            return try {
+                val bytes = Base64.decode(normalizedValue, Base64.DEFAULT)
+                if (bytes.size != 36) {
+                    null
+                } else {
+                    bytes
+                }
+            } catch (e: Throwable) {
+                null
+            }
+        }
+
+        fun of(value: String): TonAddressTags {
+            if (value.contains(":")) {
+                return EMPTY
+            }
+            val decoded = decodeUserFriendly(value) ?: return EMPTY
+            var tag = decoded[0].toInt() and 0xFF
+            val isTestnet = (tag and TEST_FLAG) != 0
+            if (isTestnet) {
+                tag = tag xor TEST_FLAG
+            }
+            val isBounceable = when (tag) {
+                BOUNCEABLE_TAG -> true
+                NON_BOUNCEABLE_TAG -> false
+                else -> return EMPTY
+            }
+            return TonAddressTags(
+                userFriendly = true,
+                isTestnet = isTestnet,
+                isBounceable = isBounceable
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt
index c774b5877..c999c1fb0 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/extensions/AddrStd.kt
@@ -16,14 +16,6 @@ fun AddrStd.toAccountId(): String {
     ).lowercase()
 }
 
-fun String.isTestnetAddress(): Boolean {
-    return startsWith("0Q") || startsWith("kQ")
-}
-
-fun String.isBounceable(): Boolean {
-    return startsWith("0:") || startsWith("E")
-}
-
 fun String.toUserFriendly(
     wallet: Boolean = true,
     testnet: Boolean,
@@ -48,7 +40,7 @@ fun String.toRawAddress(): String {
     return try {
         AddrStd(this).toString(userFriendly = false).lowercase()
     } catch (e: Exception) {
-        this
+        this.lowercase()
     }
 }
 
diff --git a/lib/emoji/build.gradle.kts b/lib/emoji/build.gradle.kts
index 796ffd5b0..3f1f6b062 100644
--- a/lib/emoji/build.gradle.kts
+++ b/lib/emoji/build.gradle.kts
@@ -23,6 +23,6 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.appCompat)
-    implementation(Dependence.AndroidX.Emoji.core)
+    implementation(libs.androidX.appCompat)
+    implementation(libs.androidX.emoji)
 }
\ No newline at end of file
diff --git a/lib/extensions/build.gradle.kts b/lib/extensions/build.gradle.kts
index b7f11eb9b..538ccb888 100644
--- a/lib/extensions/build.gradle.kts
+++ b/lib/extensions/build.gradle.kts
@@ -24,15 +24,15 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.KotlinX.serialization)
-    implementation(Dependence.KotlinX.serializationJSON)
-    implementation(Dependence.Koin.core)
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.AndroidX.security)
-    implementation(project(Dependence.UIKit.core))
-    implementation(project(Dependence.Lib.icu))
-    implementation(project(Dependence.Lib.base64))
-    implementation(Dependence.GooglePlay.installreferrer)
-    implementation("com.google.android.gms:play-services-base:18.6.0")
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.kotlinX.serialization.core)
+    implementation(libs.kotlinX.serialization.json)
+    implementation(libs.koin.core)
+    implementation(libs.androidX.core)
+    implementation(libs.androidX.security)
+    implementation(project(ProjectModules.UIKit.core))
+    implementation(project(ProjectModules.Lib.icu))
+    implementation(project(ProjectModules.Lib.base64))
+    implementation(libs.google.play.installreferrer)
+    implementation(libs.google.play.base)
 }
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/Country.kt b/lib/extensions/src/main/java/com/tonapps/extensions/Country.kt
deleted file mode 100644
index bde73b409..000000000
--- a/lib/extensions/src/main/java/com/tonapps/extensions/Country.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.tonapps.extensions
-
-import android.content.Context
-import com.android.installreferrer.api.InstallReferrerClient
-import com.android.installreferrer.api.InstallReferrerStateListener
-import kotlinx.coroutines.suspendCancellableCoroutine
-import java.util.Locale
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-
-private var cachedStoreCountry: String? = null
-private var hasFetched = false
-
-val Context.deviceCountry: String
-    get() = Locale.getDefault().country.uppercase()
-
-suspend fun Context.getStoreCountry(): String? {
-    if (hasFetched) return cachedStoreCountry
-
-    return getPlayCountry().also {
-        cachedStoreCountry = it
-        hasFetched = true
-    }
-}
-
-private suspend fun Context.getPlayCountry(): String? {
-    return suspendCancellableCoroutine { continuation ->
-        val referrerClient = InstallReferrerClient.newBuilder(this).build()
-
-        referrerClient.startConnection(object : InstallReferrerStateListener {
-            override fun onInstallReferrerSetupFinished(responseCode: Int) {
-                when (responseCode) {
-                    InstallReferrerClient.InstallReferrerResponse.OK -> {
-                        try {
-                            val referrerUrl = referrerClient.installReferrer.installReferrer
-                            val country = referrerUrl
-                                .substringAfter("utm_country=", "")
-                                .substringBefore("&")
-                                .takeIf { it.isNotEmpty() }
-
-                            continuation.resume(country?.uppercase())
-                        } catch (e: Exception) {
-                            continuation.resumeWithException(e)
-                        } finally {
-                            referrerClient.endConnection()
-                        }
-                    }
-
-                    else -> {
-                        continuation.resume(null)
-                        referrerClient.endConnection()
-                    }
-                }
-            }
-
-            override fun onInstallReferrerServiceDisconnected() {
-                continuation.resume(null)
-            }
-        })
-
-        continuation.invokeOnCancellation { referrerClient.endConnection() }
-    }
-}
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/JSON.kt b/lib/extensions/src/main/java/com/tonapps/extensions/JSON.kt
deleted file mode 100644
index 1bc145704..000000000
--- a/lib/extensions/src/main/java/com/tonapps/extensions/JSON.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.tonapps.extensions
-
-import kotlinx.serialization.json.Json
-
-val JSON = Json {
-    ignoreUnknownKeys = true
-}
\ No newline at end of file
diff --git a/lib/icu/build.gradle.kts b/lib/icu/build.gradle.kts
index f628df19d..e06cc55cc 100644
--- a/lib/icu/build.gradle.kts
+++ b/lib/icu/build.gradle.kts
@@ -23,5 +23,5 @@ android {
 
 
 dependencies {
-    implementation(Dependence.Squareup.okio)
+    implementation(libs.okio)
 }
\ No newline at end of file
diff --git a/lib/icu/src/main/java/com/tonapps/icu/Coins.kt b/lib/icu/src/main/java/com/tonapps/icu/Coins.kt
index 896bd1593..e585ac889 100644
--- a/lib/icu/src/main/java/com/tonapps/icu/Coins.kt
+++ b/lib/icu/src/main/java/com/tonapps/icu/Coins.kt
@@ -16,6 +16,8 @@ data class Coins(
 
     companion object {
 
+        val mathContext = MathContext(32, RoundingMode.HALF_EVEN)
+
         @JvmField
         val CREATOR = object : Parcelable.Creator<Coins> {
             override fun createFromParcel(parcel: Parcel) = Coins(parcel)
@@ -147,7 +149,11 @@ data class Coins(
                 v = "0"
             }
             return v
+        }
 
+
+        fun string(coins: Coins): String {
+            return coins.value.toPlainString()
         }
 
         inline fun <T> Iterable<T>.sumOf(selector: (T) -> Coins): Coins {
@@ -186,13 +192,13 @@ data class Coins(
 
     operator fun times(other: Coins): Coins {
         //  = of(value * other.value, decimals)
-        return of(value.multiply(other.value), decimals)
+        return of(value.multiply(other.value, mathContext), decimals)
     }
 
     fun div(
         other: Coins,
         scale: Int = decimals,
-        roundingMode: RoundingMode = RoundingMode.HALF_UP
+        roundingMode: RoundingMode = RoundingMode.HALF_EVEN
     ): Coins {
         try {
             val result = value.divide(other.value, scale, roundingMode)
@@ -206,25 +212,29 @@ data class Coins(
         return div(
             other = other,
             scale = decimals,
-            roundingMode = RoundingMode.HALF_UP
+            roundingMode = RoundingMode.HALF_EVEN
         )
     }
 
+    operator fun div(other: Float): Coins {
+        return of(value.divide(other.toBigDecimal(), mathContext), decimals)
+    }
+
     operator fun rem(other: Coins) = of(value.remainder(other.value), decimals)
 
     operator fun inc() = Coins(value + ONE.value, decimals)
 
     operator fun dec() = Coins(value - ONE.value, decimals)
 
-    fun multiply(other: Coins) = of(value.multiply(other.value), decimals)
+    fun multiply(other: Coins) = of(value.multiply(other.value, mathContext), decimals)
 
-    fun multiply(other: BigDecimal) = of(value.multiply(other), decimals)
+    fun multiply(other: BigDecimal) = of(value.multiply(other, mathContext), decimals)
 
-    fun multiply(other: String) = of(value.multiply(BigDecimal(other)), decimals)
+    fun multiply(other: String) = of(value.multiply(BigDecimal(other), mathContext), decimals)
 
-    fun divide(divisor: Coins, roundingMode: RoundingMode = RoundingMode.HALF_DOWN) = of(value.divide(divisor.value, roundingMode))
+    fun divide(divisor: Coins, roundingMode: RoundingMode = RoundingMode.HALF_EVEN) = of(value.divide(divisor.value, roundingMode))
 
-    fun divide(divisor: Int, roundingMode: RoundingMode = RoundingMode.HALF_DOWN) = of(value.divide(BigDecimal(divisor), roundingMode))
+    fun divide(divisor: Int, roundingMode: RoundingMode = RoundingMode.HALF_EVEN) = of(value.divide(BigDecimal(divisor), roundingMode))
 
     override operator fun compareTo(other: Coins) = value.compareTo(other.value)
 
@@ -232,12 +242,16 @@ data class Coins(
 
     fun stripTrailingZeros(): Coins = Coins(value.stripTrailingZeros(), decimals)
 
-    fun toBigInteger(): BigInteger {
-        val multiplier = BigDecimal.TEN.pow(decimals)
+    fun toBigInteger(d: Int = decimals): BigInteger {
+        val multiplier = BigDecimal.TEN.pow(d)
         val multipliedValue = value.multiply(multiplier)
         return multipliedValue.toBigInteger()
     }
 
+    fun toBigDecimal(d: Int = decimals): BigDecimal {
+        return value.setScale(d, RoundingMode.HALF_EVEN)
+    }
+
     @Deprecated("Use toBigInteger() instead")
     fun toLong(): Long {
         val multiplier = BigDecimal.TEN.pow(decimals)
@@ -249,17 +263,25 @@ data class Coins(
         return value.toFloat()
     }
 
+    fun toDouble(decimals: Int): Double {
+        val multiplier = BigDecimal.TEN.pow(decimals)
+        val multipliedValue = value.multiply(multiplier)
+        return multipliedValue.toDouble()
+    }
+
+    fun toNano(decimals: Int) = value.movePointRight(decimals).setScale(0, RoundingMode.DOWN).toPlainString()
+
     fun diff(coins: Coins): Float {
         if (coins.isZero || isZero) {
             return 0f
         }
-        val percentage = coins.value.divide(value, 4, RoundingMode.HALF_UP)
+        val percentage = coins.value.divide(value, 4, RoundingMode.HALF_EVEN)
             .multiply(BigDecimal("100"))
-            .setScale(2, RoundingMode.HALF_UP)
+            .setScale(2, RoundingMode.HALF_EVEN)
         return percentage.toFloat()
     }
 
-    fun setScale(scale: Int, roundingMode: RoundingMode = RoundingMode.HALF_UP): Coins {
+    fun setScale(scale: Int, roundingMode: RoundingMode = RoundingMode.HALF_EVEN): Coins {
         return of(value.setScale(scale, roundingMode), scale)
     }
 
diff --git a/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt b/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
index f57e29bc4..bd3eaef85 100644
--- a/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
+++ b/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
@@ -26,6 +26,10 @@ object CurrencyFormatter {
         Locale("si"),
     )
 
+    fun getScale(value: BigDecimal): Int {
+        return CurrencyFormat.getScale(value)
+    }
+
     private fun getFixedLocale(locale: Locale): Locale {
         return try {
             if (customDigitLocales.any { it.language.equals(locale.language) } || locale.isO3Country.equals("IRN", ignoreCase = true)) {
@@ -57,54 +61,61 @@ object CurrencyFormatter {
 
     fun formatPercent(
         value: BigDecimal,
-        customScale: Int = 2,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         stripTrailingZeros: Boolean = true,
     ): CharSequence {
-        val format = format(value = value, customScale = customScale, roundingMode = roundingMode, stripTrailingZeros = stripTrailingZeros)
+        val format = format(value = value, roundingMode = roundingMode, stripTrailingZeros = stripTrailingZeros)
         return "$format%"
     }
 
+    fun formatPercent(
+        value: Int
+    ) = formatPercent(value.toBigDecimal())
+
     fun format(
         currency: String = "",
         value: BigDecimal,
-        customScale: Int = 0,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
         stripTrailingZeros: Boolean = true,
     ): CharSequence {
-       return format.format(currency, value, customScale, roundingMode, replaceSymbol, stripTrailingZeros)
+       return format.format(currency, value, roundingMode, replaceSymbol, stripTrailingZeros)
+    }
+
+    fun formatFull(
+        currency: String,
+        value: Coins,
+        customScale: Int
+    ): CharSequence {
+        return format.formatFull(currency, value.value, customScale)
     }
 
     fun format(
         currency: String = "",
         value: Coins,
-        customScale: Int = 0,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
         stripTrailingZeros: Boolean = true,
     ): CharSequence {
-        return format(currency, value.value, customScale, roundingMode, replaceSymbol, stripTrailingZeros)
+        return format(currency, value.value, roundingMode, replaceSymbol, stripTrailingZeros)
     }
 
     fun formatFiat(
         currency: String,
         value: BigDecimal,
-        customScale: Int = 2,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
         stripTrailingZeros: Boolean = false,
     ): CharSequence {
-        return format(currency, value, customScale, roundingMode, replaceSymbol, stripTrailingZeros)
+        return format(currency, value, roundingMode, replaceSymbol, stripTrailingZeros)
     }
 
     fun formatFiat(
         currency: String,
         value: Coins,
-        customScale: Int = 2,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
-    ) = formatFiat(currency, value.value, customScale, roundingMode, replaceSymbol)
+    ) = formatFiat(currency, value.value, roundingMode, replaceSymbol)
 
     fun CharSequence.withCustomSymbol(context: Context): CharSequence {
         if (true) { // Not now... maybe in future
diff --git a/lib/icu/src/main/java/com/tonapps/icu/format/CurrencyFormat.kt b/lib/icu/src/main/java/com/tonapps/icu/format/CurrencyFormat.kt
index 9d3e36683..808f6c6f8 100644
--- a/lib/icu/src/main/java/com/tonapps/icu/format/CurrencyFormat.kt
+++ b/lib/icu/src/main/java/com/tonapps/icu/format/CurrencyFormat.kt
@@ -15,6 +15,7 @@ internal class CurrencyFormat(val locale: Locale) {
     companion object {
         private const val CURRENCY_SIGN = "¤"
         private const val SMALL_SPACE = " "
+        private const val DEFAULT_SPACE = " "
         private const val APOSTROPHE = "'"
         const val TON_SYMBOL = "TON"
 
@@ -77,7 +78,11 @@ internal class CurrencyFormat(val locale: Locale) {
             return fiatSymbols.containsKey(currency)
         }
 
-        private fun createFormat(decimals: Int, pattern: String, locale: Locale): DecimalFormat {
+        private fun createFormat(
+            decimals: Int,
+            pattern: String,
+            locale: Locale
+        ): DecimalFormat {
             val symbols = DecimalFormatSymbols.getInstance(locale)
             val decimalFormat = DecimalFormat(pattern, symbols)
             decimalFormat.maximumFractionDigits = decimals
@@ -87,17 +92,16 @@ internal class CurrencyFormat(val locale: Locale) {
             return decimalFormat
         }
 
-        private fun getScale(value: BigDecimal): Int {
+        fun getScaleFull(value: BigDecimal): Int {
             if (value == BigDecimal.ZERO) {
                 return 0
             }
-            val absValue = value.abs()
             return when {
-                absValue >= BigDecimal.ONE -> 2
-                absValue >= BigDecimal("0.1") -> 2
-                absValue >= BigDecimal("0.01") -> 3
+                value >= BigDecimal.ONE -> 2
+                value >= BigDecimal("0.1") -> 2
+                value >= BigDecimal("0.01") -> 3
                 else -> {
-                    val plainString = absValue.stripTrailingZeros().toPlainString()
+                    val plainString = value.stripTrailingZeros().toPlainString()
                     val dotIndex = plainString.indexOf('.')
                     if (dotIndex == -1) {
                         return 2
@@ -114,6 +118,33 @@ internal class CurrencyFormat(val locale: Locale) {
                 }
             }
         }
+
+        fun getScale(value: BigDecimal): Int {
+            if (value == BigDecimal.ZERO) {
+                return 0
+            }
+            return when {
+                value >= BigDecimal("1000") -> 0
+                value >= BigDecimal.ONE -> 2
+                BigDecimal("0.0000001") >= value -> 0
+                else -> {
+                    val plainString = value.stripTrailingZeros().toPlainString()
+                    val dotIndex = plainString.indexOf('.')
+                    if (dotIndex == -1) {
+                        return 0
+                    }
+                    var leadingZeros = 0
+                    for (i in (dotIndex + 1) until plainString.length) {
+                        if (plainString[i] == '0') {
+                            leadingZeros++
+                        } else {
+                            break
+                        }
+                    }
+                    leadingZeros + 3
+                }
+            }
+        }
     }
 
     private var format = NumberFormat.getCurrencyInstance(locale) as DecimalFormat
@@ -123,18 +154,29 @@ internal class CurrencyFormat(val locale: Locale) {
 
     internal val monetaryDecimalSeparator = format.decimalFormatSymbols.monetaryDecimalSeparator.toString()
 
+    fun formatFull(
+        currency: String,
+        value: BigDecimal,
+        customScale: Int,
+    ): CharSequence {
+        val targetScale = getScaleFull(value.abs())
+        val scale = if (targetScale > customScale) targetScale else customScale
+        val bigDecimal = value.stripTrailingZeros().setScale(scale, RoundingMode.HALF_EVEN).stripTrailingZeros()
+        val decimals = bigDecimal.scale()
+        val amount = getFormat(decimals).format(bigDecimal)
+        return format(currency, amount, true)
+    }
+
     fun format(
         currency: String = "",
         value: BigDecimal,
-        customScale: Int = 0,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
         stripTrailingZeros: Boolean,
     ): CharSequence {
-        val targetScale = getScale(value.abs())
-        val scale = if (targetScale > customScale) targetScale else customScale
+        val scale = getScale(value.abs())
         val bigDecimal = if (stripTrailingZeros) {
-            value.stripTrailingZeros().setScale(scale, roundingMode).stripTrailingZeros()
+            value.setScale(scale, roundingMode).stripTrailingZeros()
         } else {
             value.setScale(scale, roundingMode)
         }
@@ -157,14 +199,14 @@ internal class CurrencyFormat(val locale: Locale) {
                 builder.append(value)
             } else {
                 builder.append(value)
-                builder.append(SMALL_SPACE)
+                builder.append(DEFAULT_SPACE)
                 builder.append(symbol)
             }
         } else if (currency == "") {
             builder.append(value)
         } else {
             builder.append(value)
-            builder.append(SMALL_SPACE)
+            builder.append(DEFAULT_SPACE)
             builder.append(currency)
         }
         return builder.toString()
diff --git a/lib/ledger/build.gradle.kts b/lib/ledger/build.gradle.kts
index 35e227e46..9e5d58d7c 100644
--- a/lib/ledger/build.gradle.kts
+++ b/lib/ledger/build.gradle.kts
@@ -23,14 +23,14 @@ android {
 }
 
 dependencies {
-    api(Dependence.TON.tvm)
-    api(Dependence.TON.crypto)
-    api(Dependence.TON.tlb)
-    api(Dependence.TON.blockTlb)
-    api(Dependence.TON.tonapiTl)
-    api(Dependence.TON.contract)
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.LedgerHQ.bleManager)
-    implementation(project(Dependence.Lib.blockchain))
+    api(libs.ton.tvm)
+    api(libs.ton.crypto)
+    api(libs.ton.tlb)
+    api(libs.ton.blockTlb)
+    api(libs.ton.tonapiTl)
+    api(libs.ton.contract)
+    implementation(libs.androidX.core)
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.bleManager)
+    implementation(project(ProjectModules.Lib.blockchain))
 }
\ No newline at end of file
diff --git a/lib/network/build.gradle.kts b/lib/network/build.gradle.kts
index 6f23da268..4dc7c6597 100644
--- a/lib/network/build.gradle.kts
+++ b/lib/network/build.gradle.kts
@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.Squareup.okhttp)
-    implementation(Dependence.Squareup.sse)
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.sse)
 }
\ No newline at end of file
diff --git a/lib/network/src/main/java/com/tonapps/network/OkHttpClient.kt b/lib/network/src/main/java/com/tonapps/network/OkHttpClient.kt
index fffb09e6f..30c051b8a 100644
--- a/lib/network/src/main/java/com/tonapps/network/OkHttpClient.kt
+++ b/lib/network/src/main/java/com/tonapps/network/OkHttpClient.kt
@@ -1,6 +1,8 @@
 package com.tonapps.network
 
 import android.util.ArrayMap
+import android.util.Log
+import com.tonapps.network.ws.WSEvent
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.awaitClose
@@ -63,7 +65,7 @@ fun OkHttpClient.get(
     url: String,
     headers: ArrayMap<String, String>? = null
 ): String {
-    return simple(url, headers).body?.string() ?: throw Exception("Empty response")
+    return simple(url, headers).body.string()
 }
 
 fun OkHttpClient.simple(
@@ -152,3 +154,4 @@ fun OkHttpClient.sse(
         }
     }
 }.cancellable()
+
diff --git a/lib/network/src/main/java/com/tonapps/network/ws/WSConnection.kt b/lib/network/src/main/java/com/tonapps/network/ws/WSConnection.kt
new file mode 100644
index 000000000..6aa800ce1
--- /dev/null
+++ b/lib/network/src/main/java/com/tonapps/network/ws/WSConnection.kt
@@ -0,0 +1,137 @@
+package com.tonapps.network.ws
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
+import okio.ByteString
+
+open class WSConnection(
+    private val client: OkHttpClient,
+    private val url: String,
+    private val headers: Map<String, String> = emptyMap(),
+    private val reconnectDelay: Long = 3000L
+){
+
+    private var webSocket: WebSocket? = null
+    private var reconnectJob: Job? = null
+    private var isManuallyDisconnected = false
+
+    val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+
+    private val _events = MutableSharedFlow<WSEvent>(replay = 0, extraBufferCapacity = 64)
+    val events: SharedFlow<WSEvent> = _events.asSharedFlow()
+
+    private val _connectionState = MutableStateFlow<ConnectionState>(ConnectionState.Disconnected)
+    val connectionState = _connectionState.asStateFlow()
+
+    init {
+        connect()
+    }
+
+    fun connect() {
+        if (_connectionState.value != ConnectionState.Disconnected) return
+
+        isManuallyDisconnected = false
+        doConnect()
+    }
+
+    private fun scheduleReconnect() {
+        reconnectJob?.cancel()
+        _connectionState.value = ConnectionState.Reconnecting
+
+        reconnectJob = scope.launch {
+            delay(reconnectDelay)
+            if (!isManuallyDisconnected) {
+                doConnect()
+            }
+        }
+    }
+
+    private fun shouldReconnect(closeCode: Int): Boolean {
+        return closeCode != 1000 && closeCode != 1001
+    }
+
+    private fun doConnect() {
+        if (isManuallyDisconnected) return
+
+        _connectionState.value = ConnectionState.Connecting
+
+        val listener = object : WebSocketListener() {
+            override fun onOpen(webSocket: WebSocket, response: Response) {
+                this@WSConnection.webSocket = webSocket
+                _connectionState.value = ConnectionState.Connected
+                _events.tryEmit(WSEvent.Opened)
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                _events.tryEmit(WSEvent.Text(text))
+            }
+
+            override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+                webSocket.close(code, reason)
+            }
+
+            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                this@WSConnection.webSocket = null
+                _connectionState.value = ConnectionState.Disconnected
+                _events.tryEmit(WSEvent.Closed(code, reason))
+
+                if (!isManuallyDisconnected && shouldReconnect(code)) {
+                    scheduleReconnect()
+                }
+            }
+
+            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                this@WSConnection.webSocket = null
+                _connectionState.value = ConnectionState.Disconnected
+                _events.tryEmit(WSEvent.Failure(t))
+
+                if (!isManuallyDisconnected) {
+                    scheduleReconnect()
+                }
+            }
+        }
+
+        val request = Request.Builder()
+            .url(url)
+            .apply {
+                headers.forEach { (key, value) ->
+                    addHeader(key, value)
+                }
+            }
+            .build()
+
+        webSocket = client.newWebSocket(request, listener)
+    }
+
+    fun send(text: String): Boolean = webSocket?.send(text) ?: false
+
+    fun send(bytes: ByteString): Boolean = webSocket?.send(bytes) ?: false
+
+    fun disconnect() {
+        isManuallyDisconnected = true
+        reconnectJob?.cancel()
+        webSocket?.close(1000, "Normal closure")
+        webSocket = null
+        _connectionState.value = ConnectionState.Disconnected
+    }
+
+    open fun release() {
+        disconnect()
+        scope.cancel()
+    }
+}
\ No newline at end of file
diff --git a/lib/network/src/main/java/com/tonapps/network/ws/WSConnectionState.kt b/lib/network/src/main/java/com/tonapps/network/ws/WSConnectionState.kt
new file mode 100644
index 000000000..309be2f6a
--- /dev/null
+++ b/lib/network/src/main/java/com/tonapps/network/ws/WSConnectionState.kt
@@ -0,0 +1,8 @@
+package com.tonapps.network.ws
+
+sealed class ConnectionState {
+    data object Disconnected : ConnectionState()
+    data object Connecting : ConnectionState()
+    data object Connected : ConnectionState()
+    data object Reconnecting : ConnectionState()
+}
\ No newline at end of file
diff --git a/lib/network/src/main/java/com/tonapps/network/ws/WSEvent.kt b/lib/network/src/main/java/com/tonapps/network/ws/WSEvent.kt
new file mode 100644
index 000000000..311ce17fa
--- /dev/null
+++ b/lib/network/src/main/java/com/tonapps/network/ws/WSEvent.kt
@@ -0,0 +1,8 @@
+package com.tonapps.network.ws
+
+sealed class WSEvent {
+    data class Text(val text: String): WSEvent()
+    data class Closed(val code: Int, val reason: String): WSEvent()
+    data class Failure(val error: Throwable): WSEvent()
+    data object Opened: WSEvent()
+}
\ No newline at end of file
diff --git a/lib/qr/build.gradle.kts b/lib/qr/build.gradle.kts
index 2d73d3a2d..44c699ec4 100644
--- a/lib/qr/build.gradle.kts
+++ b/lib/qr/build.gradle.kts
@@ -22,10 +22,10 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.zxing)
+    implementation(libs.androidX.core)
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.zxing)
 
-    api(Dependence.ML.barcode)
-    implementation(Dependence.AndroidX.Camera.base)
+    api(libs.barcode.scanning)
+    implementation(libs.cameraX.base)
 }
\ No newline at end of file
diff --git a/lib/security/build.gradle.kts b/lib/security/build.gradle.kts
index be37559a7..b2d39ecb7 100644
--- a/lib/security/build.gradle.kts
+++ b/lib/security/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 android {
     namespace = Build.namespacePrefix("security")
     compileSdk = Build.compileSdkVersion
+    ndkVersion = Build.ndkVersion
 
     defaultConfig {
         minSdk = Build.minSdkVersion
@@ -40,12 +41,12 @@ android {
 }
 
 dependencies {
-    api(platform(Dependence.Firebase.bom))
-    api(Dependence.Firebase.crashlytics)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics)
 
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.AndroidX.security)
-    implementation(project(Dependence.Lib.extensions))
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.androidX.security)
+    implementation(project(ProjectModules.Lib.extensions))
     compileOnly(fileTree("libs") {
         include("*.aar")
     })
diff --git a/lib/security/libs/libsodium.aar b/lib/security/libs/libsodium.aar
index 42dc1686e..456baade1 100644
Binary files a/lib/security/libs/libsodium.aar and b/lib/security/libs/libsodium.aar differ
diff --git a/lib/ur/build.gradle.kts b/lib/ur/build.gradle.kts
index 8bdd607a8..cea0128c1 100644
--- a/lib/ur/build.gradle.kts
+++ b/lib/ur/build.gradle.kts
@@ -23,7 +23,7 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.Lib.extensions))
-    implementation(Dependence.cbor)
+    implementation(project(ProjectModules.Lib.extensions))
+    implementation(libs.cbor)
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9a5a4612b..f29cb3ed7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -73,3 +73,8 @@ include(":apps:wallet:data:purchase")
 include(":apps:wallet:data:battery")
 include(":apps:wallet:data:dapps")
 include(":apps:wallet:data:contacts")
+include(":apps:wallet:data:swap")
+
+
+include(":shared:core")
+include(":shared:ui")
diff --git a/shared/core/.gitignore b/shared/core/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/shared/core/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/shared/core/build.gradle.kts b/shared/core/build.gradle.kts
new file mode 100644
index 000000000..cc6b0e126
--- /dev/null
+++ b/shared/core/build.gradle.kts
@@ -0,0 +1,63 @@
+plugins {
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.android.library)
+}
+
+version = "1.0"
+
+kotlin {
+    androidTarget()
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    macosX64 {
+        binaries {
+            executable {
+                entryPoint = "main"
+            }
+        }
+    }
+    macosArm64 {
+        binaries {
+            executable {
+                entryPoint = "main"
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+
+            }
+        }
+
+        androidMain {
+            dependencies {
+
+            }
+        }
+
+        iosMain {
+            dependencies {
+
+            }
+        }
+    }
+}
+
+
+android {
+    compileSdk = Build.compileSdkVersion
+    namespace = "com.tonkeeper.core"
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    defaultConfig {
+        minSdk = Build.minSdkVersion
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
diff --git a/shared/core/src/androidMain/AndroidManifest.xml b/shared/core/src/androidMain/AndroidManifest.xml
new file mode 100644
index 000000000..1d26c87a1
--- /dev/null
+++ b/shared/core/src/androidMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest/>
\ No newline at end of file
diff --git a/shared/core/src/commonMain/kotlin/com/tonkeeper/core/Blockchain.kt b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/Blockchain.kt
new file mode 100644
index 000000000..f2dfbf77e
--- /dev/null
+++ b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/Blockchain.kt
@@ -0,0 +1,28 @@
+package com.tonkeeper.core
+
+data class Blockchain(
+    val type: Int,
+    val nativeTicker: String,
+) {
+
+    val bip44Path: Long
+        get() = 0x80000000L + type
+
+    companion object {
+        val BTC = Blockchain(0, "BTC")
+        val TON = Blockchain(607, "TON")
+        val ETH = Blockchain(60, "ETH")
+        val ETC = Blockchain(61, "ETC")
+        val TRON = Blockchain(195, "TRX")
+        val BNB = Blockchain(714, "BNB")
+        val SOL = Blockchain(501, "SOL")
+        val LTC = Blockchain(2, "LTC")
+        val DOGE = Blockchain(3, "DOGE")
+        val XMR = Blockchain(128, "XMR")
+        val XRP = Blockchain(144, "XRP")
+        val ADA = Blockchain(1815, "ADA")
+        val XTZ = Blockchain(1729, "XTZ")
+        val NMC = Blockchain(7, "NMC")
+        val XPM = Blockchain(24, "XPM")
+    }
+}
\ No newline at end of file
diff --git a/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Crypto.kt b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Crypto.kt
new file mode 100644
index 000000000..945870e92
--- /dev/null
+++ b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Crypto.kt
@@ -0,0 +1,30 @@
+package com.tonkeeper.core.currency
+
+import com.tonkeeper.core.Blockchain
+
+data class Crypto(
+    override val name: String,
+    override val decimals: Int = 9,
+    override val symbol: String? = null,
+    val blockchain: Blockchain
+): Currency {
+
+    constructor(name: String, decimals: Int, blockchain: Blockchain) : this(name, decimals, null, blockchain)
+
+    override val code: String
+        get() = blockchain.nativeTicker
+
+    companion object {
+        val TON = Crypto("Toncoin", 9, Blockchain.Companion.TON)
+        val BTC = Crypto("Bitcoin", 8, "₿", Blockchain.Companion.BTC)
+        val ETH = Crypto("Ethereum", 18, "Ξ", Blockchain.Companion.ETH)
+        val LTC = Crypto("Litecoin", 8, "Ł", Blockchain.Companion.LTC)
+        val DOGE = Crypto("Dogecoin", 8, "Ð", Blockchain.Companion.DOGE)
+        val XMR = Crypto("Monero", 12, "ɱ", Blockchain.Companion.XMR)
+        val XRP = Crypto("XRP", 6, "✕", Blockchain.Companion.XRP)
+        val ADA = Crypto("Cardano", 6, "₳", Blockchain.Companion.ADA)
+        val XTZ = Crypto("Tezos", 6, "ꜩ", Blockchain.Companion.XTZ)
+        val NMC = Crypto("Namecoin", 8, "ℕ", Blockchain.Companion.NMC)
+        val XPM = Crypto("Primecoin", 6, "Ψ", Blockchain.Companion.XPM)
+    }
+}
\ No newline at end of file
diff --git a/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Currency.kt b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Currency.kt
new file mode 100644
index 000000000..fe770bb37
--- /dev/null
+++ b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Currency.kt
@@ -0,0 +1,8 @@
+package com.tonkeeper.core.currency
+
+sealed interface Currency {
+    val name: String
+    val code: String
+    val symbol: String?
+    val decimals: Int
+}
\ No newline at end of file
diff --git a/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Fiat.kt b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Fiat.kt
new file mode 100644
index 000000000..aed9621b8
--- /dev/null
+++ b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Fiat.kt
@@ -0,0 +1,14 @@
+package com.tonkeeper.core.currency
+
+data class Fiat(
+    override val name: String,
+    override val code: String,
+    override val symbol: String? = null,
+    override val decimals: Int = 2
+): Currency {
+
+    companion object {
+        val USD = Fiat("US Dollar", "USD", "$")
+        val EUR = Fiat("Euro", "EUR", "€")
+    }
+}
\ No newline at end of file
diff --git a/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Token.kt b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Token.kt
new file mode 100644
index 000000000..8b8f0c4d2
--- /dev/null
+++ b/shared/core/src/commonMain/kotlin/com/tonkeeper/core/currency/Token.kt
@@ -0,0 +1,36 @@
+package com.tonkeeper.core.currency
+
+import com.tonkeeper.core.Blockchain
+
+data class Token(
+    override val name: String,
+    override val code: String,
+    override val symbol: String? = null,
+    override val decimals: Int = 9,
+    val contractAddress: String,
+    val blockchain: Blockchain
+): Currency {
+
+    constructor(
+        name: String,
+        code: String,
+        decimals: Int,
+        contractAddress: String,
+        blockchain: Blockchain
+    ) : this(name, code, null, decimals, contractAddress, blockchain)
+
+    object TON {
+        val USDT = Token("Tether USD", "USDT", "₮", 6, "0:b113a994b5024a16719f69139328eb759596c38a25f59028b146fecdc3621dfe", Blockchain.Companion.TON)
+        val USDe = Token("Ether USD", "USDe", 6, "0:086fa2a675f74347b08dd4606a549b8fdb98829cb282bc1949d3b12fbaed9dcc", Blockchain.Companion.TON)
+    }
+
+    object TRON {
+        val USDT = Token("Tether USD", "USDT", "₮", 6, "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t", Blockchain.Companion.TRON)
+    }
+
+    object ETH {
+        val USDT = Token("Tether USD", "USDT", "₮", 6, "0xdac17f958d2ee523a2206206994597c13d831ec7", Blockchain.Companion.ETH)
+    }
+
+
+}
\ No newline at end of file
diff --git a/shared/ui/build.gradle.kts b/shared/ui/build.gradle.kts
new file mode 100644
index 000000000..346c8c701
--- /dev/null
+++ b/shared/ui/build.gradle.kts
@@ -0,0 +1,64 @@
+plugins {
+    alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.android.library)
+}
+
+version = "1.0"
+
+kotlin {
+    androidTarget()
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    macosX64 {
+        binaries {
+            executable {
+                entryPoint = "main"
+            }
+        }
+    }
+    macosArm64 {
+        binaries {
+            executable {
+                entryPoint = "main"
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+
+            }
+        }
+
+        androidMain {
+            dependencies {
+
+            }
+        }
+
+        iosMain {
+            dependencies {
+
+            }
+        }
+    }
+}
+
+
+android {
+    compileSdk = Build.compileSdkVersion
+    namespace = "com.tonkeeper.ui"
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    defaultConfig {
+        minSdk = Build.minSdkVersion
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
diff --git a/shared/ui/src/androidMain/AndroidManifest.xml b/shared/ui/src/androidMain/AndroidManifest.xml
new file mode 100644
index 000000000..1d26c87a1
--- /dev/null
+++ b/shared/ui/src/androidMain/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest/>
\ No newline at end of file
diff --git a/tonapi/battery-api.yml b/tonapi/battery-api.yml
new file mode 100644
index 000000000..dfc3c80d8
--- /dev/null
+++ b/tonapi/battery-api.yml
@@ -0,0 +1,1692 @@
+openapi: 3.0.2
+info:
+  title: Custodial-Battery REST API.
+  version: 0.0.1
+  description: REST API for Custodial Battery which provides gas to different networks to help execute transactions.
+  contact:
+    name: Support
+    email: support@tonkeeper.com
+servers:
+  - url: "https://battery.tonkeeper.com"
+  - url: "https://testnet-battery.tonkeeper.com"
+paths:
+  /tonconnect/payload:
+    get:
+      description: Get a payload for further token receipt
+      operationId: getTonConnectPayload
+      tags:
+        - Connect
+      responses:
+        '200':
+          description: payload
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - payload
+                properties:
+                  payload:
+                    type: string
+                    example: "84jHVNLQmZsAAAAAZB0Zryi2wqVJI-KaKNXOvCijEi46YyYzkaSHyJrMPBMOkVZa"
+        'default':
+          $ref: '#/components/responses/Error'
+  /tonconnect/proof:
+    post:
+      description: Account verification and token issuance
+      operationId: tonConnectProof
+      tags:
+        - Wallet
+      requestBody:
+        $ref: "#/components/requestBodies/TonConnectProof"
+      responses:
+        '200':
+          description: auth token
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - token
+                properties:
+                  token:
+                    type: string
+                    example: "NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2ODQ3..."
+        'default':
+          $ref: '#/components/responses/Error'
+  /status:
+    get:
+      description: This method returns information about the current status of Battery Service.
+      operationId: getStatus
+      parameters:
+        - $ref: '#/components/parameters/token'
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Status'
+        'default':
+          $ref: '#/components/responses/Error'
+  /config:
+    get:
+      description: This method returns information about Battery Service.
+      operationId: getConfig
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Config'
+        'default':
+          $ref: '#/components/responses/Error'
+  /promo-used:
+    get:
+      operationId: getPromoUsed
+      parameters:
+        - name: promo
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PromoUsed'
+        'default':
+          $ref: '#/components/responses/Error'
+  /battery-charged:
+    get:
+      description: This method returns information about a user's balance.
+      operationId: getBatteryCharged
+      parameters:
+        - name: account_id
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/BatteryCharged'
+        'default':
+          $ref: '#/components/responses/Error'
+  /balance:
+    get:
+      description: This method returns information about a user's balance.
+      operationId: getBalance
+      parameters:
+        - $ref: '#/components/parameters/token'
+        - $ref: '#/components/parameters/balanceUnits'
+        - $ref: '#/components/parameters/region'
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Balance'
+        'default':
+          $ref: '#/components/responses/Error'
+  /wallet/emulate:
+    post:
+      description: Emulate sending message to blockchain
+      operationId: emulateMessageToWallet
+      tags:
+        - Emulation
+      parameters:
+        - $ref: '#/components/parameters/i18n'
+        - $ref: '#/components/parameters/token'
+        - name: enable_validation
+          in: query
+          schema:
+            type: boolean
+            default: false
+          required: false
+      requestBody:
+        $ref: "#/components/requestBodies/Boc"
+      responses:
+        '200':
+          description: emulated message
+          headers:
+            Allowed-By-Battery:
+              required: true
+              schema:
+                type: boolean
+                example: "true"
+            Supported-By-Battery:
+              required: true
+              schema:
+                type: boolean
+                example: "true"
+            Reject-Reason:
+              schema:
+                type: string
+                example: "message is too large"
+            X-Battery-Protocol-Name:
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /message:
+    post:
+      description: Send message to blockchain
+      operationId: sendMessage
+      parameters:
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/Boc"
+      responses:
+        '200':
+          description: "success"
+          headers:
+            X-Battery-Protocol-Name:
+              schema:
+                type: string
+        'default':
+          $ref: '#/components/responses/Error'
+  /v0/tron/config:
+    get:
+      operationId: getTronConfig
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - safety_margin_percent
+                properties:
+                  safety_margin_percent:
+                    type: string
+                    example: "1.5"
+        'default':
+          $ref: '#/components/responses/Error'
+  /v0/tron/estimate:
+    get:
+      description: Estimate cost of sending a tx in Tron network
+      operationId: tronEstimate
+      parameters:
+        - name: energy
+          in: query
+          required: false
+          schema:
+            type: integer
+            maximum: 1000000
+            minimum: 0
+        - name: bandwidth
+          in: query
+          required: false
+          schema:
+            type: integer
+            maximum: 2000
+            minimum: 0
+        - name: wallet
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EstimatedTronTx'
+        'default':
+          $ref: '#/components/responses/Error'
+  /v0/tron/send:
+    post:
+      description: send TRON tx
+      operationId: tronSend
+      parameters:
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/TronTx"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SentTronTx'
+        'default':
+          $ref: '#/components/responses/Error'
+  /v0/tron/transactions:
+    get:
+      operationId: getTronTransactions
+      parameters:
+        - $ref: '#/components/parameters/token'
+        - $ref: '#/components/parameters/limitQuery'
+        - $ref: '#/components/parameters/maxTimestamp'
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TronTransactionsList'
+        'default':
+          $ref: '#/components/responses/Error'
+  /v0/tron/itrx-io-callback:
+    post:
+      description: receive callback from itrx.io
+      operationId: itrxIoCallback
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              additionalProperties: true
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchase-battery/android:
+    post:
+      description: verify an in-app purchase
+      operationId: androidBatteryPurchase
+      parameters:
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/AndroidBatteryPurchase"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AndroidBatteryPurchaseStatus'
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchase-battery/ios/app-store-notification:
+    post:
+      operationId: appStoreNotification
+      requestBody:
+        $ref: "#/components/requestBodies/appStoreNotification"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/appStoreResponse'
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchase-battery/ios:
+    post:
+      description: verify an in-app purchase
+      operationId: iosBatteryPurchase
+      parameters:
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/iOSBatteryPurchase"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/iOSBatteryPurchaseStatus'
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchase-battery/promo-code:
+    post:
+      description: charge battery with promo code
+      operationId: promoCodeBatteryPurchase
+      parameters:
+        - $ref: '#/components/parameters/i18n'
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/promoCodeBatteryPurchase"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/promoCodeBatteryPurchaseStatus'
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchase-battery/verify-purchase-promo:
+    get:
+      operationId: verifyPurchasePromo
+      parameters:
+        - name: promo
+          in: query
+          schema:
+            type: string
+            maxLength: 100
+      responses:
+        '200':
+          description: "all good"
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - bonus_charges
+                properties:
+                  bonus_charges:
+                    type: string
+                    example: "10.250"
+        'default':
+          $ref: '#/components/responses/Error'
+  /recharge-methods:
+    get:
+      description: This method returns on-chain recharge methods.
+      operationId: getRechargeMethods
+      parameters:
+        - name: include_recharge_only
+          in: query
+          schema:
+            type: boolean
+            default: true
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RechargeMethods'
+        'default':
+          $ref: '#/components/responses/Error'
+  /request-refund:
+    post:
+      operationId: requestRefund
+      parameters:
+        - $ref: '#/components/parameters/token'
+      requestBody:
+        $ref: "#/components/requestBodies/requestRefund"
+      responses:
+        '200':
+          description: success
+        'default':
+          $ref: '#/components/responses/Error'
+  /purchases:
+    get:
+      description: This method returns a list of purchases made by a specific user.
+      operationId: getPurchases
+      parameters:
+        - $ref: '#/components/parameters/token'
+        - $ref: '#/components/parameters/limitQuery'
+        - $ref: '#/components/parameters/offsetQuery'
+        - name: include_gifts_on_the_way
+          in: query
+          schema:
+            type: boolean
+            default: false
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Purchases'
+        'default':
+          $ref: '#/components/responses/Error'
+  /transactions:
+    get:
+      description: This method returns a list of transactions made by a specific user.
+      operationId: getTransactions
+      parameters:
+        - $ref: '#/components/parameters/token'
+        - $ref: '#/components/parameters/limitQuery'
+        - $ref: '#/components/parameters/offsetQuery'
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Transactions'
+        'default':
+          $ref: '#/components/responses/Error'
+  /gasless/estimate-cost/{jetton_master}:
+    post:
+      operationId: estimateGaslessCost
+      parameters:
+        - $ref: '#/components/parameters/jettonMasterParameter'
+        - $ref: '#/components/parameters/optionalToken'
+        - name: wallet_address
+          in: query
+          schema:
+            type: string
+          required: false
+        - name: wallet_public_key
+          in: query
+          schema:
+            type: string
+          required: false
+        - name: enable_validation
+          in: query
+          schema:
+            type: boolean
+            default: false
+          required: false
+      requestBody:
+        $ref: "#/components/requestBodies/gaslessEstimateCost"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/GaslessEstimation'
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/promo-campaign:
+    post:
+      operationId: createPromoCampaign
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - participants
+                - name
+              properties:
+                name:
+                  type: string
+                participants:
+                  type: array
+                  items:
+                    type: object
+                    required:
+                      - address
+                      - amount
+                    properties:
+                      address:
+                        type: string
+                      amount:
+                        type: string
+                        description: amount in TON
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - participants
+                properties:
+                  participants:
+                    type: array
+                    items:
+                      type: object
+                      required:
+                        - address
+                      properties:
+                        address:
+                          type: string
+                        balance_increased:
+                          type: string
+                        error:
+                          type: string
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/apply-promo:
+    post:
+      operationId: applyPromo
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - promo_code
+                - public_key
+              properties:
+                public_key:
+                  type: string
+                promo_code:
+                  type: string
+                  example: "1234567890"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/promoCodeBatteryPurchaseStatus'
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/create-custom-refund:
+    post:
+      operationId: createCustomRefund
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+      requestBody:
+        $ref: "#/components/requestBodies/customRefund"
+      responses:
+        '200':
+          description: "all good"
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/users/{user_id}/reset-balance:
+    post:
+      operationId: resetUserBalance
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+        - name: user_id
+          in: path
+          schema:
+            type: integer
+            format: int64
+          required: true
+      requestBody:
+        $ref: "#/components/requestBodies/resetUserBalance"
+      responses:
+        '200':
+          description: "all good"
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/purchases/{purchase_id}/extend-refund-period:
+    post:
+      operationId: extendRefundPeriod
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+        - name: purchase_id
+          in: path
+          schema:
+            type: integer
+            format: int64
+          required: true
+      responses:
+        '200':
+          description: "all good"
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /restricted/users/{user_id}/increase-balance:
+    post:
+      operationId: increaseUserBalance
+      parameters:
+        - $ref: '#/components/parameters/adminToken'
+        - name: user_id
+          in: path
+          schema:
+            type: integer
+            format: int64
+          required: true
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - amount
+              properties:
+                amount:
+                  type: string
+                  description: amount in TON to increase balance by
+                reason:
+                  type: string
+                  description: reason for balance increase
+      responses:
+        '200':
+          description: "all good"
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /jetton-metadata/{name}.json:
+    get:
+      operationId: getJettonMetadata
+      tags:
+        - Emulation
+      parameters:
+        - name: name
+          in: path
+          schema:
+            type: string
+          required: true
+      responses:
+        '200':
+          description: ""
+          content:
+            application/json:
+              schema:
+                additionalProperties: true
+                example: { }
+        'default':
+          $ref: '#/components/responses/Error'
+  /enterprise/wallets/{wallet_id}/config:
+    get:
+      operationId: enterpriseGetWalletConfig
+      parameters:
+        - $ref: '#/components/parameters/enterpriseAccessToken'
+        - name: wallet_id
+          in: path
+          schema:
+            type: string
+          required: true
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EnterpriseWalletConfig'
+        'default':
+          $ref: '#/components/responses/Error'
+  /enterprise/wallets/{wallet_id}/estimate:
+    post:
+      operationId: enterpriseEstimate
+      parameters:
+        - $ref: '#/components/parameters/enterpriseAccessToken'
+        - $ref: '#/components/parameters/i18n'
+        - name: wallet_id
+          in: path
+          schema:
+            type: string
+          required: true
+        - name: emulate
+          in: query
+          schema:
+            type: boolean
+            default: false
+      requestBody:
+        $ref: "#/components/requestBodies/EnterpriseSendingBoc"
+      responses:
+        '200':
+          description: TBD
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - estimated_upfront_payment
+                properties:
+                  estimated_upfront_payment:
+                    type: string
+                  emulation:
+                    type: string
+                    description: base64 encoded emulation results. The exact type can be taken from /v2/wallet/emulate (TONAPI).
+        'default':
+          $ref: '#/components/responses/Error'
+  /enterprise/wallets/{wallet_id}/send:
+    post:
+      operationId: enterpriseSend
+      parameters:
+        - $ref: '#/components/parameters/enterpriseAccessToken'
+        - name: wallet_id
+          in: path
+          schema:
+            type: string
+          required: true
+      requestBody:
+        $ref: "#/components/requestBodies/EnterpriseSendingBoc"
+      responses:
+        '200':
+          description: "success"
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - msg_id
+                properties:
+                  msg_id:
+                    type: string
+        'default':
+          $ref: '#/components/responses/Error'
+  /enterprise/messages/{msg_id}:
+    get:
+      operationId: enterpriseGetMessage
+      parameters:
+        - $ref: '#/components/parameters/enterpriseAccessToken'
+        - name: msg_id
+          in: path
+          schema:
+            type: string
+          required: true
+      responses:
+        '200':
+          description: "success"
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - status
+                properties:
+                  payment_tx_hash:
+                    type: string
+                  committed_tx_hash:
+                    type: string
+                  status:
+                    type: string
+                    enum:
+                      - pending
+                      - completed
+                      - failed
+                  final_cost:
+                    type: string
+                  failed_reason:
+                    type: string
+        'default':
+          $ref: '#/components/responses/Error'
+  /enterprise/status:
+    get:
+      operationId: enterpriseGetStatus
+      parameters:
+        - $ref: '#/components/parameters/enterpriseAccessToken'
+      responses:
+        '200':
+          description: "success"
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - balance
+                  - wallet
+                properties:
+                  balance:
+                    type: string
+                  wallet:
+                    type: string
+        'default':
+          $ref: '#/components/responses/Error'
+components:
+  parameters:
+    enterpriseAccessToken:
+      in: header
+      name: X-Enterprise-Auth
+      schema:
+        type: string
+        example: NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2ODQ3...
+      required: true
+    token:
+      in: header
+      name: X-TonConnect-Auth
+      schema:
+        type: string
+        example: NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2ODQ3...
+      required: true
+    optionalToken:
+      in: header
+      name: X-TonConnect-Auth
+      schema:
+        type: string
+        example: NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2ODQ3...
+      required: false
+    adminToken:
+      in: query
+      name: token
+      schema:
+        type: string
+      required: true
+    jettonMasterParameter:
+      in: path
+      name: jetton_master
+      required: true
+      schema:
+        type: string
+    purchaseId:
+      in: query
+      name: id
+      required: true
+      schema:
+        type: integer
+    limitQuery:
+      in: query
+      name: limit
+      required: false
+      schema:
+        type: integer
+        default: 1000
+        maximum: 1000
+    offsetQuery:
+      in: query
+      name: offset
+      required: false
+      schema:
+        type: integer
+        default: 0
+    maxTimestamp:
+      in: query
+      name: max_timestamp
+      required: false
+      schema:
+        type: integer
+        format: int64
+    i18n:
+      in: header
+      name: Accept-Language
+      required: false
+      schema:
+        type: string
+        example: "ru-RU,ru;q=0.5"
+        default: "en"
+    balanceUnits:
+      in: query
+      name: units
+      schema:
+        type: string
+        default: "usd"
+        enum:
+          - usd
+          - ton
+    region:
+      in: query
+      name: region
+      required: false
+      schema:
+        type: string
+        description: "User's region for analytics purposes"
+  requestBodies:
+    TonConnectProof:
+      description: "Data that is expected from TON Connect"
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - address
+              - proof
+            properties:
+              address:
+                type: string
+                example: "0:97146a46acc2654y27947f14c4a4b14273e954f78bc017790b41208b0043200b"
+              proof:
+                type: object
+                required:
+                  - timestamp
+                  - domain
+                  - signature
+                  - payload
+                properties:
+                  timestamp:
+                    type: integer
+                    format: int64
+                    example: "1678275313"
+                  domain:
+                    type: object
+                    required:
+                      - value
+                    properties:
+                      length_bytes:
+                        type: integer
+                        format: int32
+                      value:
+                        type: string
+                  signature:
+                    type: string
+                  payload:
+                    type: string
+                    example: "84jHVNLQmZsAAAAAZB0Zryi2wqVJI-KaKNXOvCijEi46YyYzkaSHyJrMPBMOkVZa"
+                  state_init:
+                    type: string
+    EnterpriseSendingBoc:
+      description: bag-of-cells serialized to base64
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - boc
+              - wallet_public_key
+            properties:
+              boc:
+                type: string
+                example: te6ccgECBQEAARUAAkWIAWTtae+KgtbrX26Bep8JSq8lFLfGOoyGR/xwdjfvpvEaHg
+              wallet_public_key:
+                type: string
+
+    TronTx:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - wallet
+            properties:
+              tx:
+                type: string
+              energy:
+                type: integer
+              bandwidth:
+                type: integer
+              wallet:
+                type: string
+              instant_fee_tx:
+                type: string
+                description: "base64 encoded payment transaction in the TON network"
+    Boc:
+      description: bag-of-cells serialized to base64
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - boc
+            properties:
+              boc:
+                type: string
+                example: te6ccgECBQEAARUAAkWIAWTtae+KgtbrX26Bep8JSq8lFLfGOoyGR/xwdjfvpvEaHg
+
+    AndroidBatteryPurchase:
+      description: In-App purchase
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - purchases
+            properties:
+              purchases:
+                type: array
+                items:
+                  type: object
+                  required:
+                    - token
+                    - product_id
+                  properties:
+                    token:
+                      type: string
+                      example: 0:2cf3b5b8c891e517c9addbda1c0386a09ccacbb0e3faf630b51cfc8152325acb
+                    product_id:
+                      type: string
+                      example: 0:2cf3b5b8c891e517c9addbda1c0386a09ccacbb0e3faf630b51cfc8152325acb
+                    promo:
+                      type: string
+                      example: "HAMSTER"
+
+    appStoreNotification:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - signedPayload
+            properties:
+              signedPayload:
+                type: string
+    iOSBatteryPurchase:
+      description: In-App purchase
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - transactions
+            properties:
+              transactions:
+                type: array
+                items:
+                  type: object
+                  required:
+                    - id
+                  properties:
+                    id:
+                      type: string
+                    promo:
+                      type: string
+                      example: "HAMSTER"
+    gaslessEstimateCost:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - payload
+            properties:
+              battery:
+                type: boolean
+                default: true
+              payload:
+                type: string
+
+    resetUserBalance:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - reason
+            properties:
+              reason:
+                type: string
+    customRefund:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - amount
+              - currency
+              - comment
+              - reason
+              - destination
+            properties:
+              relayer_event_id:
+                type: integer
+              amount:
+                type: string
+                example: "10.250"
+              currency:
+                type: string
+              comment:
+                type: string
+              reason:
+                type: string
+              destination:
+                type: string
+
+    requestRefund:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              user_purchase_id:
+                type: integer
+                deprecated: true
+                example: 43
+              purchase_id:
+                type: integer
+                example: 43
+    promoCodeBatteryPurchase:
+      description: charge battery with promo code
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - promo_code
+            properties:
+              promo_code:
+                type: string
+                example: "1234567890"
+  schemas:
+    Error:
+      type: object
+      required:
+        - error
+      properties:
+        error:
+          type: string
+          example: error description
+    Status:
+      type: object
+      required:
+        - pending_transactions
+      properties:
+        pending_transactions:
+          type: array
+          items:
+            type: object
+            required:
+              - id
+            properties:
+              id:
+                type: string
+    EnterpriseWalletConfig:
+      type: object
+      required:
+        - excess_account
+      properties:
+        excess_account:
+          type: string
+          description: when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service.
+          example: 0:da6b1b6663a0e4d18cc8574ccd9db5296e367dd9324706f3bbd9eb1cd2caf0bf
+
+    RelayerSendingEstimation:
+      type: object
+      required:
+        - commission
+      properties:
+        commission:
+          type: string
+    Config:
+      type: object
+      required:
+        - excess_account
+        - fund_receiver
+        - message_ttl
+        - charge_cost
+        - gas_proxy
+        - mean_prices
+      properties:
+        charge_cost:
+          description: "cost of 1 charge in TON"
+          type: string
+          example: "0.0026"
+        fund_receiver:
+          type: string
+          description: "with zero balance it is possible to transfer some jettons (stablecoins, jusdt, etc) to this address to refill the balance. Such transfers would be paid by Battery Service."
+          example: 0:07331e629e39d006d86a8cc7659c10a97c671f7535dc8b7f251a1a944dda348e
+        excess_account:
+          type: string
+          description: when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service.
+          example: 0:da6b1b6663a0e4d18cc8574ccd9db5296e367dd9324706f3bbd9eb1cd2caf0bf
+        message_ttl:
+          type: integer
+          description: "ttl for message in seconds"
+          example: 300
+        gas_proxy:
+          type: array
+          items:
+            type: object
+            required:
+              - address
+            properties:
+              address:
+                type: string
+        mean_prices:
+          type: object
+          required:
+            - battery_mean_price_swap
+            - battery_mean_price_jetton
+            - battery_mean_price_nft
+          properties:
+            battery_mean_price_swap:
+              type: integer
+            battery_mean_price_jetton:
+              type: integer
+            battery_mean_price_nft:
+              type: integer
+            battery_mean_price_tron_usdt:
+              type: integer
+    GaslessEstimation:
+      type: object
+      required:
+        - commission
+      properties:
+        commission:
+          type: string
+    PromoUsed:
+      type: object
+      required:
+        - promo_used
+        - bonus_charges
+      properties:
+        promo_used:
+          type: boolean
+        bonus_charges:
+          type: string
+          example: "10.250"
+    BatteryCharged:
+      type: object
+      required:
+        - battery_charged
+      properties:
+        battery_charged:
+          type: boolean
+    Balance:
+      type: object
+      required:
+        - balance
+        - units
+        - reserved
+      properties:
+        balance:
+          type: string
+          example: "10.250"
+        reserved:
+          type: string
+          example: "0.3"
+          description: "reserved amount in units (TON/USD)"
+        units:
+          type: string
+          example: "usd"
+          enum:
+            - usd
+            - ton
+    RechargeMethods:
+      type: object
+      required:
+        - methods
+      properties:
+        methods:
+          type: array
+          items:
+            type: object
+            required:
+              - type
+              - symbol
+              - decimals
+              - rate
+              - support_gasless
+              - support_recharge
+            properties:
+              image:
+                type: string
+                example: "https://example.com/image.png"
+              jetton_master:
+                type: string
+              min_bootstrap_value:
+                type: string
+                example: "10.0"
+              type:
+                type: string
+                enum:
+                  - jetton
+                  - ton
+              rate:
+                type: string
+                example: "10.250"
+              symbol:
+                type: string
+                example: "usdt"
+              decimals:
+                type: integer
+                example: 6
+              support_gasless:
+                type: boolean
+                example: true
+              support_recharge:
+                type: boolean
+                example: true
+    Purchases:
+      type: object
+      required:
+        - purchases
+        - total_purchases
+      properties:
+        total_purchases:
+          type: integer
+          example: 1
+        purchases:
+          type: array
+          items:
+            type: object
+            required:
+              - user_purchase_id
+              - purchase_id
+              - type
+              - charges
+              - datetime
+            properties:
+              promo:
+                type: string
+              for_account_id:
+                type: string
+              user_purchase_id:
+                type: integer
+                deprecated: true
+                example: 2
+              purchase_id:
+                type: integer
+                example: 2
+              type:
+                type: string
+                example: "android"
+                enum:
+                  - android
+                  - ios
+                  - promo-code
+                  - crypto
+                  - gift
+                  - on-the-way-gift
+              amount:
+                description: "Amount describes the amount paid by the user for this purchase when we know it. For crypto purchases it is always set."
+                type: string
+                example: "10.250"
+              charges:
+                type: integer
+                example: 1200
+              currency:
+                description: "Currency is set when we know it. For crypto purchases it is always set."
+                type: string
+                example: "USDT"
+              datetime:
+                type: string
+                example: "2006-01-02T15:04:05Z07:00"
+              refund_information:
+                type: object
+                required:
+                  - pending_refund
+                  - fully_refunded
+                  - partially_refunded
+                properties:
+                  fully_refunded:
+                    type: boolean
+                  partially_refunded:
+                    type: boolean
+                  pending_refund:
+                    type: boolean
+                  refunded:
+                    type: object
+                    required:
+                      - amount
+                      - charges
+                    properties:
+                      amount:
+                        type: string
+                        example: "10.250"
+                      charges:
+                        type: integer
+                        example: 1200
+                  refundable:
+                    type: object
+                    required:
+                      - amount
+                      - charges
+                    properties:
+                      amount:
+                        type: string
+                        example: "10.250"
+                      charges:
+                        type: integer
+                        example: 1200
+    EstimatedTronTx:
+      type: object
+      required:
+        - energy_charges
+        - bandwidth_charges
+        - activation_charges
+        - total_charges
+        - instant_fee
+      properties:
+        energy_charges:
+          type: integer
+        bandwidth_charges:
+          type: integer
+        activation_charges:
+          type: integer
+        total_charges:
+          type: integer
+        instant_fee:
+          type: object
+          required:
+            - fee_address
+            - accepted_assets
+          properties:
+            fee_address:
+              type: string
+            accepted_assets:
+              type: array
+              items:
+                type: object
+                required:
+                  - type
+                  - amount_nano
+                  - name
+                  - decimals
+                properties:
+                  type:
+                    type: string
+                    enum:
+                      - jetton
+                      - ton
+                  name:
+                    type: string
+                  jetton_master_id:
+                    type: string
+                  amount_nano:
+                    type: string
+                    example: "10.250"
+                  decimals:
+                    type: integer
+    SentTronTx:
+      type: object
+      required:
+        - status
+      properties:
+        status:
+          type: string
+    TronTransactionsList:
+      type: object
+      required:
+        - transactions
+      properties:
+        transactions:
+          type: array
+          items:
+            type: object
+            required:
+              - txid
+              - timestamp
+              - from_account
+              - to_account
+              - amount
+              - is_pending
+              - is_failed
+              - battery_charges
+            properties:
+              txid:
+                type: string
+              from_account:
+                type: string
+              to_account:
+                type: string
+              amount:
+                type: string
+              is_pending:
+                type: boolean
+              is_failed:
+                type: boolean
+              battery_charges:
+                type: integer
+              timestamp:
+                type: integer
+                format: int64
+              trongrid_result:
+                type: integer
+    AndroidBatteryPurchaseStatus:
+      type: object
+      required:
+        - purchases
+      properties:
+        purchases:
+          type: array
+          items:
+            type: object
+            required:
+              - product_id
+              - token
+              - success
+            properties:
+              product_id:
+                type: string
+                example: "1000000790000000"
+              token:
+                type: string
+                example: "1000000790000000"
+              success:
+                type: boolean
+                example: true
+              error:
+                type: object
+                required:
+                  - msg
+                  - code
+                properties:
+                  msg:
+                    type: string
+                    example: "Temporary error. Try again later."
+                  code:
+                    type: string
+                    example: "invalid-product-id"
+                    enum:
+                      - invalid-product-id
+                      - user-not-found
+                      - purchase-is-already-used
+                      - temporary-error
+                      - unknown
+
+    appStoreResponse:
+      type: object
+    iOSBatteryPurchaseStatus:
+      type: object
+      required:
+        - transactions
+      properties:
+        transactions:
+          type: array
+          items:
+            type: object
+            required:
+              - transaction_id
+              - success
+            properties:
+              transaction_id:
+                type: string
+                example: "1000000790000000"
+              success:
+                type: boolean
+                example: true
+              error:
+                type: object
+                required:
+                  - msg
+                  - code
+                properties:
+                  msg:
+                    type: string
+                    example: "Temporary error. Try again later."
+                  code:
+                    type: string
+                    example: "invalid-bundle-id"
+                    enum:
+                      - invalid-bundle-id
+                      - invalid-product-id
+                      - user-not-found
+                      - purchase-is-already-used
+                      - temporary-error
+                      - unknown
+    promoCodeBatteryPurchaseStatus:
+      type: object
+      required:
+        - success
+        - balance_change
+      properties:
+        balance_change:
+          type: string
+          example: "10.250"
+        success:
+          type: boolean
+          example: true
+        error:
+          type: object
+          required:
+            - msg
+            - code
+          properties:
+            msg:
+              type: string
+              example: "Temporary error. Try again later."
+            code:
+              type: string
+              example: "promo-code-not-found"
+              enum:
+                - promo-code-not-found
+                - promo-exceeded-attempts
+                - temporary-error
+    Transactions:
+      type: object
+      required:
+        - transactions
+        - total_transactions
+      properties:
+        total_transactions:
+          type: integer
+          example: 1
+        next_offset:
+          type: integer
+          description: if set, then there are more transactions to be loaded. Use this value as offset parameter in the next request.
+          example: 10
+        transactions:
+          type: array
+          items:
+            type: object
+            required:
+              - id
+              - paid_amount
+              - status
+              - created_at
+            properties:
+              id:
+                type: string
+              paid_amount:
+                type: string
+                description: represents the amount of money paid by the user for this transaction.
+                example: "10.250"
+              status:
+                type: string
+                example: "10.250"
+                enum:
+                  - pending
+                  - completed
+                  - failed
+              created_at:
+                type: string
+                example: "2006-01-02T15:04:05Z07:00"
+  responses:
+    Error:
+      description: Some error during request processing
+      content:
+        application/json:
+          schema:
+            type: object
+            required:
+              - error
+            properties:
+              error:
+                type: string
+              error-key:
+                type: string
+              error-details:
+                type: string
\ No newline at end of file
diff --git a/tonapi/battery.sh b/tonapi/battery.sh
new file mode 100644
index 000000000..1de8bc9b3
--- /dev/null
+++ b/tonapi/battery.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bash generate.sh "battery-api.yml" "batteryapi"
\ No newline at end of file
diff --git a/tonapi/build.gradle.kts b/tonapi/build.gradle.kts
index 7254c1b9b..e5b24c793 100644
--- a/tonapi/build.gradle.kts
+++ b/tonapi/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
+    kotlin("plugin.serialization")
 }
 
 android {
@@ -21,7 +22,7 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.Squareup.moshi)
-    implementation(Dependence.Squareup.moshiAdapters)
-    implementation(Dependence.Squareup.okhttp)
+    implementation(libs.okhttp)
+    implementation(libs.kotlinX.serialization.core)
+    implementation(libs.kotlinX.serialization.json)
 }
\ No newline at end of file
diff --git a/tonapi/generate.sh b/tonapi/generate.sh
new file mode 100644
index 000000000..a0c59955c
--- /dev/null
+++ b/tonapi/generate.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+OPENAPI_URL="$1"
+PACKAGE_NAME="io.$2"
+TARGET_SRC_DIR='src/main/kotlin'
+TEMP_DIR='temp_api_gen'
+TEMPLATE_DIR='./templates'
+
+rm -rf "$TEMP_DIR"
+mkdir -p "$TEMP_DIR"
+
+openapi-generator generate \
+  -i "$OPENAPI_URL" \
+  -g kotlin \
+  -o "$TEMP_DIR" \
+  -t "$TEMPLATE_DIR" \
+  --library jvm-okhttp4 \
+  --global-property apiTests=false,modelTests=false \
+  --type-mappings "number=kotlin.String" \
+  --additional-properties "serializationLibrary=kotlinx_serialization,packageName=$PACKAGE_NAME,platform=android,hideGenerationTimestamp=true,enumUnknownDefaultCase=true,enumUnknownDefaultCaseName=UNKNOWN"
+
+if [ $? -ne 0 ]; then
+    echo "Failed to generate API client."
+    rm -rf "$TEMP_DIR"
+    exit 1
+fi
+
+find "$TEMP_DIR" -type f -name "*.kt" -print0 | xargs -0 sed -i '' 's/kotlin.collections.Map<kotlin.String, kotlin.Any>/kotlin.collections.Map<kotlin.String, io.JsonAny>/g'
+find "$TEMP_DIR" -type f -name "*.kt" -print0 | xargs -0 sed -i '' 's/@SerialName(value = "unknown_default_open_api")/@SerialName(value = "unknown")/g'
+find "$TEMP_DIR" -type f -name "*.kt" -print0 | xargs -0 sed -i '' 's/unknown_default_open_api("unknown_default_open_api")/unknown("unknown")/g'
+find "$TEMP_DIR" -type f -name "*.kt" -print0 | xargs -0 sed -i '' 's/.unknown_default_open_api/.unknown/g'
+find "$TEMP_DIR" -type f -name "*.kt" -print0 | xargs -0 sed -i '' 's/values()/entries/g'
+
+GENERATED_SRC_PATH="$TEMP_DIR/src/main/kotlin/"
+if [ ! -d "$GENERATED_SRC_PATH" ]; then
+    echo "Failed to find generated source directory: $GENERATED_SRC_PATH"
+    rm -rf "$TEMP_DIR"
+    exit 1
+fi
+mkdir -p "$TARGET_SRC_DIR"
+cp -r "$GENERATED_SRC_PATH"* "$TARGET_SRC_DIR/"
+if [ $? -ne 0 ]; then
+    echo "Failed to copy generated sources to target directory: $TARGET_SRC_DIR"
+    rm -rf "$TEMP_DIR"
+    exit 1
+fi
+
+INFRA_DIR="$TARGET_SRC_DIR/io/$2/infrastructure"
+if [ -d "$INFRA_DIR" ]; then
+    rm -rf "$INFRA_DIR"
+else
+    echo "Failed to find infrastructure directory: $INFRA_DIR"
+fi
+
+rm -rf "$TEMP_DIR"
+
+echo "Done"
+
diff --git a/tonapi/proguard-rules.pro b/tonapi/proguard-rules.pro
new file mode 100644
index 000000000..7d677c8e1
--- /dev/null
+++ b/tonapi/proguard-rules.pro
@@ -0,0 +1,11 @@
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations
+
+# kotlinx-serialization-json specific. Add this if you have java.lang.NoClassDefFoundError kotlinx.serialization.json.JsonObjectSerializer
+-keepclassmembers class kotlinx.serialization.json.** { *** Companion; }
+-keepclasseswithmembers class kotlinx.serialization.json.** { kotlinx.serialization.KSerializer serializer(...); }
+
+# project specific.
+-keep,includedescriptorclasses class io.tonapi.models.**$$serializer { *; }
+-keepclassmembers class io.tonapi.models.** { *** Companion; }
+-keepclasseswithmembers class io.tonapi.models.** { kotlinx.serialization.KSerializer serializer(...); }
diff --git a/tonapi/src/main/kotlin/io/JsonAny.kt b/tonapi/src/main/kotlin/io/JsonAny.kt
new file mode 100644
index 000000000..f0570d8b7
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/JsonAny.kt
@@ -0,0 +1,73 @@
+package io
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonEncoder
+import kotlinx.serialization.json.JsonNull
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.longOrNull
+
+@Serializable(with = JsonAnySerializer::class)
+sealed class JsonAny {
+    data class Object(val value: Map<String, JsonAny>) : JsonAny()
+    data class Array(val value: List<JsonAny>) : JsonAny()
+    data class Primitive(val value: Any?) : JsonAny()
+
+    fun asObject(): Map<String, JsonAny>? = (this as? Object)?.value
+    fun asArray(): List<JsonAny>? = (this as? Array)?.value
+    fun asPrimitive(): Any? = (this as? Primitive)?.value
+
+    fun asString(): String? = asPrimitive()?.toString()
+    fun asLong(): Long? = (asPrimitive() as? Number)?.toLong()
+    fun asDouble(): Double? = (asPrimitive() as? Number)?.toDouble()
+    fun asBoolean(): Boolean? = asPrimitive() as? Boolean
+}
+
+object JsonAnySerializer : KSerializer<JsonAny> {
+    override val descriptor: SerialDescriptor = JsonElement.serializer().descriptor
+
+    override fun serialize(encoder: Encoder, value: JsonAny) {
+        val jsonEncoder = encoder as? JsonEncoder ?: return
+        val jsonElement = serializeJsonAny(value)
+        jsonEncoder.encodeJsonElement(jsonElement)
+    }
+
+    private fun serializeJsonAny(value: JsonAny): JsonElement = when (value) {
+        is JsonAny.Object -> JsonObject(value.value.mapValues { serializeJsonAny(it.value) })
+        is JsonAny.Array -> JsonArray(value.value.map { serializeJsonAny(it) })
+        is JsonAny.Primitive -> when (val primitive = value.value) {
+            is String -> JsonPrimitive(primitive)
+            is Number -> JsonPrimitive(primitive)
+            is Boolean -> JsonPrimitive(primitive)
+            else -> JsonNull
+        }
+    }
+
+    override fun deserialize(decoder: Decoder): JsonAny {
+        val jsonDecoder = decoder as? JsonDecoder ?: return JsonAny.Primitive(null)
+        val jsonElement = jsonDecoder.decodeJsonElement()
+        return deserializeJsonElement(jsonElement)
+    }
+
+    private fun deserializeJsonElement(element: JsonElement): JsonAny = when (element) {
+        is JsonObject -> JsonAny.Object(element.mapValues { deserializeJsonElement(it.value) })
+        is JsonArray -> JsonAny.Array(element.map { deserializeJsonElement(it) })
+        is JsonPrimitive -> {
+            val value = if (element.isString) {
+                element.content
+            } else {
+                element.booleanOrNull ?: element.longOrNull ?: element.doubleOrNull ?: element.content
+            }
+            JsonAny.Primitive(value)
+        }
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/Serializer.kt b/tonapi/src/main/kotlin/io/Serializer.kt
new file mode 100644
index 000000000..391b1fb8d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/Serializer.kt
@@ -0,0 +1,32 @@
+package io
+
+import io.serializers.AnySerializer
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.contextual
+
+object Serializer {
+
+    private val contextualModule = SerializersModule {
+        contextual(AnySerializer)
+    }
+
+    @JvmStatic
+    val JSON: Json by lazy {
+        Json {
+            encodeDefaults = false
+            ignoreUnknownKeys = true
+            isLenient = true
+            coerceInputValues = true
+            serializersModule = contextualModule
+        }
+    }
+
+    inline fun <reified T> toJSON(value: T): String {
+        return JSON.encodeToString(value)
+    }
+
+    inline fun <reified T> fromJSON(string: String): T {
+        return JSON.decodeFromString(string)
+    }
+}
\ No newline at end of file
diff --git a/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt
index 8ca1dfc8c..c7f6aec7b 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt
@@ -20,23 +20,24 @@ import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.batteryapi.models.GetTonConnectPayload200Response
-import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
+import io.batteryapi.models.InlineObject
 
-import com.squareup.moshi.Json
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-import io.batteryapi.infrastructure.ApiClient
-import io.batteryapi.infrastructure.ApiResponse
-import io.batteryapi.infrastructure.ClientException
-import io.batteryapi.infrastructure.ClientError
-import io.batteryapi.infrastructure.ServerException
-import io.batteryapi.infrastructure.ServerError
-import io.batteryapi.infrastructure.MultiValueMap
-import io.batteryapi.infrastructure.PartConfig
-import io.batteryapi.infrastructure.RequestConfig
-import io.batteryapi.infrastructure.RequestMethod
-import io.batteryapi.infrastructure.ResponseType
-import io.batteryapi.infrastructure.Success
-import io.batteryapi.infrastructure.toMultiValue
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
 
 class ConnectApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
@@ -46,17 +47,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /tonconnect/payload
-     * 
-     * Get a payload for further token receipt
-     * @return GetTonConnectPayload200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTonConnectPayload() : GetTonConnectPayload200Response {
@@ -77,14 +67,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /tonconnect/payload
-     * 
-     * Get a payload for further token receipt
-     * @return ApiResponse<GetTonConnectPayload200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTonConnectPayloadWithHttpInfo() : ApiResponse<GetTonConnectPayload200Response?> {
@@ -95,11 +77,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTonConnectPayload
-     *
-     * @return RequestConfig
-     */
     fun getTonConnectPayloadRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/DefaultApi.kt
similarity index 69%
rename from tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
rename to tonapi/src/main/kotlin/io/batteryapi/apis/DefaultApi.kt
index 8d310c67e..043d522db 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/DefaultApi.kt
@@ -39,9 +39,10 @@ import io.batteryapi.models.EnterpriseWalletConfig
 import io.batteryapi.models.EstimateGaslessCostRequest
 import io.batteryapi.models.EstimatedTronTx
 import io.batteryapi.models.GaslessEstimation
-import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
 import io.batteryapi.models.GetTronConfig200Response
 import io.batteryapi.models.IOSBatteryPurchaseStatus
+import io.batteryapi.models.IncreaseUserBalanceRequest
+import io.batteryapi.models.InlineObject
 import io.batteryapi.models.IosBatteryPurchaseRequest
 import io.batteryapi.models.PromoCodeBatteryPurchaseRequest
 import io.batteryapi.models.PromoCodeBatteryPurchaseStatus
@@ -55,24 +56,26 @@ import io.batteryapi.models.Status
 import io.batteryapi.models.Transactions
 import io.batteryapi.models.TronSendRequest
 import io.batteryapi.models.TronTransactionsList
-
-import com.squareup.moshi.Json
-
-import io.batteryapi.infrastructure.ApiClient
-import io.batteryapi.infrastructure.ApiResponse
-import io.batteryapi.infrastructure.ClientException
-import io.batteryapi.infrastructure.ClientError
-import io.batteryapi.infrastructure.ServerException
-import io.batteryapi.infrastructure.ServerError
-import io.batteryapi.infrastructure.MultiValueMap
-import io.batteryapi.infrastructure.PartConfig
-import io.batteryapi.infrastructure.RequestConfig
-import io.batteryapi.infrastructure.RequestMethod
-import io.batteryapi.infrastructure.ResponseType
-import io.batteryapi.infrastructure.Success
-import io.batteryapi.infrastructure.toMultiValue
-
-class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.batteryapi.models.VerifyPurchasePromo200Response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class DefaultApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -80,19 +83,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /purchase-battery/android
-     * 
-     * verify an in-app purchase
-     * @param xTonConnectAuth 
-     * @param androidBatteryPurchaseRequest In-App purchase
-     * @return AndroidBatteryPurchaseStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun androidBatteryPurchase(xTonConnectAuth: kotlin.String, androidBatteryPurchaseRequest: AndroidBatteryPurchaseRequest) : AndroidBatteryPurchaseStatus {
@@ -113,16 +103,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /purchase-battery/android
-     * 
-     * verify an in-app purchase
-     * @param xTonConnectAuth 
-     * @param androidBatteryPurchaseRequest In-App purchase
-     * @return ApiResponse<AndroidBatteryPurchaseStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun androidBatteryPurchaseWithHttpInfo(xTonConnectAuth: kotlin.String, androidBatteryPurchaseRequest: AndroidBatteryPurchaseRequest) : ApiResponse<AndroidBatteryPurchaseStatus?> {
@@ -133,13 +113,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation androidBatteryPurchase
-     *
-     * @param xTonConnectAuth 
-     * @param androidBatteryPurchaseRequest In-App purchase
-     * @return RequestConfig
-     */
     fun androidBatteryPurchaseRequestConfig(xTonConnectAuth: kotlin.String, androidBatteryPurchaseRequest: AndroidBatteryPurchaseRequest) : RequestConfig<AndroidBatteryPurchaseRequest> {
         val localVariableBody = androidBatteryPurchaseRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -158,18 +131,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /purchase-battery/ios/app-store-notification
-     * 
-     * 
-     * @param appStoreNotificationRequest 
-     * @return kotlin.Any
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun appStoreNotification(appStoreNotificationRequest: AppStoreNotificationRequest) : kotlin.Any {
@@ -190,15 +151,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /purchase-battery/ios/app-store-notification
-     * 
-     * 
-     * @param appStoreNotificationRequest 
-     * @return ApiResponse<kotlin.Any?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun appStoreNotificationWithHttpInfo(appStoreNotificationRequest: AppStoreNotificationRequest) : ApiResponse<kotlin.Any?> {
@@ -209,12 +161,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation appStoreNotification
-     *
-     * @param appStoreNotificationRequest 
-     * @return RequestConfig
-     */
     fun appStoreNotificationRequestConfig(appStoreNotificationRequest: AppStoreNotificationRequest) : RequestConfig<AppStoreNotificationRequest> {
         val localVariableBody = appStoreNotificationRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -232,19 +178,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /restricted/apply-promo
-     * 
-     * 
-     * @param token 
-     * @param applyPromoRequest 
-     * @return PromoCodeBatteryPurchaseStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun applyPromo(token: kotlin.String, applyPromoRequest: ApplyPromoRequest) : PromoCodeBatteryPurchaseStatus {
@@ -265,16 +198,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /restricted/apply-promo
-     * 
-     * 
-     * @param token 
-     * @param applyPromoRequest 
-     * @return ApiResponse<PromoCodeBatteryPurchaseStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun applyPromoWithHttpInfo(token: kotlin.String, applyPromoRequest: ApplyPromoRequest) : ApiResponse<PromoCodeBatteryPurchaseStatus?> {
@@ -285,13 +208,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation applyPromo
-     *
-     * @param token 
-     * @param applyPromoRequest 
-     * @return RequestConfig
-     */
     fun applyPromoRequestConfig(token: kotlin.String, applyPromoRequest: ApplyPromoRequest) : RequestConfig<ApplyPromoRequest> {
         val localVariableBody = applyPromoRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -312,26 +228,13 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /restricted/create-custom-refund
-     * 
-     * 
-     * @param token 
-     * @param createCustomRefundRequest 
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun createCustomRefund(token: kotlin.String, createCustomRefundRequest: CreateCustomRefundRequest) : kotlin.collections.Map<kotlin.String, kotlin.Any> {
+    fun createCustomRefund(token: kotlin.String, createCustomRefundRequest: CreateCustomRefundRequest) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
         val localVarResponse = createCustomRefundWithHttpInfo(token = token, createCustomRefundRequest = createCustomRefundRequest)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -345,33 +248,16 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /restricted/create-custom-refund
-     * 
-     * 
-     * @param token 
-     * @param createCustomRefundRequest 
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun createCustomRefundWithHttpInfo(token: kotlin.String, createCustomRefundRequest: CreateCustomRefundRequest) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
+    fun createCustomRefundWithHttpInfo(token: kotlin.String, createCustomRefundRequest: CreateCustomRefundRequest) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
         val localVariableConfig = createCustomRefundRequestConfig(token = token, createCustomRefundRequest = createCustomRefundRequest)
 
-        return request<CreateCustomRefundRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<CreateCustomRefundRequest, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation createCustomRefund
-     *
-     * @param token 
-     * @param createCustomRefundRequest 
-     * @return RequestConfig
-     */
     fun createCustomRefundRequestConfig(token: kotlin.String, createCustomRefundRequest: CreateCustomRefundRequest) : RequestConfig<CreateCustomRefundRequest> {
         val localVariableBody = createCustomRefundRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -392,19 +278,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /restricted/promo-campaign
-     * 
-     * 
-     * @param token 
-     * @param createPromoCampaignRequest 
-     * @return CreatePromoCampaign200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun createPromoCampaign(token: kotlin.String, createPromoCampaignRequest: CreatePromoCampaignRequest) : CreatePromoCampaign200Response {
@@ -425,16 +298,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /restricted/promo-campaign
-     * 
-     * 
-     * @param token 
-     * @param createPromoCampaignRequest 
-     * @return ApiResponse<CreatePromoCampaign200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun createPromoCampaignWithHttpInfo(token: kotlin.String, createPromoCampaignRequest: CreatePromoCampaignRequest) : ApiResponse<CreatePromoCampaign200Response?> {
@@ -445,13 +308,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation createPromoCampaign
-     *
-     * @param token 
-     * @param createPromoCampaignRequest 
-     * @return RequestConfig
-     */
     fun createPromoCampaignRequestConfig(token: kotlin.String, createPromoCampaignRequest: CreatePromoCampaignRequest) : RequestConfig<CreatePromoCampaignRequest> {
         val localVariableBody = createPromoCampaignRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -472,22 +328,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /enterprise/wallets/{wallet_id}/estimate
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @param emulate  (optional, default to false)
-     * @return EnterpriseEstimate200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun enterpriseEstimate(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest, acceptLanguage: kotlin.String? = "en", emulate: kotlin.Boolean? = false) : EnterpriseEstimate200Response {
@@ -508,19 +348,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /enterprise/wallets/{wallet_id}/estimate
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @param emulate  (optional, default to false)
-     * @return ApiResponse<EnterpriseEstimate200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun enterpriseEstimateWithHttpInfo(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest, acceptLanguage: kotlin.String?, emulate: kotlin.Boolean?) : ApiResponse<EnterpriseEstimate200Response?> {
@@ -531,16 +358,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation enterpriseEstimate
-     *
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @param emulate  (optional, default to false)
-     * @return RequestConfig
-     */
     fun enterpriseEstimateRequestConfig(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest, acceptLanguage: kotlin.String?, emulate: kotlin.Boolean?) : RequestConfig<EnterpriseEstimateRequest> {
         val localVariableBody = enterpriseEstimateRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -565,19 +382,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /enterprise/messages/{msg_id}
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param msgId 
-     * @return EnterpriseGetMessage200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun enterpriseGetMessage(xEnterpriseAuth: kotlin.String, msgId: kotlin.String) : EnterpriseGetMessage200Response {
@@ -598,16 +402,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /enterprise/messages/{msg_id}
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param msgId 
-     * @return ApiResponse<EnterpriseGetMessage200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun enterpriseGetMessageWithHttpInfo(xEnterpriseAuth: kotlin.String, msgId: kotlin.String) : ApiResponse<EnterpriseGetMessage200Response?> {
@@ -618,13 +412,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation enterpriseGetMessage
-     *
-     * @param xEnterpriseAuth 
-     * @param msgId 
-     * @return RequestConfig
-     */
     fun enterpriseGetMessageRequestConfig(xEnterpriseAuth: kotlin.String, msgId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -642,18 +429,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /enterprise/status
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @return EnterpriseGetStatus200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun enterpriseGetStatus(xEnterpriseAuth: kotlin.String) : EnterpriseGetStatus200Response {
@@ -674,15 +449,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /enterprise/status
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @return ApiResponse<EnterpriseGetStatus200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun enterpriseGetStatusWithHttpInfo(xEnterpriseAuth: kotlin.String) : ApiResponse<EnterpriseGetStatus200Response?> {
@@ -693,12 +459,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation enterpriseGetStatus
-     *
-     * @param xEnterpriseAuth 
-     * @return RequestConfig
-     */
     fun enterpriseGetStatusRequestConfig(xEnterpriseAuth: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -716,19 +476,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /enterprise/wallets/{wallet_id}/config
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @return EnterpriseWalletConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun enterpriseGetWalletConfig(xEnterpriseAuth: kotlin.String, walletId: kotlin.String) : EnterpriseWalletConfig {
@@ -749,16 +496,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /enterprise/wallets/{wallet_id}/config
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @return ApiResponse<EnterpriseWalletConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun enterpriseGetWalletConfigWithHttpInfo(xEnterpriseAuth: kotlin.String, walletId: kotlin.String) : ApiResponse<EnterpriseWalletConfig?> {
@@ -769,13 +506,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation enterpriseGetWalletConfig
-     *
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @return RequestConfig
-     */
     fun enterpriseGetWalletConfigRequestConfig(xEnterpriseAuth: kotlin.String, walletId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -793,20 +523,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /enterprise/wallets/{wallet_id}/send
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @return EnterpriseSend200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun enterpriseSend(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest) : EnterpriseSend200Response {
@@ -827,17 +543,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /enterprise/wallets/{wallet_id}/send
-     * 
-     * 
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @return ApiResponse<EnterpriseSend200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun enterpriseSendWithHttpInfo(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest) : ApiResponse<EnterpriseSend200Response?> {
@@ -848,14 +553,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation enterpriseSend
-     *
-     * @param xEnterpriseAuth 
-     * @param walletId 
-     * @param enterpriseEstimateRequest bag-of-cells serialized to base64
-     * @return RequestConfig
-     */
     fun enterpriseSendRequestConfig(xEnterpriseAuth: kotlin.String, walletId: kotlin.String, enterpriseEstimateRequest: EnterpriseEstimateRequest) : RequestConfig<EnterpriseEstimateRequest> {
         val localVariableBody = enterpriseEstimateRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -874,26 +571,10 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /gasless/estimate-cost/{jetton_master}
-     * 
-     * 
-     * @param jettonMaster 
-     * @param estimateGaslessCostRequest 
-     * @param xTonConnectAuth  (optional)
-     * @param walletAddress  (optional)
-     * @param walletPublicKey  (optional)
-     * @return GaslessEstimation
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun estimateGaslessCost(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String? = null, walletAddress: kotlin.String? = null, walletPublicKey: kotlin.String? = null) : GaslessEstimation {
-        val localVarResponse = estimateGaslessCostWithHttpInfo(jettonMaster = jettonMaster, estimateGaslessCostRequest = estimateGaslessCostRequest, xTonConnectAuth = xTonConnectAuth, walletAddress = walletAddress, walletPublicKey = walletPublicKey)
+    fun estimateGaslessCost(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String? = null, walletAddress: kotlin.String? = null, walletPublicKey: kotlin.String? = null, enableValidation: kotlin.Boolean? = false) : GaslessEstimation {
+        val localVarResponse = estimateGaslessCostWithHttpInfo(jettonMaster = jettonMaster, estimateGaslessCostRequest = estimateGaslessCostRequest, xTonConnectAuth = xTonConnectAuth, walletAddress = walletAddress, walletPublicKey = walletPublicKey, enableValidation = enableValidation)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as GaslessEstimation
@@ -910,40 +591,17 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /gasless/estimate-cost/{jetton_master}
-     * 
-     * 
-     * @param jettonMaster 
-     * @param estimateGaslessCostRequest 
-     * @param xTonConnectAuth  (optional)
-     * @param walletAddress  (optional)
-     * @param walletPublicKey  (optional)
-     * @return ApiResponse<GaslessEstimation?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun estimateGaslessCostWithHttpInfo(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String?, walletAddress: kotlin.String?, walletPublicKey: kotlin.String?) : ApiResponse<GaslessEstimation?> {
-        val localVariableConfig = estimateGaslessCostRequestConfig(jettonMaster = jettonMaster, estimateGaslessCostRequest = estimateGaslessCostRequest, xTonConnectAuth = xTonConnectAuth, walletAddress = walletAddress, walletPublicKey = walletPublicKey)
+    fun estimateGaslessCostWithHttpInfo(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String?, walletAddress: kotlin.String?, walletPublicKey: kotlin.String?, enableValidation: kotlin.Boolean?) : ApiResponse<GaslessEstimation?> {
+        val localVariableConfig = estimateGaslessCostRequestConfig(jettonMaster = jettonMaster, estimateGaslessCostRequest = estimateGaslessCostRequest, xTonConnectAuth = xTonConnectAuth, walletAddress = walletAddress, walletPublicKey = walletPublicKey, enableValidation = enableValidation)
 
         return request<EstimateGaslessCostRequest, GaslessEstimation>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation estimateGaslessCost
-     *
-     * @param jettonMaster 
-     * @param estimateGaslessCostRequest 
-     * @param xTonConnectAuth  (optional)
-     * @param walletAddress  (optional)
-     * @param walletPublicKey  (optional)
-     * @return RequestConfig
-     */
-    fun estimateGaslessCostRequestConfig(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String?, walletAddress: kotlin.String?, walletPublicKey: kotlin.String?) : RequestConfig<EstimateGaslessCostRequest> {
+    fun estimateGaslessCostRequestConfig(jettonMaster: kotlin.String, estimateGaslessCostRequest: EstimateGaslessCostRequest, xTonConnectAuth: kotlin.String?, walletAddress: kotlin.String?, walletPublicKey: kotlin.String?, enableValidation: kotlin.Boolean?) : RequestConfig<EstimateGaslessCostRequest> {
         val localVariableBody = estimateGaslessCostRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
@@ -953,6 +611,9 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
                 if (walletPublicKey != null) {
                     put("wallet_public_key", listOf(walletPublicKey.toString()))
                 }
+                if (enableValidation != null) {
+                    put("enable_validation", listOf(enableValidation.toString()))
+                }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         xTonConnectAuth?.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
@@ -969,26 +630,13 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /restricted/purchases/{purchase_id}/extend-refund-period
-     * 
-     * 
-     * @param purchaseId 
-     * @param token 
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun extendRefundPeriod(purchaseId: kotlin.Long, token: kotlin.String) : kotlin.collections.Map<kotlin.String, kotlin.Any> {
+    fun extendRefundPeriod(purchaseId: kotlin.Long, token: kotlin.String) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
         val localVarResponse = extendRefundPeriodWithHttpInfo(purchaseId = purchaseId, token = token)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -1002,33 +650,16 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /restricted/purchases/{purchase_id}/extend-refund-period
-     * 
-     * 
-     * @param purchaseId 
-     * @param token 
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun extendRefundPeriodWithHttpInfo(purchaseId: kotlin.Long, token: kotlin.String) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
+    fun extendRefundPeriodWithHttpInfo(purchaseId: kotlin.Long, token: kotlin.String) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
         val localVariableConfig = extendRefundPeriodRequestConfig(purchaseId = purchaseId, token = token)
 
-        return request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<Unit, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation extendRefundPeriod
-     *
-     * @param purchaseId 
-     * @param token 
-     * @return RequestConfig
-     */
     fun extendRefundPeriodRequestConfig(purchaseId: kotlin.Long, token: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1052,8 +683,8 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
      * enum for parameter units
      */
      enum class UnitsGetBalance(val value: kotlin.String) {
-         @Json(name = "usd") usd("usd"),
-         @Json(name = "ton") ton("ton");
+         @SerialName(value = "usd") usd("usd"),
+         @SerialName(value = "ton") ton("ton");
 
         /**
          * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -1065,23 +696,10 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         override fun toString(): kotlin.String = "$value"
      }
 
-    /**
-     * GET /balance
-     * 
-     * This method returns information about a user&#39;s balance.
-     * @param xTonConnectAuth 
-     * @param units  (optional, default to usd)
-     * @return Balance
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getBalance(xTonConnectAuth: kotlin.String, units: UnitsGetBalance? = UnitsGetBalance.usd) : Balance {
-        val localVarResponse = getBalanceWithHttpInfo(xTonConnectAuth = xTonConnectAuth, units = units)
+    fun getBalance(xTonConnectAuth: kotlin.String, units: UnitsGetBalance? = UnitsGetBalance.usd, region: kotlin.String? = null) : Balance {
+        val localVarResponse = getBalanceWithHttpInfo(xTonConnectAuth = xTonConnectAuth, units = units, region = region)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as Balance
@@ -1098,40 +716,26 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /balance
-     * 
-     * This method returns information about a user&#39;s balance.
-     * @param xTonConnectAuth 
-     * @param units  (optional, default to usd)
-     * @return ApiResponse<Balance?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getBalanceWithHttpInfo(xTonConnectAuth: kotlin.String, units: UnitsGetBalance?) : ApiResponse<Balance?> {
-        val localVariableConfig = getBalanceRequestConfig(xTonConnectAuth = xTonConnectAuth, units = units)
+    fun getBalanceWithHttpInfo(xTonConnectAuth: kotlin.String, units: UnitsGetBalance?, region: kotlin.String?) : ApiResponse<Balance?> {
+        val localVariableConfig = getBalanceRequestConfig(xTonConnectAuth = xTonConnectAuth, units = units, region = region)
 
         return request<Unit, Balance>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBalance
-     *
-     * @param xTonConnectAuth 
-     * @param units  (optional, default to usd)
-     * @return RequestConfig
-     */
-    fun getBalanceRequestConfig(xTonConnectAuth: kotlin.String, units: UnitsGetBalance?) : RequestConfig<Unit> {
+    fun getBalanceRequestConfig(xTonConnectAuth: kotlin.String, units: UnitsGetBalance?, region: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (units != null) {
                     put("units", listOf(units.value))
                 }
+                if (region != null) {
+                    put("region", listOf(region.toString()))
+                }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
@@ -1147,18 +751,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /battery-charged
-     * 
-     * This method returns information about a user&#39;s balance.
-     * @param accountId 
-     * @return BatteryCharged
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBatteryCharged(accountId: kotlin.String) : BatteryCharged {
@@ -1179,15 +771,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /battery-charged
-     * 
-     * This method returns information about a user&#39;s balance.
-     * @param accountId 
-     * @return ApiResponse<BatteryCharged?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBatteryChargedWithHttpInfo(accountId: kotlin.String) : ApiResponse<BatteryCharged?> {
@@ -1198,12 +781,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBatteryCharged
-     *
-     * @param accountId 
-     * @return RequestConfig
-     */
     fun getBatteryChargedRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1223,17 +800,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /config
-     * 
-     * This method returns information about Battery Service.
-     * @return Config
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getConfig() : Config {
@@ -1254,14 +820,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /config
-     * 
-     * This method returns information about Battery Service.
-     * @return ApiResponse<Config?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getConfigWithHttpInfo() : ApiResponse<Config?> {
@@ -1272,11 +830,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getConfig
-     *
-     * @return RequestConfig
-     */
     fun getConfigRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1293,18 +846,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /promo-used
-     * 
-     * 
-     * @param promo 
-     * @return PromoUsed
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getPromoUsed(promo: kotlin.String) : PromoUsed {
@@ -1325,15 +866,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /promo-used
-     * 
-     * 
-     * @param promo 
-     * @return ApiResponse<PromoUsed?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getPromoUsedWithHttpInfo(promo: kotlin.String) : ApiResponse<PromoUsed?> {
@@ -1344,12 +876,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getPromoUsed
-     *
-     * @param promo 
-     * @return RequestConfig
-     */
     fun getPromoUsedRequestConfig(promo: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1369,21 +895,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /purchases
-     * 
-     * This method returns a list of purchases made by a specific user.
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param includeGiftsOnTheWay  (optional, default to false)
-     * @return Purchases
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getPurchases(xTonConnectAuth: kotlin.String, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0, includeGiftsOnTheWay: kotlin.Boolean? = false) : Purchases {
@@ -1404,18 +915,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /purchases
-     * 
-     * This method returns a list of purchases made by a specific user.
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param includeGiftsOnTheWay  (optional, default to false)
-     * @return ApiResponse<Purchases?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getPurchasesWithHttpInfo(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?, includeGiftsOnTheWay: kotlin.Boolean?) : ApiResponse<Purchases?> {
@@ -1426,15 +925,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getPurchases
-     *
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param includeGiftsOnTheWay  (optional, default to false)
-     * @return RequestConfig
-     */
     fun getPurchasesRequestConfig(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?, includeGiftsOnTheWay: kotlin.Boolean?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1463,18 +953,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /recharge-methods
-     * 
-     * This method returns on-chain recharge methods.
-     * @param includeRechargeOnly  (optional, default to true)
-     * @return RechargeMethods
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRechargeMethods(includeRechargeOnly: kotlin.Boolean? = true) : RechargeMethods {
@@ -1495,15 +973,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /recharge-methods
-     * 
-     * This method returns on-chain recharge methods.
-     * @param includeRechargeOnly  (optional, default to true)
-     * @return ApiResponse<RechargeMethods?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRechargeMethodsWithHttpInfo(includeRechargeOnly: kotlin.Boolean?) : ApiResponse<RechargeMethods?> {
@@ -1514,12 +983,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRechargeMethods
-     *
-     * @param includeRechargeOnly  (optional, default to true)
-     * @return RequestConfig
-     */
     fun getRechargeMethodsRequestConfig(includeRechargeOnly: kotlin.Boolean?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1541,18 +1004,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /status
-     * 
-     * This method returns information about the current status of Battery Service.
-     * @param xTonConnectAuth 
-     * @return Status
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getStatus(xTonConnectAuth: kotlin.String) : Status {
@@ -1573,15 +1024,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /status
-     * 
-     * This method returns information about the current status of Battery Service.
-     * @param xTonConnectAuth 
-     * @return ApiResponse<Status?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getStatusWithHttpInfo(xTonConnectAuth: kotlin.String) : ApiResponse<Status?> {
@@ -1592,12 +1034,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getStatus
-     *
-     * @param xTonConnectAuth 
-     * @return RequestConfig
-     */
     fun getStatusRequestConfig(xTonConnectAuth: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1615,20 +1051,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /transactions
-     * 
-     * This method returns a list of transactions made by a specific user.
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return Transactions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTransactions(xTonConnectAuth: kotlin.String, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0) : Transactions {
@@ -1649,17 +1071,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /transactions
-     * 
-     * This method returns a list of transactions made by a specific user.
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<Transactions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTransactionsWithHttpInfo(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<Transactions?> {
@@ -1670,14 +1081,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTransactions
-     *
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
     fun getTransactionsRequestConfig(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1703,17 +1106,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /v0/tron/config
-     * 
-     * 
-     * @return GetTronConfig200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTronConfig() : GetTronConfig200Response {
@@ -1734,14 +1126,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /v0/tron/config
-     * 
-     * 
-     * @return ApiResponse<GetTronConfig200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTronConfigWithHttpInfo() : ApiResponse<GetTronConfig200Response?> {
@@ -1752,11 +1136,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTronConfig
-     *
-     * @return RequestConfig
-     */
     fun getTronConfigRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1773,20 +1152,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /v0/tron/transactions
-     * 
-     * 
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param maxTimestamp  (optional)
-     * @return TronTransactionsList
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTronTransactions(xTonConnectAuth: kotlin.String, limit: kotlin.Int? = 1000, maxTimestamp: kotlin.Long? = null) : TronTransactionsList {
@@ -1807,17 +1172,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /v0/tron/transactions
-     * 
-     * 
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param maxTimestamp  (optional)
-     * @return ApiResponse<TronTransactionsList?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTronTransactionsWithHttpInfo(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, maxTimestamp: kotlin.Long?) : ApiResponse<TronTransactionsList?> {
@@ -1828,14 +1182,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTronTransactions
-     *
-     * @param xTonConnectAuth 
-     * @param limit  (optional, default to 1000)
-     * @param maxTimestamp  (optional)
-     * @return RequestConfig
-     */
     fun getTronTransactionsRequestConfig(xTonConnectAuth: kotlin.String, limit: kotlin.Int?, maxTimestamp: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1861,19 +1207,56 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /purchase-battery/ios
-     * 
-     * verify an in-app purchase
-     * @param xTonConnectAuth 
-     * @param iosBatteryPurchaseRequest In-App purchase
-     * @return IOSBatteryPurchaseStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun increaseUserBalance(userId: kotlin.Long, token: kotlin.String, increaseUserBalanceRequest: IncreaseUserBalanceRequest) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
+        val localVarResponse = increaseUserBalanceWithHttpInfo(userId = userId, token = token, increaseUserBalanceRequest = increaseUserBalanceRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun increaseUserBalanceWithHttpInfo(userId: kotlin.Long, token: kotlin.String, increaseUserBalanceRequest: IncreaseUserBalanceRequest) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
+        val localVariableConfig = increaseUserBalanceRequestConfig(userId = userId, token = token, increaseUserBalanceRequest = increaseUserBalanceRequest)
+
+        return request<IncreaseUserBalanceRequest, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
+            localVariableConfig
+        )
+    }
+
+    fun increaseUserBalanceRequestConfig(userId: kotlin.Long, token: kotlin.String, increaseUserBalanceRequest: IncreaseUserBalanceRequest) : RequestConfig<IncreaseUserBalanceRequest> {
+        val localVariableBody = increaseUserBalanceRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                put("token", listOf(token.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/restricted/users/{user_id}/increase-balance".replace("{"+"user_id"+"}", encodeURIComponent(userId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun iosBatteryPurchase(xTonConnectAuth: kotlin.String, iosBatteryPurchaseRequest: IosBatteryPurchaseRequest) : IOSBatteryPurchaseStatus {
@@ -1894,16 +1277,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /purchase-battery/ios
-     * 
-     * verify an in-app purchase
-     * @param xTonConnectAuth 
-     * @param iosBatteryPurchaseRequest In-App purchase
-     * @return ApiResponse<IOSBatteryPurchaseStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun iosBatteryPurchaseWithHttpInfo(xTonConnectAuth: kotlin.String, iosBatteryPurchaseRequest: IosBatteryPurchaseRequest) : ApiResponse<IOSBatteryPurchaseStatus?> {
@@ -1914,13 +1287,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation iosBatteryPurchase
-     *
-     * @param xTonConnectAuth 
-     * @param iosBatteryPurchaseRequest In-App purchase
-     * @return RequestConfig
-     */
     fun iosBatteryPurchaseRequestConfig(xTonConnectAuth: kotlin.String, iosBatteryPurchaseRequest: IosBatteryPurchaseRequest) : RequestConfig<IosBatteryPurchaseRequest> {
         val localVariableBody = iosBatteryPurchaseRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1939,20 +1305,53 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /purchase-battery/promo-code
-     * 
-     * charge battery with promo code
-     * @param xTonConnectAuth 
-     * @param promoCodeBatteryPurchaseRequest charge battery with promo code
-     * @param acceptLanguage  (optional, default to "en")
-     * @return PromoCodeBatteryPurchaseStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun itrxIoCallback(requestBody: kotlin.collections.Map<kotlin.String, io.JsonAny>) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
+        val localVarResponse = itrxIoCallbackWithHttpInfo(requestBody = requestBody)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun itrxIoCallbackWithHttpInfo(requestBody: kotlin.collections.Map<kotlin.String, io.JsonAny>) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
+        val localVariableConfig = itrxIoCallbackRequestConfig(requestBody = requestBody)
+
+        return request<kotlin.collections.Map<kotlin.String, io.JsonAny>, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
+            localVariableConfig
+        )
+    }
+
+    fun itrxIoCallbackRequestConfig(requestBody: kotlin.collections.Map<kotlin.String, io.JsonAny>) : RequestConfig<kotlin.collections.Map<kotlin.String, io.JsonAny>> {
+        val localVariableBody = requestBody
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v0/tron/itrx-io-callback",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun promoCodeBatteryPurchase(xTonConnectAuth: kotlin.String, promoCodeBatteryPurchaseRequest: PromoCodeBatteryPurchaseRequest, acceptLanguage: kotlin.String? = "en") : PromoCodeBatteryPurchaseStatus {
@@ -1973,17 +1372,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /purchase-battery/promo-code
-     * 
-     * charge battery with promo code
-     * @param xTonConnectAuth 
-     * @param promoCodeBatteryPurchaseRequest charge battery with promo code
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<PromoCodeBatteryPurchaseStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun promoCodeBatteryPurchaseWithHttpInfo(xTonConnectAuth: kotlin.String, promoCodeBatteryPurchaseRequest: PromoCodeBatteryPurchaseRequest, acceptLanguage: kotlin.String?) : ApiResponse<PromoCodeBatteryPurchaseStatus?> {
@@ -1994,14 +1382,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation promoCodeBatteryPurchase
-     *
-     * @param xTonConnectAuth 
-     * @param promoCodeBatteryPurchaseRequest charge battery with promo code
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun promoCodeBatteryPurchaseRequestConfig(xTonConnectAuth: kotlin.String, promoCodeBatteryPurchaseRequest: PromoCodeBatteryPurchaseRequest, acceptLanguage: kotlin.String?) : RequestConfig<PromoCodeBatteryPurchaseRequest> {
         val localVariableBody = promoCodeBatteryPurchaseRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -2021,19 +1401,7 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /request-refund
-     * 
-     * 
-     * @param xTonConnectAuth 
-     * @param requestRefundRequest 
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun requestRefund(xTonConnectAuth: kotlin.String, requestRefundRequest: RequestRefundRequest) : Unit {
         val localVarResponse = requestRefundWithHttpInfo(xTonConnectAuth = xTonConnectAuth, requestRefundRequest = requestRefundRequest)
@@ -2053,16 +1421,7 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /request-refund
-     * 
-     * 
-     * @param xTonConnectAuth 
-     * @param requestRefundRequest 
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+
     @Throws(IllegalStateException::class, IOException::class)
     fun requestRefundWithHttpInfo(xTonConnectAuth: kotlin.String, requestRefundRequest: RequestRefundRequest) : ApiResponse<Unit?> {
         val localVariableConfig = requestRefundRequestConfig(xTonConnectAuth = xTonConnectAuth, requestRefundRequest = requestRefundRequest)
@@ -2072,13 +1431,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation requestRefund
-     *
-     * @param xTonConnectAuth 
-     * @param requestRefundRequest 
-     * @return RequestConfig
-     */
     fun requestRefundRequestConfig(xTonConnectAuth: kotlin.String, requestRefundRequest: RequestRefundRequest) : RequestConfig<RequestRefundRequest> {
         val localVariableBody = requestRefundRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -2097,27 +1449,13 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /restricted/users/{user_id}/reset-balance
-     * 
-     * 
-     * @param userId 
-     * @param token 
-     * @param resetUserBalanceRequest 
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun resetUserBalance(userId: kotlin.Long, token: kotlin.String, resetUserBalanceRequest: ResetUserBalanceRequest) : kotlin.collections.Map<kotlin.String, kotlin.Any> {
+    fun resetUserBalance(userId: kotlin.Long, token: kotlin.String, resetUserBalanceRequest: ResetUserBalanceRequest) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
         val localVarResponse = resetUserBalanceWithHttpInfo(userId = userId, token = token, resetUserBalanceRequest = resetUserBalanceRequest)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -2131,35 +1469,16 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /restricted/users/{user_id}/reset-balance
-     * 
-     * 
-     * @param userId 
-     * @param token 
-     * @param resetUserBalanceRequest 
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun resetUserBalanceWithHttpInfo(userId: kotlin.Long, token: kotlin.String, resetUserBalanceRequest: ResetUserBalanceRequest) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
+    fun resetUserBalanceWithHttpInfo(userId: kotlin.Long, token: kotlin.String, resetUserBalanceRequest: ResetUserBalanceRequest) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
         val localVariableConfig = resetUserBalanceRequestConfig(userId = userId, token = token, resetUserBalanceRequest = resetUserBalanceRequest)
 
-        return request<ResetUserBalanceRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<ResetUserBalanceRequest, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation resetUserBalance
-     *
-     * @param userId 
-     * @param token 
-     * @param resetUserBalanceRequest 
-     * @return RequestConfig
-     */
     fun resetUserBalanceRequestConfig(userId: kotlin.Long, token: kotlin.String, resetUserBalanceRequest: ResetUserBalanceRequest) : RequestConfig<ResetUserBalanceRequest> {
         val localVariableBody = resetUserBalanceRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -2180,19 +1499,7 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /message
-     * 
-     * Send message to blockchain
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun sendMessage(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest) : Unit {
         val localVarResponse = sendMessageWithHttpInfo(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest)
@@ -2212,16 +1519,7 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /message
-     * 
-     * Send message to blockchain
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+
     @Throws(IllegalStateException::class, IOException::class)
     fun sendMessageWithHttpInfo(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest) : ApiResponse<Unit?> {
         val localVariableConfig = sendMessageRequestConfig(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest)
@@ -2231,13 +1529,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation sendMessage
-     *
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @return RequestConfig
-     */
     fun sendMessageRequestConfig(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest) : RequestConfig<EmulateMessageToWalletRequest> {
         val localVariableBody = emulateMessageToWalletRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -2256,20 +1547,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /v0/tron/estimate
-     * 
-     * Estimate cost of sending a tx in Tron network
-     * @param wallet 
-     * @param energy  (optional)
-     * @param bandwidth  (optional)
-     * @return EstimatedTronTx
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun tronEstimate(wallet: kotlin.String, energy: kotlin.Int? = null, bandwidth: kotlin.Int? = null) : EstimatedTronTx {
@@ -2290,17 +1567,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /v0/tron/estimate
-     * 
-     * Estimate cost of sending a tx in Tron network
-     * @param wallet 
-     * @param energy  (optional)
-     * @param bandwidth  (optional)
-     * @return ApiResponse<EstimatedTronTx?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun tronEstimateWithHttpInfo(wallet: kotlin.String, energy: kotlin.Int?, bandwidth: kotlin.Int?) : ApiResponse<EstimatedTronTx?> {
@@ -2311,14 +1577,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation tronEstimate
-     *
-     * @param wallet 
-     * @param energy  (optional)
-     * @param bandwidth  (optional)
-     * @return RequestConfig
-     */
     fun tronEstimateRequestConfig(wallet: kotlin.String, energy: kotlin.Int?, bandwidth: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -2344,19 +1602,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * POST /v0/tron/send
-     * 
-     * send TRON tx
-     * @param xTonConnectAuth 
-     * @param tronSendRequest 
-     * @return SentTronTx
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun tronSend(xTonConnectAuth: kotlin.String, tronSendRequest: TronSendRequest) : SentTronTx {
@@ -2377,16 +1622,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /v0/tron/send
-     * 
-     * send TRON tx
-     * @param xTonConnectAuth 
-     * @param tronSendRequest 
-     * @return ApiResponse<SentTronTx?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun tronSendWithHttpInfo(xTonConnectAuth: kotlin.String, tronSendRequest: TronSendRequest) : ApiResponse<SentTronTx?> {
@@ -2397,13 +1632,6 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation tronSend
-     *
-     * @param xTonConnectAuth 
-     * @param tronSendRequest 
-     * @return RequestConfig
-     */
     fun tronSendRequestConfig(xTonConnectAuth: kotlin.String, tronSendRequest: TronSendRequest) : RequestConfig<TronSendRequest> {
         val localVariableBody = tronSendRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -2422,25 +1650,13 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * GET /purchase-battery/verify-purchase-promo
-     * 
-     * 
-     * @param promo  (optional)
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun verifyPurchasePromo(promo: kotlin.String? = null) : kotlin.collections.Map<kotlin.String, kotlin.Any> {
+    fun verifyPurchasePromo(promo: kotlin.String? = null) : VerifyPurchasePromo200Response {
         val localVarResponse = verifyPurchasePromoWithHttpInfo(promo = promo)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as VerifyPurchasePromo200Response
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -2454,31 +1670,16 @@ class BatteryApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * GET /purchase-battery/verify-purchase-promo
-     * 
-     * 
-     * @param promo  (optional)
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun verifyPurchasePromoWithHttpInfo(promo: kotlin.String?) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
+    fun verifyPurchasePromoWithHttpInfo(promo: kotlin.String?) : ApiResponse<VerifyPurchasePromo200Response?> {
         val localVariableConfig = verifyPurchasePromoRequestConfig(promo = promo)
 
-        return request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<Unit, VerifyPurchasePromo200Response>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation verifyPurchasePromo
-     *
-     * @param promo  (optional)
-     * @return RequestConfig
-     */
     fun verifyPurchasePromoRequestConfig(promo: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
diff --git a/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt
index 4d7a4f916..61db803ed 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt
@@ -20,23 +20,24 @@ import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.batteryapi.models.EmulateMessageToWalletRequest
-import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.batteryapi.infrastructure.ApiClient
-import io.batteryapi.infrastructure.ApiResponse
-import io.batteryapi.infrastructure.ClientException
-import io.batteryapi.infrastructure.ClientError
-import io.batteryapi.infrastructure.ServerException
-import io.batteryapi.infrastructure.ServerError
-import io.batteryapi.infrastructure.MultiValueMap
-import io.batteryapi.infrastructure.PartConfig
-import io.batteryapi.infrastructure.RequestConfig
-import io.batteryapi.infrastructure.RequestMethod
-import io.batteryapi.infrastructure.ResponseType
-import io.batteryapi.infrastructure.Success
-import io.batteryapi.infrastructure.toMultiValue
+import io.batteryapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
 
 class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
@@ -46,27 +47,13 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto
         }
     }
 
-    /**
-     * POST /wallet/emulate
-     * 
-     * Emulate sending message to blockchain
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun emulateMessageToWallet(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String? = "en") : kotlin.collections.Map<kotlin.String, kotlin.Any> {
-        val localVarResponse = emulateMessageToWalletWithHttpInfo(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage)
+    fun emulateMessageToWallet(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String? = "en", enableValidation: kotlin.Boolean? = false) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
+        val localVarResponse = emulateMessageToWalletWithHttpInfo(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage, enableValidation = enableValidation)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -80,38 +67,24 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto
         }
     }
 
-    /**
-     * POST /wallet/emulate
-     * 
-     * Emulate sending message to blockchain
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun emulateMessageToWalletWithHttpInfo(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
-        val localVariableConfig = emulateMessageToWalletRequestConfig(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage)
+    fun emulateMessageToWalletWithHttpInfo(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?, enableValidation: kotlin.Boolean?) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
+        val localVariableConfig = emulateMessageToWalletRequestConfig(xTonConnectAuth = xTonConnectAuth, emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage, enableValidation = enableValidation)
 
-        return request<EmulateMessageToWalletRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<EmulateMessageToWalletRequest, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation emulateMessageToWallet
-     *
-     * @param xTonConnectAuth 
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
-    fun emulateMessageToWalletRequestConfig(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : RequestConfig<EmulateMessageToWalletRequest> {
+    fun emulateMessageToWalletRequestConfig(xTonConnectAuth: kotlin.String, emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?, enableValidation: kotlin.Boolean?) : RequestConfig<EmulateMessageToWalletRequest> {
         val localVariableBody = emulateMessageToWalletRequest
-        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (enableValidation != null) {
+                    put("enable_validation", listOf(enableValidation.toString()))
+                }
+            }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
         xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
@@ -128,25 +101,13 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto
         )
     }
 
-    /**
-     * GET /jetton-metadata/{name}.json
-     * 
-     * 
-     * @param name 
-     * @return kotlin.collections.Map<kotlin.String, kotlin.Any>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getJettonMetadata(name: kotlin.String) : kotlin.collections.Map<kotlin.String, kotlin.Any> {
+    fun getJettonMetadata(name: kotlin.String) : kotlin.collections.Map<kotlin.String, io.JsonAny> {
         val localVarResponse = getJettonMetadataWithHttpInfo(name = name)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Any>
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, io.JsonAny>
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -160,31 +121,16 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Facto
         }
     }
 
-    /**
-     * GET /jetton-metadata/{name}.json
-     * 
-     * 
-     * @param name 
-     * @return ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getJettonMetadataWithHttpInfo(name: kotlin.String) : ApiResponse<kotlin.collections.Map<kotlin.String, kotlin.Any>?> {
+    fun getJettonMetadataWithHttpInfo(name: kotlin.String) : ApiResponse<kotlin.collections.Map<kotlin.String, io.JsonAny>?> {
         val localVariableConfig = getJettonMetadataRequestConfig(name = name)
 
-        return request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+        return request<Unit, kotlin.collections.Map<kotlin.String, io.JsonAny>>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettonMetadata
-     *
-     * @param name 
-     * @return RequestConfig
-     */
     fun getJettonMetadataRequestConfig(name: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt
index 4814347e1..accf86316 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt
@@ -19,25 +19,26 @@ import java.io.IOException
 import okhttp3.Call
 import okhttp3.HttpUrl
 
-import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
+import io.batteryapi.models.InlineObject
 import io.batteryapi.models.TonConnectProof200Response
 import io.batteryapi.models.TonConnectProofRequest
 
-import com.squareup.moshi.Json
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-import io.batteryapi.infrastructure.ApiClient
-import io.batteryapi.infrastructure.ApiResponse
-import io.batteryapi.infrastructure.ClientException
-import io.batteryapi.infrastructure.ClientError
-import io.batteryapi.infrastructure.ServerException
-import io.batteryapi.infrastructure.ServerError
-import io.batteryapi.infrastructure.MultiValueMap
-import io.batteryapi.infrastructure.PartConfig
-import io.batteryapi.infrastructure.RequestConfig
-import io.batteryapi.infrastructure.RequestMethod
-import io.batteryapi.infrastructure.ResponseType
-import io.batteryapi.infrastructure.Success
-import io.batteryapi.infrastructure.toMultiValue
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
 
 class WalletApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
@@ -47,18 +48,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /tonconnect/proof
-     * 
-     * Account verification and token issuance
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return TonConnectProof200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun tonConnectProof(tonConnectProofRequest: TonConnectProofRequest) : TonConnectProof200Response {
@@ -79,15 +68,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         }
     }
 
-    /**
-     * POST /tonconnect/proof
-     * 
-     * Account verification and token issuance
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return ApiResponse<TonConnectProof200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun tonConnectProofWithHttpInfo(tonConnectProofRequest: TonConnectProofRequest) : ApiResponse<TonConnectProof200Response?> {
@@ -98,12 +78,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory
         )
     }
 
-    /**
-     * To obtain the request config of the operation tonConnectProof
-     *
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return RequestConfig
-     */
     fun tonConnectProofRequestConfig(tonConnectProofRequest: TonConnectProofRequest) : RequestConfig<TonConnectProofRequest> {
         val localVariableBody = tonConnectProofRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigDecimalAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigDecimalAdapter.kt
deleted file mode 100644
index fc838489e..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigDecimalAdapter.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.math.BigDecimal
-
-class BigDecimalAdapter {
-    @ToJson
-    fun toJson(value: BigDecimal): String {
-        return value.toPlainString()
-    }
-
-    @FromJson
-    fun fromJson(value: String): BigDecimal {
-        return BigDecimal(value)
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigIntegerAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigIntegerAdapter.kt
deleted file mode 100644
index 374f9fba6..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigIntegerAdapter.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.math.BigInteger
-
-class BigIntegerAdapter {
-    @ToJson
-    fun toJson(value: BigInteger): String {
-        return value.toString()
-    }
-
-    @FromJson
-    fun fromJson(value: String): BigInteger {
-        return BigInteger(value)
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ByteArrayAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ByteArrayAdapter.kt
deleted file mode 100644
index 42aa4cfa7..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ByteArrayAdapter.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-
-class ByteArrayAdapter {
-    @ToJson
-    fun toJson(data: ByteArray): String = String(data)
-
-    @FromJson
-    fun fromJson(data: String): ByteArray = data.toByteArray()
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Errors.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Errors.kt
deleted file mode 100644
index a64ba33f3..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Errors.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-@file:Suppress("unused")
-package io.batteryapi.infrastructure
-
-import java.lang.RuntimeException
-
-open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
-
-    companion object {
-        private const val serialVersionUID: Long = 123L
-    }
-}
-
-open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
-
-    companion object {
-        private const val serialVersionUID: Long = 456L
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateAdapter.kt
deleted file mode 100644
index 03fca3572..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-
-class LocalDateAdapter {
-    @ToJson
-    fun toJson(value: LocalDate): String {
-        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): LocalDate {
-        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateTimeAdapter.kt
deleted file mode 100644
index 3520c7c07..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateTimeAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-
-class LocalDateTimeAdapter {
-    @ToJson
-    fun toJson(value: LocalDateTime): String {
-        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): LocalDateTime {
-        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/OffsetDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/OffsetDateTimeAdapter.kt
deleted file mode 100644
index 6f867a2a1..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/OffsetDateTimeAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.OffsetDateTime
-import java.time.format.DateTimeFormatter
-
-class OffsetDateTimeAdapter {
-    @ToJson
-    fun toJson(value: OffsetDateTime): String {
-        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): OffsetDateTime {
-        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/PartConfig.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/PartConfig.kt
deleted file mode 100644
index eee5f0b93..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/PartConfig.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.batteryapi.infrastructure
-
-/**
- * Defines a config object for a given part of a multi-part request.
- * NOTE: Headers is a Map<String,String> because rfc2616 defines
- *       multi-valued headers as csv-only.
- */
-data class PartConfig<T>(
-    val headers: MutableMap<String, String> = mutableMapOf(),
-    val body: T? = null
-)
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestMethod.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestMethod.kt
deleted file mode 100644
index a8466c3fe..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestMethod.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.batteryapi.infrastructure
-
-/**
- * Provides enumerated HTTP verbs
- */
-enum class RequestMethod {
-    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ResponseExtensions.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ResponseExtensions.kt
deleted file mode 100644
index 1c454c0d8..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ResponseExtensions.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.batteryapi.infrastructure
-
-import okhttp3.Response
-
-/**
- * Provides an extension to evaluation whether the response is a 1xx code
- */
-val Response.isInformational : Boolean get() = this.code in 100..199
-
-/**
- * Provides an extension to evaluation whether the response is a 3xx code
- */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-val Response.isRedirect : Boolean get() = this.code in 300..399
-
-/**
- * Provides an extension to evaluation whether the response is a 4xx code
- */
-val Response.isClientError : Boolean get() = this.code in 400..499
-
-/**
- * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
- */
-val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Serializer.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Serializer.kt
deleted file mode 100644
index 39d9f9293..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Serializer.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-
-object Serializer {
-    @JvmStatic
-    val moshiBuilder: Moshi.Builder = Moshi.Builder()
-        .add(OffsetDateTimeAdapter())
-        .add(LocalDateTimeAdapter())
-        .add(LocalDateAdapter())
-        .add(UUIDAdapter())
-        .add(ByteArrayAdapter())
-        .add(URIAdapter())
-        .add(KotlinJsonAdapterFactory())
-        .add(BigDecimalAdapter())
-        .add(BigIntegerAdapter())
-
-    @JvmStatic
-    val moshi: Moshi by lazy {
-        moshiBuilder.build()
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/URIAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/URIAdapter.kt
deleted file mode 100644
index d7f761568..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/URIAdapter.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.net.URI
-
-class URIAdapter {
-    @ToJson
-    fun toJson(uri: URI): String = uri.toString()
-
-    @FromJson
-    fun fromJson(s: String): URI = URI.create(s)
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/UUIDAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/UUIDAdapter.kt
deleted file mode 100644
index 4ff8f621b..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/UUIDAdapter.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.batteryapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.util.UUID
-
-class UUIDAdapter {
-    @ToJson
-    fun toJson(uuid: UUID): String = uuid.toString()
-
-    @FromJson
-    fun fromJson(s: String): UUID = UUID.fromString(s)
-}
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequest.kt
index 3d99d4a72..2457a9a46 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequest.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.AndroidBatteryPurchaseRequestPurchasesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param purchases 
- */
 
+@Serializable
 
 data class AndroidBatteryPurchaseRequest (
 
-    @Json(name = "purchases")
+    @SerialName(value = "purchases")
     val purchases: kotlin.collections.List<AndroidBatteryPurchaseRequestPurchasesInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequestPurchasesInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequestPurchasesInner.kt
index e558324c4..6c81e740d 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequestPurchasesInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequestPurchasesInner.kt
@@ -16,27 +16,22 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param token 
- * @param productId 
- * @param promo 
- */
 
+@Serializable
 
 data class AndroidBatteryPurchaseRequestPurchasesInner (
 
-    @Json(name = "token")
+    @SerialName(value = "token")
     val token: kotlin.String,
 
-    @Json(name = "product_id")
+    @SerialName(value = "product_id")
     val productId: kotlin.String,
 
-    @Json(name = "promo")
+    @SerialName(value = "promo")
     val promo: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatus.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatus.kt
index c05509c8d..e2e1f7a2e 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatus.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatus.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.AndroidBatteryPurchaseStatusPurchasesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param purchases 
- */
 
+@Serializable
 
 data class AndroidBatteryPurchaseStatus (
 
-    @Json(name = "purchases")
+    @SerialName(value = "purchases")
     val purchases: kotlin.collections.List<AndroidBatteryPurchaseStatusPurchasesInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInner.kt
index e76d03f8f..a31c26fee 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInner.kt
@@ -17,31 +17,25 @@ package io.batteryapi.models
 
 import io.batteryapi.models.AndroidBatteryPurchaseStatusPurchasesInnerError
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param productId 
- * @param token 
- * @param success 
- * @param error 
- */
 
+@Serializable
 
 data class AndroidBatteryPurchaseStatusPurchasesInner (
 
-    @Json(name = "product_id")
+    @SerialName(value = "product_id")
     val productId: kotlin.String,
 
-    @Json(name = "token")
+    @SerialName(value = "token")
     val token: kotlin.String,
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: AndroidBatteryPurchaseStatusPurchasesInnerError? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInnerError.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInnerError.kt
index 8fb814156..010aee49f 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInnerError.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInnerError.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param msg 
- * @param code 
- */
 
+@Serializable
 
 data class AndroidBatteryPurchaseStatusPurchasesInnerError (
 
-    @Json(name = "msg")
+    @SerialName(value = "msg")
     val msg: kotlin.String,
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: AndroidBatteryPurchaseStatusPurchasesInnerError.Code
 
 ) {
@@ -42,13 +38,13 @@ data class AndroidBatteryPurchaseStatusPurchasesInnerError (
      *
      * Values: invalidMinusProductMinusId,userMinusNotMinusFound,purchaseMinusIsMinusAlreadyMinusUsed,temporaryMinusError,unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Code(val value: kotlin.String) {
-        @Json(name = "invalid-product-id") invalidMinusProductMinusId("invalid-product-id"),
-        @Json(name = "user-not-found") userMinusNotMinusFound("user-not-found"),
-        @Json(name = "purchase-is-already-used") purchaseMinusIsMinusAlreadyMinusUsed("purchase-is-already-used"),
-        @Json(name = "temporary-error") temporaryMinusError("temporary-error"),
-        @Json(name = "unknown") unknown("unknown");
+        @SerialName(value = "invalid-product-id") invalidMinusProductMinusId("invalid-product-id"),
+        @SerialName(value = "user-not-found") userMinusNotMinusFound("user-not-found"),
+        @SerialName(value = "purchase-is-already-used") purchaseMinusIsMinusAlreadyMinusUsed("purchase-is-already-used"),
+        @SerialName(value = "temporary-error") temporaryMinusError("temporary-error"),
+        @SerialName(value = "unknown") unknown("unknown");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt
index 31a89c08f..52723572a 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param signedPayload 
- */
 
+@Serializable
 
 data class AppStoreNotificationRequest (
 
-    @Json(name = "signedPayload")
+    @SerialName(value = "signedPayload")
     val signedPayload: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/ApplyPromoRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/ApplyPromoRequest.kt
index c9df47e04..aa2f1e709 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/ApplyPromoRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/ApplyPromoRequest.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param publicKey 
- * @param promoCode 
- */
 
+@Serializable
 
 data class ApplyPromoRequest (
 
-    @Json(name = "public_key")
+    @SerialName(value = "public_key")
     val publicKey: kotlin.String,
 
-    @Json(name = "promo_code")
+    @SerialName(value = "promo_code")
     val promoCode: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt
index 1bef4641a..3282e2fe5 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt
@@ -16,28 +16,23 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param balance 
- * @param reserved reserved amount in units (TON/USD)
- * @param units 
- */
 
+@Serializable
 
 data class Balance (
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.String,
 
     /* reserved amount in units (TON/USD) */
-    @Json(name = "reserved")
+    @SerialName(value = "reserved")
     val reserved: kotlin.String,
 
-    @Json(name = "units")
+    @SerialName(value = "units")
     val units: Balance.Units
 
 ) {
@@ -47,10 +42,10 @@ data class Balance (
      *
      * Values: usd,ton
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Units(val value: kotlin.String) {
-        @Json(name = "usd") usd("usd"),
-        @Json(name = "ton") ton("ton");
+        @SerialName(value = "usd") usd("usd"),
+        @SerialName(value = "ton") ton("ton");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/BatteryCharged.kt b/tonapi/src/main/kotlin/io/batteryapi/models/BatteryCharged.kt
index a43b1accf..987024408 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/BatteryCharged.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/BatteryCharged.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param batteryCharged 
- */
 
+@Serializable
 
 data class BatteryCharged (
 
-    @Json(name = "battery_charged")
+    @SerialName(value = "battery_charged")
     val batteryCharged: kotlin.Boolean
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt
index b01df59d4..74ed33beb 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt
@@ -18,43 +18,35 @@ package io.batteryapi.models
 import io.batteryapi.models.ConfigGasProxyInner
 import io.batteryapi.models.ConfigMeanPrices
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param chargeCost cost of 1 charge in TON
- * @param fundReceiver with zero balance it is possible to transfer some jettons (stablecoins, jusdt, etc) to this address to refill the balance. Such transfers would be paid by Battery Service.
- * @param excessAccount when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service.
- * @param messageTtl ttl for message in seconds
- * @param gasProxy 
- * @param meanPrices 
- */
 
+@Serializable
 
 data class Config (
 
     /* cost of 1 charge in TON */
-    @Json(name = "charge_cost")
+    @SerialName(value = "charge_cost")
     val chargeCost: kotlin.String,
 
     /* with zero balance it is possible to transfer some jettons (stablecoins, jusdt, etc) to this address to refill the balance. Such transfers would be paid by Battery Service. */
-    @Json(name = "fund_receiver")
+    @SerialName(value = "fund_receiver")
     val fundReceiver: kotlin.String,
 
     /* when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service. */
-    @Json(name = "excess_account")
+    @SerialName(value = "excess_account")
     val excessAccount: kotlin.String,
 
     /* ttl for message in seconds */
-    @Json(name = "message_ttl")
+    @SerialName(value = "message_ttl")
     val messageTtl: kotlin.Int,
 
-    @Json(name = "gas_proxy")
+    @SerialName(value = "gas_proxy")
     val gasProxy: kotlin.collections.List<ConfigGasProxyInner>,
 
-    @Json(name = "mean_prices")
+    @SerialName(value = "mean_prices")
     val meanPrices: ConfigMeanPrices
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/ConfigGasProxyInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/ConfigGasProxyInner.kt
index aa8db9ddc..6a1eeed57 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/ConfigGasProxyInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/ConfigGasProxyInner.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param address 
- */
 
+@Serializable
 
 data class ConfigGasProxyInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/ConfigMeanPrices.kt b/tonapi/src/main/kotlin/io/batteryapi/models/ConfigMeanPrices.kt
index b09515cea..807168198 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/ConfigMeanPrices.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/ConfigMeanPrices.kt
@@ -16,31 +16,25 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param batteryMeanPriceSwap 
- * @param batteryMeanPriceJetton 
- * @param batteryMeanPriceNft 
- * @param batteryMeanPriceTronUsdt 
- */
 
+@Serializable
 
 data class ConfigMeanPrices (
 
-    @Json(name = "battery_mean_price_swap")
+    @SerialName(value = "battery_mean_price_swap")
     val batteryMeanPriceSwap: kotlin.Int,
 
-    @Json(name = "battery_mean_price_jetton")
+    @SerialName(value = "battery_mean_price_jetton")
     val batteryMeanPriceJetton: kotlin.Int,
 
-    @Json(name = "battery_mean_price_nft")
+    @SerialName(value = "battery_mean_price_nft")
     val batteryMeanPriceNft: kotlin.Int,
 
-    @Json(name = "battery_mean_price_tron_usdt")
+    @SerialName(value = "battery_mean_price_tron_usdt")
     val batteryMeanPriceTronUsdt: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt
index d25bd7161..3c0b75ddb 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt
@@ -16,39 +16,31 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param amount 
- * @param currency 
- * @param comment 
- * @param reason 
- * @param destination 
- * @param relayerEventId 
- */
 
+@Serializable
 
 data class CreateCustomRefundRequest (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "currency")
+    @SerialName(value = "currency")
     val currency: kotlin.String,
 
-    @Json(name = "comment")
+    @SerialName(value = "comment")
     val comment: kotlin.String,
 
-    @Json(name = "reason")
+    @SerialName(value = "reason")
     val reason: kotlin.String,
 
-    @Json(name = "destination")
+    @SerialName(value = "destination")
     val destination: kotlin.String,
 
-    @Json(name = "relayer_event_id")
+    @SerialName(value = "relayer_event_id")
     val relayerEventId: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200Response.kt
index 365a98fa6..4fc04afbf 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200Response.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.CreatePromoCampaign200ResponseParticipantsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param participants 
- */
 
+@Serializable
 
 data class CreatePromoCampaign200Response (
 
-    @Json(name = "participants")
+    @SerialName(value = "participants")
     val participants: kotlin.collections.List<CreatePromoCampaign200ResponseParticipantsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200ResponseParticipantsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200ResponseParticipantsInner.kt
index 54f47aaba..23813ba66 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200ResponseParticipantsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaign200ResponseParticipantsInner.kt
@@ -16,27 +16,22 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param address 
- * @param balanceIncreased 
- * @param error 
- */
 
+@Serializable
 
 data class CreatePromoCampaign200ResponseParticipantsInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "balance_increased")
+    @SerialName(value = "balance_increased")
     val balanceIncreased: kotlin.String? = null,
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequest.kt
index cda572ba6..c84b0d098 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequest.kt
@@ -17,23 +17,19 @@ package io.batteryapi.models
 
 import io.batteryapi.models.CreatePromoCampaignRequestParticipantsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param name 
- * @param participants 
- */
 
+@Serializable
 
 data class CreatePromoCampaignRequest (
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "participants")
+    @SerialName(value = "participants")
     val participants: kotlin.collections.List<CreatePromoCampaignRequestParticipantsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequestParticipantsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequestParticipantsInner.kt
index 81f6d8355..745915334 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequestParticipantsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreatePromoCampaignRequestParticipantsInner.kt
@@ -16,24 +16,20 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param address 
- * @param amount amount in TON
- */
 
+@Serializable
 
 data class CreatePromoCampaignRequestParticipantsInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
     /* amount in TON */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt
index 2c0e44410..0f076838e 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param boc 
- */
 
+@Serializable
 
 data class EmulateMessageToWalletRequest (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimate200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimate200Response.kt
index 013b3ebc0..8a40698ff 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimate200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimate200Response.kt
@@ -16,24 +16,20 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param estimatedUpfrontPayment 
- * @param emulation base64 encoded emulation results. The exact type can be taken from /v2/wallet/emulate (TONAPI).
- */
 
+@Serializable
 
 data class EnterpriseEstimate200Response (
 
-    @Json(name = "estimated_upfront_payment")
+    @SerialName(value = "estimated_upfront_payment")
     val estimatedUpfrontPayment: kotlin.String,
 
     /* base64 encoded emulation results. The exact type can be taken from /v2/wallet/emulate (TONAPI). */
-    @Json(name = "emulation")
+    @SerialName(value = "emulation")
     val emulation: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimateRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimateRequest.kt
index e5bf04083..55be8fd65 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimateRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseEstimateRequest.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param boc 
- * @param walletPublicKey 
- */
 
+@Serializable
 
 data class EnterpriseEstimateRequest (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String,
 
-    @Json(name = "wallet_public_key")
+    @SerialName(value = "wallet_public_key")
     val walletPublicKey: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetMessage200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetMessage200Response.kt
index 253795a7a..a4f5768ea 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetMessage200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetMessage200Response.kt
@@ -16,35 +16,28 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param status 
- * @param paymentTxHash 
- * @param committedTxHash 
- * @param finalCost 
- * @param failedReason 
- */
 
+@Serializable
 
 data class EnterpriseGetMessage200Response (
 
-    @Json(name = "status")
+    @SerialName(value = "status")
     val status: EnterpriseGetMessage200Response.Status,
 
-    @Json(name = "payment_tx_hash")
+    @SerialName(value = "payment_tx_hash")
     val paymentTxHash: kotlin.String? = null,
 
-    @Json(name = "committed_tx_hash")
+    @SerialName(value = "committed_tx_hash")
     val committedTxHash: kotlin.String? = null,
 
-    @Json(name = "final_cost")
+    @SerialName(value = "final_cost")
     val finalCost: kotlin.String? = null,
 
-    @Json(name = "failed_reason")
+    @SerialName(value = "failed_reason")
     val failedReason: kotlin.String? = null
 
 ) {
@@ -54,11 +47,11 @@ data class EnterpriseGetMessage200Response (
      *
      * Values: pending,completed,failed
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Status(val value: kotlin.String) {
-        @Json(name = "pending") pending("pending"),
-        @Json(name = "completed") completed("completed"),
-        @Json(name = "failed") failed("failed");
+        @SerialName(value = "pending") pending("pending"),
+        @SerialName(value = "completed") completed("completed"),
+        @SerialName(value = "failed") failed("failed");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetStatus200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetStatus200Response.kt
index d3a7e7b77..bca3a3a04 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetStatus200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseGetStatus200Response.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param balance 
- * @param wallet 
- */
 
+@Serializable
 
 data class EnterpriseGetStatus200Response (
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.String,
 
-    @Json(name = "wallet")
+    @SerialName(value = "wallet")
     val wallet: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseSend200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseSend200Response.kt
index 839c4a207..fd89b397b 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseSend200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseSend200Response.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param msgId 
- */
 
+@Serializable
 
 data class EnterpriseSend200Response (
 
-    @Json(name = "msg_id")
+    @SerialName(value = "msg_id")
     val msgId: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseWalletConfig.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseWalletConfig.kt
index c321b0a38..5e82165b5 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseWalletConfig.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EnterpriseWalletConfig.kt
@@ -16,20 +16,17 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param excessAccount when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service.
- */
 
+@Serializable
 
 data class EnterpriseWalletConfig (
 
     /* when building a message to transfer an NFT or Jetton, use this address to send excess funds back to Battery Service. */
-    @Json(name = "excess_account")
+    @SerialName(value = "excess_account")
     val excessAccount: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt
index de7235beb..6ffb57567 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param error 
- */
 
+@Serializable
 
 data class Error (
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EstimateGaslessCostRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EstimateGaslessCostRequest.kt
index 55ba0092d..34c58a49c 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EstimateGaslessCostRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EstimateGaslessCostRequest.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param payload 
- * @param battery 
- */
 
+@Serializable
 
 data class EstimateGaslessCostRequest (
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String,
 
-    @Json(name = "battery")
+    @SerialName(value = "battery")
     val battery: kotlin.Boolean? = true
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTx.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTx.kt
index ecfebc316..d90e059d0 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTx.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTx.kt
@@ -15,33 +15,31 @@
 
 package io.batteryapi.models
 
+import io.batteryapi.models.EstimatedTronTxInstantFee
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param energyCharges 
- * @param bandwidthCharges 
- * @param activationCharges 
- * @param totalCharges 
- */
 
+@Serializable
 
 data class EstimatedTronTx (
 
-    @Json(name = "energy_charges")
+    @SerialName(value = "energy_charges")
     val energyCharges: kotlin.Int,
 
-    @Json(name = "bandwidth_charges")
+    @SerialName(value = "bandwidth_charges")
     val bandwidthCharges: kotlin.Int,
 
-    @Json(name = "activation_charges")
+    @SerialName(value = "activation_charges")
     val activationCharges: kotlin.Int,
 
-    @Json(name = "total_charges")
-    val totalCharges: kotlin.Int
+    @SerialName(value = "total_charges")
+    val totalCharges: kotlin.Int,
+
+    @SerialName(value = "instant_fee")
+    val instantFee: EstimatedTronTxInstantFee
 
 ) {
 
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFee.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFee.kt
new file mode 100644
index 000000000..58c6c8366
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFee.kt
@@ -0,0 +1,39 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.batteryapi.models
+
+import io.batteryapi.models.EstimatedTronTxInstantFeeAcceptedAssetsInner
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+
+
+@Serializable
+
+data class EstimatedTronTxInstantFee (
+
+    @SerialName(value = "fee_address")
+    val feeAddress: kotlin.String,
+
+    @SerialName(value = "accepted_assets")
+    val acceptedAssets: kotlin.collections.List<EstimatedTronTxInstantFeeAcceptedAssetsInner>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFeeAcceptedAssetsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFeeAcceptedAssetsInner.kt
new file mode 100644
index 000000000..1b77553f1
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EstimatedTronTxInstantFeeAcceptedAssetsInner.kt
@@ -0,0 +1,57 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.batteryapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+
+
+@Serializable
+
+data class EstimatedTronTxInstantFeeAcceptedAssetsInner (
+
+    @SerialName(value = "type")
+    val type: EstimatedTronTxInstantFeeAcceptedAssetsInner.Type,
+
+    @SerialName(value = "name")
+    val name: kotlin.String,
+
+    @SerialName(value = "amount_nano")
+    val amountNano: kotlin.String,
+
+    @SerialName(value = "decimals")
+    val decimals: kotlin.Int,
+
+    @SerialName(value = "jetton_master_id")
+    val jettonMasterId: kotlin.String? = null
+
+) {
+
+    /**
+     * 
+     *
+     * Values: jetton,ton
+     */
+    @Serializable
+    enum class Type(val value: kotlin.String) {
+        @SerialName(value = "jetton") jetton("jetton"),
+        @SerialName(value = "ton") ton("ton");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GasProxyAddress.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GasProxyAddress.kt
deleted file mode 100644
index d22281cc8..000000000
--- a/tonapi/src/main/kotlin/io/batteryapi/models/GasProxyAddress.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.batteryapi.models
-
-import com.squareup.moshi.Json
-
-data class GasProxyAddress(
-    @Json(name = "address")
-    val address: String
-)
\ No newline at end of file
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt
index a3a433cdf..19e7a5b89 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param commission 
- */
 
+@Serializable
 
 data class GaslessEstimation (
 
-    @Json(name = "commission")
+    @SerialName(value = "commission")
     val commission: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayload200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayload200Response.kt
index 718c852c1..104aa1432 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayload200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayload200Response.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param payload 
- */
 
+@Serializable
 
 data class GetTonConnectPayload200Response (
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GetTronConfig200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GetTronConfig200Response.kt
index 30fbcbd38..87a8589bd 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/GetTronConfig200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GetTronConfig200Response.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param safetyMarginPercent 
- */
 
+@Serializable
 
 data class GetTronConfig200Response (
 
-    @Json(name = "safety_margin_percent")
+    @SerialName(value = "safety_margin_percent")
     val safetyMarginPercent: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt
index 9004569bf..fafd85018 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.IOSBatteryPurchaseStatusTransactionsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param transactions 
- */
 
+@Serializable
 
 data class IOSBatteryPurchaseStatus (
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.collections.List<IOSBatteryPurchaseStatusTransactionsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInner.kt
index 274ce23fb..c9213b221 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInner.kt
@@ -17,27 +17,22 @@ package io.batteryapi.models
 
 import io.batteryapi.models.IOSBatteryPurchaseStatusTransactionsInnerError
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param transactionId 
- * @param success 
- * @param error 
- */
 
+@Serializable
 
 data class IOSBatteryPurchaseStatusTransactionsInner (
 
-    @Json(name = "transaction_id")
+    @SerialName(value = "transaction_id")
     val transactionId: kotlin.String,
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: IOSBatteryPurchaseStatusTransactionsInnerError? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInnerError.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInnerError.kt
index c18aec4af..0a07da7ea 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInnerError.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInnerError.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param msg 
- * @param code 
- */
 
+@Serializable
 
 data class IOSBatteryPurchaseStatusTransactionsInnerError (
 
-    @Json(name = "msg")
+    @SerialName(value = "msg")
     val msg: kotlin.String,
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: IOSBatteryPurchaseStatusTransactionsInnerError.Code
 
 ) {
@@ -42,14 +38,14 @@ data class IOSBatteryPurchaseStatusTransactionsInnerError (
      *
      * Values: invalidMinusBundleMinusId,invalidMinusProductMinusId,userMinusNotMinusFound,purchaseMinusIsMinusAlreadyMinusUsed,temporaryMinusError,unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Code(val value: kotlin.String) {
-        @Json(name = "invalid-bundle-id") invalidMinusBundleMinusId("invalid-bundle-id"),
-        @Json(name = "invalid-product-id") invalidMinusProductMinusId("invalid-product-id"),
-        @Json(name = "user-not-found") userMinusNotMinusFound("user-not-found"),
-        @Json(name = "purchase-is-already-used") purchaseMinusIsMinusAlreadyMinusUsed("purchase-is-already-used"),
-        @Json(name = "temporary-error") temporaryMinusError("temporary-error"),
-        @Json(name = "unknown") unknown("unknown");
+        @SerialName(value = "invalid-bundle-id") invalidMinusBundleMinusId("invalid-bundle-id"),
+        @SerialName(value = "invalid-product-id") invalidMinusProductMinusId("invalid-product-id"),
+        @SerialName(value = "user-not-found") userMinusNotMinusFound("user-not-found"),
+        @SerialName(value = "purchase-is-already-used") purchaseMinusIsMinusAlreadyMinusUsed("purchase-is-already-used"),
+        @SerialName(value = "temporary-error") temporaryMinusError("temporary-error"),
+        @SerialName(value = "unknown") unknown("unknown");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IncreaseUserBalanceRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IncreaseUserBalanceRequest.kt
new file mode 100644
index 000000000..8c5108f36
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IncreaseUserBalanceRequest.kt
@@ -0,0 +1,40 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.batteryapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+
+
+@Serializable
+
+data class IncreaseUserBalanceRequest (
+
+    /* amount in TON to increase balance by */
+    @SerialName(value = "amount")
+    val amount: kotlin.String,
+
+    /* reason for balance increase */
+    @SerialName(value = "reason")
+    val reason: kotlin.String? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt b/tonapi/src/main/kotlin/io/batteryapi/models/InlineObject.kt
similarity index 60%
rename from tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt
rename to tonapi/src/main/kotlin/io/batteryapi/models/InlineObject.kt
index 909a18b43..a37317ec3 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/InlineObject.kt
@@ -16,27 +16,22 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param error 
- * @param errorKey 
- * @param errorDetails 
- */
 
+@Serializable
 
-data class GetTonConnectPayloadDefaultResponse (
+data class InlineObject (
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: kotlin.String,
 
-    @Json(name = "error-key")
+    @SerialName(value = "error-key")
     val errorKey: kotlin.String? = null,
 
-    @Json(name = "error-details")
+    @SerialName(value = "error-details")
     val errorDetails: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt
index ed426738d..5f2aab375 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.IosBatteryPurchaseRequestTransactionsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param transactions 
- */
 
+@Serializable
 
 data class IosBatteryPurchaseRequest (
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.collections.List<IosBatteryPurchaseRequestTransactionsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequestTransactionsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequestTransactionsInner.kt
index b78519dfe..68860fc96 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequestTransactionsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequestTransactionsInner.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param id 
- * @param promo 
- */
 
+@Serializable
 
 data class IosBatteryPurchaseRequestTransactionsInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: kotlin.String,
 
-    @Json(name = "promo")
+    @SerialName(value = "promo")
     val promo: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseRequest.kt
index 01aae0599..042fe7458 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseRequest.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param promoCode 
- */
 
+@Serializable
 
 data class PromoCodeBatteryPurchaseRequest (
 
-    @Json(name = "promo_code")
+    @SerialName(value = "promo_code")
     val promoCode: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatus.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatus.kt
index d1a6ca9e4..69dad8d0f 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatus.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatus.kt
@@ -17,27 +17,22 @@ package io.batteryapi.models
 
 import io.batteryapi.models.PromoCodeBatteryPurchaseStatusError
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param balanceChange 
- * @param success 
- * @param error 
- */
 
+@Serializable
 
 data class PromoCodeBatteryPurchaseStatus (
 
-    @Json(name = "balance_change")
+    @SerialName(value = "balance_change")
     val balanceChange: kotlin.String,
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: PromoCodeBatteryPurchaseStatusError? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatusError.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatusError.kt
index c92c46295..159e10517 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatusError.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatusError.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param msg 
- * @param code 
- */
 
+@Serializable
 
 data class PromoCodeBatteryPurchaseStatusError (
 
-    @Json(name = "msg")
+    @SerialName(value = "msg")
     val msg: kotlin.String,
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: PromoCodeBatteryPurchaseStatusError.Code
 
 ) {
@@ -42,11 +38,11 @@ data class PromoCodeBatteryPurchaseStatusError (
      *
      * Values: promoMinusCodeMinusNotMinusFound,promoMinusExceededMinusAttempts,temporaryMinusError
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Code(val value: kotlin.String) {
-        @Json(name = "promo-code-not-found") promoMinusCodeMinusNotMinusFound("promo-code-not-found"),
-        @Json(name = "promo-exceeded-attempts") promoMinusExceededMinusAttempts("promo-exceeded-attempts"),
-        @Json(name = "temporary-error") temporaryMinusError("temporary-error");
+        @SerialName(value = "promo-code-not-found") promoMinusCodeMinusNotMinusFound("promo-code-not-found"),
+        @SerialName(value = "promo-exceeded-attempts") promoMinusExceededMinusAttempts("promo-exceeded-attempts"),
+        @SerialName(value = "temporary-error") temporaryMinusError("temporary-error");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PromoUsed.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PromoUsed.kt
index bc619d712..491ef4dfe 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PromoUsed.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoUsed.kt
@@ -16,20 +16,20 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param promoUsed 
- */
 
+@Serializable
 
 data class PromoUsed (
 
-    @Json(name = "promo_used")
-    val promoUsed: kotlin.Boolean
+    @SerialName(value = "promo_used")
+    val promoUsed: kotlin.Boolean,
+
+    @SerialName(value = "bonus_charges")
+    val bonusCharges: kotlin.String
 
 ) {
 
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt
index eb5d8d0b1..d8e93d91b 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt
@@ -17,23 +17,19 @@ package io.batteryapi.models
 
 import io.batteryapi.models.PurchasesPurchasesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param totalPurchases 
- * @param purchases 
- */
 
+@Serializable
 
 data class Purchases (
 
-    @Json(name = "total_purchases")
+    @SerialName(value = "total_purchases")
     val totalPurchases: kotlin.Int,
 
-    @Json(name = "purchases")
+    @SerialName(value = "purchases")
     val purchases: kotlin.collections.List<PurchasesPurchasesInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInner.kt
index e4d979925..8b6323496 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInner.kt
@@ -17,58 +17,46 @@ package io.batteryapi.models
 
 import io.batteryapi.models.PurchasesPurchasesInnerRefundInformation
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param userPurchaseId 
- * @param purchaseId 
- * @param type 
- * @param charges 
- * @param datetime 
- * @param promo 
- * @param forAccountId 
- * @param amount Amount describes the amount paid by the user for this purchase when we know it. For crypto purchases it is always set.
- * @param currency Currency is set when we know it. For crypto purchases it is always set.
- * @param refundInformation 
- */
 
+@Serializable
 
 data class PurchasesPurchasesInner (
 
-    @Json(name = "user_purchase_id")
+    @SerialName(value = "user_purchase_id")
     @Deprecated(message = "This property is deprecated.")
     val userPurchaseId: kotlin.Int,
 
-    @Json(name = "purchase_id")
+    @SerialName(value = "purchase_id")
     val purchaseId: kotlin.Int,
 
-    @Json(name = "type")
+    @SerialName(value = "type")
     val type: PurchasesPurchasesInner.Type,
 
-    @Json(name = "charges")
+    @SerialName(value = "charges")
     val charges: kotlin.Int,
 
-    @Json(name = "datetime")
+    @SerialName(value = "datetime")
     val datetime: kotlin.String,
 
-    @Json(name = "promo")
+    @SerialName(value = "promo")
     val promo: kotlin.String? = null,
 
-    @Json(name = "for_account_id")
+    @SerialName(value = "for_account_id")
     val forAccountId: kotlin.String? = null,
 
     /* Amount describes the amount paid by the user for this purchase when we know it. For crypto purchases it is always set. */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String? = null,
 
     /* Currency is set when we know it. For crypto purchases it is always set. */
-    @Json(name = "currency")
+    @SerialName(value = "currency")
     val currency: kotlin.String? = null,
 
-    @Json(name = "refund_information")
+    @SerialName(value = "refund_information")
     val refundInformation: PurchasesPurchasesInnerRefundInformation? = null
 
 ) {
@@ -78,14 +66,14 @@ data class PurchasesPurchasesInner (
      *
      * Values: android,ios,promoMinusCode,crypto,gift,onMinusTheMinusWayMinusGift
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Type(val value: kotlin.String) {
-        @Json(name = "android") android("android"),
-        @Json(name = "ios") ios("ios"),
-        @Json(name = "promo-code") promoMinusCode("promo-code"),
-        @Json(name = "crypto") crypto("crypto"),
-        @Json(name = "gift") gift("gift"),
-        @Json(name = "on-the-way-gift") onMinusTheMinusWayMinusGift("on-the-way-gift");
+        @SerialName(value = "android") android("android"),
+        @SerialName(value = "ios") ios("ios"),
+        @SerialName(value = "promo-code") promoMinusCode("promo-code"),
+        @SerialName(value = "crypto") crypto("crypto"),
+        @SerialName(value = "gift") gift("gift"),
+        @SerialName(value = "on-the-way-gift") onMinusTheMinusWayMinusGift("on-the-way-gift");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt
index baef29114..1a590eadd 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt
@@ -17,35 +17,28 @@ package io.batteryapi.models
 
 import io.batteryapi.models.PurchasesPurchasesInnerRefundInformationRefunded
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param fullyRefunded 
- * @param partiallyRefunded 
- * @param pendingRefund 
- * @param refunded 
- * @param refundable 
- */
 
+@Serializable
 
 data class PurchasesPurchasesInnerRefundInformation (
 
-    @Json(name = "fully_refunded")
+    @SerialName(value = "fully_refunded")
     val fullyRefunded: kotlin.Boolean,
 
-    @Json(name = "partially_refunded")
+    @SerialName(value = "partially_refunded")
     val partiallyRefunded: kotlin.Boolean,
 
-    @Json(name = "pending_refund")
+    @SerialName(value = "pending_refund")
     val pendingRefund: kotlin.Boolean,
 
-    @Json(name = "refunded")
+    @SerialName(value = "refunded")
     val refunded: PurchasesPurchasesInnerRefundInformationRefunded? = null,
 
-    @Json(name = "refundable")
+    @SerialName(value = "refundable")
     val refundable: PurchasesPurchasesInnerRefundInformationRefunded? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformationRefunded.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformationRefunded.kt
index efc958edf..aa6099f0d 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformationRefunded.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformationRefunded.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param amount 
- * @param charges 
- */
 
+@Serializable
 
 data class PurchasesPurchasesInnerRefundInformationRefunded (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "charges")
+    @SerialName(value = "charges")
     val charges: kotlin.Int
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethods.kt b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethods.kt
index eb031aad8..a66d41ffb 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethods.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethods.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.RechargeMethodsMethodsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param methods 
- */
 
+@Serializable
 
 data class RechargeMethods (
 
-    @Json(name = "methods")
+    @SerialName(value = "methods")
     val methods: kotlin.collections.List<RechargeMethodsMethodsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethodsMethodsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethodsMethodsInner.kt
index 6af745293..409785fd5 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethodsMethodsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethodsMethodsInner.kt
@@ -16,51 +16,40 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param type 
- * @param rate 
- * @param symbol 
- * @param decimals 
- * @param supportGasless 
- * @param supportRecharge 
- * @param image 
- * @param jettonMaster 
- * @param minBootstrapValue 
- */
 
+@Serializable
 
 data class RechargeMethodsMethodsInner (
 
-    @Json(name = "type")
+    @SerialName(value = "type")
     val type: RechargeMethodsMethodsInner.Type,
 
-    @Json(name = "rate")
+    @SerialName(value = "rate")
     val rate: kotlin.String,
 
-    @Json(name = "symbol")
+    @SerialName(value = "symbol")
     val symbol: kotlin.String,
 
-    @Json(name = "decimals")
+    @SerialName(value = "decimals")
     val decimals: kotlin.Int,
 
-    @Json(name = "support_gasless")
+    @SerialName(value = "support_gasless")
     val supportGasless: kotlin.Boolean,
 
-    @Json(name = "support_recharge")
+    @SerialName(value = "support_recharge")
     val supportRecharge: kotlin.Boolean,
 
-    @Json(name = "image")
+    @SerialName(value = "image")
     val image: kotlin.String? = null,
 
-    @Json(name = "jetton_master")
+    @SerialName(value = "jetton_master")
     val jettonMaster: kotlin.String? = null,
 
-    @Json(name = "min_bootstrap_value")
+    @SerialName(value = "min_bootstrap_value")
     val minBootstrapValue: kotlin.String? = null
 
 ) {
@@ -70,10 +59,10 @@ data class RechargeMethodsMethodsInner (
      *
      * Values: jetton,ton
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Type(val value: kotlin.String) {
-        @Json(name = "jetton") jetton("jetton"),
-        @Json(name = "ton") ton("ton");
+        @SerialName(value = "jetton") jetton("jetton"),
+        @SerialName(value = "ton") ton("ton");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/RelayerSendingEstimation.kt b/tonapi/src/main/kotlin/io/batteryapi/models/RelayerSendingEstimation.kt
index f9c31f066..cf2ff81f4 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/RelayerSendingEstimation.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RelayerSendingEstimation.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param commission 
- */
 
+@Serializable
 
 data class RelayerSendingEstimation (
 
-    @Json(name = "commission")
+    @SerialName(value = "commission")
     val commission: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt
index cb4ceba3a..5f63c4935 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt
@@ -16,24 +16,20 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param userPurchaseId 
- * @param purchaseId 
- */
 
+@Serializable
 
 data class RequestRefundRequest (
 
-    @Json(name = "user_purchase_id")
+    @SerialName(value = "user_purchase_id")
     @Deprecated(message = "This property is deprecated.")
     val userPurchaseId: kotlin.Int? = null,
 
-    @Json(name = "purchase_id")
+    @SerialName(value = "purchase_id")
     val purchaseId: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/ResetUserBalanceRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/ResetUserBalanceRequest.kt
index 5012b3343..c43b3f896 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/ResetUserBalanceRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/ResetUserBalanceRequest.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param reason 
- */
 
+@Serializable
 
 data class ResetUserBalanceRequest (
 
-    @Json(name = "reason")
+    @SerialName(value = "reason")
     val reason: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/SentTronTx.kt b/tonapi/src/main/kotlin/io/batteryapi/models/SentTronTx.kt
index 32b15f78f..5ee833f63 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/SentTronTx.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/SentTronTx.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param status 
- */
 
+@Serializable
 
 data class SentTronTx (
 
-    @Json(name = "status")
+    @SerialName(value = "status")
     val status: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt
index 5e4555484..965b80922 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.StatusPendingTransactionsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param pendingTransactions 
- */
 
+@Serializable
 
 data class Status (
 
-    @Json(name = "pending_transactions")
+    @SerialName(value = "pending_transactions")
     val pendingTransactions: kotlin.collections.List<StatusPendingTransactionsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/StatusPendingTransactionsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/StatusPendingTransactionsInner.kt
index 6329fa7a8..01448927c 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/StatusPendingTransactionsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/StatusPendingTransactionsInner.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param id 
- */
 
+@Serializable
 
 data class StatusPendingTransactionsInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProof200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProof200Response.kt
index 7e95734a8..2fe8a1e49 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProof200Response.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProof200Response.kt
@@ -16,19 +16,16 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param token 
- */
 
+@Serializable
 
 data class TonConnectProof200Response (
 
-    @Json(name = "token")
+    @SerialName(value = "token")
     val token: kotlin.String
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequest.kt
index f90901fdd..42e8f8af0 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequest.kt
@@ -17,23 +17,19 @@ package io.batteryapi.models
 
 import io.batteryapi.models.TonConnectProofRequestProof
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param address 
- * @param proof 
- */
 
+@Serializable
 
 data class TonConnectProofRequest (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: TonConnectProofRequestProof
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProof.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProof.kt
index 3024447ee..fce06cdfe 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProof.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProof.kt
@@ -17,35 +17,28 @@ package io.batteryapi.models
 
 import io.batteryapi.models.TonConnectProofRequestProofDomain
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param timestamp 
- * @param domain 
- * @param signature 
- * @param payload 
- * @param stateInit 
- */
 
+@Serializable
 
 data class TonConnectProofRequestProof (
 
-    @Json(name = "timestamp")
+    @SerialName(value = "timestamp")
     val timestamp: kotlin.Long,
 
-    @Json(name = "domain")
+    @SerialName(value = "domain")
     val domain: TonConnectProofRequestProofDomain,
 
-    @Json(name = "signature")
+    @SerialName(value = "signature")
     val signature: kotlin.String,
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String,
 
-    @Json(name = "state_init")
+    @SerialName(value = "state_init")
     val stateInit: kotlin.String? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProofDomain.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProofDomain.kt
index d39135b54..dda61bdf8 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProofDomain.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProofDomain.kt
@@ -16,23 +16,19 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param `value` 
- * @param lengthBytes 
- */
 
+@Serializable
 
 data class TonConnectProofRequestProofDomain (
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.String,
 
-    @Json(name = "length_bytes")
+    @SerialName(value = "length_bytes")
     val lengthBytes: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Transactions.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Transactions.kt
index 74d2c37ba..a93975e43 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/Transactions.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Transactions.kt
@@ -17,28 +17,23 @@ package io.batteryapi.models
 
 import io.batteryapi.models.TransactionsTransactionsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param totalTransactions 
- * @param transactions 
- * @param nextOffset if set, then there are more transactions to be loaded. Use this value as offset parameter in the next request.
- */
 
+@Serializable
 
 data class Transactions (
 
-    @Json(name = "total_transactions")
+    @SerialName(value = "total_transactions")
     val totalTransactions: kotlin.Int,
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.collections.List<TransactionsTransactionsInner>,
 
     /* if set, then there are more transactions to be loaded. Use this value as offset parameter in the next request. */
-    @Json(name = "next_offset")
+    @SerialName(value = "next_offset")
     val nextOffset: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TransactionsTransactionsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TransactionsTransactionsInner.kt
index a8e4f8715..e75840d93 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TransactionsTransactionsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TransactionsTransactionsInner.kt
@@ -16,32 +16,26 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param id 
- * @param paidAmount represents the amount of money paid by the user for this transaction.
- * @param status 
- * @param createdAt 
- */
 
+@Serializable
 
 data class TransactionsTransactionsInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: kotlin.String,
 
     /* represents the amount of money paid by the user for this transaction. */
-    @Json(name = "paid_amount")
+    @SerialName(value = "paid_amount")
     val paidAmount: kotlin.String,
 
-    @Json(name = "status")
+    @SerialName(value = "status")
     val status: TransactionsTransactionsInner.Status,
 
-    @Json(name = "created_at")
+    @SerialName(value = "created_at")
     val createdAt: kotlin.String
 
 ) {
@@ -51,11 +45,11 @@ data class TransactionsTransactionsInner (
      *
      * Values: pending,completed,failed
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable
     enum class Status(val value: kotlin.String) {
-        @Json(name = "pending") pending("pending"),
-        @Json(name = "completed") completed("completed"),
-        @Json(name = "failed") failed("failed");
+        @SerialName(value = "pending") pending("pending"),
+        @SerialName(value = "completed") completed("completed"),
+        @SerialName(value = "failed") failed("failed");
     }
 
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TronSendRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TronSendRequest.kt
index ac5ce0d0e..3609a9313 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TronSendRequest.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TronSendRequest.kt
@@ -16,32 +16,30 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param wallet 
- * @param tx 
- * @param energy 
- * @param bandwidth 
- */
 
+@Serializable
 
 data class TronSendRequest (
 
-    @Json(name = "wallet")
+    @SerialName(value = "wallet")
     val wallet: kotlin.String,
 
-    @Json(name = "tx")
+    @SerialName(value = "tx")
     val tx: kotlin.String? = null,
 
-    @Json(name = "energy")
+    @SerialName(value = "energy")
     val energy: kotlin.Int? = null,
 
-    @Json(name = "bandwidth")
-    val bandwidth: kotlin.Int? = null
+    @SerialName(value = "bandwidth")
+    val bandwidth: kotlin.Int? = null,
+
+    /* base64 encoded payment transaction in the TON network */
+    @SerialName(value = "instant_fee_tx")
+    val instantFeeTx: kotlin.String? = null
 
 ) {
 
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsList.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsList.kt
index a9ef821cd..86ade1867 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsList.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsList.kt
@@ -17,19 +17,16 @@ package io.batteryapi.models
 
 import io.batteryapi.models.TronTransactionsListTransactionsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param transactions 
- */
 
+@Serializable
 
 data class TronTransactionsList (
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.collections.List<TronTransactionsListTransactionsInner>
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsListTransactionsInner.kt b/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsListTransactionsInner.kt
index 45177459e..0e3355ba6 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsListTransactionsInner.kt
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TronTransactionsListTransactionsInner.kt
@@ -16,51 +16,40 @@
 package io.batteryapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
 
-/**
- * 
- *
- * @param txid 
- * @param fromAccount 
- * @param toAccount 
- * @param amount 
- * @param isPending 
- * @param isFailed 
- * @param batteryCharges 
- * @param timestamp 
- * @param trongridResult 
- */
 
+@Serializable
 
 data class TronTransactionsListTransactionsInner (
 
-    @Json(name = "txid")
+    @SerialName(value = "txid")
     val txid: kotlin.String,
 
-    @Json(name = "from_account")
+    @SerialName(value = "from_account")
     val fromAccount: kotlin.String,
 
-    @Json(name = "to_account")
+    @SerialName(value = "to_account")
     val toAccount: kotlin.String,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "is_pending")
+    @SerialName(value = "is_pending")
     val isPending: kotlin.Boolean,
 
-    @Json(name = "is_failed")
+    @SerialName(value = "is_failed")
     val isFailed: kotlin.Boolean,
 
-    @Json(name = "battery_charges")
+    @SerialName(value = "battery_charges")
     val batteryCharges: kotlin.Int,
 
-    @Json(name = "timestamp")
+    @SerialName(value = "timestamp")
     val timestamp: kotlin.Long,
 
-    @Json(name = "trongrid_result")
+    @SerialName(value = "trongrid_result")
     val trongridResult: kotlin.Int? = null
 
 ) {
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/VerifyPurchasePromo200Response.kt b/tonapi/src/main/kotlin/io/batteryapi/models/VerifyPurchasePromo200Response.kt
new file mode 100644
index 000000000..0e4e3d30a
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/VerifyPurchasePromo200Response.kt
@@ -0,0 +1,35 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.batteryapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+
+
+@Serializable
+
+data class VerifyPurchasePromo200Response (
+
+    @SerialName(value = "bonus_charges")
+    val bonusCharges: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/extensions/NftItem.kt b/tonapi/src/main/kotlin/io/extensions/NftItem.kt
new file mode 100644
index 000000000..cad89af51
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/extensions/NftItem.kt
@@ -0,0 +1,6 @@
+package io.extensions
+
+import io.tonapi.models.NftItem
+
+val NftItem.renderType: String
+    get() = metadata["render_type"]?.asString() ?: ""
\ No newline at end of file
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiAbstractions.kt b/tonapi/src/main/kotlin/io/infrastructure/ApiAbstractions.kt
similarity index 95%
rename from tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiAbstractions.kt
rename to tonapi/src/main/kotlin/io/infrastructure/ApiAbstractions.kt
index 02fff23f2..84e25a19a 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiAbstractions.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/ApiAbstractions.kt
@@ -1,4 +1,4 @@
-package io.batteryapi.infrastructure
+package io.infrastructure
 
 typealias MultiValueMap = MutableMap<String,List<String>>
 
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiClient.kt b/tonapi/src/main/kotlin/io/infrastructure/ApiClient.kt
similarity index 96%
rename from tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiClient.kt
rename to tonapi/src/main/kotlin/io/infrastructure/ApiClient.kt
index 2c9f4f574..45504ae5b 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiClient.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/ApiClient.kt
@@ -1,5 +1,6 @@
-package io.batteryapi.infrastructure
+package io.infrastructure
 
+import io.Serializer
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -28,7 +29,8 @@ import java.time.OffsetDateTime
 import java.time.OffsetTime
 import java.util.Locale
 import java.util.regex.Pattern
-import com.squareup.moshi.adapter
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 
 val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
 
@@ -49,7 +51,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         var username: String? = null
         var password: String? = null
         var accessToken: String? = null
-        const val baseUrlKey: String = "io.batteryapi.baseUrl"
+        const val baseUrlKey: String = "io.tonapi.baseUrl"
 
         @JvmStatic
         val defaultClient: OkHttpClient by lazy {
@@ -166,7 +168,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                 if (content == null) {
                     EMPTY_REQUEST
                 } else {
-                    Serializer.moshi.adapter(T::class.java).toJson(content)
+                    Serializer.toJSON(content)
                         .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull())
                 }
             mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
@@ -176,7 +178,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
             else -> throw UnsupportedOperationException("requestBody currently only supports JSON body, text body, byte body and File body.")
         }
 
-    @OptIn(ExperimentalStdlibApi::class)
     protected inline fun <reified T: Any?> responseBody(response: Response, mediaType: String? = JsonMediaType): T? {
         val body = response.body
         if(body == null) {
@@ -241,7 +242,7 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
                 if (bodyContent.isEmpty()) {
                     return null
                 }
-                Serializer.moshi.adapter<T>().fromJson(bodyContent)
+                Serializer.fromJSON<T>(bodyContent)
             }
             mediaType == OctetMediaType -> body.bytes() as? T
             mediaType == TextMediaType -> body.string() as? T
@@ -341,8 +342,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         null -> ""
         is Array<*> -> toMultiValue(value, "csv").toString()
         is Iterable<*> -> toMultiValue(value, "csv").toString()
-        is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
-            parseDateToQueryString(value)
         else -> value.toString()
     }
 
@@ -353,6 +352,6 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         formatter. It also easily allows to provide a simple way to define a custom date format pattern
         inside a gson/moshi adapter.
         */
-        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+        return Serializer.toJSON(value).replace("\"", "")
     }
 }
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiResponse.kt b/tonapi/src/main/kotlin/io/infrastructure/ApiResponse.kt
similarity index 97%
rename from tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiResponse.kt
rename to tonapi/src/main/kotlin/io/infrastructure/ApiResponse.kt
index 99586537f..8305b92c6 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiResponse.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/ApiResponse.kt
@@ -1,4 +1,4 @@
-package io.batteryapi.infrastructure
+package io.infrastructure
 
 enum class ResponseType {
     Success, Informational, Redirection, ClientError, ServerError
diff --git a/tonapi/src/main/kotlin/io/infrastructure/AtomicBooleanAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/AtomicBooleanAdapter.kt
new file mode 100644
index 000000000..94da7ddad
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/AtomicBooleanAdapter.kt
@@ -0,0 +1,19 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.util.concurrent.atomic.AtomicBoolean
+
+object AtomicBooleanAdapter : KSerializer<AtomicBoolean> {
+    override fun serialize(encoder: Encoder, value: AtomicBoolean) {
+        encoder.encodeBoolean(value.get())
+    }
+
+    override fun deserialize(decoder: Decoder): AtomicBoolean = AtomicBoolean(decoder.decodeBoolean())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("AtomicBoolean", PrimitiveKind.BOOLEAN)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/AtomicIntegerAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/AtomicIntegerAdapter.kt
new file mode 100644
index 000000000..ebaba5f17
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/AtomicIntegerAdapter.kt
@@ -0,0 +1,19 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.util.concurrent.atomic.AtomicInteger
+
+object AtomicIntegerAdapter : KSerializer<AtomicInteger> {
+    override fun serialize(encoder: Encoder, value: AtomicInteger) {
+        encoder.encodeInt(value.get())
+    }
+
+    override fun deserialize(decoder: Decoder): AtomicInteger = AtomicInteger(decoder.decodeInt())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("AtomicInteger", PrimitiveKind.INT)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/AtomicLongAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/AtomicLongAdapter.kt
new file mode 100644
index 000000000..bc4adfd96
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/AtomicLongAdapter.kt
@@ -0,0 +1,19 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.util.concurrent.atomic.AtomicLong
+
+object AtomicLongAdapter : KSerializer<AtomicLong> {
+    override fun serialize(encoder: Encoder, value: AtomicLong) {
+        encoder.encodeLong(value.get())
+    }
+
+    override fun deserialize(decoder: Decoder): AtomicLong = AtomicLong(decoder.decodeLong())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("AtomicLong", PrimitiveKind.LONG)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/BigDecimalAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/BigDecimalAdapter.kt
new file mode 100644
index 000000000..6d2740f81
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/BigDecimalAdapter.kt
@@ -0,0 +1,15 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.math.BigDecimal
+
+object BigDecimalAdapter : KSerializer<BigDecimal> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("BigDecimal", PrimitiveKind.STRING)
+    override fun deserialize(decoder: Decoder): BigDecimal = BigDecimal(decoder.decodeString())
+    override fun serialize(encoder: Encoder, value: BigDecimal) = encoder.encodeString(value.toPlainString())
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/BigIntegerAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/BigIntegerAdapter.kt
new file mode 100644
index 000000000..f59626c99
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/BigIntegerAdapter.kt
@@ -0,0 +1,20 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.math.BigInteger
+
+object BigIntegerAdapter : KSerializer<BigInteger> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("BigInteger", PrimitiveKind.STRING)
+    override fun deserialize(decoder: Decoder): BigInteger {
+        return BigInteger(decoder.decodeString())
+    }
+
+    override fun serialize(encoder: Encoder, value: BigInteger) {
+        encoder.encodeString(value.toString())
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/Errors.kt b/tonapi/src/main/kotlin/io/infrastructure/Errors.kt
similarity index 94%
rename from tonapi/src/main/kotlin/io/tonapi/infrastructure/Errors.kt
rename to tonapi/src/main/kotlin/io/infrastructure/Errors.kt
index dc12358dc..0435a402b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/Errors.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/Errors.kt
@@ -1,5 +1,6 @@
 @file:Suppress("unused")
-package io.tonapi.infrastructure
+
+package io.infrastructure
 
 import java.lang.RuntimeException
 
diff --git a/tonapi/src/main/kotlin/io/infrastructure/LocalDateAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000..3ef48d339
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,22 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+object LocalDateAdapter : KSerializer<LocalDate> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("LocalDate", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: LocalDate) {
+        encoder.encodeString(DateTimeFormatter.ISO_LOCAL_DATE.format(value))
+    }
+
+    override fun deserialize(decoder: Decoder): LocalDate {
+        return LocalDate.parse(decoder.decodeString(), DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/LocalDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000..7e42fc408
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,22 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+object LocalDateTimeAdapter : KSerializer<LocalDateTime> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("LocalDateTime", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: LocalDateTime) {
+        encoder.encodeString(DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value))
+    }
+
+    override fun deserialize(decoder: Decoder): LocalDateTime {
+        return LocalDateTime.parse(decoder.decodeString(), DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/OffsetDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000..a5cc07c65
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,22 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+object OffsetDateTimeAdapter : KSerializer<OffsetDateTime> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("OffsetDateTime", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: OffsetDateTime) {
+        encoder.encodeString(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value))
+    }
+
+    override fun deserialize(decoder: Decoder): OffsetDateTime {
+        return OffsetDateTime.parse(decoder.decodeString(), DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/PartConfig.kt b/tonapi/src/main/kotlin/io/infrastructure/PartConfig.kt
similarity index 90%
rename from tonapi/src/main/kotlin/io/tonapi/infrastructure/PartConfig.kt
rename to tonapi/src/main/kotlin/io/infrastructure/PartConfig.kt
index 1e932b0a8..bab67dc4b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/PartConfig.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/PartConfig.kt
@@ -1,4 +1,4 @@
-package io.tonapi.infrastructure
+package io.infrastructure
 
 /**
  * Defines a config object for a given part of a multi-part request.
diff --git a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestConfig.kt b/tonapi/src/main/kotlin/io/infrastructure/RequestConfig.kt
similarity index 94%
rename from tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestConfig.kt
rename to tonapi/src/main/kotlin/io/infrastructure/RequestConfig.kt
index 974122e57..3ed43e1e9 100644
--- a/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestConfig.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/RequestConfig.kt
@@ -1,4 +1,4 @@
-package io.batteryapi.infrastructure
+package io.infrastructure
 
 /**
  * Defines a config object for a given request.
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestMethod.kt b/tonapi/src/main/kotlin/io/infrastructure/RequestMethod.kt
similarity index 78%
rename from tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestMethod.kt
rename to tonapi/src/main/kotlin/io/infrastructure/RequestMethod.kt
index bb7eacb92..73a6173e1 100644
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestMethod.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/RequestMethod.kt
@@ -1,4 +1,4 @@
-package io.tonapi.infrastructure
+package io.infrastructure
 
 /**
  * Provides enumerated HTTP verbs
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ResponseExtensions.kt b/tonapi/src/main/kotlin/io/infrastructure/ResponseExtensions.kt
similarity index 95%
rename from tonapi/src/main/kotlin/io/tonapi/infrastructure/ResponseExtensions.kt
rename to tonapi/src/main/kotlin/io/infrastructure/ResponseExtensions.kt
index 0d81acd92..91347f149 100644
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ResponseExtensions.kt
+++ b/tonapi/src/main/kotlin/io/infrastructure/ResponseExtensions.kt
@@ -1,4 +1,4 @@
-package io.tonapi.infrastructure
+package io.infrastructure
 
 import okhttp3.Response
 
diff --git a/tonapi/src/main/kotlin/io/infrastructure/StringBuilderAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/StringBuilderAdapter.kt
new file mode 100644
index 000000000..55b5cd100
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/StringBuilderAdapter.kt
@@ -0,0 +1,18 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+
+object StringBuilderAdapter : KSerializer<StringBuilder> {
+    override fun serialize(encoder: Encoder, value: StringBuilder) {
+        encoder.encodeString(value.toString())
+    }
+
+    override fun deserialize(decoder: Decoder): StringBuilder = StringBuilder(decoder.decodeString())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("StringBuilder", PrimitiveKind.STRING)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/URIAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/URIAdapter.kt
new file mode 100644
index 000000000..e43da27e6
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/URIAdapter.kt
@@ -0,0 +1,19 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.net.URI
+
+object URIAdapter : KSerializer<URI> {
+    override fun serialize(encoder: Encoder, value: URI) {
+        encoder.encodeString(value.toASCIIString())
+    }
+
+    override fun deserialize(decoder: Decoder): URI = URI(decoder.decodeString())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("URI", PrimitiveKind.STRING)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/URLAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/URLAdapter.kt
new file mode 100644
index 000000000..d5653c9da
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/URLAdapter.kt
@@ -0,0 +1,19 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.net.URL
+
+object URLAdapter : KSerializer<URL> {
+    override fun serialize(encoder: Encoder, value: URL) {
+        encoder.encodeString(value.toExternalForm())
+    }
+
+    override fun deserialize(decoder: Decoder): URL = URL(decoder.decodeString())
+
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("URL", PrimitiveKind.STRING)
+}
diff --git a/tonapi/src/main/kotlin/io/infrastructure/UUIDAdapter.kt b/tonapi/src/main/kotlin/io/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000..348ecae78
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,21 @@
+package io.infrastructure
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.SerialDescriptor
+import java.util.UUID
+
+object UUIDAdapter : KSerializer<UUID> {
+    override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("UUID", PrimitiveKind.STRING)
+
+    override fun serialize(encoder: Encoder, value: UUID) {
+        encoder.encodeString(value.toString())
+    }
+
+    override fun deserialize(decoder: Decoder): UUID {
+        return UUID.fromString(decoder.decodeString())
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/serializers/AnySerializer.kt b/tonapi/src/main/kotlin/io/serializers/AnySerializer.kt
new file mode 100644
index 000000000..e97275680
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/serializers/AnySerializer.kt
@@ -0,0 +1,51 @@
+package io.serializers
+
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.buildClassSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
+
+object AnySerializer : KSerializer<Any> {
+    override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Any")
+
+    override fun serialize(encoder: Encoder, value: Any) {
+        val jsonEncoder = encoder as? JsonEncoder ?: error("This serializer can be used only with Json")
+        val jsonElement = serializeAny(value)
+        jsonEncoder.encodeJsonElement(jsonElement)
+    }
+
+    private fun serializeAny(value: Any): JsonElement = when (value) {
+        is Map<*, *> -> {
+            val map = value as Map<String, Any>
+            JsonObject(map.mapValues { serializeAny(it.value) })
+        }
+        is List<*> -> {
+            val list = value as List<Any>
+            JsonArray(list.map { serializeAny(it) })
+        }
+        is String -> JsonPrimitive(value)
+        is Number -> JsonPrimitive(value)
+        is Boolean -> JsonPrimitive(value)
+        else -> JsonNull
+    }
+
+    override fun deserialize(decoder: Decoder): Any {
+        val jsonDecoder = decoder as? JsonDecoder ?: error("This serializer can be used only with Json")
+        val element = jsonDecoder.decodeJsonElement()
+        return deserializeJsonElement(element)
+    }
+
+    private fun deserializeJsonElement(element: JsonElement): Any = when (element) {
+        is JsonObject -> element.mapValues { deserializeJsonElement(it.value) }
+        is JsonArray -> element.map { deserializeJsonElement(it) }
+        is JsonPrimitive -> {
+            if (element.isString) {
+                element.content
+            } else {
+                element.content.toBooleanStrictOrNull() ?: element.content.toDoubleOrNull() ?: element.content
+            }
+        }
+    }
+}
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/AccountsApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/AccountsApi.kt
index 68d204ca1..e6f84de0e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/AccountsApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/AccountsApi.kt
@@ -16,45 +16,47 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.Account
 import io.tonapi.models.AccountEvent
 import io.tonapi.models.AccountEvents
 import io.tonapi.models.Accounts
-import io.tonapi.models.AddressParse200Response
 import io.tonapi.models.DnsExpiring
 import io.tonapi.models.DomainNames
 import io.tonapi.models.FoundAccounts
+import io.tonapi.models.GaslessEstimateRequestMessagesInner
 import io.tonapi.models.GetAccountDiff200Response
 import io.tonapi.models.GetAccountPublicKey200Response
 import io.tonapi.models.GetAccountsRequest
+import io.tonapi.models.InlineObject
 import io.tonapi.models.JettonBalance
+import io.tonapi.models.JettonOperations
 import io.tonapi.models.JettonsBalances
 import io.tonapi.models.Multisigs
 import io.tonapi.models.NftItems
-import io.tonapi.models.StatusDefaultResponse
 import io.tonapi.models.Subscriptions
 import io.tonapi.models.TraceIDs
 
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class AccountsApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -62,17 +64,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get account&#39;s domains
-     * @param accountId account ID
-     * @return DomainNames
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun accountDnsBackResolve(accountId: kotlin.String) : DomainNames {
@@ -93,14 +84,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get account&#39;s domains
-     * @param accountId account ID
-     * @return ApiResponse<DomainNames?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun accountDnsBackResolveWithHttpInfo(accountId: kotlin.String) : ApiResponse<DomainNames?> {
@@ -111,12 +94,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation accountDnsBackResolve
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun accountDnsBackResolveRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -133,24 +110,13 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * parse address and display in all formats
-     * @param accountId account ID
-     * @return AddressParse200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun addressParse(accountId: kotlin.String) : AddressParse200Response {
-        val localVarResponse = addressParseWithHttpInfo(accountId = accountId)
+    fun emulateMessageToAccountEvent(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : AccountEvent {
+        val localVarResponse = emulateMessageToAccountEventWithHttpInfo(accountId = accountId, gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as AddressParse200Response
+            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvent
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -164,39 +130,32 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * parse address and display in all formats
-     * @param accountId account ID
-     * @return ApiResponse<AddressParse200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun addressParseWithHttpInfo(accountId: kotlin.String) : ApiResponse<AddressParse200Response?> {
-        val localVariableConfig = addressParseRequestConfig(accountId = accountId)
+    fun emulateMessageToAccountEventWithHttpInfo(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<AccountEvent?> {
+        val localVariableConfig = emulateMessageToAccountEventRequestConfig(accountId = accountId, gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
-        return request<Unit, AddressParse200Response>(
+        return request<GaslessEstimateRequestMessagesInner, AccountEvent>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation addressParse
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
-    fun addressParseRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf()
+    fun emulateMessageToAccountEventRequestConfig(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (ignoreSignatureCheck != null) {
+                    put("ignore_signature_check", listOf(ignoreSignatureCheck.toString()))
+                }
+            }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
         localVariableHeaders["Accept"] = "application/json"
 
         return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/address/{account_id}/parse".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
+            method = RequestMethod.POST,
+            path = "/v2/accounts/{account_id}/events/emulate".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,
@@ -204,17 +163,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get human-friendly information about an account without low-level details.
-     * @param accountId account ID
-     * @return Account
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccount(accountId: kotlin.String) : Account {
@@ -235,14 +183,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get human-friendly information about an account without low-level details.
-     * @param accountId account ID
-     * @return ApiResponse<Account?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountWithHttpInfo(accountId: kotlin.String) : ApiResponse<Account?> {
@@ -253,12 +193,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccount
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getAccountRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -275,19 +209,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get account&#39;s balance change
-     * @param accountId account ID
-     * @param startDate 
-     * @param endDate 
-     * @return GetAccountDiff200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountDiff(accountId: kotlin.String, startDate: kotlin.Long, endDate: kotlin.Long) : GetAccountDiff200Response {
@@ -308,16 +229,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get account&#39;s balance change
-     * @param accountId account ID
-     * @param startDate 
-     * @param endDate 
-     * @return ApiResponse<GetAccountDiff200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountDiffWithHttpInfo(accountId: kotlin.String, startDate: kotlin.Long, endDate: kotlin.Long) : ApiResponse<GetAccountDiff200Response?> {
@@ -328,14 +239,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountDiff
-     *
-     * @param accountId account ID
-     * @param startDate 
-     * @param endDate 
-     * @return RequestConfig
-     */
     fun getAccountDiffRequestConfig(accountId: kotlin.String, startDate: kotlin.Long, endDate: kotlin.Long) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -356,18 +259,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get expiring account .ton dns
-     * @param accountId account ID
-     * @param period number of days before expiration (optional)
-     * @return DnsExpiring
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountDnsExpiring(accountId: kotlin.String, period: kotlin.Int? = null) : DnsExpiring {
@@ -388,15 +279,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get expiring account .ton dns
-     * @param accountId account ID
-     * @param period number of days before expiration (optional)
-     * @return ApiResponse<DnsExpiring?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountDnsExpiringWithHttpInfo(accountId: kotlin.String, period: kotlin.Int?) : ApiResponse<DnsExpiring?> {
@@ -407,13 +289,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountDnsExpiring
-     *
-     * @param accountId account ID
-     * @param period number of days before expiration (optional)
-     * @return RequestConfig
-     */
     fun getAccountDnsExpiringRequestConfig(accountId: kotlin.String, period: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -435,20 +310,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get event for an account by event_id
-     * @param accountId account ID
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @return AccountEvent
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountEvent(accountId: kotlin.String, eventId: kotlin.String, acceptLanguage: kotlin.String? = "en", subjectOnly: kotlin.Boolean? = false) : AccountEvent {
@@ -469,17 +330,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get event for an account by event_id
-     * @param accountId account ID
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @return ApiResponse<AccountEvent?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountEventWithHttpInfo(accountId: kotlin.String, eventId: kotlin.String, acceptLanguage: kotlin.String?, subjectOnly: kotlin.Boolean?) : ApiResponse<AccountEvent?> {
@@ -490,15 +340,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountEvent
-     *
-     * @param accountId account ID
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @return RequestConfig
-     */
     fun getAccountEventRequestConfig(accountId: kotlin.String, eventId: kotlin.String, acceptLanguage: kotlin.String?, subjectOnly: kotlin.Boolean?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -521,24 +362,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get events for an account. Each event is built on top of a trace which is a series of transactions caused by one inbound message. TonAPI looks for known patterns inside the trace and splits the trace into actions, where a single action represents a meaningful high-level operation like a Jetton Transfer or an NFT Purchase. Actions are expected to be shown to users. It is advised not to build any logic on top of actions because actions can be changed at any time.
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param initiator Show only events that are initiated by this account (optional, default to false)
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountEvents(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", initiator: kotlin.Boolean? = false, subjectOnly: kotlin.Boolean? = false, beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
@@ -559,21 +382,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get events for an account. Each event is built on top of a trace which is a series of transactions caused by one inbound message. TonAPI looks for known patterns inside the trace and splits the trace into actions, where a single action represents a meaningful high-level operation like a Jetton Transfer or an NFT Purchase. Actions are expected to be shown to users. It is advised not to build any logic on top of actions because actions can be changed at any time.
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param initiator Show only events that are initiated by this account (optional, default to false)
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountEventsWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, initiator: kotlin.Boolean?, subjectOnly: kotlin.Boolean?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
@@ -584,19 +392,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountEvents
-     *
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param initiator Show only events that are initiated by this account (optional, default to false)
-     * @param subjectOnly filter actions where requested account is not real subject (for example sender or receiver jettons) (optional, default to false)
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return RequestConfig
-     */
     fun getAccountEventsRequestConfig(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, initiator: kotlin.Boolean?, subjectOnly: kotlin.Boolean?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -632,23 +427,69 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get Jetton balance by owner address
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return JettonBalance
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountJettonBalance(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>? = null) : JettonBalance {
-        val localVarResponse = getAccountJettonBalanceWithHttpInfo(accountId = accountId, jettonId = jettonId, currencies = currencies)
+    fun getAccountExtraCurrencyHistoryByID(accountId: kotlin.String, id: kotlin.Int, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
+        val localVarResponse = getAccountExtraCurrencyHistoryByIDWithHttpInfo(accountId = accountId, id = id, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvents
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getAccountExtraCurrencyHistoryByIDWithHttpInfo(accountId: kotlin.String, id: kotlin.Int, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
+        val localVariableConfig = getAccountExtraCurrencyHistoryByIDRequestConfig(accountId = accountId, id = id, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+
+        return request<Unit, AccountEvents>(
+            localVariableConfig
+        )
+    }
+
+    fun getAccountExtraCurrencyHistoryByIDRequestConfig(accountId: kotlin.String, id: kotlin.Int, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (beforeLt != null) {
+                    put("before_lt", listOf(beforeLt.toString()))
+                }
+                put("limit", listOf(limit.toString()))
+                if (startDate != null) {
+                    put("start_date", listOf(startDate.toString()))
+                }
+                if (endDate != null) {
+                    put("end_date", listOf(endDate.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/accounts/{account_id}/extra-currency/{id}/history".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())).replace("{"+"id"+"}", encodeURIComponent(id.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getAccountJettonBalance(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>? = null, supportedExtensions: kotlin.collections.List<kotlin.String>? = null) : JettonBalance {
+        val localVarResponse = getAccountJettonBalanceWithHttpInfo(accountId = accountId, jettonId = jettonId, currencies = currencies, supportedExtensions = supportedExtensions)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as JettonBalance
@@ -665,41 +506,26 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get Jetton balance by owner address
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return ApiResponse<JettonBalance?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountJettonBalanceWithHttpInfo(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?) : ApiResponse<JettonBalance?> {
-        val localVariableConfig = getAccountJettonBalanceRequestConfig(accountId = accountId, jettonId = jettonId, currencies = currencies)
+    fun getAccountJettonBalanceWithHttpInfo(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, supportedExtensions: kotlin.collections.List<kotlin.String>?) : ApiResponse<JettonBalance?> {
+        val localVariableConfig = getAccountJettonBalanceRequestConfig(accountId = accountId, jettonId = jettonId, currencies = currencies, supportedExtensions = supportedExtensions)
 
         return request<Unit, JettonBalance>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountJettonBalance
-     *
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return RequestConfig
-     */
-    fun getAccountJettonBalanceRequestConfig(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?) : RequestConfig<Unit> {
+    fun getAccountJettonBalanceRequestConfig(accountId: kotlin.String, jettonId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, supportedExtensions: kotlin.collections.List<kotlin.String>?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (currencies != null) {
                     put("currencies", toMultiValue(currencies.toList(), "csv"))
                 }
+                if (supportedExtensions != null) {
+                    put("supported_extensions", toMultiValue(supportedExtensions.toList(), "csv"))
+                }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         localVariableHeaders["Accept"] = "application/json"
@@ -714,26 +540,11 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get the transfer jetton history for account and jetton
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
     fun getAccountJettonHistoryByID(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
+        @Suppress("DEPRECATION")
         val localVarResponse = getAccountJettonHistoryByIDWithHttpInfo(accountId = accountId, jettonId = jettonId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
 
         return when (localVarResponse.responseType) {
@@ -751,23 +562,11 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get the transfer jetton history for account and jetton
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
+    @Deprecated(message = "This operation is deprecated.")
     fun getAccountJettonHistoryByIDWithHttpInfo(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
+        @Suppress("DEPRECATION")
         val localVariableConfig = getAccountJettonHistoryByIDRequestConfig(accountId = accountId, jettonId = jettonId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
 
         return request<Unit, AccountEvents>(
@@ -775,18 +574,7 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountJettonHistoryByID
-     *
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return RequestConfig
-     */
+    @Deprecated(message = "This operation is deprecated.")
     fun getAccountJettonHistoryByIDRequestConfig(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -816,22 +604,10 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get all Jettons balances by owner address
-     * @param accountId account ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return JettonsBalances
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountJettonsBalances(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>? = null, extensions: List<String>? = null) : JettonsBalances {
-        val localVarResponse = getAccountJettonsBalancesWithHttpInfo(accountId = accountId, currencies = currencies, extensions = extensions)
+    fun getAccountJettonsBalances(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>? = null, supportedExtensions: kotlin.collections.List<kotlin.String>? = null) : JettonsBalances {
+        val localVarResponse = getAccountJettonsBalancesWithHttpInfo(accountId = accountId, currencies = currencies, supportedExtensions = supportedExtensions)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as JettonsBalances
@@ -848,41 +624,25 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get all Jettons balances by owner address
-     * @param accountId account ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return ApiResponse<JettonsBalances?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountJettonsBalancesWithHttpInfo(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, extensions: List<String>?) : ApiResponse<JettonsBalances?> {
-        val localVariableConfig = getAccountJettonsBalancesRequestConfig(accountId = accountId, currencies = currencies, extensions = extensions)
+    fun getAccountJettonsBalancesWithHttpInfo(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, supportedExtensions: kotlin.collections.List<kotlin.String>?) : ApiResponse<JettonsBalances?> {
+        val localVariableConfig = getAccountJettonsBalancesRequestConfig(accountId = accountId, currencies = currencies, supportedExtensions = supportedExtensions)
 
         return request<Unit, JettonsBalances>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountJettonsBalances
-     *
-     * @param accountId account ID
-     * @param currencies accept ton and all possible fiat currencies, separated by commas (optional)
-     * @return RequestConfig
-     */
-    fun getAccountJettonsBalancesRequestConfig(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, extensions: List<String>?) : RequestConfig<Unit> {
+    fun getAccountJettonsBalancesRequestConfig(accountId: kotlin.String, currencies: kotlin.collections.List<kotlin.String>?, supportedExtensions: kotlin.collections.List<kotlin.String>?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (currencies != null) {
                     put("currencies", toMultiValue(currencies.toList(), "csv"))
                 }
-                if (extensions != null) {
-                    put("supported_extensions", toMultiValue(extensions.toList(), "csv"))
+                if (supportedExtensions != null) {
+                    put("supported_extensions", toMultiValue(supportedExtensions.toList(), "csv"))
                 }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -898,29 +658,13 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get the transfer jettons history for account
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountJettonsHistory(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
-        val localVarResponse = getAccountJettonsHistoryWithHttpInfo(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+    fun getAccountJettonsHistory(accountId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long? = null) : JettonOperations {
+        val localVarResponse = getAccountJettonsHistoryWithHttpInfo(accountId = accountId, limit = limit, beforeLt = beforeLt)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvents
+            ResponseType.Success -> (localVarResponse as Success<*>).data as JettonOperations
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -934,41 +678,17 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get the transfer jettons history for account
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountJettonsHistoryWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
-        val localVariableConfig = getAccountJettonsHistoryRequestConfig(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+    fun getAccountJettonsHistoryWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long?) : ApiResponse<JettonOperations?> {
+        val localVariableConfig = getAccountJettonsHistoryRequestConfig(accountId = accountId, limit = limit, beforeLt = beforeLt)
 
-        return request<Unit, AccountEvents>(
+        return request<Unit, JettonOperations>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountJettonsHistory
-     *
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return RequestConfig
-     */
-    fun getAccountJettonsHistoryRequestConfig(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
+    fun getAccountJettonsHistoryRequestConfig(accountId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
@@ -976,15 +696,8 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
                     put("before_lt", listOf(beforeLt.toString()))
                 }
                 put("limit", listOf(limit.toString()))
-                if (startDate != null) {
-                    put("start_date", listOf(startDate.toString()))
-                }
-                if (endDate != null) {
-                    put("end_date", listOf(endDate.toString()))
-                }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
         localVariableHeaders["Accept"] = "application/json"
 
         return RequestConfig(
@@ -997,17 +710,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get account&#39;s multisigs
-     * @param accountId account ID
-     * @return Multisigs
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountMultisigs(accountId: kotlin.String) : Multisigs {
@@ -1028,14 +730,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get account&#39;s multisigs
-     * @param accountId account ID
-     * @return ApiResponse<Multisigs?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountMultisigsWithHttpInfo(accountId: kotlin.String) : ApiResponse<Multisigs?> {
@@ -1046,12 +740,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountMultisigs
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getAccountMultisigsRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1068,21 +756,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get all NFT items by owner address
-     * @param accountId account ID
-     * @param collection nft collection (optional)
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param indirectOwnership Selling nft items in ton implemented usually via transfer items to special selling account. This option enables including items which owned not directly. (optional, default to false)
-     * @return NftItems
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountNftItems(accountId: kotlin.String, collection: kotlin.String? = null, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0, indirectOwnership: kotlin.Boolean? = false) : NftItems {
@@ -1103,18 +776,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get all NFT items by owner address
-     * @param accountId account ID
-     * @param collection nft collection (optional)
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param indirectOwnership Selling nft items in ton implemented usually via transfer items to special selling account. This option enables including items which owned not directly. (optional, default to false)
-     * @return ApiResponse<NftItems?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountNftItemsWithHttpInfo(accountId: kotlin.String, collection: kotlin.String?, limit: kotlin.Int?, offset: kotlin.Int?, indirectOwnership: kotlin.Boolean?) : ApiResponse<NftItems?> {
@@ -1125,16 +786,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountNftItems
-     *
-     * @param accountId account ID
-     * @param collection nft collection (optional)
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @param indirectOwnership Selling nft items in ton implemented usually via transfer items to special selling account. This option enables including items which owned not directly. (optional, default to false)
-     * @return RequestConfig
-     */
     fun getAccountNftItemsRequestConfig(accountId: kotlin.String, collection: kotlin.String?, limit: kotlin.Int?, offset: kotlin.Int?, indirectOwnership: kotlin.Boolean?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1165,17 +816,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get public key by account id
-     * @param accountId account ID
-     * @return GetAccountPublicKey200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountPublicKey(accountId: kotlin.String) : GetAccountPublicKey200Response {
@@ -1196,14 +836,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get public key by account id
-     * @param accountId account ID
-     * @return ApiResponse<GetAccountPublicKey200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountPublicKeyWithHttpInfo(accountId: kotlin.String) : ApiResponse<GetAccountPublicKey200Response?> {
@@ -1214,12 +846,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountPublicKey
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getAccountPublicKeyRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1236,17 +862,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get all subscriptions by wallet address
-     * @param accountId account ID
-     * @return Subscriptions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountSubscriptions(accountId: kotlin.String) : Subscriptions {
@@ -1267,14 +882,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get all subscriptions by wallet address
-     * @param accountId account ID
-     * @return ApiResponse<Subscriptions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountSubscriptionsWithHttpInfo(accountId: kotlin.String) : ApiResponse<Subscriptions?> {
@@ -1285,12 +892,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountSubscriptions
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getAccountSubscriptionsRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1307,19 +908,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get traces for account
-     * @param accountId account ID
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return TraceIDs
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountTraces(accountId: kotlin.String, beforeLt: kotlin.Long? = null, limit: kotlin.Int? = 100) : TraceIDs {
@@ -1340,16 +928,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get traces for account
-     * @param accountId account ID
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return ApiResponse<TraceIDs?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountTracesWithHttpInfo(accountId: kotlin.String, beforeLt: kotlin.Long?, limit: kotlin.Int?) : ApiResponse<TraceIDs?> {
@@ -1360,14 +938,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountTraces
-     *
-     * @param accountId account ID
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return RequestConfig
-     */
     fun getAccountTracesRequestConfig(accountId: kotlin.String, beforeLt: kotlin.Long?, limit: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1392,18 +962,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Get human-friendly information about several accounts without low-level details.
-     * @param currency  (optional)
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return Accounts
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccounts(currency: kotlin.String? = null, getAccountsRequest: GetAccountsRequest? = null) : Accounts {
@@ -1424,15 +982,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get human-friendly information about several accounts without low-level details.
-     * @param currency  (optional)
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return ApiResponse<Accounts?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountsWithHttpInfo(currency: kotlin.String?, getAccountsRequest: GetAccountsRequest?) : ApiResponse<Accounts?> {
@@ -1443,13 +992,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccounts
-     *
-     * @param currency  (optional)
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return RequestConfig
-     */
     fun getAccountsRequestConfig(currency: kotlin.String?, getAccountsRequest: GetAccountsRequest?) : RequestConfig<GetAccountsRequest> {
         val localVariableBody = getAccountsRequest
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1472,17 +1014,65 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Update internal cache for a particular account
-     * @param accountId account ID
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getJettonAccountHistoryByID(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : JettonOperations {
+        val localVarResponse = getJettonAccountHistoryByIDWithHttpInfo(accountId = accountId, jettonId = jettonId, limit = limit, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as JettonOperations
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getJettonAccountHistoryByIDWithHttpInfo(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<JettonOperations?> {
+        val localVariableConfig = getJettonAccountHistoryByIDRequestConfig(accountId = accountId, jettonId = jettonId, limit = limit, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+
+        return request<Unit, JettonOperations>(
+            localVariableConfig
+        )
+    }
+
+    fun getJettonAccountHistoryByIDRequestConfig(accountId: kotlin.String, jettonId: kotlin.String, limit: kotlin.Int, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (beforeLt != null) {
+                    put("before_lt", listOf(beforeLt.toString()))
+                }
+                put("limit", listOf(limit.toString()))
+                if (startDate != null) {
+                    put("start_date", listOf(startDate.toString()))
+                }
+                if (endDate != null) {
+                    put("end_date", listOf(endDate.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/jettons/{jetton_id}/accounts/{account_id}/history".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())).replace("{"+"jetton_id"+"}", encodeURIComponent(jettonId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun reindexAccount(accountId: kotlin.String) : Unit {
         val localVarResponse = reindexAccountWithHttpInfo(accountId = accountId)
@@ -1502,14 +1092,7 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Update internal cache for a particular account
-     * @param accountId account ID
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+
     @Throws(IllegalStateException::class, IOException::class)
     fun reindexAccountWithHttpInfo(accountId: kotlin.String) : ApiResponse<Unit?> {
         val localVariableConfig = reindexAccountRequestConfig(accountId = accountId)
@@ -1519,12 +1102,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation reindexAccount
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun reindexAccountRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1541,17 +1118,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * 
-     * Search by account domain name
-     * @param name 
-     * @return FoundAccounts
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun searchAccounts(name: kotlin.String) : FoundAccounts {
@@ -1572,14 +1138,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Search by account domain name
-     * @param name 
-     * @return ApiResponse<FoundAccounts?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun searchAccountsWithHttpInfo(name: kotlin.String) : ApiResponse<FoundAccounts?> {
@@ -1590,12 +1148,6 @@ class AccountsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation searchAccounts
-     *
-     * @param name 
-     * @return RequestConfig
-     */
     fun searchAccountsRequestConfig(name: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/BlockchainApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/BlockchainApi.kt
index f377e8522..3420f93e1 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/BlockchainApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/BlockchainApi.kt
@@ -16,7 +16,7 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.BlockchainAccountInspect
@@ -24,34 +24,36 @@ import io.tonapi.models.BlockchainBlock
 import io.tonapi.models.BlockchainBlockShards
 import io.tonapi.models.BlockchainBlocks
 import io.tonapi.models.BlockchainConfig
+import io.tonapi.models.BlockchainLibrary
 import io.tonapi.models.BlockchainRawAccount
+import io.tonapi.models.ExecGetMethodWithBodyForBlockchainAccountRequest
+import io.tonapi.models.InlineObject
 import io.tonapi.models.MethodExecutionResult
 import io.tonapi.models.RawBlockchainConfig
 import io.tonapi.models.ReducedBlocks
 import io.tonapi.models.SendBlockchainMessageRequest
-import io.tonapi.models.ServiceStatus
-import io.tonapi.models.StatusDefaultResponse
 import io.tonapi.models.Transaction
 import io.tonapi.models.Transactions
 import io.tonapi.models.Validators
 
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -59,17 +61,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Blockchain account inspect
-     * @param accountId account ID
-     * @return BlockchainAccountInspect
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun blockchainAccountInspect(accountId: kotlin.String) : BlockchainAccountInspect {
@@ -90,14 +81,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Blockchain account inspect
-     * @param accountId account ID
-     * @return ApiResponse<BlockchainAccountInspect?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun blockchainAccountInspectWithHttpInfo(accountId: kotlin.String) : ApiResponse<BlockchainAccountInspect?> {
@@ -108,12 +91,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation blockchainAccountInspect
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun blockchainAccountInspectRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -130,19 +107,52 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Execute get method for account
-     * @param accountId account ID
-     * @param methodName contract get method name
-     * @param args  (optional)
-     * @return MethodExecutionResult
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun downloadBlockchainBlockBoc(blockId: kotlin.String) : java.io.File {
+        val localVarResponse = downloadBlockchainBlockBocWithHttpInfo(blockId = blockId)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as java.io.File
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun downloadBlockchainBlockBocWithHttpInfo(blockId: kotlin.String) : ApiResponse<java.io.File?> {
+        val localVariableConfig = downloadBlockchainBlockBocRequestConfig(blockId = blockId)
+
+        return request<Unit, java.io.File>(
+            localVariableConfig
+        )
+    }
+
+    fun downloadBlockchainBlockBocRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/octet-stream, application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/blockchain/blocks/{block_id}/boc".replace("{"+"block_id"+"}", encodeURIComponent(blockId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun execGetMethodForBlockchainAccount(accountId: kotlin.String, methodName: kotlin.String, args: kotlin.collections.List<kotlin.String>? = null) : MethodExecutionResult {
@@ -163,16 +173,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Execute get method for account
-     * @param accountId account ID
-     * @param methodName contract get method name
-     * @param args  (optional)
-     * @return ApiResponse<MethodExecutionResult?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun execGetMethodForBlockchainAccountWithHttpInfo(accountId: kotlin.String, methodName: kotlin.String, args: kotlin.collections.List<kotlin.String>?) : ApiResponse<MethodExecutionResult?> {
@@ -183,14 +183,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation execGetMethodForBlockchainAccount
-     *
-     * @param accountId account ID
-     * @param methodName contract get method name
-     * @param args  (optional)
-     * @return RequestConfig
-     */
     fun execGetMethodForBlockchainAccountRequestConfig(accountId: kotlin.String, methodName: kotlin.String, args: kotlin.collections.List<kotlin.String>?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -212,29 +204,71 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun execGetMethodWithBodyForBlockchainAccount(accountId: kotlin.String, methodName: kotlin.String, execGetMethodWithBodyForBlockchainAccountRequest: ExecGetMethodWithBodyForBlockchainAccountRequest? = null) : MethodExecutionResult {
+        val localVarResponse = execGetMethodWithBodyForBlockchainAccountWithHttpInfo(accountId = accountId, methodName = methodName, execGetMethodWithBodyForBlockchainAccountRequest = execGetMethodWithBodyForBlockchainAccountRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as MethodExecutionResult
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun execGetMethodWithBodyForBlockchainAccountWithHttpInfo(accountId: kotlin.String, methodName: kotlin.String, execGetMethodWithBodyForBlockchainAccountRequest: ExecGetMethodWithBodyForBlockchainAccountRequest?) : ApiResponse<MethodExecutionResult?> {
+        val localVariableConfig = execGetMethodWithBodyForBlockchainAccountRequestConfig(accountId = accountId, methodName = methodName, execGetMethodWithBodyForBlockchainAccountRequest = execGetMethodWithBodyForBlockchainAccountRequest)
+
+        return request<ExecGetMethodWithBodyForBlockchainAccountRequest, MethodExecutionResult>(
+            localVariableConfig
+        )
+    }
+
+    fun execGetMethodWithBodyForBlockchainAccountRequestConfig(accountId: kotlin.String, methodName: kotlin.String, execGetMethodWithBodyForBlockchainAccountRequest: ExecGetMethodWithBodyForBlockchainAccountRequest?) : RequestConfig<ExecGetMethodWithBodyForBlockchainAccountRequest> {
+        val localVariableBody = execGetMethodWithBodyForBlockchainAccountRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v2/blockchain/accounts/{account_id}/methods/{method_name}".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())).replace("{"+"method_name"+"}", encodeURIComponent(methodName.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     /**
      * enum for parameter sortOrder
      */
      enum class SortOrderGetBlockchainAccountTransactions(val value: kotlin.String) {
-         @Json(name = "desc") desc("desc"),
-         @Json(name = "asc") asc("asc")
+         @SerialName(value = "desc") desc("desc"),
+         @SerialName(value = "asc") asc("asc"),
+         @SerialName(value = "unknown") unknown("unknown");
+
+        /**
+         * Override [toString()] to avoid using the enum variable name as the value, and instead use
+         * the actual value defined in the API spec file.
+         *
+         * This solves a problem when the variable name and its value are different, and ensures that
+         * the client sends the correct enum values to the server always.
+         */
+        override fun toString(): kotlin.String = "$value"
      }
 
-    /**
-     * 
-     * Get account transactions
-     * @param accountId account ID
-     * @param afterLt omit this parameter to get last transactions (optional)
-     * @param beforeLt omit this parameter to get last transactions (optional)
-     * @param limit  (optional, default to 100)
-     * @param sortOrder  (optional, default to desc)
-     * @return Transactions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainAccountTransactions(accountId: kotlin.String, afterLt: kotlin.Long? = null, beforeLt: kotlin.Long? = null, limit: kotlin.Int? = 100, sortOrder: SortOrderGetBlockchainAccountTransactions? = SortOrderGetBlockchainAccountTransactions.desc) : Transactions {
@@ -255,18 +289,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get account transactions
-     * @param accountId account ID
-     * @param afterLt omit this parameter to get last transactions (optional)
-     * @param beforeLt omit this parameter to get last transactions (optional)
-     * @param limit  (optional, default to 100)
-     * @param sortOrder  (optional, default to desc)
-     * @return ApiResponse<Transactions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainAccountTransactionsWithHttpInfo(accountId: kotlin.String, afterLt: kotlin.Long?, beforeLt: kotlin.Long?, limit: kotlin.Int?, sortOrder: SortOrderGetBlockchainAccountTransactions?) : ApiResponse<Transactions?> {
@@ -277,16 +299,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainAccountTransactions
-     *
-     * @param accountId account ID
-     * @param afterLt omit this parameter to get last transactions (optional)
-     * @param beforeLt omit this parameter to get last transactions (optional)
-     * @param limit  (optional, default to 100)
-     * @param sortOrder  (optional, default to desc)
-     * @return RequestConfig
-     */
     fun getBlockchainAccountTransactionsRequestConfig(accountId: kotlin.String, afterLt: kotlin.Long?, beforeLt: kotlin.Long?, limit: kotlin.Int?, sortOrder: SortOrderGetBlockchainAccountTransactions?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -317,17 +329,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get blockchain block data
-     * @param blockId block ID
-     * @return BlockchainBlock
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainBlock(blockId: kotlin.String) : BlockchainBlock {
@@ -348,14 +349,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get blockchain block data
-     * @param blockId block ID
-     * @return ApiResponse<BlockchainBlock?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainBlockWithHttpInfo(blockId: kotlin.String) : ApiResponse<BlockchainBlock?> {
@@ -366,12 +359,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainBlock
-     *
-     * @param blockId block ID
-     * @return RequestConfig
-     */
     fun getBlockchainBlockRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -388,17 +375,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get transactions from block
-     * @param blockId block ID
-     * @return Transactions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainBlockTransactions(blockId: kotlin.String) : Transactions {
@@ -419,14 +395,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get transactions from block
-     * @param blockId block ID
-     * @return ApiResponse<Transactions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainBlockTransactionsWithHttpInfo(blockId: kotlin.String) : ApiResponse<Transactions?> {
@@ -437,12 +405,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainBlockTransactions
-     *
-     * @param blockId block ID
-     * @return RequestConfig
-     */
     fun getBlockchainBlockTransactionsRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -459,16 +421,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get blockchain config
-     * @return BlockchainConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainConfig() : BlockchainConfig {
@@ -489,13 +441,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get blockchain config
-     * @return ApiResponse<BlockchainConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainConfigWithHttpInfo() : ApiResponse<BlockchainConfig?> {
@@ -506,11 +451,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainConfig
-     *
-     * @return RequestConfig
-     */
     fun getBlockchainConfigRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -527,17 +467,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get blockchain config from a specific block, if present.
-     * @param masterchainSeqno masterchain block seqno
-     * @return BlockchainConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainConfigFromBlock(masterchainSeqno: kotlin.Int) : BlockchainConfig {
@@ -558,14 +487,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get blockchain config from a specific block, if present.
-     * @param masterchainSeqno masterchain block seqno
-     * @return ApiResponse<BlockchainConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainConfigFromBlockWithHttpInfo(masterchainSeqno: kotlin.Int) : ApiResponse<BlockchainConfig?> {
@@ -576,12 +497,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainConfigFromBlock
-     *
-     * @param masterchainSeqno masterchain block seqno
-     * @return RequestConfig
-     */
     fun getBlockchainConfigFromBlockRequestConfig(masterchainSeqno: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -598,17 +513,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get all blocks in all shards and workchains between target and previous masterchain block according to shards last blocks snapshot in masterchain.  We don&#39;t recommend to build your app around this method because it has problem with scalability and will work very slow in the future.
-     * @param masterchainSeqno masterchain block seqno
-     * @return BlockchainBlocks
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainMasterchainBlocks(masterchainSeqno: kotlin.Int) : BlockchainBlocks {
@@ -629,14 +533,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get all blocks in all shards and workchains between target and previous masterchain block according to shards last blocks snapshot in masterchain.  We don&#39;t recommend to build your app around this method because it has problem with scalability and will work very slow in the future.
-     * @param masterchainSeqno masterchain block seqno
-     * @return ApiResponse<BlockchainBlocks?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainMasterchainBlocksWithHttpInfo(masterchainSeqno: kotlin.Int) : ApiResponse<BlockchainBlocks?> {
@@ -647,12 +543,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainMasterchainBlocks
-     *
-     * @param masterchainSeqno masterchain block seqno
-     * @return RequestConfig
-     */
     fun getBlockchainMasterchainBlocksRequestConfig(masterchainSeqno: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -669,16 +559,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get last known masterchain block
-     * @return BlockchainBlock
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainMasterchainHead() : BlockchainBlock {
@@ -699,13 +579,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get last known masterchain block
-     * @return ApiResponse<BlockchainBlock?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainMasterchainHeadWithHttpInfo() : ApiResponse<BlockchainBlock?> {
@@ -716,11 +589,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainMasterchainHead
-     *
-     * @return RequestConfig
-     */
     fun getBlockchainMasterchainHeadRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -737,17 +605,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get blockchain block shards
-     * @param masterchainSeqno masterchain block seqno
-     * @return BlockchainBlockShards
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainMasterchainShards(masterchainSeqno: kotlin.Int) : BlockchainBlockShards {
@@ -768,14 +625,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get blockchain block shards
-     * @param masterchainSeqno masterchain block seqno
-     * @return ApiResponse<BlockchainBlockShards?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainMasterchainShardsWithHttpInfo(masterchainSeqno: kotlin.Int) : ApiResponse<BlockchainBlockShards?> {
@@ -786,12 +635,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainMasterchainShards
-     *
-     * @param masterchainSeqno masterchain block seqno
-     * @return RequestConfig
-     */
     fun getBlockchainMasterchainShardsRequestConfig(masterchainSeqno: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -808,17 +651,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get all transactions in all shards and workchains between target and previous masterchain block according to shards last blocks snapshot in masterchain. We don&#39;t recommend to build your app around this method because it has problem with scalability and will work very slow in the future.
-     * @param masterchainSeqno masterchain block seqno
-     * @return Transactions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainMasterchainTransactions(masterchainSeqno: kotlin.Int) : Transactions {
@@ -839,14 +671,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get all transactions in all shards and workchains between target and previous masterchain block according to shards last blocks snapshot in masterchain. We don&#39;t recommend to build your app around this method because it has problem with scalability and will work very slow in the future.
-     * @param masterchainSeqno masterchain block seqno
-     * @return ApiResponse<Transactions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainMasterchainTransactionsWithHttpInfo(masterchainSeqno: kotlin.Int) : ApiResponse<Transactions?> {
@@ -857,12 +681,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainMasterchainTransactions
-     *
-     * @param masterchainSeqno masterchain block seqno
-     * @return RequestConfig
-     */
     fun getBlockchainMasterchainTransactionsRequestConfig(masterchainSeqno: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -879,17 +697,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get low-level information about an account taken directly from the blockchain.
-     * @param accountId account ID
-     * @return BlockchainRawAccount
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainRawAccount(accountId: kotlin.String) : BlockchainRawAccount {
@@ -910,14 +717,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get low-level information about an account taken directly from the blockchain.
-     * @param accountId account ID
-     * @return ApiResponse<BlockchainRawAccount?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainRawAccountWithHttpInfo(accountId: kotlin.String) : ApiResponse<BlockchainRawAccount?> {
@@ -928,12 +727,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainRawAccount
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getBlockchainRawAccountRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -950,17 +743,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get transaction data
-     * @param transactionId transaction ID
-     * @return Transaction
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainTransaction(transactionId: kotlin.String) : Transaction {
@@ -981,14 +763,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get transaction data
-     * @param transactionId transaction ID
-     * @return ApiResponse<Transaction?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainTransactionWithHttpInfo(transactionId: kotlin.String) : ApiResponse<Transaction?> {
@@ -999,12 +773,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainTransaction
-     *
-     * @param transactionId transaction ID
-     * @return RequestConfig
-     */
     fun getBlockchainTransactionRequestConfig(transactionId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1021,17 +789,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get transaction data by message hash
-     * @param msgId message ID
-     * @return Transaction
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainTransactionByMessageHash(msgId: kotlin.String) : Transaction {
@@ -1052,14 +809,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get transaction data by message hash
-     * @param msgId message ID
-     * @return ApiResponse<Transaction?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainTransactionByMessageHashWithHttpInfo(msgId: kotlin.String) : ApiResponse<Transaction?> {
@@ -1070,12 +819,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainTransactionByMessageHash
-     *
-     * @param msgId message ID
-     * @return RequestConfig
-     */
     fun getBlockchainTransactionByMessageHashRequestConfig(msgId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1092,16 +835,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get blockchain validators
-     * @return Validators
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getBlockchainValidators() : Validators {
@@ -1122,13 +855,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get blockchain validators
-     * @return ApiResponse<Validators?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getBlockchainValidatorsWithHttpInfo() : ApiResponse<Validators?> {
@@ -1139,11 +865,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getBlockchainValidators
-     *
-     * @return RequestConfig
-     */
     fun getBlockchainValidatorsRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1160,16 +881,52 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw blockchain config
-     * @return RawBlockchainConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getLibraryByHash(hash: kotlin.String) : BlockchainLibrary {
+        val localVarResponse = getLibraryByHashWithHttpInfo(hash = hash)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as BlockchainLibrary
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getLibraryByHashWithHttpInfo(hash: kotlin.String) : ApiResponse<BlockchainLibrary?> {
+        val localVariableConfig = getLibraryByHashRequestConfig(hash = hash)
+
+        return request<Unit, BlockchainLibrary>(
+            localVariableConfig
+        )
+    }
+
+    fun getLibraryByHashRequestConfig(hash: kotlin.String) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/blockchain/libraries/{hash}".replace("{"+"hash"+"}", encodeURIComponent(hash.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockchainConfig() : RawBlockchainConfig {
@@ -1190,13 +947,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw blockchain config
-     * @return ApiResponse<RawBlockchainConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockchainConfigWithHttpInfo() : ApiResponse<RawBlockchainConfig?> {
@@ -1207,11 +957,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockchainConfig
-     *
-     * @return RequestConfig
-     */
     fun getRawBlockchainConfigRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1228,17 +973,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw blockchain config from a specific block, if present.
-     * @param masterchainSeqno masterchain block seqno
-     * @return RawBlockchainConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockchainConfigFromBlock(masterchainSeqno: kotlin.Int) : RawBlockchainConfig {
@@ -1259,14 +993,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw blockchain config from a specific block, if present.
-     * @param masterchainSeqno masterchain block seqno
-     * @return ApiResponse<RawBlockchainConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockchainConfigFromBlockWithHttpInfo(masterchainSeqno: kotlin.Int) : ApiResponse<RawBlockchainConfig?> {
@@ -1277,12 +1003,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockchainConfigFromBlock
-     *
-     * @param masterchainSeqno masterchain block seqno
-     * @return RequestConfig
-     */
     fun getRawBlockchainConfigFromBlockRequestConfig(masterchainSeqno: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1299,18 +1019,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get reduced blockchain blocks data
-     * @param from 
-     * @param to 
-     * @return ReducedBlocks
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getReducedBlockchainBlocks(from: kotlin.Long, to: kotlin.Long) : ReducedBlocks {
@@ -1331,15 +1039,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get reduced blockchain blocks data
-     * @param from 
-     * @param to 
-     * @return ApiResponse<ReducedBlocks?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getReducedBlockchainBlocksWithHttpInfo(from: kotlin.Long, to: kotlin.Long) : ApiResponse<ReducedBlocks?> {
@@ -1350,13 +1049,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getReducedBlockchainBlocks
-     *
-     * @param from 
-     * @param to 
-     * @return RequestConfig
-     */
     fun getReducedBlockchainBlocksRequestConfig(from: kotlin.Long, to: kotlin.Long) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1377,17 +1069,7 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Send message to blockchain
-     * @param sendBlockchainMessageRequest both a single boc and a batch of boc serialized in base64/hex are accepted
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun sendBlockchainMessage(sendBlockchainMessageRequest: SendBlockchainMessageRequest) : Unit {
         val localVarResponse = sendBlockchainMessageWithHttpInfo(sendBlockchainMessageRequest = sendBlockchainMessageRequest)
@@ -1407,14 +1089,7 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Send message to blockchain
-     * @param sendBlockchainMessageRequest both a single boc and a batch of boc serialized in base64/hex are accepted
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+
     @Throws(IllegalStateException::class, IOException::class)
     fun sendBlockchainMessageWithHttpInfo(sendBlockchainMessageRequest: SendBlockchainMessageRequest) : ApiResponse<Unit?> {
         val localVariableConfig = sendBlockchainMessageRequestConfig(sendBlockchainMessageRequest = sendBlockchainMessageRequest)
@@ -1424,18 +1099,13 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation sendBlockchainMessage
-     *
-     * @param sendBlockchainMessageRequest both a single boc and a batch of boc serialized in base64/hex are accepted
-     * @return RequestConfig
-     */
     fun sendBlockchainMessageRequestConfig(sendBlockchainMessageRequest: SendBlockchainMessageRequest) : RequestConfig<SendBlockchainMessageRequest> {
         val localVariableBody = sendBlockchainMessageRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         localVariableHeaders["Content-Type"] = "application/json"
         localVariableHeaders["Accept"] = "application/json"
+
         return RequestConfig(
             method = RequestMethod.POST,
             path = "/v2/blockchain/message",
@@ -1446,74 +1116,6 @@ class BlockchainApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Status
-     * @return ServiceStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun status() : ServiceStatus {
-        val localVarResponse = statusWithHttpInfo()
-
-        return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as ServiceStatus
-            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
-            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
-            ResponseType.ClientError -> {
-                val localVarError = localVarResponse as ClientError<*>
-                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
-            }
-            ResponseType.ServerError -> {
-                val localVarError = localVarResponse as ServerError<*>
-                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
-            }
-        }
-    }
-
-    /**
-     * 
-     * Status
-     * @return ApiResponse<ServiceStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class)
-    fun statusWithHttpInfo() : ApiResponse<ServiceStatus?> {
-        val localVariableConfig = statusRequestConfig()
-
-        return request<Unit, ServiceStatus>(
-            localVariableConfig
-        )
-    }
-
-    /**
-     * To obtain the request config of the operation status
-     *
-     * @return RequestConfig
-     */
-    fun statusRequestConfig() : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf()
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        localVariableHeaders["Accept"] = "application/json"
-
-        return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/status",
-            query = localVariableQuery,
-            headers = localVariableHeaders,
-            requiresAuthentication = false,
-            body = localVariableBody
-        )
-    }
-
 
     private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
         HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/ConnectApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/ConnectApi.kt
index d0cf1a167..38008532e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/ConnectApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/ConnectApi.kt
@@ -16,31 +16,32 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.AccountInfoByStateInit
 import io.tonapi.models.GetAccountInfoByStateInitRequest
 import io.tonapi.models.GetTonConnectPayload200Response
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class ConnectApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -48,17 +49,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get account info by state init
-     * @param getAccountInfoByStateInitRequest Data that is expected
-     * @return AccountInfoByStateInit
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountInfoByStateInit(getAccountInfoByStateInitRequest: GetAccountInfoByStateInitRequest) : AccountInfoByStateInit {
@@ -79,14 +69,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get account info by state init
-     * @param getAccountInfoByStateInitRequest Data that is expected
-     * @return ApiResponse<AccountInfoByStateInit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountInfoByStateInitWithHttpInfo(getAccountInfoByStateInitRequest: GetAccountInfoByStateInitRequest) : ApiResponse<AccountInfoByStateInit?> {
@@ -97,12 +79,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountInfoByStateInit
-     *
-     * @param getAccountInfoByStateInitRequest Data that is expected
-     * @return RequestConfig
-     */
     fun getAccountInfoByStateInitRequestConfig(getAccountInfoByStateInitRequest: GetAccountInfoByStateInitRequest) : RequestConfig<GetAccountInfoByStateInitRequest> {
         val localVariableBody = getAccountInfoByStateInitRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -120,16 +96,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get a payload for further token receipt
-     * @return GetTonConnectPayload200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTonConnectPayload() : GetTonConnectPayload200Response {
@@ -150,13 +116,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get a payload for further token receipt
-     * @return ApiResponse<GetTonConnectPayload200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTonConnectPayloadWithHttpInfo() : ApiResponse<GetTonConnectPayload200Response?> {
@@ -167,11 +126,6 @@ class ConnectApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTonConnectPayload
-     *
-     * @return RequestConfig
-     */
     fun getTonConnectPayloadRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/DNSApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/DNSApi.kt
index 642ad2860..7525badc5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/DNSApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/DNSApi.kt
@@ -16,32 +16,33 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.Auctions
 import io.tonapi.models.DnsRecord
 import io.tonapi.models.DomainBids
 import io.tonapi.models.DomainInfo
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class DNSApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -49,17 +50,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * DNS resolve for domain name
-     * @param domainName domain name with .ton or .t.me
-     * @return DnsRecord
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun dnsResolve(domainName: kotlin.String) : DnsRecord {
@@ -80,14 +70,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * DNS resolve for domain name
-     * @param domainName domain name with .ton or .t.me
-     * @return ApiResponse<DnsRecord?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun dnsResolveWithHttpInfo(domainName: kotlin.String) : ApiResponse<DnsRecord?> {
@@ -98,12 +80,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation dnsResolve
-     *
-     * @param domainName domain name with .ton or .t.me
-     * @return RequestConfig
-     */
     fun dnsResolveRequestConfig(domainName: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -120,17 +96,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get all auctions
-     * @param tld domain filter for current auctions \&quot;ton\&quot; or \&quot;t.me\&quot; (optional)
-     * @return Auctions
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAllAuctions(tld: kotlin.String? = null) : Auctions {
@@ -151,14 +116,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get all auctions
-     * @param tld domain filter for current auctions \&quot;ton\&quot; or \&quot;t.me\&quot; (optional)
-     * @return ApiResponse<Auctions?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAllAuctionsWithHttpInfo(tld: kotlin.String?) : ApiResponse<Auctions?> {
@@ -169,12 +126,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAllAuctions
-     *
-     * @param tld domain filter for current auctions \&quot;ton\&quot; or \&quot;t.me\&quot; (optional)
-     * @return RequestConfig
-     */
     fun getAllAuctionsRequestConfig(tld: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -196,17 +147,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get full information about domain name
-     * @param domainName domain name with .ton or .t.me
-     * @return DomainInfo
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getDnsInfo(domainName: kotlin.String) : DomainInfo {
@@ -227,14 +167,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get full information about domain name
-     * @param domainName domain name with .ton or .t.me
-     * @return ApiResponse<DomainInfo?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getDnsInfoWithHttpInfo(domainName: kotlin.String) : ApiResponse<DomainInfo?> {
@@ -245,12 +177,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getDnsInfo
-     *
-     * @param domainName domain name with .ton or .t.me
-     * @return RequestConfig
-     */
     fun getDnsInfoRequestConfig(domainName: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -267,17 +193,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get domain bids
-     * @param domainName domain name with .ton or .t.me
-     * @return DomainBids
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getDomainBids(domainName: kotlin.String) : DomainBids {
@@ -298,14 +213,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get domain bids
-     * @param domainName domain name with .ton or .t.me
-     * @return ApiResponse<DomainBids?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getDomainBidsWithHttpInfo(domainName: kotlin.String) : ApiResponse<DomainBids?> {
@@ -316,12 +223,6 @@ class DNSApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getDomainBids
-     *
-     * @param domainName domain name with .ton or .t.me
-     * @return RequestConfig
-     */
     fun getDomainBidsRequestConfig(domainName: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/EmulationApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/EmulationApi.kt
index 5648012bf..b500b69eb 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/EmulationApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/EmulationApi.kt
@@ -16,35 +16,36 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.AccountEvent
-import io.tonapi.models.DecodeMessageRequest
 import io.tonapi.models.DecodedMessage
 import io.tonapi.models.EmulateMessageToWalletRequest
 import io.tonapi.models.Event
+import io.tonapi.models.GaslessEstimateRequestMessagesInner
+import io.tonapi.models.InlineObject
 import io.tonapi.models.MessageConsequences
-import io.tonapi.models.StatusDefaultResponse
 import io.tonapi.models.Trace
 
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class EmulationApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -52,21 +53,10 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Decode a given message. Only external incoming messages can be decoded currently.
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @return DecodedMessage
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun decodeMessage(decodeMessageRequest: DecodeMessageRequest) : DecodedMessage {
-        val localVarResponse = decodeMessageWithHttpInfo(decodeMessageRequest = decodeMessageRequest)
+    fun decodeMessage(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner) : DecodedMessage {
+        val localVarResponse = decodeMessageWithHttpInfo(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as DecodedMessage
@@ -83,32 +73,18 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Decode a given message. Only external incoming messages can be decoded currently.
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @return ApiResponse<DecodedMessage?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun decodeMessageWithHttpInfo(decodeMessageRequest: DecodeMessageRequest) : ApiResponse<DecodedMessage?> {
-        val localVariableConfig = decodeMessageRequestConfig(decodeMessageRequest = decodeMessageRequest)
+    fun decodeMessageWithHttpInfo(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner) : ApiResponse<DecodedMessage?> {
+        val localVariableConfig = decodeMessageRequestConfig(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner)
 
-        return request<DecodeMessageRequest, DecodedMessage>(
+        return request<GaslessEstimateRequestMessagesInner, DecodedMessage>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation decodeMessage
-     *
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @return RequestConfig
-     */
-    fun decodeMessageRequestConfig(decodeMessageRequest: DecodeMessageRequest) : RequestConfig<DecodeMessageRequest> {
-        val localVariableBody = decodeMessageRequest
+    fun decodeMessageRequestConfig(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         localVariableHeaders["Content-Type"] = "application/json"
@@ -124,24 +100,10 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param accountId account ID
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return AccountEvent
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun emulateMessageToAccountEvent(accountId: kotlin.String, decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : AccountEvent {
-        val localVarResponse = emulateMessageToAccountEventWithHttpInfo(accountId = accountId, decodeMessageRequest = decodeMessageRequest, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToAccountEvent(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : AccountEvent {
+        val localVarResponse = emulateMessageToAccountEventWithHttpInfo(accountId = accountId, gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvent
@@ -158,38 +120,18 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param accountId account ID
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return ApiResponse<AccountEvent?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun emulateMessageToAccountEventWithHttpInfo(accountId: kotlin.String, decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<AccountEvent?> {
-        val localVariableConfig = emulateMessageToAccountEventRequestConfig(accountId = accountId, decodeMessageRequest = decodeMessageRequest, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToAccountEventWithHttpInfo(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<AccountEvent?> {
+        val localVariableConfig = emulateMessageToAccountEventRequestConfig(accountId = accountId, gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
-        return request<DecodeMessageRequest, AccountEvent>(
+        return request<GaslessEstimateRequestMessagesInner, AccountEvent>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation emulateMessageToAccountEvent
-     *
-     * @param accountId account ID
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return RequestConfig
-     */
-    fun emulateMessageToAccountEventRequestConfig(accountId: kotlin.String, decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<DecodeMessageRequest> {
-        val localVariableBody = decodeMessageRequest
+    fun emulateMessageToAccountEventRequestConfig(accountId: kotlin.String, gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (ignoreSignatureCheck != null) {
@@ -211,23 +153,10 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return Event
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun emulateMessageToEvent(decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : Event {
-        val localVarResponse = emulateMessageToEventWithHttpInfo(decodeMessageRequest = decodeMessageRequest, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToEvent(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : Event {
+        val localVarResponse = emulateMessageToEventWithHttpInfo(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as Event
@@ -244,36 +173,18 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return ApiResponse<Event?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun emulateMessageToEventWithHttpInfo(decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Event?> {
-        val localVariableConfig = emulateMessageToEventRequestConfig(decodeMessageRequest = decodeMessageRequest, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToEventWithHttpInfo(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Event?> {
+        val localVariableConfig = emulateMessageToEventRequestConfig(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
 
-        return request<DecodeMessageRequest, Event>(
+        return request<GaslessEstimateRequestMessagesInner, Event>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation emulateMessageToEvent
-     *
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param acceptLanguage  (optional, default to "en")
-     * @param ignoreSignatureCheck  (optional)
-     * @return RequestConfig
-     */
-    fun emulateMessageToEventRequestConfig(decodeMessageRequest: DecodeMessageRequest, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<DecodeMessageRequest> {
-        val localVariableBody = decodeMessageRequest
+    fun emulateMessageToEventRequestConfig(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (ignoreSignatureCheck != null) {
@@ -295,22 +206,10 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param ignoreSignatureCheck  (optional)
-     * @return Trace
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun emulateMessageToTrace(decodeMessageRequest: DecodeMessageRequest, ignoreSignatureCheck: kotlin.Boolean? = null) : Trace {
-        val localVarResponse = emulateMessageToTraceWithHttpInfo(decodeMessageRequest = decodeMessageRequest, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToTrace(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean? = null) : Trace {
+        val localVarResponse = emulateMessageToTraceWithHttpInfo(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, ignoreSignatureCheck = ignoreSignatureCheck)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as Trace
@@ -327,34 +226,18 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param ignoreSignatureCheck  (optional)
-     * @return ApiResponse<Trace?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun emulateMessageToTraceWithHttpInfo(decodeMessageRequest: DecodeMessageRequest, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Trace?> {
-        val localVariableConfig = emulateMessageToTraceRequestConfig(decodeMessageRequest = decodeMessageRequest, ignoreSignatureCheck = ignoreSignatureCheck)
+    fun emulateMessageToTraceWithHttpInfo(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Trace?> {
+        val localVariableConfig = emulateMessageToTraceRequestConfig(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, ignoreSignatureCheck = ignoreSignatureCheck)
 
-        return request<DecodeMessageRequest, Trace>(
+        return request<GaslessEstimateRequestMessagesInner, Trace>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation emulateMessageToTrace
-     *
-     * @param decodeMessageRequest bag-of-cells serialized to hex
-     * @param ignoreSignatureCheck  (optional)
-     * @return RequestConfig
-     */
-    fun emulateMessageToTraceRequestConfig(decodeMessageRequest: DecodeMessageRequest, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<DecodeMessageRequest> {
-        val localVariableBody = decodeMessageRequest
+    fun emulateMessageToTraceRequestConfig(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
                 if (ignoreSignatureCheck != null) {
@@ -375,18 +258,6 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64/hex and additional parameters to configure emulation
-     * @param acceptLanguage  (optional, default to "en")
-     * @return MessageConsequences
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun emulateMessageToWallet(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String? = "en") : MessageConsequences {
@@ -407,15 +278,6 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Emulate sending message to blockchain
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64/hex and additional parameters to configure emulation
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<MessageConsequences?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun emulateMessageToWalletWithHttpInfo(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : ApiResponse<MessageConsequences?> {
@@ -426,13 +288,6 @@ class EmulationApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * To obtain the request config of the operation emulateMessageToWallet
-     *
-     * @param emulateMessageToWalletRequest bag-of-cells serialized to base64/hex and additional parameters to configure emulation
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun emulateMessageToWalletRequestConfig(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : RequestConfig<EmulateMessageToWalletRequest> {
         val localVariableBody = emulateMessageToWalletRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/EventsApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/EventsApi.kt
index 22f2f1d49..8b0aa45bc 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/EventsApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/EventsApi.kt
@@ -16,29 +16,31 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.Event
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class EventsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.GaslessEstimateRequestMessagesInner
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class EventsApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -46,18 +48,59 @@ class EventsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get an event either by event ID or a hash of any transaction in a trace. An event is built on top of a trace which is a series of transactions caused by one inbound message. TonAPI looks for known patterns inside the trace and splits the trace into actions, where a single action represents a meaningful high-level operation like a Jetton Transfer or an NFT Purchase. Actions are expected to be shown to users. It is advised not to build any logic on top of actions because actions can be changed at any time.
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return Event
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun emulateMessageToEvent(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String? = "en", ignoreSignatureCheck: kotlin.Boolean? = null) : Event {
+        val localVarResponse = emulateMessageToEventWithHttpInfo(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Event
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun emulateMessageToEventWithHttpInfo(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Event?> {
+        val localVariableConfig = emulateMessageToEventRequestConfig(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, acceptLanguage = acceptLanguage, ignoreSignatureCheck = ignoreSignatureCheck)
+
+        return request<GaslessEstimateRequestMessagesInner, Event>(
+            localVariableConfig
+        )
+    }
+
+    fun emulateMessageToEventRequestConfig(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, acceptLanguage: kotlin.String?, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (ignoreSignatureCheck != null) {
+                    put("ignore_signature_check", listOf(ignoreSignatureCheck.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v2/events/emulate",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getEvent(eventId: kotlin.String, acceptLanguage: kotlin.String? = "en") : Event {
@@ -78,15 +121,6 @@ class EventsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get an event either by event ID or a hash of any transaction in a trace. An event is built on top of a trace which is a series of transactions caused by one inbound message. TonAPI looks for known patterns inside the trace and splits the trace into actions, where a single action represents a meaningful high-level operation like a Jetton Transfer or an NFT Purchase. Actions are expected to be shown to users. It is advised not to build any logic on top of actions because actions can be changed at any time.
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<Event?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getEventWithHttpInfo(eventId: kotlin.String, acceptLanguage: kotlin.String?) : ApiResponse<Event?> {
@@ -97,13 +131,6 @@ class EventsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getEvent
-     *
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun getEventRequestConfig(eventId: kotlin.String, acceptLanguage: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/ExtraCurrencyApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/ExtraCurrencyApi.kt
new file mode 100644
index 000000000..fecb3f060
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/ExtraCurrencyApi.kt
@@ -0,0 +1,99 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.apis
+
+import java.io.IOException
+import okhttp3.Call
+import okhttp3.HttpUrl
+
+import io.tonapi.models.EcPreview
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class ExtraCurrencyApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty(ApiClient.baseUrlKey, "https://tonapi.io")
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getExtraCurrencyInfo(id: kotlin.Int) : EcPreview {
+        val localVarResponse = getExtraCurrencyInfoWithHttpInfo(id = id)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as EcPreview
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getExtraCurrencyInfoWithHttpInfo(id: kotlin.Int) : ApiResponse<EcPreview?> {
+        val localVariableConfig = getExtraCurrencyInfoRequestConfig(id = id)
+
+        return request<Unit, EcPreview>(
+            localVariableConfig
+        )
+    }
+
+    fun getExtraCurrencyInfoRequestConfig(id: kotlin.Int) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/extra-currency/{id}".replace("{"+"id"+"}", encodeURIComponent(id.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+
+    private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
+        HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
+}
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/GaslessApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/GaslessApi.kt
index 91089b99d..c257bc869 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/GaslessApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/GaslessApi.kt
@@ -16,32 +16,34 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.GaslessConfig
 import io.tonapi.models.GaslessEstimateRequest
 import io.tonapi.models.GaslessSendRequest
+import io.tonapi.models.GaslessTx
+import io.tonapi.models.InlineObject
 import io.tonapi.models.SignRawParams
-import io.tonapi.models.StatusDefaultResponse
 
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class GaslessApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -49,16 +51,6 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Returns configuration of gasless transfers
-     * @return GaslessConfig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun gaslessConfig() : GaslessConfig {
@@ -79,13 +71,6 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Returns configuration of gasless transfers
-     * @return ApiResponse<GaslessConfig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun gaslessConfigWithHttpInfo() : ApiResponse<GaslessConfig?> {
@@ -96,11 +81,6 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation gaslessConfig
-     *
-     * @return RequestConfig
-     */
     fun gaslessConfigRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -117,22 +97,10 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Estimates the cost of the given messages and returns a payload to sign.
-     * @param masterId jetton to pay commission
-     * @param gaslessEstimateRequest bag-of-cells serialized to hex
-     * @return SignRawParams
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun gaslessEstimate(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest) : SignRawParams {
-        val localVarResponse = gaslessEstimateWithHttpInfo(masterId = masterId, gaslessEstimateRequest = gaslessEstimateRequest)
+    fun gaslessEstimate(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest, acceptLanguage: kotlin.String? = "en") : SignRawParams {
+        val localVarResponse = gaslessEstimateWithHttpInfo(masterId = masterId, gaslessEstimateRequest = gaslessEstimateRequest, acceptLanguage = acceptLanguage)
 
         return when (localVarResponse.responseType) {
             ResponseType.Success -> (localVarResponse as Success<*>).data as SignRawParams
@@ -149,36 +117,21 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Estimates the cost of the given messages and returns a payload to sign.
-     * @param masterId jetton to pay commission
-     * @param gaslessEstimateRequest bag-of-cells serialized to hex
-     * @return ApiResponse<SignRawParams?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun gaslessEstimateWithHttpInfo(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest) : ApiResponse<SignRawParams?> {
-        val localVariableConfig = gaslessEstimateRequestConfig(masterId = masterId, gaslessEstimateRequest = gaslessEstimateRequest)
+    fun gaslessEstimateWithHttpInfo(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest, acceptLanguage: kotlin.String?) : ApiResponse<SignRawParams?> {
+        val localVariableConfig = gaslessEstimateRequestConfig(masterId = masterId, gaslessEstimateRequest = gaslessEstimateRequest, acceptLanguage = acceptLanguage)
 
         return request<GaslessEstimateRequest, SignRawParams>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation gaslessEstimate
-     *
-     * @param masterId jetton to pay commission
-     * @param gaslessEstimateRequest bag-of-cells serialized to hex
-     * @return RequestConfig
-     */
-    fun gaslessEstimateRequestConfig(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest) : RequestConfig<GaslessEstimateRequest> {
+    fun gaslessEstimateRequestConfig(masterId: kotlin.String, gaslessEstimateRequest: GaslessEstimateRequest, acceptLanguage: kotlin.String?) : RequestConfig<GaslessEstimateRequest> {
         val localVariableBody = gaslessEstimateRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
         localVariableHeaders["Content-Type"] = "application/json"
         localVariableHeaders["Accept"] = "application/json"
 
@@ -192,23 +145,13 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * 
-     * @param gaslessSendRequest bag-of-cells serialized to hex
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun gaslessSend(gaslessSendRequest: GaslessSendRequest) : Unit {
+    fun gaslessSend(gaslessSendRequest: GaslessSendRequest) : GaslessTx {
         val localVarResponse = gaslessSendWithHttpInfo(gaslessSendRequest = gaslessSendRequest)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> Unit
+            ResponseType.Success -> (localVarResponse as Success<*>).data as GaslessTx
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -222,29 +165,16 @@ class GaslessApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * 
-     * @param gaslessSendRequest bag-of-cells serialized to hex
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+    @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun gaslessSendWithHttpInfo(gaslessSendRequest: GaslessSendRequest) : ApiResponse<Unit?> {
+    fun gaslessSendWithHttpInfo(gaslessSendRequest: GaslessSendRequest) : ApiResponse<GaslessTx?> {
         val localVariableConfig = gaslessSendRequestConfig(gaslessSendRequest = gaslessSendRequest)
 
-        return request<GaslessSendRequest, Unit>(
+        return request<GaslessSendRequest, GaslessTx>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation gaslessSend
-     *
-     * @param gaslessSendRequest bag-of-cells serialized to hex
-     * @return RequestConfig
-     */
     fun gaslessSendRequestConfig(gaslessSendRequest: GaslessSendRequest) : RequestConfig<GaslessSendRequest> {
         val localVariableBody = gaslessSendRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/InscriptionsApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/InscriptionsApi.kt
deleted file mode 100644
index 98287e5fc..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/apis/InscriptionsApi.kt
+++ /dev/null
@@ -1,437 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.apis
-
-import java.io.IOException
-import okhttp3.OkHttpClient
-import okhttp3.HttpUrl
-
-import io.tonapi.models.AccountEvents
-import io.tonapi.models.GetInscriptionOpTemplate200Response
-import io.tonapi.models.InscriptionBalances
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class InscriptionsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
-    companion object {
-        @JvmStatic
-        val defaultBasePath: String by lazy {
-            System.getProperties().getProperty(ApiClient.baseUrlKey, "https://tonapi.io")
-        }
-    }
-
-    /**
-     * 
-     * Get all inscriptions by owner address. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return InscriptionBalances
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountInscriptions(accountId: kotlin.String, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0) : InscriptionBalances {
-        val localVarResponse = getAccountInscriptionsWithHttpInfo(accountId = accountId, limit = limit, offset = offset)
-
-        return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as InscriptionBalances
-            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
-            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
-            ResponseType.ClientError -> {
-                val localVarError = localVarResponse as ClientError<*>
-                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
-            }
-            ResponseType.ServerError -> {
-                val localVarError = localVarResponse as ServerError<*>
-                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
-            }
-        }
-    }
-
-    /**
-     * 
-     * Get all inscriptions by owner address. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<InscriptionBalances?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountInscriptionsWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<InscriptionBalances?> {
-        val localVariableConfig = getAccountInscriptionsRequestConfig(accountId = accountId, limit = limit, offset = offset)
-
-        return request<Unit, InscriptionBalances>(
-            localVariableConfig
-        )
-    }
-
-    /**
-     * To obtain the request config of the operation getAccountInscriptions
-     *
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
-    fun getAccountInscriptionsRequestConfig(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
-            .apply {
-                if (limit != null) {
-                    put("limit", listOf(limit.toString()))
-                }
-                if (offset != null) {
-                    put("offset", listOf(offset.toString()))
-                }
-            }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        localVariableHeaders["Accept"] = "application/json"
-
-        return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/experimental/accounts/{account_id}/inscriptions".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
-            query = localVariableQuery,
-            headers = localVariableHeaders,
-            requiresAuthentication = false,
-            body = localVariableBody
-        )
-    }
-
-    /**
-     * 
-     * Get the transfer inscriptions history for account. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountInscriptionsHistory(accountId: kotlin.String, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, limit: kotlin.Int? = 100) : AccountEvents {
-        val localVarResponse = getAccountInscriptionsHistoryWithHttpInfo(accountId = accountId, acceptLanguage = acceptLanguage, beforeLt = beforeLt, limit = limit)
-
-        return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvents
-            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
-            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
-            ResponseType.ClientError -> {
-                val localVarError = localVarResponse as ClientError<*>
-                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
-            }
-            ResponseType.ServerError -> {
-                val localVarError = localVarResponse as ServerError<*>
-                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
-            }
-        }
-    }
-
-    /**
-     * 
-     * Get the transfer inscriptions history for account. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountInscriptionsHistoryWithHttpInfo(accountId: kotlin.String, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, limit: kotlin.Int?) : ApiResponse<AccountEvents?> {
-        val localVariableConfig = getAccountInscriptionsHistoryRequestConfig(accountId = accountId, acceptLanguage = acceptLanguage, beforeLt = beforeLt, limit = limit)
-
-        return request<Unit, AccountEvents>(
-            localVariableConfig
-        )
-    }
-
-    /**
-     * To obtain the request config of the operation getAccountInscriptionsHistory
-     *
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return RequestConfig
-     */
-    fun getAccountInscriptionsHistoryRequestConfig(accountId: kotlin.String, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, limit: kotlin.Int?) : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
-            .apply {
-                if (beforeLt != null) {
-                    put("before_lt", listOf(beforeLt.toString()))
-                }
-                if (limit != null) {
-                    put("limit", listOf(limit.toString()))
-                }
-            }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
-        localVariableHeaders["Accept"] = "application/json"
-
-        return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/experimental/accounts/{account_id}/inscriptions/history".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
-            query = localVariableQuery,
-            headers = localVariableHeaders,
-            requiresAuthentication = false,
-            body = localVariableBody
-        )
-    }
-
-    /**
-     * 
-     * Get the transfer inscriptions history for account. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param ticker 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountInscriptionsHistoryByTicker(accountId: kotlin.String, ticker: kotlin.String, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, limit: kotlin.Int? = 100) : AccountEvents {
-        val localVarResponse = getAccountInscriptionsHistoryByTickerWithHttpInfo(accountId = accountId, ticker = ticker, acceptLanguage = acceptLanguage, beforeLt = beforeLt, limit = limit)
-
-        return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvents
-            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
-            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
-            ResponseType.ClientError -> {
-                val localVarError = localVarResponse as ClientError<*>
-                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
-            }
-            ResponseType.ServerError -> {
-                val localVarError = localVarResponse as ServerError<*>
-                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
-            }
-        }
-    }
-
-    /**
-     * 
-     * Get the transfer inscriptions history for account. It&#39;s experimental API and can be dropped in the future.
-     * @param accountId account ID
-     * @param ticker 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountInscriptionsHistoryByTickerWithHttpInfo(accountId: kotlin.String, ticker: kotlin.String, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, limit: kotlin.Int?) : ApiResponse<AccountEvents?> {
-        val localVariableConfig = getAccountInscriptionsHistoryByTickerRequestConfig(accountId = accountId, ticker = ticker, acceptLanguage = acceptLanguage, beforeLt = beforeLt, limit = limit)
-
-        return request<Unit, AccountEvents>(
-            localVariableConfig
-        )
-    }
-
-    /**
-     * To obtain the request config of the operation getAccountInscriptionsHistoryByTicker
-     *
-     * @param accountId account ID
-     * @param ticker 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param limit  (optional, default to 100)
-     * @return RequestConfig
-     */
-    fun getAccountInscriptionsHistoryByTickerRequestConfig(accountId: kotlin.String, ticker: kotlin.String, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, limit: kotlin.Int?) : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
-            .apply {
-                if (beforeLt != null) {
-                    put("before_lt", listOf(beforeLt.toString()))
-                }
-                if (limit != null) {
-                    put("limit", listOf(limit.toString()))
-                }
-            }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
-        localVariableHeaders["Accept"] = "application/json"
-
-        return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/experimental/accounts/{account_id}/inscriptions/{ticker}/history".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())).replace("{"+"ticker"+"}", encodeURIComponent(ticker.toString())),
-            query = localVariableQuery,
-            headers = localVariableHeaders,
-            requiresAuthentication = false,
-            body = localVariableBody
-        )
-    }
-
-    /**
-     * enum for parameter type
-     */
-     enum class TypeGetInscriptionOpTemplate(val value: kotlin.String) {
-         @Json(name = "ton20") ton20("ton20"),
-         @Json(name = "gram20") gram20("gram20")
-     }
-
-    /**
-     * enum for parameter operation
-     */
-     enum class OperationGetInscriptionOpTemplate(val value: kotlin.String) {
-         @Json(name = "transfer") transfer("transfer")
-     }
-
-    /**
-     * 
-     * return comment for making operation with inscription. please don&#39;t use it if you don&#39;t know what you are doing
-     * @param type 
-     * @param operation 
-     * @param amount 
-     * @param ticker 
-     * @param who 
-     * @param destination  (optional)
-     * @param comment  (optional)
-     * @return GetInscriptionOpTemplate200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getInscriptionOpTemplate(type: TypeGetInscriptionOpTemplate, operation: OperationGetInscriptionOpTemplate, amount: kotlin.String, ticker: kotlin.String, who: kotlin.String, destination: kotlin.String? = null, comment: kotlin.String? = null) : GetInscriptionOpTemplate200Response {
-        val localVarResponse = getInscriptionOpTemplateWithHttpInfo(type = type, operation = operation, amount = amount, ticker = ticker, who = who, destination = destination, comment = comment)
-
-        return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as GetInscriptionOpTemplate200Response
-            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
-            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
-            ResponseType.ClientError -> {
-                val localVarError = localVarResponse as ClientError<*>
-                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
-            }
-            ResponseType.ServerError -> {
-                val localVarError = localVarResponse as ServerError<*>
-                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
-            }
-        }
-    }
-
-    /**
-     * 
-     * return comment for making operation with inscription. please don&#39;t use it if you don&#39;t know what you are doing
-     * @param type 
-     * @param operation 
-     * @param amount 
-     * @param ticker 
-     * @param who 
-     * @param destination  (optional)
-     * @param comment  (optional)
-     * @return ApiResponse<GetInscriptionOpTemplate200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
-    @Suppress("UNCHECKED_CAST")
-    @Throws(IllegalStateException::class, IOException::class)
-    fun getInscriptionOpTemplateWithHttpInfo(type: TypeGetInscriptionOpTemplate, operation: OperationGetInscriptionOpTemplate, amount: kotlin.String, ticker: kotlin.String, who: kotlin.String, destination: kotlin.String?, comment: kotlin.String?) : ApiResponse<GetInscriptionOpTemplate200Response?> {
-        val localVariableConfig = getInscriptionOpTemplateRequestConfig(type = type, operation = operation, amount = amount, ticker = ticker, who = who, destination = destination, comment = comment)
-
-        return request<Unit, GetInscriptionOpTemplate200Response>(
-            localVariableConfig
-        )
-    }
-
-    /**
-     * To obtain the request config of the operation getInscriptionOpTemplate
-     *
-     * @param type 
-     * @param operation 
-     * @param amount 
-     * @param ticker 
-     * @param who 
-     * @param destination  (optional)
-     * @param comment  (optional)
-     * @return RequestConfig
-     */
-    fun getInscriptionOpTemplateRequestConfig(type: TypeGetInscriptionOpTemplate, operation: OperationGetInscriptionOpTemplate, amount: kotlin.String, ticker: kotlin.String, who: kotlin.String, destination: kotlin.String?, comment: kotlin.String?) : RequestConfig<Unit> {
-        val localVariableBody = null
-        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
-            .apply {
-                put("type", listOf(type.value))
-                if (destination != null) {
-                    put("destination", listOf(destination.toString()))
-                }
-                if (comment != null) {
-                    put("comment", listOf(comment.toString()))
-                }
-                put("operation", listOf(operation.value))
-                put("amount", listOf(amount.toString()))
-                put("ticker", listOf(ticker.toString()))
-                put("who", listOf(who.toString()))
-            }
-        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        localVariableHeaders["Accept"] = "application/json"
-
-        return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/experimental/inscriptions/op-template",
-            query = localVariableQuery,
-            headers = localVariableHeaders,
-            requiresAuthentication = false,
-            body = localVariableBody
-        )
-    }
-
-
-    private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
-        HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/JettonsApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/JettonsApi.kt
index 36d237161..5660e0956 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/JettonsApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/JettonsApi.kt
@@ -16,33 +16,35 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.Event
+import io.tonapi.models.GetAccountsRequest
+import io.tonapi.models.InlineObject
 import io.tonapi.models.JettonHolders
 import io.tonapi.models.JettonInfo
 import io.tonapi.models.JettonTransferPayload
 import io.tonapi.models.Jettons
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class JettonsApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -50,19 +52,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get jetton&#39;s holders
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return JettonHolders
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getJettonHolders(accountId: kotlin.String, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0) : JettonHolders {
@@ -83,16 +72,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get jetton&#39;s holders
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<JettonHolders?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getJettonHoldersWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<JettonHolders?> {
@@ -103,14 +82,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettonHolders
-     *
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
     fun getJettonHoldersRequestConfig(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -135,17 +106,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get jetton metadata by jetton master address
-     * @param accountId account ID
-     * @return JettonInfo
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getJettonInfo(accountId: kotlin.String) : JettonInfo {
@@ -166,14 +126,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get jetton metadata by jetton master address
-     * @param accountId account ID
-     * @return ApiResponse<JettonInfo?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getJettonInfoWithHttpInfo(accountId: kotlin.String) : ApiResponse<JettonInfo?> {
@@ -184,12 +136,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettonInfo
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getJettonInfoRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -206,18 +152,53 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get jetton&#39;s custom payload and state init required for transfer
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @return JettonTransferPayload
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getJettonInfosByAddresses(getAccountsRequest: GetAccountsRequest? = null) : Jettons {
+        val localVarResponse = getJettonInfosByAddressesWithHttpInfo(getAccountsRequest = getAccountsRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Jettons
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getJettonInfosByAddressesWithHttpInfo(getAccountsRequest: GetAccountsRequest?) : ApiResponse<Jettons?> {
+        val localVariableConfig = getJettonInfosByAddressesRequestConfig(getAccountsRequest = getAccountsRequest)
+
+        return request<GetAccountsRequest, Jettons>(
+            localVariableConfig
+        )
+    }
+
+    fun getJettonInfosByAddressesRequestConfig(getAccountsRequest: GetAccountsRequest?) : RequestConfig<GetAccountsRequest> {
+        val localVariableBody = getAccountsRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v2/jettons/_bulk",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getJettonTransferPayload(accountId: kotlin.String, jettonId: kotlin.String) : JettonTransferPayload {
@@ -238,15 +219,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get jetton&#39;s custom payload and state init required for transfer
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @return ApiResponse<JettonTransferPayload?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getJettonTransferPayloadWithHttpInfo(accountId: kotlin.String, jettonId: kotlin.String) : ApiResponse<JettonTransferPayload?> {
@@ -257,13 +229,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettonTransferPayload
-     *
-     * @param accountId account ID
-     * @param jettonId jetton ID
-     * @return RequestConfig
-     */
     fun getJettonTransferPayloadRequestConfig(accountId: kotlin.String, jettonId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -280,18 +245,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get a list of all indexed jetton masters in the blockchain.
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return Jettons
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getJettons(limit: kotlin.Int? = 100, offset: kotlin.Int? = 0) : Jettons {
@@ -312,15 +265,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get a list of all indexed jetton masters in the blockchain.
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<Jettons?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getJettonsWithHttpInfo(limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<Jettons?> {
@@ -331,13 +275,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettons
-     *
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
     fun getJettonsRequestConfig(limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -362,18 +299,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get only jetton transfers in the event
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return Event
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getJettonsEvents(eventId: kotlin.String, acceptLanguage: kotlin.String? = "en") : Event {
@@ -394,15 +319,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get only jetton transfers in the event
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<Event?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getJettonsEventsWithHttpInfo(eventId: kotlin.String, acceptLanguage: kotlin.String?) : ApiResponse<Event?> {
@@ -413,13 +329,6 @@ class JettonsApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getJettonsEvents
-     *
-     * @param eventId event ID or transaction hash in hex (without 0x) or base64url format
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun getJettonsEventsRequestConfig(eventId: kotlin.String, acceptLanguage: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/LiteServerApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/LiteServerApi.kt
index d1fc97eff..6fc23ae52 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/LiteServerApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/LiteServerApi.kt
@@ -16,7 +16,7 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.GetAllRawShardsInfo200Response
@@ -34,27 +34,28 @@ import io.tonapi.models.GetRawShardBlockProof200Response
 import io.tonapi.models.GetRawShardInfo200Response
 import io.tonapi.models.GetRawTime200Response
 import io.tonapi.models.GetRawTransactions200Response
+import io.tonapi.models.InlineObject
 import io.tonapi.models.SendRawMessage200Response
 import io.tonapi.models.SendRawMessageRequest
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -62,17 +63,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get all raw shards info
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return GetAllRawShardsInfo200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAllRawShardsInfo(blockId: kotlin.String) : GetAllRawShardsInfo200Response {
@@ -93,14 +83,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get all raw shards info
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return ApiResponse<GetAllRawShardsInfo200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAllRawShardsInfoWithHttpInfo(blockId: kotlin.String) : ApiResponse<GetAllRawShardsInfo200Response?> {
@@ -111,12 +93,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAllRawShardsInfo
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return RequestConfig
-     */
     fun getAllRawShardsInfoRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -133,16 +109,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get out msg queue sizes
-     * @return GetOutMsgQueueSizes200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getOutMsgQueueSizes() : GetOutMsgQueueSizes200Response {
@@ -163,13 +129,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get out msg queue sizes
-     * @return ApiResponse<GetOutMsgQueueSizes200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getOutMsgQueueSizesWithHttpInfo() : ApiResponse<GetOutMsgQueueSizes200Response?> {
@@ -180,11 +139,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getOutMsgQueueSizes
-     *
-     * @return RequestConfig
-     */
     fun getOutMsgQueueSizesRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -201,18 +155,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw account state
-     * @param accountId account ID
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return GetRawAccountState200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawAccountState(accountId: kotlin.String, targetBlock: kotlin.String? = null) : GetRawAccountState200Response {
@@ -233,15 +175,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw account state
-     * @param accountId account ID
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return ApiResponse<GetRawAccountState200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawAccountStateWithHttpInfo(accountId: kotlin.String, targetBlock: kotlin.String?) : ApiResponse<GetRawAccountState200Response?> {
@@ -252,13 +185,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawAccountState
-     *
-     * @param accountId account ID
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return RequestConfig
-     */
     fun getRawAccountStateRequestConfig(accountId: kotlin.String, targetBlock: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -280,19 +206,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw block proof
-     * @param knownBlock known block: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return GetRawBlockProof200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockProof(knownBlock: kotlin.String, mode: kotlin.Int, targetBlock: kotlin.String? = null) : GetRawBlockProof200Response {
@@ -313,16 +226,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw block proof
-     * @param knownBlock known block: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return ApiResponse<GetRawBlockProof200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockProofWithHttpInfo(knownBlock: kotlin.String, mode: kotlin.Int, targetBlock: kotlin.String?) : ApiResponse<GetRawBlockProof200Response?> {
@@ -333,14 +236,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockProof
-     *
-     * @param knownBlock known block: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param targetBlock target block: (workchain,shard,seqno,root_hash,file_hash) (optional)
-     * @return RequestConfig
-     */
     fun getRawBlockProofRequestConfig(knownBlock: kotlin.String, mode: kotlin.Int, targetBlock: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -364,17 +259,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw blockchain block
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return GetRawBlockchainBlock200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockchainBlock(blockId: kotlin.String) : GetRawBlockchainBlock200Response {
@@ -395,14 +279,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw blockchain block
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return ApiResponse<GetRawBlockchainBlock200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockchainBlockWithHttpInfo(blockId: kotlin.String) : ApiResponse<GetRawBlockchainBlock200Response?> {
@@ -413,12 +289,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockchainBlock
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return RequestConfig
-     */
     fun getRawBlockchainBlockRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -435,18 +305,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw blockchain block header
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return GetRawBlockchainBlockHeader200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockchainBlockHeader(blockId: kotlin.String, mode: kotlin.Int) : GetRawBlockchainBlockHeader200Response {
@@ -467,15 +325,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw blockchain block header
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return ApiResponse<GetRawBlockchainBlockHeader200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockchainBlockHeaderWithHttpInfo(blockId: kotlin.String, mode: kotlin.Int) : ApiResponse<GetRawBlockchainBlockHeader200Response?> {
@@ -486,13 +335,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockchainBlockHeader
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return RequestConfig
-     */
     fun getRawBlockchainBlockHeaderRequestConfig(blockId: kotlin.String, mode: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -512,17 +354,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw blockchain block state
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return GetRawBlockchainBlockState200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawBlockchainBlockState(blockId: kotlin.String) : GetRawBlockchainBlockState200Response {
@@ -543,14 +374,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw blockchain block state
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return ApiResponse<GetRawBlockchainBlockState200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawBlockchainBlockStateWithHttpInfo(blockId: kotlin.String) : ApiResponse<GetRawBlockchainBlockState200Response?> {
@@ -561,12 +384,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawBlockchainBlockState
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return RequestConfig
-     */
     fun getRawBlockchainBlockStateRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -583,18 +400,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw config
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return GetRawConfig200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawConfig(blockId: kotlin.String, mode: kotlin.Int) : GetRawConfig200Response {
@@ -615,15 +420,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw config
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return ApiResponse<GetRawConfig200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawConfigWithHttpInfo(blockId: kotlin.String, mode: kotlin.Int) : ApiResponse<GetRawConfig200Response?> {
@@ -634,13 +430,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawConfig
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @return RequestConfig
-     */
     fun getRawConfigRequestConfig(blockId: kotlin.String, mode: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -660,21 +449,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw list block transactions
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param count count
-     * @param accountId account ID (optional)
-     * @param lt lt (optional)
-     * @return GetRawListBlockTransactions200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawListBlockTransactions(blockId: kotlin.String, mode: kotlin.Int, count: kotlin.Int, accountId: kotlin.String? = null, lt: kotlin.Long? = null) : GetRawListBlockTransactions200Response {
@@ -695,18 +469,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw list block transactions
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param count count
-     * @param accountId account ID (optional)
-     * @param lt lt (optional)
-     * @return ApiResponse<GetRawListBlockTransactions200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawListBlockTransactionsWithHttpInfo(blockId: kotlin.String, mode: kotlin.Int, count: kotlin.Int, accountId: kotlin.String?, lt: kotlin.Long?) : ApiResponse<GetRawListBlockTransactions200Response?> {
@@ -717,16 +479,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawListBlockTransactions
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param mode mode
-     * @param count count
-     * @param accountId account ID (optional)
-     * @param lt lt (optional)
-     * @return RequestConfig
-     */
     fun getRawListBlockTransactionsRequestConfig(blockId: kotlin.String, mode: kotlin.Int, count: kotlin.Int, accountId: kotlin.String?, lt: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -753,16 +505,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw masterchain info
-     * @return GetRawMasterchainInfo200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawMasterchainInfo() : GetRawMasterchainInfo200Response {
@@ -783,13 +525,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw masterchain info
-     * @return ApiResponse<GetRawMasterchainInfo200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawMasterchainInfoWithHttpInfo() : ApiResponse<GetRawMasterchainInfo200Response?> {
@@ -800,11 +535,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawMasterchainInfo
-     *
-     * @return RequestConfig
-     */
     fun getRawMasterchainInfoRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -821,17 +551,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw masterchain info ext
-     * @param mode mode
-     * @return GetRawMasterchainInfoExt200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawMasterchainInfoExt(mode: kotlin.Int) : GetRawMasterchainInfoExt200Response {
@@ -852,14 +571,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw masterchain info ext
-     * @param mode mode
-     * @return ApiResponse<GetRawMasterchainInfoExt200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawMasterchainInfoExtWithHttpInfo(mode: kotlin.Int) : ApiResponse<GetRawMasterchainInfoExt200Response?> {
@@ -870,12 +581,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawMasterchainInfoExt
-     *
-     * @param mode mode
-     * @return RequestConfig
-     */
     fun getRawMasterchainInfoExtRequestConfig(mode: kotlin.Int) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -895,17 +600,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw shard block proof
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return GetRawShardBlockProof200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawShardBlockProof(blockId: kotlin.String) : GetRawShardBlockProof200Response {
@@ -926,14 +620,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw shard block proof
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return ApiResponse<GetRawShardBlockProof200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawShardBlockProofWithHttpInfo(blockId: kotlin.String) : ApiResponse<GetRawShardBlockProof200Response?> {
@@ -944,12 +630,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawShardBlockProof
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @return RequestConfig
-     */
     fun getRawShardBlockProofRequestConfig(blockId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -966,20 +646,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw shard info
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param workchain workchain
-     * @param shard shard
-     * @param exact exact
-     * @return GetRawShardInfo200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawShardInfo(blockId: kotlin.String, workchain: kotlin.Int, shard: kotlin.Long, exact: kotlin.Boolean) : GetRawShardInfo200Response {
@@ -1000,17 +666,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw shard info
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param workchain workchain
-     * @param shard shard
-     * @param exact exact
-     * @return ApiResponse<GetRawShardInfo200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawShardInfoWithHttpInfo(blockId: kotlin.String, workchain: kotlin.Int, shard: kotlin.Long, exact: kotlin.Boolean) : ApiResponse<GetRawShardInfo200Response?> {
@@ -1021,15 +676,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawShardInfo
-     *
-     * @param blockId block ID: (workchain,shard,seqno,root_hash,file_hash)
-     * @param workchain workchain
-     * @param shard shard
-     * @param exact exact
-     * @return RequestConfig
-     */
     fun getRawShardInfoRequestConfig(blockId: kotlin.String, workchain: kotlin.Int, shard: kotlin.Long, exact: kotlin.Boolean) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1051,16 +697,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw time
-     * @return GetRawTime200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawTime() : GetRawTime200Response {
@@ -1081,13 +717,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw time
-     * @return ApiResponse<GetRawTime200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawTimeWithHttpInfo() : ApiResponse<GetRawTime200Response?> {
@@ -1098,11 +727,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawTime
-     *
-     * @return RequestConfig
-     */
     fun getRawTimeRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -1119,20 +743,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Get raw transactions
-     * @param accountId account ID
-     * @param count count
-     * @param lt lt
-     * @param hash hash
-     * @return GetRawTransactions200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRawTransactions(accountId: kotlin.String, count: kotlin.Int, lt: kotlin.Long, hash: kotlin.String) : GetRawTransactions200Response {
@@ -1153,17 +763,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Get raw transactions
-     * @param accountId account ID
-     * @param count count
-     * @param lt lt
-     * @param hash hash
-     * @return ApiResponse<GetRawTransactions200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRawTransactionsWithHttpInfo(accountId: kotlin.String, count: kotlin.Int, lt: kotlin.Long, hash: kotlin.String) : ApiResponse<GetRawTransactions200Response?> {
@@ -1174,15 +773,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRawTransactions
-     *
-     * @param accountId account ID
-     * @param count count
-     * @param lt lt
-     * @param hash hash
-     * @return RequestConfig
-     */
     fun getRawTransactionsRequestConfig(accountId: kotlin.String, count: kotlin.Int, lt: kotlin.Long, hash: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -1204,17 +794,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * 
-     * Send raw message to blockchain
-     * @param sendRawMessageRequest Data that is expected
-     * @return SendRawMessage200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun sendRawMessage(sendRawMessageRequest: SendRawMessageRequest) : SendRawMessage200Response {
@@ -1235,14 +814,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         }
     }
 
-    /**
-     * 
-     * Send raw message to blockchain
-     * @param sendRawMessageRequest Data that is expected
-     * @return ApiResponse<SendRawMessage200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun sendRawMessageWithHttpInfo(sendRawMessageRequest: SendRawMessageRequest) : ApiResponse<SendRawMessage200Response?> {
@@ -1253,12 +824,6 @@ class LiteServerApi(basePath: kotlin.String = defaultBasePath, client: OkHttpCli
         )
     }
 
-    /**
-     * To obtain the request config of the operation sendRawMessage
-     *
-     * @param sendRawMessageRequest Data that is expected
-     * @return RequestConfig
-     */
     fun sendRawMessageRequestConfig(sendRawMessageRequest: SendRawMessageRequest) : RequestConfig<SendRawMessageRequest> {
         val localVariableBody = sendRawMessageRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/MultisigApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/MultisigApi.kt
index ee94168b5..f09fd78b5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/MultisigApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/MultisigApi.kt
@@ -16,29 +16,31 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
+import io.tonapi.models.InlineObject
 import io.tonapi.models.Multisig
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class MultisigApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.MultisigOrder
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class MultisigApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -46,17 +48,6 @@ class MultisigApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get multisig account info
-     * @param accountId account ID
-     * @return Multisig
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getMultisigAccount(accountId: kotlin.String) : Multisig {
@@ -77,14 +68,6 @@ class MultisigApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         }
     }
 
-    /**
-     * 
-     * Get multisig account info
-     * @param accountId account ID
-     * @return ApiResponse<Multisig?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getMultisigAccountWithHttpInfo(accountId: kotlin.String) : ApiResponse<Multisig?> {
@@ -95,12 +78,6 @@ class MultisigApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
-    /**
-     * To obtain the request config of the operation getMultisigAccount
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getMultisigAccountRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -117,6 +94,52 @@ class MultisigApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClien
         )
     }
 
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getMultisigOrder(accountId: kotlin.String) : MultisigOrder {
+        val localVarResponse = getMultisigOrderWithHttpInfo(accountId = accountId)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as MultisigOrder
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getMultisigOrderWithHttpInfo(accountId: kotlin.String) : ApiResponse<MultisigOrder?> {
+        val localVariableConfig = getMultisigOrderRequestConfig(accountId = accountId)
+
+        return request<Unit, MultisigOrder>(
+            localVariableConfig
+        )
+    }
+
+    fun getMultisigOrderRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/multisig/order/{account_id}".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
 
     private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
         HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/NFTApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/NFTApi.kt
index 121e9bb70..8e71a12c9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/NFTApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/NFTApi.kt
@@ -16,34 +16,36 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.AccountEvents
 import io.tonapi.models.GetAccountsRequest
+import io.tonapi.models.InlineObject
 import io.tonapi.models.NftCollection
 import io.tonapi.models.NftCollections
 import io.tonapi.models.NftItem
 import io.tonapi.models.NftItems
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.NftOperations
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class NFTApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -51,29 +53,13 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get the transfer nft history
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountNftHistory(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
-        val localVarResponse = getAccountNftHistoryWithHttpInfo(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+    fun getAccountNftHistory(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null) : NftOperations {
+        val localVarResponse = getAccountNftHistoryWithHttpInfo(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountEvents
+            ResponseType.Success -> (localVarResponse as Success<*>).data as NftOperations
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -87,41 +73,17 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get the transfer nft history
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountNftHistoryWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
-        val localVariableConfig = getAccountNftHistoryRequestConfig(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
+    fun getAccountNftHistoryWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?) : ApiResponse<NftOperations?> {
+        val localVariableConfig = getAccountNftHistoryRequestConfig(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt)
 
-        return request<Unit, AccountEvents>(
+        return request<Unit, NftOperations>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountNftHistory
-     *
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return RequestConfig
-     */
-    fun getAccountNftHistoryRequestConfig(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
+    fun getAccountNftHistoryRequestConfig(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
             .apply {
@@ -129,12 +91,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
                     put("before_lt", listOf(beforeLt.toString()))
                 }
                 put("limit", listOf(limit.toString()))
-                if (startDate != null) {
-                    put("start_date", listOf(startDate.toString()))
-                }
-                if (endDate != null) {
-                    put("end_date", listOf(endDate.toString()))
-                }
             }
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
         acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
@@ -150,19 +106,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get NFT items from collection by collection address
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return NftItems
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getItemsFromCollection(accountId: kotlin.String, limit: kotlin.Int? = 1000, offset: kotlin.Int? = 0) : NftItems {
@@ -183,16 +126,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get NFT items from collection by collection address
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<NftItems?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getItemsFromCollectionWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<NftItems?> {
@@ -203,14 +136,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getItemsFromCollection
-     *
-     * @param accountId account ID
-     * @param limit  (optional, default to 1000)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
     fun getItemsFromCollectionRequestConfig(accountId: kotlin.String, limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -235,17 +160,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get NFT collection by collection address
-     * @param accountId account ID
-     * @return NftCollection
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getNftCollection(accountId: kotlin.String) : NftCollection {
@@ -266,14 +180,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get NFT collection by collection address
-     * @param accountId account ID
-     * @return ApiResponse<NftCollection?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getNftCollectionWithHttpInfo(accountId: kotlin.String) : ApiResponse<NftCollection?> {
@@ -284,12 +190,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getNftCollection
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getNftCollectionRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -306,18 +206,53 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get NFT collections
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return NftCollections
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getNftCollectionItemsByAddresses(getAccountsRequest: GetAccountsRequest? = null) : NftCollections {
+        val localVarResponse = getNftCollectionItemsByAddressesWithHttpInfo(getAccountsRequest = getAccountsRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as NftCollections
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getNftCollectionItemsByAddressesWithHttpInfo(getAccountsRequest: GetAccountsRequest?) : ApiResponse<NftCollections?> {
+        val localVariableConfig = getNftCollectionItemsByAddressesRequestConfig(getAccountsRequest = getAccountsRequest)
+
+        return request<GetAccountsRequest, NftCollections>(
+            localVariableConfig
+        )
+    }
+
+    fun getNftCollectionItemsByAddressesRequestConfig(getAccountsRequest: GetAccountsRequest?) : RequestConfig<GetAccountsRequest> {
+        val localVariableBody = getAccountsRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v2/nfts/collections/_bulk",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getNftCollections(limit: kotlin.Int? = 100, offset: kotlin.Int? = 0) : NftCollections {
@@ -338,15 +273,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get NFT collections
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return ApiResponse<NftCollections?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getNftCollectionsWithHttpInfo(limit: kotlin.Int?, offset: kotlin.Int?) : ApiResponse<NftCollections?> {
@@ -357,13 +283,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getNftCollections
-     *
-     * @param limit  (optional, default to 100)
-     * @param offset  (optional, default to 0)
-     * @return RequestConfig
-     */
     fun getNftCollectionsRequestConfig(limit: kotlin.Int?, offset: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -388,25 +307,11 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get the transfer nfts history for account
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return AccountEvents
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
     fun getNftHistoryByID(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String? = "en", beforeLt: kotlin.Long? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null) : AccountEvents {
+        @Suppress("DEPRECATION")
         val localVarResponse = getNftHistoryByIDWithHttpInfo(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
 
         return when (localVarResponse.responseType) {
@@ -424,22 +329,11 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get the transfer nfts history for account
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return ApiResponse<AccountEvents?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
+    @Deprecated(message = "This operation is deprecated.")
     fun getNftHistoryByIDWithHttpInfo(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : ApiResponse<AccountEvents?> {
+        @Suppress("DEPRECATION")
         val localVariableConfig = getNftHistoryByIDRequestConfig(accountId = accountId, limit = limit, acceptLanguage = acceptLanguage, beforeLt = beforeLt, startDate = startDate, endDate = endDate)
 
         return request<Unit, AccountEvents>(
@@ -447,17 +341,7 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getNftHistoryByID
-     *
-     * @param accountId account ID
-     * @param limit 
-     * @param acceptLanguage  (optional, default to "en")
-     * @param beforeLt omit this parameter to get last events (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @return RequestConfig
-     */
+    @Deprecated(message = "This operation is deprecated.")
     fun getNftHistoryByIDRequestConfig(accountId: kotlin.String, limit: kotlin.Int, acceptLanguage: kotlin.String?, beforeLt: kotlin.Long?, startDate: kotlin.Long?, endDate: kotlin.Long?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -487,17 +371,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get NFT item by its address
-     * @param accountId account ID
-     * @return NftItem
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getNftItemByAddress(accountId: kotlin.String) : NftItem {
@@ -518,14 +391,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get NFT item by its address
-     * @param accountId account ID
-     * @return ApiResponse<NftItem?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getNftItemByAddressWithHttpInfo(accountId: kotlin.String) : ApiResponse<NftItem?> {
@@ -536,12 +401,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getNftItemByAddress
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getNftItemByAddressRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -558,17 +417,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * 
-     * Get NFT items by their addresses
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return NftItems
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getNftItemsByAddresses(getAccountsRequest: GetAccountsRequest? = null) : NftItems {
@@ -589,14 +437,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         }
     }
 
-    /**
-     * 
-     * Get NFT items by their addresses
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return ApiResponse<NftItems?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getNftItemsByAddressesWithHttpInfo(getAccountsRequest: GetAccountsRequest?) : ApiResponse<NftItems?> {
@@ -607,12 +447,6 @@ class NFTApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = A
         )
     }
 
-    /**
-     * To obtain the request config of the operation getNftItemsByAddresses
-     *
-     * @param getAccountsRequest a list of account ids (optional)
-     * @return RequestConfig
-     */
     fun getNftItemsByAddressesRequestConfig(getAccountsRequest: GetAccountsRequest?) : RequestConfig<GetAccountsRequest> {
         val localVariableBody = getAccountsRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/PurchasesApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/PurchasesApi.kt
new file mode 100644
index 000000000..14e004d5a
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/PurchasesApi.kt
@@ -0,0 +1,107 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.apis
+
+import java.io.IOException
+import okhttp3.Call
+import okhttp3.HttpUrl
+
+import io.tonapi.models.AccountPurchases
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class PurchasesApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty(ApiClient.baseUrlKey, "https://tonapi.io")
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPurchaseHistory(accountId: kotlin.String, beforeLt: kotlin.Long? = null, limit: kotlin.Int? = 100) : AccountPurchases {
+        val localVarResponse = getPurchaseHistoryWithHttpInfo(accountId = accountId, beforeLt = beforeLt, limit = limit)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as AccountPurchases
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getPurchaseHistoryWithHttpInfo(accountId: kotlin.String, beforeLt: kotlin.Long?, limit: kotlin.Int?) : ApiResponse<AccountPurchases?> {
+        val localVariableConfig = getPurchaseHistoryRequestConfig(accountId = accountId, beforeLt = beforeLt, limit = limit)
+
+        return request<Unit, AccountPurchases>(
+            localVariableConfig
+        )
+    }
+
+    fun getPurchaseHistoryRequestConfig(accountId: kotlin.String, beforeLt: kotlin.Long?, limit: kotlin.Int?) : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (beforeLt != null) {
+                    put("before_lt", listOf(beforeLt.toString()))
+                }
+                if (limit != null) {
+                    put("limit", listOf(limit.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/purchases/{account_id}/history".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+
+    private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
+        HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
+}
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/RatesApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/RatesApi.kt
index 1fac026ef..b44c69213 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/RatesApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/RatesApi.kt
@@ -16,31 +16,32 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.GetChartRates200Response
 import io.tonapi.models.GetMarketsRates200Response
 import io.tonapi.models.GetRates200Response
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class RatesApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -48,21 +49,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         }
     }
 
-    /**
-     * 
-     * Get chart by token
-     * @param token accept jetton master address
-     * @param currency  (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @param pointsCount  (optional, default to 200)
-     * @return GetChartRates200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getChartRates(token: kotlin.String, currency: kotlin.String? = null, startDate: kotlin.Long? = null, endDate: kotlin.Long? = null, pointsCount: kotlin.Int? = 200) : GetChartRates200Response {
@@ -83,18 +69,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         }
     }
 
-    /**
-     * 
-     * Get chart by token
-     * @param token accept jetton master address
-     * @param currency  (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @param pointsCount  (optional, default to 200)
-     * @return ApiResponse<GetChartRates200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getChartRatesWithHttpInfo(token: kotlin.String, currency: kotlin.String?, startDate: kotlin.Long?, endDate: kotlin.Long?, pointsCount: kotlin.Int?) : ApiResponse<GetChartRates200Response?> {
@@ -105,16 +79,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         )
     }
 
-    /**
-     * To obtain the request config of the operation getChartRates
-     *
-     * @param token accept jetton master address
-     * @param currency  (optional)
-     * @param startDate  (optional)
-     * @param endDate  (optional)
-     * @param pointsCount  (optional, default to 200)
-     * @return RequestConfig
-     */
     fun getChartRatesRequestConfig(token: kotlin.String, currency: kotlin.String?, startDate: kotlin.Long?, endDate: kotlin.Long?, pointsCount: kotlin.Int?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
@@ -146,16 +110,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         )
     }
 
-    /**
-     * 
-     * Get the TON price from markets
-     * @return GetMarketsRates200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getMarketsRates() : GetMarketsRates200Response {
@@ -176,13 +130,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         }
     }
 
-    /**
-     * 
-     * Get the TON price from markets
-     * @return ApiResponse<GetMarketsRates200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getMarketsRatesWithHttpInfo() : ApiResponse<GetMarketsRates200Response?> {
@@ -193,11 +140,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         )
     }
 
-    /**
-     * To obtain the request config of the operation getMarketsRates
-     *
-     * @return RequestConfig
-     */
     fun getMarketsRatesRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -214,18 +156,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         )
     }
 
-    /**
-     * 
-     * Get the token price to the currency
-     * @param tokens accept ton and jetton master addresses, separated by commas
-     * @param currencies accept ton and all possible fiat currencies, separated by commas
-     * @return GetRates200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getRates(tokens: kotlin.collections.List<kotlin.String>, currencies: kotlin.collections.List<kotlin.String>) : GetRates200Response {
@@ -246,15 +176,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         }
     }
 
-    /**
-     * 
-     * Get the token price to the currency
-     * @param tokens accept ton and jetton master addresses, separated by commas
-     * @param currencies accept ton and all possible fiat currencies, separated by commas
-     * @return ApiResponse<GetRates200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getRatesWithHttpInfo(tokens: kotlin.collections.List<kotlin.String>, currencies: kotlin.collections.List<kotlin.String>) : ApiResponse<GetRates200Response?> {
@@ -265,13 +186,6 @@ class RatesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient =
         )
     }
 
-    /**
-     * To obtain the request config of the operation getRates
-     *
-     * @param tokens accept ton and jetton master addresses, separated by commas
-     * @param currencies accept ton and all possible fiat currencies, separated by commas
-     * @return RequestConfig
-     */
     fun getRatesRequestConfig(tokens: kotlin.collections.List<kotlin.String>, currencies: kotlin.collections.List<kotlin.String>) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/StakingApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/StakingApi.kt
index 383e3922a..4ec9ba432 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/StakingApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/StakingApi.kt
@@ -16,32 +16,33 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.AccountStaking
 import io.tonapi.models.GetStakingPoolHistory200Response
 import io.tonapi.models.GetStakingPoolInfo200Response
 import io.tonapi.models.GetStakingPools200Response
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.InlineObject
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class StakingApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -49,17 +50,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * All pools where account participates
-     * @param accountId account ID
-     * @return AccountStaking
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getAccountNominatorsPools(accountId: kotlin.String) : AccountStaking {
@@ -80,14 +70,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * All pools where account participates
-     * @param accountId account ID
-     * @return ApiResponse<AccountStaking?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getAccountNominatorsPoolsWithHttpInfo(accountId: kotlin.String) : ApiResponse<AccountStaking?> {
@@ -98,12 +80,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountNominatorsPools
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getAccountNominatorsPoolsRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -120,17 +96,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Pool history
-     * @param accountId account ID
-     * @return GetStakingPoolHistory200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getStakingPoolHistory(accountId: kotlin.String) : GetStakingPoolHistory200Response {
@@ -151,14 +116,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Pool history
-     * @param accountId account ID
-     * @return ApiResponse<GetStakingPoolHistory200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getStakingPoolHistoryWithHttpInfo(accountId: kotlin.String) : ApiResponse<GetStakingPoolHistory200Response?> {
@@ -169,12 +126,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getStakingPoolHistory
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun getStakingPoolHistoryRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -191,18 +142,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Stacking pool info
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @return GetStakingPoolInfo200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getStakingPoolInfo(accountId: kotlin.String, acceptLanguage: kotlin.String? = "en") : GetStakingPoolInfo200Response {
@@ -223,15 +162,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Stacking pool info
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<GetStakingPoolInfo200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getStakingPoolInfoWithHttpInfo(accountId: kotlin.String, acceptLanguage: kotlin.String?) : ApiResponse<GetStakingPoolInfo200Response?> {
@@ -242,13 +172,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getStakingPoolInfo
-     *
-     * @param accountId account ID
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun getStakingPoolInfoRequestConfig(accountId: kotlin.String, acceptLanguage: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -266,19 +189,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * All pools available in network
-     * @param availableFor account ID (optional)
-     * @param includeUnverified return also pools not from white list - just compatible by interfaces (maybe dangerous!) (optional)
-     * @param acceptLanguage  (optional, default to "en")
-     * @return GetStakingPools200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getStakingPools(availableFor: kotlin.String? = null, includeUnverified: kotlin.Boolean? = null, acceptLanguage: kotlin.String? = "en") : GetStakingPools200Response {
@@ -299,16 +209,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * All pools available in network
-     * @param availableFor account ID (optional)
-     * @param includeUnverified return also pools not from white list - just compatible by interfaces (maybe dangerous!) (optional)
-     * @param acceptLanguage  (optional, default to "en")
-     * @return ApiResponse<GetStakingPools200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getStakingPoolsWithHttpInfo(availableFor: kotlin.String?, includeUnverified: kotlin.Boolean?, acceptLanguage: kotlin.String?) : ApiResponse<GetStakingPools200Response?> {
@@ -319,14 +219,6 @@ class StakingApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getStakingPools
-     *
-     * @param availableFor account ID (optional)
-     * @param includeUnverified return also pools not from white list - just compatible by interfaces (maybe dangerous!) (optional)
-     * @param acceptLanguage  (optional, default to "en")
-     * @return RequestConfig
-     */
     fun getStakingPoolsRequestConfig(availableFor: kotlin.String?, includeUnverified: kotlin.Boolean?, acceptLanguage: kotlin.String?) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/StorageApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/StorageApi.kt
index 5404bc6a4..40649fa6b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/StorageApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/StorageApi.kt
@@ -16,29 +16,30 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.GetStorageProviders200Response
-import io.tonapi.models.StatusDefaultResponse
+import io.tonapi.models.InlineObject
 
-import com.squareup.moshi.Json
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
 
-class StorageApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+class StorageApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -46,16 +47,6 @@ class StorageApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get TON storage providers deployed to the blockchain.
-     * @return GetStorageProviders200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getStorageProviders() : GetStorageProviders200Response {
@@ -76,13 +67,6 @@ class StorageApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get TON storage providers deployed to the blockchain.
-     * @return ApiResponse<GetStorageProviders200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getStorageProvidersWithHttpInfo() : ApiResponse<GetStorageProviders200Response?> {
@@ -93,11 +77,6 @@ class StorageApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getStorageProviders
-     *
-     * @return RequestConfig
-     */
     fun getStorageProvidersRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/TracesApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/TracesApi.kt
index 07bd9ac61..7f5fd6fe9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/TracesApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/TracesApi.kt
@@ -16,29 +16,31 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
-import io.tonapi.models.StatusDefaultResponse
+import io.tonapi.models.GaslessEstimateRequestMessagesInner
+import io.tonapi.models.InlineObject
 import io.tonapi.models.Trace
 
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class TracesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class TracesApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -46,17 +48,58 @@ class TracesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get the trace by trace ID or hash of any transaction in trace
-     * @param traceId trace ID or transaction hash in hex (without 0x) or base64url format
-     * @return Trace
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun emulateMessageToTrace(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean? = null) : Trace {
+        val localVarResponse = emulateMessageToTraceWithHttpInfo(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, ignoreSignatureCheck = ignoreSignatureCheck)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Trace
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun emulateMessageToTraceWithHttpInfo(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean?) : ApiResponse<Trace?> {
+        val localVariableConfig = emulateMessageToTraceRequestConfig(gaslessEstimateRequestMessagesInner = gaslessEstimateRequestMessagesInner, ignoreSignatureCheck = ignoreSignatureCheck)
+
+        return request<GaslessEstimateRequestMessagesInner, Trace>(
+            localVariableConfig
+        )
+    }
+
+    fun emulateMessageToTraceRequestConfig(gaslessEstimateRequestMessagesInner: GaslessEstimateRequestMessagesInner, ignoreSignatureCheck: kotlin.Boolean?) : RequestConfig<GaslessEstimateRequestMessagesInner> {
+        val localVariableBody = gaslessEstimateRequestMessagesInner
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (ignoreSignatureCheck != null) {
+                    put("ignore_signature_check", listOf(ignoreSignatureCheck.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/v2/traces/emulate",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun getTrace(traceId: kotlin.String) : Trace {
@@ -77,14 +120,6 @@ class TracesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get the trace by trace ID or hash of any transaction in trace
-     * @param traceId trace ID or transaction hash in hex (without 0x) or base64url format
-     * @return ApiResponse<Trace?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun getTraceWithHttpInfo(traceId: kotlin.String) : ApiResponse<Trace?> {
@@ -95,12 +130,6 @@ class TracesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation getTrace
-     *
-     * @param traceId trace ID or transaction hash in hex (without 0x) or base64url format
-     * @return RequestConfig
-     */
     fun getTraceRequestConfig(traceId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/UtilitiesApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/UtilitiesApi.kt
index 15d72ee9f..3ce508dba 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/UtilitiesApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/UtilitiesApi.kt
@@ -16,30 +16,31 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
 import io.tonapi.models.AddressParse200Response
+import io.tonapi.models.InlineObject
 import io.tonapi.models.ServiceStatus
-import io.tonapi.models.StatusDefaultResponse
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -47,17 +48,6 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * parse address and display in all formats
-     * @param accountId account ID
-     * @return AddressParse200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun addressParse(accountId: kotlin.String) : AddressParse200Response {
@@ -78,14 +68,6 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * parse address and display in all formats
-     * @param accountId account ID
-     * @return ApiResponse<AddressParse200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun addressParseWithHttpInfo(accountId: kotlin.String) : ApiResponse<AddressParse200Response?> {
@@ -96,12 +78,6 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * To obtain the request config of the operation addressParse
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
     fun addressParseRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
@@ -118,16 +94,98 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * 
-     * Status
-     * @return ServiceStatus
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOpenapiJson() : kotlin.Any {
+        val localVarResponse = getOpenapiJsonWithHttpInfo()
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.Any
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getOpenapiJsonWithHttpInfo() : ApiResponse<kotlin.Any?> {
+        val localVariableConfig = getOpenapiJsonRequestConfig()
+
+        return request<Unit, kotlin.Any>(
+            localVariableConfig
+        )
+    }
+
+    fun getOpenapiJsonRequestConfig() : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/openapi.json",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOpenapiYml() : java.io.File {
+        val localVarResponse = getOpenapiYmlWithHttpInfo()
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as java.io.File
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    @Throws(IllegalStateException::class, IOException::class)
+    fun getOpenapiYmlWithHttpInfo() : ApiResponse<java.io.File?> {
+        val localVariableConfig = getOpenapiYmlRequestConfig()
+
+        return request<Unit, java.io.File>(
+            localVariableConfig
+        )
+    }
+
+    fun getOpenapiYmlRequestConfig() : RequestConfig<Unit> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/v2/openapi.yml",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun status() : ServiceStatus {
@@ -148,13 +206,6 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         }
     }
 
-    /**
-     * 
-     * Status
-     * @return ApiResponse<ServiceStatus?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun statusWithHttpInfo() : ApiResponse<ServiceStatus?> {
@@ -165,11 +216,6 @@ class UtilitiesApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClie
         )
     }
 
-    /**
-     * To obtain the request config of the operation status
-     *
-     * @return RequestConfig
-     */
     fun statusRequestConfig() : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/apis/WalletApi.kt b/tonapi/src/main/kotlin/io/tonapi/apis/WalletApi.kt
index 155e2c22b..f158ab997 100644
--- a/tonapi/src/main/kotlin/io/tonapi/apis/WalletApi.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/apis/WalletApi.kt
@@ -16,33 +16,36 @@
 package io.tonapi.apis
 
 import java.io.IOException
-import okhttp3.OkHttpClient
+import okhttp3.Call
 import okhttp3.HttpUrl
 
-import io.tonapi.models.Accounts
-import io.tonapi.models.GetWalletBackup200Response
+import io.tonapi.models.EmulateMessageToWalletRequest
+import io.tonapi.models.InlineObject
+import io.tonapi.models.MessageConsequences
 import io.tonapi.models.Seqno
-import io.tonapi.models.StatusDefaultResponse
 import io.tonapi.models.TonConnectProof200Response
 import io.tonapi.models.TonConnectProofRequest
-
-import com.squareup.moshi.Json
-
-import io.tonapi.infrastructure.ApiClient
-import io.tonapi.infrastructure.ApiResponse
-import io.tonapi.infrastructure.ClientException
-import io.tonapi.infrastructure.ClientError
-import io.tonapi.infrastructure.ServerException
-import io.tonapi.infrastructure.ServerError
-import io.tonapi.infrastructure.MultiValueMap
-import io.tonapi.infrastructure.PartConfig
-import io.tonapi.infrastructure.RequestConfig
-import io.tonapi.infrastructure.RequestMethod
-import io.tonapi.infrastructure.ResponseType
-import io.tonapi.infrastructure.Success
-import io.tonapi.infrastructure.toMultiValue
-
-class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+import io.tonapi.models.Wallet
+import io.tonapi.models.Wallets
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+class WalletApi(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
     companion object {
         @JvmStatic
         val defaultBasePath: String by lazy {
@@ -50,24 +53,13 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get account seqno
-     * @param accountId account ID
-     * @return Seqno
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getAccountSeqno(accountId: kotlin.String) : Seqno {
-        val localVarResponse = getAccountSeqnoWithHttpInfo(accountId = accountId)
+    fun emulateMessageToWallet(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String? = "en") : MessageConsequences {
+        val localVarResponse = emulateMessageToWalletWithHttpInfo(emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as Seqno
+            ResponseType.Success -> (localVarResponse as Success<*>).data as MessageConsequences
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -81,39 +73,27 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get account seqno
-     * @param accountId account ID
-     * @return ApiResponse<Seqno?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getAccountSeqnoWithHttpInfo(accountId: kotlin.String) : ApiResponse<Seqno?> {
-        val localVariableConfig = getAccountSeqnoRequestConfig(accountId = accountId)
+    fun emulateMessageToWalletWithHttpInfo(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : ApiResponse<MessageConsequences?> {
+        val localVariableConfig = emulateMessageToWalletRequestConfig(emulateMessageToWalletRequest = emulateMessageToWalletRequest, acceptLanguage = acceptLanguage)
 
-        return request<Unit, Seqno>(
+        return request<EmulateMessageToWalletRequest, MessageConsequences>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getAccountSeqno
-     *
-     * @param accountId account ID
-     * @return RequestConfig
-     */
-    fun getAccountSeqnoRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
-        val localVariableBody = null
+    fun emulateMessageToWalletRequestConfig(emulateMessageToWalletRequest: EmulateMessageToWalletRequest, acceptLanguage: kotlin.String?) : RequestConfig<EmulateMessageToWalletRequest> {
+        val localVariableBody = emulateMessageToWalletRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
         localVariableHeaders["Accept"] = "application/json"
 
         return RequestConfig(
-            method = RequestMethod.GET,
-            path = "/v2/wallet/{account_id}/seqno".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
+            method = RequestMethod.POST,
+            path = "/v2/wallet/emulate",
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,
@@ -121,24 +101,13 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get backup info
-     * @param xTonConnectAuth 
-     * @return GetWalletBackup200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getWalletBackup(xTonConnectAuth: kotlin.String) : GetWalletBackup200Response {
-        val localVarResponse = getWalletBackupWithHttpInfo(xTonConnectAuth = xTonConnectAuth)
+    fun getAccountSeqno(accountId: kotlin.String) : Seqno {
+        val localVarResponse = getAccountSeqnoWithHttpInfo(accountId = accountId)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as GetWalletBackup200Response
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Seqno
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -152,40 +121,25 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get backup info
-     * @param xTonConnectAuth 
-     * @return ApiResponse<GetWalletBackup200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getWalletBackupWithHttpInfo(xTonConnectAuth: kotlin.String) : ApiResponse<GetWalletBackup200Response?> {
-        val localVariableConfig = getWalletBackupRequestConfig(xTonConnectAuth = xTonConnectAuth)
+    fun getAccountSeqnoWithHttpInfo(accountId: kotlin.String) : ApiResponse<Seqno?> {
+        val localVariableConfig = getAccountSeqnoRequestConfig(accountId = accountId)
 
-        return request<Unit, GetWalletBackup200Response>(
+        return request<Unit, Seqno>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getWalletBackup
-     *
-     * @param xTonConnectAuth 
-     * @return RequestConfig
-     */
-    fun getWalletBackupRequestConfig(xTonConnectAuth: kotlin.String) : RequestConfig<Unit> {
+    fun getAccountSeqnoRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
         localVariableHeaders["Accept"] = "application/json"
 
         return RequestConfig(
             method = RequestMethod.GET,
-            path = "/v2/wallet/backup",
+            path = "/v2/wallet/{account_id}/seqno".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,
@@ -193,24 +147,13 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Get wallets by public key
-     * @param publicKey 
-     * @return Accounts
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun getWalletsByPublicKey(publicKey: kotlin.String) : Accounts {
-        val localVarResponse = getWalletsByPublicKeyWithHttpInfo(publicKey = publicKey)
+    fun getWalletInfo(accountId: kotlin.String) : Wallet {
+        val localVarResponse = getWalletInfoWithHttpInfo(accountId = accountId)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> (localVarResponse as Success<*>).data as Accounts
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Wallet
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -224,31 +167,17 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Get wallets by public key
-     * @param publicKey 
-     * @return ApiResponse<Accounts?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun getWalletsByPublicKeyWithHttpInfo(publicKey: kotlin.String) : ApiResponse<Accounts?> {
-        val localVariableConfig = getWalletsByPublicKeyRequestConfig(publicKey = publicKey)
+    fun getWalletInfoWithHttpInfo(accountId: kotlin.String) : ApiResponse<Wallet?> {
+        val localVariableConfig = getWalletInfoRequestConfig(accountId = accountId)
 
-        return request<Unit, Accounts>(
+        return request<Unit, Wallet>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation getWalletsByPublicKey
-     *
-     * @param publicKey 
-     * @return RequestConfig
-     */
-    fun getWalletsByPublicKeyRequestConfig(publicKey: kotlin.String) : RequestConfig<Unit> {
+    fun getWalletInfoRequestConfig(accountId: kotlin.String) : RequestConfig<Unit> {
         val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
@@ -256,7 +185,7 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
 
         return RequestConfig(
             method = RequestMethod.GET,
-            path = "/v2/pubkeys/{public_key}/wallets".replace("{"+"public_key"+"}", encodeURIComponent(publicKey.toString())),
+            path = "/v2/wallet/{account_id}".replace("{"+"account_id"+"}", encodeURIComponent(accountId.toString())),
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,
@@ -264,24 +193,13 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Set backup info
-     * @param xTonConnectAuth 
-     * @param body Information for saving backup
-     * @return void
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
+    @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
-    fun setWalletBackup(xTonConnectAuth: kotlin.String, body: java.io.File) : Unit {
-        val localVarResponse = setWalletBackupWithHttpInfo(xTonConnectAuth = xTonConnectAuth, body = body)
+    fun getWalletsByPublicKey(publicKey: kotlin.String) : Wallets {
+        val localVarResponse = getWalletsByPublicKeyWithHttpInfo(publicKey = publicKey)
 
         return when (localVarResponse.responseType) {
-            ResponseType.Success -> Unit
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Wallets
             ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
             ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
             ResponseType.ClientError -> {
@@ -295,42 +213,25 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Set backup info
-     * @param xTonConnectAuth 
-     * @param body Information for saving backup
-     * @return ApiResponse<Unit?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
+    @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
-    fun setWalletBackupWithHttpInfo(xTonConnectAuth: kotlin.String, body: java.io.File) : ApiResponse<Unit?> {
-        val localVariableConfig = setWalletBackupRequestConfig(xTonConnectAuth = xTonConnectAuth, body = body)
+    fun getWalletsByPublicKeyWithHttpInfo(publicKey: kotlin.String) : ApiResponse<Wallets?> {
+        val localVariableConfig = getWalletsByPublicKeyRequestConfig(publicKey = publicKey)
 
-        return request<java.io.File, Unit>(
+        return request<Unit, Wallets>(
             localVariableConfig
         )
     }
 
-    /**
-     * To obtain the request config of the operation setWalletBackup
-     *
-     * @param xTonConnectAuth 
-     * @param body Information for saving backup
-     * @return RequestConfig
-     */
-    fun setWalletBackupRequestConfig(xTonConnectAuth: kotlin.String, body: java.io.File) : RequestConfig<java.io.File> {
-        val localVariableBody = body
+    fun getWalletsByPublicKeyRequestConfig(publicKey: kotlin.String) : RequestConfig<Unit> {
+        val localVariableBody = null
         val localVariableQuery: MultiValueMap = mutableMapOf()
         val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
-        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
-        localVariableHeaders["Content-Type"] = "application/octet-stream"
         localVariableHeaders["Accept"] = "application/json"
 
         return RequestConfig(
-            method = RequestMethod.PUT,
-            path = "/v2/wallet/backup",
+            method = RequestMethod.GET,
+            path = "/v2/pubkeys/{public_key}/wallets".replace("{"+"public_key"+"}", encodeURIComponent(publicKey.toString())),
             query = localVariableQuery,
             headers = localVariableHeaders,
             requiresAuthentication = false,
@@ -338,17 +239,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * 
-     * Account verification and token issuance
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return TonConnectProof200Response
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     * @throws UnsupportedOperationException If the API returns an informational or redirection response
-     * @throws ClientException If the API returns a client error response
-     * @throws ServerException If the API returns a server error response
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
     fun tonConnectProof(tonConnectProofRequest: TonConnectProofRequest) : TonConnectProof200Response {
@@ -369,14 +259,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         }
     }
 
-    /**
-     * 
-     * Account verification and token issuance
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return ApiResponse<TonConnectProof200Response?>
-     * @throws IllegalStateException If the request is not correctly configured
-     * @throws IOException Rethrows the OkHttp execute method exception
-     */
     @Suppress("UNCHECKED_CAST")
     @Throws(IllegalStateException::class, IOException::class)
     fun tonConnectProofWithHttpInfo(tonConnectProofRequest: TonConnectProofRequest) : ApiResponse<TonConnectProof200Response?> {
@@ -387,12 +269,6 @@ class WalletApi(basePath: kotlin.String = defaultBasePath, client: OkHttpClient
         )
     }
 
-    /**
-     * To obtain the request config of the operation tonConnectProof
-     *
-     * @param tonConnectProofRequest Data that is expected from TON Connect
-     * @return RequestConfig
-     */
     fun tonConnectProofRequestConfig(tonConnectProofRequest: TonConnectProofRequest) : RequestConfig<TonConnectProofRequest> {
         val localVariableBody = tonConnectProofRequest
         val localVariableQuery: MultiValueMap = mutableMapOf()
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiAbstractions.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiAbstractions.kt
deleted file mode 100644
index ca9d5b047..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiAbstractions.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.tonapi.infrastructure
-
-typealias MultiValueMap = MutableMap<String,List<String>>
-
-fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
-    "csv" -> ","
-    "tsv" -> "\t"
-    "pipe" -> "|"
-    "space" -> " "
-    else -> ""
-}
-
-val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
-
-fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
-        = toMultiValue(items.asIterable(), collectionFormat, map)
-
-fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
-    return when(collectionFormat) {
-        "multi" -> items.map(map)
-        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiClient.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiClient.kt
deleted file mode 100644
index f441883c9..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiClient.kt
+++ /dev/null
@@ -1,252 +0,0 @@
-package io.tonapi.infrastructure
-
-import android.util.Log
-import okhttp3.OkHttpClient
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.asRequestBody
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.FormBody
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.ResponseBody
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Request
-import okhttp3.Headers
-import okhttp3.Headers.Companion.toHeaders
-import okhttp3.MultipartBody
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import okhttp3.internal.EMPTY_REQUEST
-import java.io.BufferedWriter
-import java.io.File
-import java.io.FileWriter
-import java.io.IOException
-import java.net.URLConnection
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.LocalTime
-import java.time.OffsetDateTime
-import java.time.OffsetTime
-import java.util.Locale
-import com.squareup.moshi.adapter
-
-open class ApiClient(val baseUrl: String, val client: OkHttpClient = defaultClient) {
-    companion object {
-        protected const val ContentType = "Content-Type"
-        protected const val Accept = "Accept"
-        protected const val Authorization = "Authorization"
-        protected const val JsonMediaType = "application/json"
-        protected const val FormDataMediaType = "multipart/form-data"
-        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
-        protected const val XmlMediaType = "application/xml"
-        protected const val OctetMediaType = "application/octet-stream"
-
-        val apiKey: MutableMap<String, String> = mutableMapOf()
-        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
-        var username: String? = null
-        var password: String? = null
-        var accessToken: String? = null
-        const val baseUrlKey = "io.tonapi.baseUrl"
-
-        @JvmStatic
-        val defaultClient: OkHttpClient by lazy {
-            builder.build()
-        }
-
-        @JvmStatic
-        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
-    }
-
-    /**
-     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
-     *
-     * @param file The given file
-     * @return The guessed Content-Type
-     */
-    protected fun guessContentTypeFromFile(file: File): String {
-        val contentType = URLConnection.guessContentTypeFromName(file.name)
-        return contentType ?: "application/octet-stream"
-    }
-
-    protected inline fun <reified T> requestBody(content: T, mediaType: String?): RequestBody =
-        when {
-            content is File -> content.asRequestBody((mediaType ?: guessContentTypeFromFile(content)).toMediaTypeOrNull())
-            mediaType == FormDataMediaType ->
-                MultipartBody.Builder()
-                    .setType(MultipartBody.FORM)
-                    .apply {
-                        // content's type *must* be Map<String, PartConfig<*>>
-                        @Suppress("UNCHECKED_CAST")
-                        (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                            if (part.body is File) {
-                                val partHeaders = part.headers.toMutableMap() +
-                                    ("Content-Disposition" to "form-data; name=\"$name\"; filename=\"${part.body.name}\"")
-                                val fileMediaType = guessContentTypeFromFile(part.body).toMediaTypeOrNull()
-                                addPart(
-                                    partHeaders.toHeaders(),
-                                    part.body.asRequestBody(fileMediaType)
-                                )
-                            } else {
-                                val partHeaders = part.headers.toMutableMap() +
-                                    ("Content-Disposition" to "form-data; name=\"$name\"")
-                                addPart(
-                                    partHeaders.toHeaders(),
-                                    parameterToString(part.body).toRequestBody(null)
-                                )
-                            }
-                        }
-                    }.build()
-            mediaType == FormUrlEncMediaType -> {
-                FormBody.Builder().apply {
-                    // content's type *must* be Map<String, PartConfig<*>>
-                    @Suppress("UNCHECKED_CAST")
-                    (content as Map<String, PartConfig<*>>).forEach { (name, part) ->
-                        add(name, parameterToString(part.body))
-                    }
-                }.build()
-            }
-            mediaType == null || mediaType.startsWith("application/") && mediaType.endsWith("json") ->
-                if (content == null) {
-                    EMPTY_REQUEST
-                } else {
-                    Serializer.moshi.adapter(T::class.java).toJson(content)
-                        .toRequestBody((mediaType ?: JsonMediaType).toMediaTypeOrNull())
-                }
-            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
-            mediaType == OctetMediaType && content is ByteArray ->
-                content.toRequestBody(OctetMediaType.toMediaTypeOrNull())
-            // TODO: this should be extended with other serializers
-            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body, byte body and File body.")
-        }
-
-    @OptIn(ExperimentalStdlibApi::class)
-    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
-        if(body == null) {
-            return null
-        }
-        if (T::class.java == File::class.java) {
-            // return tempFile
-            // Attention: if you are developing an android app that supports API Level 25 and bellow, please check flag supportAndroidApiLevel25AndBelow in https://openapi-generator.tech/docs/generators/kotlin#config-options
-            val tempFile = java.nio.file.Files.createTempFile("tmp.io.tonapi", null).toFile()
-            tempFile.deleteOnExit()
-            body.byteStream().use { inputStream ->
-                tempFile.outputStream().use { tempFileOutputStream ->
-                    inputStream.copyTo(tempFileOutputStream)
-                }
-            }
-            return tempFile as T
-        }
-
-        return when {
-            mediaType == null || (mediaType.startsWith("application/") && mediaType.endsWith("json")) -> {
-                val bodyContent = body.string()
-                if (bodyContent.isEmpty()) {
-                    return null
-                }
-                Serializer.moshi.adapter<T>().fromJson(bodyContent)
-            }
-            mediaType == OctetMediaType -> body.bytes() as? T
-            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
-        }
-    }
-
-
-    protected inline fun <reified I, reified T: Any?> request(requestConfig: RequestConfig<I>): ApiResponse<T?> {
-        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
-
-        val url = httpUrl.newBuilder()
-            .addEncodedPathSegments(requestConfig.path.trimStart('/'))
-            .apply {
-                requestConfig.query.forEach { query ->
-                    query.value.forEach { queryValue ->
-                        addQueryParameter(query.key, queryValue)
-                    }
-                }
-            }.build()
-
-        // take content-type/accept from spec or set to default (application/json) if not defined
-        if (requestConfig.body != null && requestConfig.headers[ContentType].isNullOrEmpty()) {
-            requestConfig.headers[ContentType] = JsonMediaType
-        }
-        if (requestConfig.headers[Accept].isNullOrEmpty()) {
-            requestConfig.headers[Accept] = JsonMediaType
-        }
-        val headers = requestConfig.headers
-
-        if (headers[Accept].isNullOrEmpty()) {
-            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
-        }
-
-        val contentType = if (headers[ContentType] != null) {
-            // TODO: support multiple contentType options here.
-            (headers[ContentType] as String).substringBefore(";").lowercase(Locale.US)
-        } else {
-            null
-        }
-
-        val request = when (requestConfig.method) {
-            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
-            RequestMethod.GET -> Request.Builder().url(url)
-            RequestMethod.HEAD -> Request.Builder().url(url).head()
-            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
-            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
-            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
-            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
-        }.apply {
-            headers.forEach { header -> addHeader(header.key, header.value) }
-        }.build()
-
-        val response = client.newCall(request).execute()
-
-        val accept = response.header(ContentType)?.substringBefore(";")?.lowercase(Locale.US)
-
-        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
-        return when {
-            response.isRedirect -> Redirection(
-                response.code,
-                response.headers.toMultimap()
-            )
-            response.isInformational -> Informational(
-                response.message,
-                response.code,
-                response.headers.toMultimap()
-            )
-            response.isSuccessful -> Success(
-                responseBody(response.body, accept),
-                response.code,
-                response.headers.toMultimap()
-            )
-            response.isClientError -> ClientError(
-                response.message,
-                response.body?.string(),
-                response.code,
-                response.headers.toMultimap()
-            )
-            else -> ServerError(
-                response.message,
-                response.body?.string(),
-                response.code,
-                response.headers.toMultimap()
-            )
-        }
-    }
-
-    protected fun parameterToString(value: Any?): String = when (value) {
-        null -> ""
-        is Array<*> -> toMultiValue(value, "csv").toString()
-        is Iterable<*> -> toMultiValue(value, "csv").toString()
-        is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime ->
-            parseDateToQueryString(value)
-        else -> value.toString()
-    }
-
-    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
-        /*
-        .replace("\"", "") converts the json object string to an actual string for the query parameter.
-        The moshi or gson adapter allows a more generic solution instead of trying to use a native
-        formatter. It also easily allows to provide a simple way to define a custom date format pattern
-        inside a gson/moshi adapter.
-        */
-        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiResponse.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiResponse.kt
deleted file mode 100644
index 0e202ffea..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ApiResponse.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package io.tonapi.infrastructure
-
-enum class ResponseType {
-    Success, Informational, Redirection, ClientError, ServerError
-}
-
-interface Response
-
-abstract class ApiResponse<T>(val responseType: ResponseType): Response {
-    abstract val statusCode: Int
-    abstract val headers: Map<String,List<String>>
-}
-
-class Success<T>(
-    val data: T,
-    override val statusCode: Int = -1,
-    override val headers: Map<String, List<String>> = mapOf()
-): ApiResponse<T>(ResponseType.Success)
-
-class Informational<T>(
-    val statusText: String,
-    override val statusCode: Int = -1,
-    override val headers: Map<String, List<String>> = mapOf()
-) : ApiResponse<T>(ResponseType.Informational)
-
-class Redirection<T>(
-    override val statusCode: Int = -1,
-    override val headers: Map<String, List<String>> = mapOf()
-) : ApiResponse<T>(ResponseType.Redirection)
-
-class ClientError<T>(
-    val message: String? = null,
-    val body: Any? = null,
-    override val statusCode: Int = -1,
-    override val headers: Map<String, List<String>> = mapOf()
-) : ApiResponse<T>(ResponseType.ClientError)
-
-class ServerError<T>(
-    val message: String? = null,
-    val body: Any? = null,
-    override val statusCode: Int = -1,
-    override val headers: Map<String, List<String>>
-): ApiResponse<T>(ResponseType.ServerError)
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigDecimalAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigDecimalAdapter.kt
deleted file mode 100644
index 4246e0317..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigDecimalAdapter.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.math.BigDecimal
-
-class BigDecimalAdapter {
-    @ToJson
-    fun toJson(value: BigDecimal): String {
-        return value.toPlainString()
-    }
-
-    @FromJson
-    fun fromJson(value: String): BigDecimal {
-        return BigDecimal(value)
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigIntegerAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigIntegerAdapter.kt
deleted file mode 100644
index 040d9346b..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/BigIntegerAdapter.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.math.BigInteger
-
-class BigIntegerAdapter {
-    @ToJson
-    fun toJson(value: BigInteger): String {
-        return value.toString()
-    }
-
-    @FromJson
-    fun fromJson(value: String): BigInteger {
-        return BigInteger(value)
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ByteArrayAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/ByteArrayAdapter.kt
deleted file mode 100644
index f49620dc4..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/ByteArrayAdapter.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-
-class ByteArrayAdapter {
-    @ToJson
-    fun toJson(data: ByteArray): String = String(data)
-
-    @FromJson
-    fun fromJson(data: String): ByteArray = data.toByteArray()
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateAdapter.kt
deleted file mode 100644
index 60d7a627e..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-
-class LocalDateAdapter {
-    @ToJson
-    fun toJson(value: LocalDate): String {
-        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): LocalDate {
-        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateTimeAdapter.kt
deleted file mode 100644
index b4ba2f36b..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/LocalDateTimeAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-
-class LocalDateTimeAdapter {
-    @ToJson
-    fun toJson(value: LocalDateTime): String {
-        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): LocalDateTime {
-        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/OffsetDateTimeAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/OffsetDateTimeAdapter.kt
deleted file mode 100644
index 39e12c265..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/OffsetDateTimeAdapter.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.OffsetDateTime
-import java.time.format.DateTimeFormatter
-
-class OffsetDateTimeAdapter {
-    @ToJson
-    fun toJson(value: OffsetDateTime): String {
-        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
-    }
-
-    @FromJson
-    fun fromJson(value: String): OffsetDateTime {
-        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
-    }
-
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestConfig.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestConfig.kt
deleted file mode 100644
index d9a02f95e..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/RequestConfig.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.tonapi.infrastructure
-
-/**
- * Defines a config object for a given request.
- * NOTE: This object doesn't include 'body' because it
- *       allows for caching of the constructed object
- *       for many request definitions.
- * NOTE: Headers is a Map<String,String> because rfc2616 defines
- *       multi-valued headers as csv-only.
- */
-data class RequestConfig<T>(
-    val method: RequestMethod,
-    val path: String,
-    val headers: MutableMap<String, String> = mutableMapOf(),
-    val query: MutableMap<String, List<String>> = mutableMapOf(),
-    val requiresAuthentication: Boolean,
-    val body: T? = null
-)
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/Serializer.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/Serializer.kt
deleted file mode 100644
index fe632ebb2..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/Serializer.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
-
-object Serializer {
-    @JvmStatic
-    val moshiBuilder: Moshi.Builder = Moshi.Builder()
-        .add(OffsetDateTimeAdapter())
-        .add(LocalDateTimeAdapter())
-        .add(LocalDateAdapter())
-        .add(UUIDAdapter())
-        .add(ByteArrayAdapter())
-        .add(URIAdapter())
-        .add(KotlinJsonAdapterFactory())
-        .add(BigDecimalAdapter())
-        .add(BigIntegerAdapter())
-
-    @JvmStatic
-    val moshi: Moshi by lazy {
-        moshiBuilder.build()
-    }
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/URIAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/URIAdapter.kt
deleted file mode 100644
index c570c4909..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/URIAdapter.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.net.URI
-
-class URIAdapter {
-    @ToJson
-    fun toJson(uri: URI) = uri.toString()
-
-    @FromJson
-    fun fromJson(s: String): URI = URI.create(s)
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/infrastructure/UUIDAdapter.kt b/tonapi/src/main/kotlin/io/tonapi/infrastructure/UUIDAdapter.kt
deleted file mode 100644
index 41fbb9ac8..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/infrastructure/UUIDAdapter.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.tonapi.infrastructure
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.util.UUID
-
-class UUIDAdapter {
-    @ToJson
-    fun toJson(uuid: UUID) = uuid.toString()
-
-    @FromJson
-    fun fromJson(s: String): UUID = UUID.fromString(s)
-}
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccStatusChange.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccStatusChange.kt
index 9db39edf7..0d7022d20 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccStatusChange.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccStatusChange.kt
@@ -16,26 +16,33 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: unchanged,frozen,deleted
+ * Values: acst_unchanged,acst_frozen,acst_deleted.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = AccStatusChangeSerializer::class)
 enum class AccStatusChange(val value: kotlin.String) {
 
-    @Json(name = "acst_unchanged")
-    unchanged("acst_unchanged"),
+    @SerialName(value = "acst_unchanged")
+    acst_unchanged("acst_unchanged"),
+
+    @SerialName(value = "acst_frozen")
+    acst_frozen("acst_frozen"),
 
-    @Json(name = "acst_frozen")
-    frozen("acst_frozen"),
+    @SerialName(value = "acst_deleted")
+    acst_deleted("acst_deleted"),
 
-    @Json(name = "acst_deleted")
-    deleted("acst_deleted");
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -57,10 +64,24 @@ enum class AccStatusChange(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): AccStatusChange? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object AccStatusChangeSerializer : KSerializer<AccStatusChange> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): AccStatusChange {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return AccStatusChange.entries.firstOrNull { it.value == value }
+            ?: AccStatusChange.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: AccStatusChange) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Account.kt b/tonapi/src/main/kotlin/io/tonapi/models/Account.kt
index 8fbed658b..0fc9e32e8 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Account.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Account.kt
@@ -16,71 +16,68 @@
 package io.tonapi.models
 
 import io.tonapi.models.AccountStatus
+import io.tonapi.models.ExtraCurrency
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param balance 
- * @param lastActivity unix timestamp
- * @param status 
- * @param getMethods 
- * @param isWallet 
- * @param currenciesBalance {'USD': 1, 'IDR': 1000}
- * @param interfaces 
- * @param name 
- * @param isScam 
- * @param icon 
- * @param memoRequired 
- * @param isSuspended 
- */
 
+@Serializable
 
 data class Account (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.Long,
 
     /* unix timestamp */
-    @Json(name = "last_activity")
+    @SerialName(value = "last_activity")
     val lastActivity: kotlin.Long,
 
-    @Json(name = "status")
+    @Contextual @SerialName(value = "status")
     val status: AccountStatus,
 
-    @Json(name = "get_methods")
+    @SerialName(value = "get_methods")
     val getMethods: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "is_wallet")
+    @SerialName(value = "is_wallet")
     val isWallet: kotlin.Boolean,
 
+    @SerialName(value = "extra_balance")
+    val extraBalance: kotlin.collections.List<ExtraCurrency>? = null,
+
     /* {'USD': 1, 'IDR': 1000} */
-    @Json(name = "currencies_balance")
-    val currenciesBalance: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
+    @Contextual @SerialName(value = "currencies_balance")
+    val currenciesBalance: kotlin.collections.Map<kotlin.String, io.JsonAny>? = null,
 
-    @Json(name = "interfaces")
+    @SerialName(value = "interfaces")
     val interfaces: kotlin.collections.List<kotlin.String>? = null,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String? = null,
 
-    @Json(name = "is_scam")
+    @SerialName(value = "is_scam")
     val isScam: kotlin.Boolean? = null,
 
-    @Json(name = "icon")
+    @SerialName(value = "icon")
     val icon: kotlin.String? = null,
 
-    @Json(name = "memo_required")
+    @SerialName(value = "memo_required")
     val memoRequired: kotlin.Boolean? = null,
 
-    @Json(name = "is_suspended")
+    @SerialName(value = "is_suspended")
     val isSuspended: kotlin.Boolean? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountAddress.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountAddress.kt
index 898ea2894..caf212ee7 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountAddress.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountAddress.kt
@@ -16,38 +16,39 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param isScam Is this account was marked as part of scammers activity
- * @param isWallet 
- * @param name Display name. Data collected from different sources like moderation lists, dns, collections names and over.
- * @param icon 
- */
 
+@Serializable
 
 data class AccountAddress (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
     /* Is this account was marked as part of scammers activity */
-    @Json(name = "is_scam")
+    @SerialName(value = "is_scam")
     val isScam: kotlin.Boolean,
 
-    @Json(name = "is_wallet")
+    @SerialName(value = "is_wallet")
     val isWallet: kotlin.Boolean,
 
     /* Display name. Data collected from different sources like moderation lists, dns, collections names and over. */
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String? = null,
 
-    @Json(name = "icon")
+    @SerialName(value = "icon")
     val icon: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountEvent.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountEvent.kt
index 85f40bd67..ecec70489 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountEvent.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountEvent.kt
@@ -18,51 +18,52 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.Action
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * An event is built on top of a trace which is a series of transactions caused by one inbound message. TonAPI looks for known patterns inside the trace and splits the trace into actions, where a single action represents a meaningful high-level operation like a Jetton Transfer or an NFT Purchase. Actions are expected to be shown to users. It is advised not to build any logic on top of actions because actions can be changed at any time.
- *
- * @param eventId 
- * @param account 
- * @param timestamp 
- * @param actions 
- * @param isScam scam
- * @param lt 
- * @param inProgress Event is not finished yet. Transactions still happening
- * @param extra TODO
- */
 
+@Serializable
 
 data class AccountEvent (
 
-    @Json(name = "event_id")
+    @SerialName(value = "event_id")
     val eventId: kotlin.String,
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: AccountAddress,
 
-    @Json(name = "timestamp")
+    @SerialName(value = "timestamp")
     val timestamp: kotlin.Long,
 
-    @Json(name = "actions")
+    @SerialName(value = "actions")
     val actions: kotlin.collections.List<Action>,
 
     /* scam */
-    @Json(name = "is_scam")
+    @SerialName(value = "is_scam")
     val isScam: kotlin.Boolean,
 
-    @Json(name = "lt")
+    @SerialName(value = "lt")
     val lt: kotlin.Long,
 
     /* Event is not finished yet. Transactions still happening */
-    @Json(name = "in_progress")
+    @SerialName(value = "in_progress")
     val inProgress: kotlin.Boolean,
 
     /* TODO */
-    @Json(name = "extra")
-    val extra: kotlin.Long
+    @SerialName(value = "extra")
+    val extra: kotlin.Long,
 
-)
+    @SerialName(value = "progress")
+    val progress: kotlin.Float
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountEvents.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountEvents.kt
index dfdc6d88c..14023dd28 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountEvents.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountEvents.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountEvent
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param events 
- * @param nextFrom 
- */
 
+@Serializable
 
 data class AccountEvents (
 
-    @Json(name = "events")
+    @SerialName(value = "events")
     val events: kotlin.collections.List<AccountEvent>,
 
-    @Json(name = "next_from")
+    @SerialName(value = "next_from")
     val nextFrom: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountInfoByStateInit.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountInfoByStateInit.kt
index f48b83541..af396ea5c 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountInfoByStateInit.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountInfoByStateInit.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param publicKey 
- * @param address 
- */
 
+@Serializable
 
 data class AccountInfoByStateInit (
 
-    @Json(name = "public_key")
+    @SerialName(value = "public_key")
     val publicKey: kotlin.String,
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountPurchases.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountPurchases.kt
new file mode 100644
index 000000000..ff51039ac
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountPurchases.kt
@@ -0,0 +1,44 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.Purchase
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class AccountPurchases (
+
+    @SerialName(value = "purchases")
+    val purchases: kotlin.collections.List<Purchase>,
+
+    @SerialName(value = "next_from")
+    val nextFrom: kotlin.Long
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountStaking.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountStaking.kt
index 06ea329a8..22c0e9948 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountStaking.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountStaking.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountStakingInfo
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param pools 
- */
 
+@Serializable
 
 data class AccountStaking (
 
-    @Json(name = "pools")
+    @SerialName(value = "pools")
     val pools: kotlin.collections.List<AccountStakingInfo>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountStakingInfo.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountStakingInfo.kt
index d7c6fcab6..826e9dc8f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountStakingInfo.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountStakingInfo.kt
@@ -16,36 +16,37 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param pool 
- * @param amount 
- * @param pendingDeposit 
- * @param pendingWithdraw 
- * @param readyWithdraw 
- */
 
+@Serializable
 
 data class AccountStakingInfo (
 
-    @Json(name = "pool")
+    @SerialName(value = "pool")
     val pool: kotlin.String,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "pending_deposit")
+    @SerialName(value = "pending_deposit")
     val pendingDeposit: kotlin.Long,
 
-    @Json(name = "pending_withdraw")
+    @SerialName(value = "pending_withdraw")
     val pendingWithdraw: kotlin.Long,
 
-    @Json(name = "ready_withdraw")
+    @SerialName(value = "ready_withdraw")
     val readyWithdraw: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountStatus.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountStatus.kt
index bd2567b25..507f62540 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountStatus.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountStatus.kt
@@ -16,29 +16,36 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: nonexist,uninit,active,frozen
+ * Values: nonexist,uninit,active,frozen.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = AccountStatusSerializer::class)
 enum class AccountStatus(val value: kotlin.String) {
 
-    @Json(name = "nonexist")
+    @SerialName(value = "nonexist")
     nonexist("nonexist"),
 
-    @Json(name = "uninit")
+    @SerialName(value = "uninit")
     uninit("uninit"),
 
-    @Json(name = "active")
+    @SerialName(value = "active")
     active("active"),
 
-    @Json(name = "frozen")
-    frozen("frozen");
+    @SerialName(value = "frozen")
+    frozen("frozen"),
+
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -60,10 +67,24 @@ enum class AccountStatus(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): AccountStatus? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object AccountStatusSerializer : KSerializer<AccountStatus> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): AccountStatus {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return AccountStatus.entries.firstOrNull { it.value == value }
+            ?: AccountStatus.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: AccountStatus) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AccountStorageInfo.kt b/tonapi/src/main/kotlin/io/tonapi/models/AccountStorageInfo.kt
index e37a4e1b8..70838a10b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AccountStorageInfo.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AccountStorageInfo.kt
@@ -16,37 +16,38 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param usedCells 
- * @param usedBits 
- * @param usedPublicCells 
- * @param lastPaid time of the last payment
- * @param duePayment 
- */
 
+@Serializable
 
 data class AccountStorageInfo (
 
-    @Json(name = "used_cells")
+    @SerialName(value = "used_cells")
     val usedCells: kotlin.Long,
 
-    @Json(name = "used_bits")
+    @SerialName(value = "used_bits")
     val usedBits: kotlin.Long,
 
-    @Json(name = "used_public_cells")
+    @SerialName(value = "used_public_cells")
     val usedPublicCells: kotlin.Long,
 
     /* time of the last payment */
-    @Json(name = "last_paid")
+    @SerialName(value = "last_paid")
     val lastPaid: kotlin.Long,
 
-    @Json(name = "due_payment")
+    @SerialName(value = "due_payment")
     val duePayment: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Accounts.kt b/tonapi/src/main/kotlin/io/tonapi/models/Accounts.kt
index 07c1159dd..e86d5bd93 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Accounts.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Accounts.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.Account
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param accounts 
- */
 
+@Serializable
 
 data class Accounts (
 
-    @Json(name = "accounts")
+    @SerialName(value = "accounts")
     val accounts: kotlin.collections.List<Account>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Action.kt b/tonapi/src/main/kotlin/io/tonapi/models/Action.kt
index cdcaf1a37..f59648f98 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Action.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Action.kt
@@ -22,14 +22,15 @@ import io.tonapi.models.DepositStakeAction
 import io.tonapi.models.DomainRenewAction
 import io.tonapi.models.ElectionsDepositStakeAction
 import io.tonapi.models.ElectionsRecoverStakeAction
-import io.tonapi.models.InscriptionMintAction
-import io.tonapi.models.InscriptionTransferAction
+import io.tonapi.models.ExtraCurrencyTransferAction
+import io.tonapi.models.GasRelayAction
 import io.tonapi.models.JettonBurnAction
 import io.tonapi.models.JettonMintAction
 import io.tonapi.models.JettonSwapAction
 import io.tonapi.models.JettonTransferAction
 import io.tonapi.models.NftItemTransferAction
 import io.tonapi.models.NftPurchaseAction
+import io.tonapi.models.PurchaseAction
 import io.tonapi.models.SmartContractAction
 import io.tonapi.models.SubscriptionAction
 import io.tonapi.models.TonTransferAction
@@ -37,123 +38,166 @@ import io.tonapi.models.UnSubscriptionAction
 import io.tonapi.models.WithdrawStakeAction
 import io.tonapi.models.WithdrawStakeRequestAction
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param type 
- * @param status 
- * @param simplePreview 
- * @param baseTransactions 
- * @param tonTransfer 
- * @param contractDeploy 
- * @param jettonTransfer 
- * @param jettonBurn 
- * @param jettonMint 
- * @param nftItemTransfer 
- * @param subscribe 
- * @param unSubscribe 
- * @param auctionBid 
- * @param nftPurchase 
- * @param depositStake 
- * @param withdrawStake 
- * @param withdrawStakeRequest 
- * @param electionsDepositStake 
- * @param electionsRecoverStake 
- * @param jettonSwap 
- * @param smartContractExec 
- * @param domainRenew 
- * @param inscriptionTransfer 
- * @param inscriptionMint 
- */
 
+@Serializable
 
 data class Action (
 
-    @Json(name = "type")
-    val type: String,
+    @SerialName(value = "type")
+    val type: Action.Type,
 
-    @Json(name = "status")
+    @SerialName(value = "status")
     val status: Action.Status,
 
-    @Json(name = "simple_preview")
+    @SerialName(value = "simple_preview")
     val simplePreview: ActionSimplePreview,
 
-    @Json(name = "base_transactions")
+    @SerialName(value = "base_transactions")
     val baseTransactions: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "TonTransfer")
+    @SerialName(value = "TonTransfer")
     val tonTransfer: TonTransferAction? = null,
 
-    @Json(name = "ContractDeploy")
+    @SerialName(value = "ExtraCurrencyTransfer")
+    val extraCurrencyTransfer: ExtraCurrencyTransferAction? = null,
+
+    @SerialName(value = "ContractDeploy")
     val contractDeploy: ContractDeployAction? = null,
 
-    @Json(name = "JettonTransfer")
+    @SerialName(value = "JettonTransfer")
     val jettonTransfer: JettonTransferAction? = null,
 
-    @Json(name = "JettonBurn")
+    @SerialName(value = "JettonBurn")
     val jettonBurn: JettonBurnAction? = null,
 
-    @Json(name = "JettonMint")
+    @SerialName(value = "JettonMint")
     val jettonMint: JettonMintAction? = null,
 
-    @Json(name = "NftItemTransfer")
+    @SerialName(value = "NftItemTransfer")
     val nftItemTransfer: NftItemTransferAction? = null,
 
-    @Json(name = "Subscribe")
+    @SerialName(value = "Subscribe")
     val subscribe: SubscriptionAction? = null,
 
-    @Json(name = "UnSubscribe")
+    @SerialName(value = "UnSubscribe")
     val unSubscribe: UnSubscriptionAction? = null,
 
-    @Json(name = "AuctionBid")
+    @SerialName(value = "AuctionBid")
     val auctionBid: AuctionBidAction? = null,
 
-    @Json(name = "NftPurchase")
+    @SerialName(value = "NftPurchase")
     val nftPurchase: NftPurchaseAction? = null,
 
-    @Json(name = "DepositStake")
+    @SerialName(value = "DepositStake")
     val depositStake: DepositStakeAction? = null,
 
-    @Json(name = "WithdrawStake")
+    @SerialName(value = "WithdrawStake")
     val withdrawStake: WithdrawStakeAction? = null,
 
-    @Json(name = "WithdrawStakeRequest")
+    @SerialName(value = "WithdrawStakeRequest")
     val withdrawStakeRequest: WithdrawStakeRequestAction? = null,
 
-    @Json(name = "ElectionsDepositStake")
+    @SerialName(value = "ElectionsDepositStake")
     val electionsDepositStake: ElectionsDepositStakeAction? = null,
 
-    @Json(name = "ElectionsRecoverStake")
+    @SerialName(value = "ElectionsRecoverStake")
     val electionsRecoverStake: ElectionsRecoverStakeAction? = null,
 
-    @Json(name = "JettonSwap")
+    @SerialName(value = "JettonSwap")
     val jettonSwap: JettonSwapAction? = null,
 
-    @Json(name = "SmartContractExec")
+    @SerialName(value = "SmartContractExec")
     val smartContractExec: SmartContractAction? = null,
 
-    @Json(name = "DomainRenew")
+    @SerialName(value = "DomainRenew")
     val domainRenew: DomainRenewAction? = null,
 
-    @Json(name = "InscriptionTransfer")
-    val inscriptionTransfer: InscriptionTransferAction? = null,
+    @SerialName(value = "Purchase")
+    val purchase: PurchaseAction? = null,
 
-    @Json(name = "InscriptionMint")
-    val inscriptionMint: InscriptionMintAction? = null
+    @SerialName(value = "GasRelay")
+    val gasRelay: GasRelayAction? = null
 
 ) {
+
     /**
      * 
      *
-     * Values: ok,failed
+     * Values: TonTransfer,ExtraCurrencyTransfer,ContractDeploy,JettonTransfer,JettonBurn,JettonMint,NftItemTransfer,Subscribe,UnSubscribe,AuctionBid,NftPurchase,DepositStake,WithdrawStake,WithdrawStakeRequest,ElectionsDepositStake,ElectionsRecoverStake,JettonSwap,SmartContractExec,DomainRenew,Purchase,Unknown.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = TypeSerializer::class)
+    enum class Type(val value: kotlin.String) {
+        @SerialName(value = "TonTransfer") TonTransfer("TonTransfer"),
+        @SerialName(value = "ExtraCurrencyTransfer") ExtraCurrencyTransfer("ExtraCurrencyTransfer"),
+        @SerialName(value = "ContractDeploy") ContractDeploy("ContractDeploy"),
+        @SerialName(value = "JettonTransfer") JettonTransfer("JettonTransfer"),
+        @SerialName(value = "JettonBurn") JettonBurn("JettonBurn"),
+        @SerialName(value = "JettonMint") JettonMint("JettonMint"),
+        @SerialName(value = "NftItemTransfer") NftItemTransfer("NftItemTransfer"),
+        @SerialName(value = "Subscribe") Subscribe("Subscribe"),
+        @SerialName(value = "UnSubscribe") UnSubscribe("UnSubscribe"),
+        @SerialName(value = "AuctionBid") AuctionBid("AuctionBid"),
+        @SerialName(value = "NftPurchase") NftPurchase("NftPurchase"),
+        @SerialName(value = "DepositStake") DepositStake("DepositStake"),
+        @SerialName(value = "WithdrawStake") WithdrawStake("WithdrawStake"),
+        @SerialName(value = "WithdrawStakeRequest") WithdrawStakeRequest("WithdrawStakeRequest"),
+        @SerialName(value = "ElectionsDepositStake") ElectionsDepositStake("ElectionsDepositStake"),
+        @SerialName(value = "ElectionsRecoverStake") ElectionsRecoverStake("ElectionsRecoverStake"),
+        @SerialName(value = "JettonSwap") JettonSwap("JettonSwap"),
+        @SerialName(value = "SmartContractExec") SmartContractExec("SmartContractExec"),
+        @SerialName(value = "DomainRenew") DomainRenew("DomainRenew"),
+        @SerialName(value = "Purchase") Purchase("Purchase"),
+        @SerialName(value = "Unknown") Unknown("Unknown"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object TypeSerializer : KSerializer<Type> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Type {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Type.entries.firstOrNull { it.value == value }
+                ?: Type.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Type) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+    /**
+     * 
+     *
+     * Values: ok,failed.unknown
+     */
+    @Serializable(with = StatusSerializer::class)
     enum class Status(val value: kotlin.String) {
-        @Json(name = "ok") ok("ok"),
-        @Json(name = "failed") failed("failed");
+        @SerialName(value = "ok") ok("ok"),
+        @SerialName(value = "failed") failed("failed"),
+        @SerialName(value = "unknown") unknown("unknown");
     }
+
+    internal object StatusSerializer : KSerializer<Status> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Status {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Status.entries.firstOrNull { it.value == value }
+                ?: Status.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Status) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ActionPhase.kt b/tonapi/src/main/kotlin/io/tonapi/models/ActionPhase.kt
index 2a61cc40e..0f51b02e6 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ActionPhase.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ActionPhase.kt
@@ -16,44 +16,43 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param success 
- * @param resultCode 
- * @param totalActions 
- * @param skippedActions 
- * @param fwdFees 
- * @param totalFees 
- * @param resultCodeDescription 
- */
 
+@Serializable
 
 data class ActionPhase (
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
-    @Json(name = "result_code")
+    @SerialName(value = "result_code")
     val resultCode: kotlin.Int,
 
-    @Json(name = "total_actions")
+    @SerialName(value = "total_actions")
     val totalActions: kotlin.Int,
 
-    @Json(name = "skipped_actions")
+    @SerialName(value = "skipped_actions")
     val skippedActions: kotlin.Int,
 
-    @Json(name = "fwd_fees")
+    @SerialName(value = "fwd_fees")
     val fwdFees: kotlin.Long,
 
-    @Json(name = "total_fees")
+    @SerialName(value = "total_fees")
     val totalFees: kotlin.Long,
 
-    @Json(name = "result_code_description")
+    @SerialName(value = "result_code_description")
     val resultCodeDescription: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ActionSimplePreview.kt b/tonapi/src/main/kotlin/io/tonapi/models/ActionSimplePreview.kt
index e4412b7a5..898d8de92 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ActionSimplePreview.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ActionSimplePreview.kt
@@ -17,42 +17,42 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * shortly describes what this action is about.
- *
- * @param name 
- * @param description 
- * @param accounts 
- * @param actionImage a link to an image for this particular action.
- * @param `value` 
- * @param valueImage a link to an image that depicts this action's asset.
- */
 
+@Serializable
 
 data class ActionSimplePreview (
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "description")
+    @SerialName(value = "description")
     val description: kotlin.String,
 
-    @Json(name = "accounts")
+    @SerialName(value = "accounts")
     val accounts: kotlin.collections.List<AccountAddress>,
 
     /* a link to an image for this particular action. */
-    @Json(name = "action_image")
+    @SerialName(value = "action_image")
     val actionImage: kotlin.String? = null,
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.String? = null,
 
     /* a link to an image that depicts this action's asset. */
-    @Json(name = "value_image")
+    @SerialName(value = "value_image")
     val valueImage: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200Response.kt
index ece951668..575786516 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200Response.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.AddressParse200ResponseBounceable
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param rawForm 
- * @param bounceable 
- * @param nonBounceable 
- * @param givenType 
- * @param testOnly 
- */
 
+@Serializable
 
 data class AddressParse200Response (
 
-    @Json(name = "raw_form")
+    @SerialName(value = "raw_form")
     val rawForm: kotlin.String,
 
-    @Json(name = "bounceable")
+    @SerialName(value = "bounceable")
     val bounceable: AddressParse200ResponseBounceable,
 
-    @Json(name = "non_bounceable")
+    @SerialName(value = "non_bounceable")
     val nonBounceable: AddressParse200ResponseBounceable,
 
-    @Json(name = "given_type")
+    @SerialName(value = "given_type")
     val givenType: kotlin.String,
 
-    @Json(name = "test_only")
+    @SerialName(value = "test_only")
     val testOnly: kotlin.Boolean
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200ResponseBounceable.kt b/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200ResponseBounceable.kt
index 1a13b8eb2..5bb7089b4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200ResponseBounceable.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AddressParse200ResponseBounceable.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param b64 
- * @param b64url 
- */
 
+@Serializable
 
 data class AddressParse200ResponseBounceable (
 
-    @Json(name = "b64")
+    @SerialName(value = "b64")
     val b64: kotlin.String,
 
-    @Json(name = "b64url")
+    @SerialName(value = "b64url")
     val b64url: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ApyHistory.kt b/tonapi/src/main/kotlin/io/tonapi/models/ApyHistory.kt
index c16085e54..0d2c23694 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ApyHistory.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ApyHistory.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param apy 
- * @param time 
- */
 
+@Serializable
 
 data class ApyHistory (
 
-    @Json(name = "apy")
-    val apy: java.math.BigDecimal,
+    @SerialName(value = "apy")
+    val apy: kotlin.String,
 
-    @Json(name = "time")
+    @SerialName(value = "time")
     val time: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Auction.kt b/tonapi/src/main/kotlin/io/tonapi/models/Auction.kt
index 48663dc7c..d2250cc6a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Auction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Auction.kt
@@ -16,36 +16,37 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param domain 
- * @param owner 
- * @param price 
- * @param bids 
- * @param date 
- */
 
+@Serializable
 
 data class Auction (
 
-    @Json(name = "domain")
+    @SerialName(value = "domain")
     val domain: kotlin.String,
 
-    @Json(name = "owner")
+    @SerialName(value = "owner")
     val owner: kotlin.String,
 
-    @Json(name = "price")
+    @SerialName(value = "price")
     val price: kotlin.Long,
 
-    @Json(name = "bids")
+    @SerialName(value = "bids")
     val bids: kotlin.Long,
 
-    @Json(name = "date")
+    @SerialName(value = "date")
     val date: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/AuctionBidAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/AuctionBidAction.kt
index 0ffcd9344..bd18c54e0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/AuctionBidAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/AuctionBidAction.kt
@@ -19,35 +19,33 @@ import io.tonapi.models.AccountAddress
 import io.tonapi.models.NftItem
 import io.tonapi.models.Price
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param auctionType 
- * @param amount 
- * @param bidder 
- * @param auction 
- * @param nft 
- */
 
+@Serializable
 
 data class AuctionBidAction (
 
-    @Json(name = "auction_type")
-    val auctionType: String,
+    @SerialName(value = "auction_type")
+    val auctionType: AuctionBidAction.AuctionType,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: Price,
 
-    @Json(name = "bidder")
+    @SerialName(value = "bidder")
     val bidder: AccountAddress,
 
-    @Json(name = "auction")
+    @SerialName(value = "auction")
     val auction: AccountAddress,
 
-    @Json(name = "nft")
+    @SerialName(value = "nft")
     val nft: NftItem? = null
 
 ) {
@@ -55,14 +53,30 @@ data class AuctionBidAction (
     /**
      * 
      *
-     * Values: dNSPeriodTon,dNSPeriodTg,nUMBERPeriodTg,getgems
+     * Values: DNSPeriodTon,DNSPeriodTg,NUMBERPeriodTg,getgems.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = AuctionTypeSerializer::class)
     enum class AuctionType(val value: kotlin.String) {
-        @Json(name = "DNS.ton") dNSPeriodTon("DNS.ton"),
-        @Json(name = "DNS.tg") dNSPeriodTg("DNS.tg"),
-        @Json(name = "NUMBER.tg") nUMBERPeriodTg("NUMBER.tg"),
-        @Json(name = "getgems") getgems("getgems");
+        @SerialName(value = "DNS.ton") DNSPeriodTon("DNS.ton"),
+        @SerialName(value = "DNS.tg") DNSPeriodTg("DNS.tg"),
+        @SerialName(value = "NUMBER.tg") NUMBERPeriodTg("NUMBER.tg"),
+        @SerialName(value = "getgems") getgems("getgems"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object AuctionTypeSerializer : KSerializer<AuctionType> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): AuctionType {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return AuctionType.entries.firstOrNull { it.value == value }
+                ?: AuctionType.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: AuctionType) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Auctions.kt b/tonapi/src/main/kotlin/io/tonapi/models/Auctions.kt
index e9dbd1ec4..f0088aeac 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Auctions.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Auctions.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.Auction
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param `data` 
- * @param total 
- */
 
+@Serializable
 
 data class Auctions (
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.collections.List<Auction>,
 
-    @Json(name = "total")
+    @SerialName(value = "total")
     val total: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollection.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollection.kt
index 46d66230b..ff3937b6d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollection.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollection.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockCurrencyCollectionOtherInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param grams 
- * @param other 
- */
 
+@Serializable
 
 data class BlockCurrencyCollection (
 
-    @Json(name = "grams")
+    @SerialName(value = "grams")
     val grams: kotlin.Long,
 
-    @Json(name = "other")
+    @SerialName(value = "other")
     val other: kotlin.collections.List<BlockCurrencyCollectionOtherInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollectionOtherInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollectionOtherInner.kt
index 608f95037..31b820bdf 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollectionOtherInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockCurrencyCollectionOtherInner.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param `value` 
- */
 
+@Serializable
 
 data class BlockCurrencyCollectionOtherInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: kotlin.Long,
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockLimits.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockLimits.kt
index e40512d6e..67367aa9a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockLimits.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockLimits.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockParamLimits
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param bytes 
- * @param gas 
- * @param ltDelta 
- */
 
+@Serializable
 
 data class BlockLimits (
 
-    @Json(name = "bytes")
+    @SerialName(value = "bytes")
     val bytes: BlockParamLimits,
 
-    @Json(name = "gas")
+    @SerialName(value = "gas")
     val gas: BlockParamLimits,
 
-    @Json(name = "lt_delta")
+    @SerialName(value = "lt_delta")
     val ltDelta: BlockParamLimits
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockParamLimits.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockParamLimits.kt
index 0b0964b98..0236a82cc 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockParamLimits.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockParamLimits.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param underload 
- * @param softLimit 
- * @param hardLimit 
- */
 
+@Serializable
 
 data class BlockParamLimits (
 
-    @Json(name = "underload")
+    @SerialName(value = "underload")
     val underload: kotlin.Long,
 
-    @Json(name = "soft_limit")
+    @SerialName(value = "soft_limit")
     val softLimit: kotlin.Long,
 
-    @Json(name = "hard_limit")
+    @SerialName(value = "hard_limit")
     val hardLimit: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockRaw.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockRaw.kt
index 74c8fa3f6..a5f813d8f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockRaw.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockRaw.kt
@@ -16,36 +16,37 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param workchain 
- * @param shard 
- * @param seqno 
- * @param rootHash 
- * @param fileHash 
- */
 
+@Serializable
 
 data class BlockRaw (
 
-    @Json(name = "workchain")
+    @SerialName(value = "workchain")
     val workchain: kotlin.Int,
 
-    @Json(name = "shard")
+    @SerialName(value = "shard")
     val shard: kotlin.String,
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Int,
 
-    @Json(name = "root_hash")
+    @SerialName(value = "root_hash")
     val rootHash: kotlin.String,
 
-    @Json(name = "file_hash")
+    @SerialName(value = "file_hash")
     val fileHash: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockValueFlow.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockValueFlow.kt
index 2c4ccc80d..bbb2447f0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockValueFlow.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockValueFlow.kt
@@ -17,56 +17,52 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockCurrencyCollection
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param fromPrevBlk 
- * @param toNextBlk 
- * @param imported 
- * @param exported 
- * @param feesCollected 
- * @param feesImported 
- * @param recovered 
- * @param created 
- * @param minted 
- * @param burned 
- */
 
+@Serializable
 
 data class BlockValueFlow (
 
-    @Json(name = "from_prev_blk")
+    @SerialName(value = "from_prev_blk")
     val fromPrevBlk: BlockCurrencyCollection,
 
-    @Json(name = "to_next_blk")
+    @SerialName(value = "to_next_blk")
     val toNextBlk: BlockCurrencyCollection,
 
-    @Json(name = "imported")
+    @SerialName(value = "imported")
     val imported: BlockCurrencyCollection,
 
-    @Json(name = "exported")
+    @SerialName(value = "exported")
     val exported: BlockCurrencyCollection,
 
-    @Json(name = "fees_collected")
+    @SerialName(value = "fees_collected")
     val feesCollected: BlockCurrencyCollection,
 
-    @Json(name = "fees_imported")
+    @SerialName(value = "fees_imported")
     val feesImported: BlockCurrencyCollection,
 
-    @Json(name = "recovered")
+    @SerialName(value = "recovered")
     val recovered: BlockCurrencyCollection,
 
-    @Json(name = "created")
+    @SerialName(value = "created")
     val created: BlockCurrencyCollection,
 
-    @Json(name = "minted")
+    @SerialName(value = "minted")
     val minted: BlockCurrencyCollection,
 
-    @Json(name = "burned")
+    @SerialName(value = "burned")
     val burned: BlockCurrencyCollection? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspect.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspect.kt
index eddebca9a..15e3878bf 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspect.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspect.kt
@@ -15,45 +15,69 @@
 
 package io.tonapi.models
 
-import io.tonapi.models.BlockchainAccountInspectMethodsInner
+import io.tonapi.models.Method
+import io.tonapi.models.Source
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param code 
- * @param codeHash 
- * @param methods 
- * @param compiler 
- */
 
+@Serializable
 
 data class BlockchainAccountInspect (
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: kotlin.String,
 
-    @Json(name = "code_hash")
+    @SerialName(value = "code_hash")
     val codeHash: kotlin.String,
 
-    @Json(name = "methods")
-    val methods: kotlin.collections.List<BlockchainAccountInspectMethodsInner>,
+    @SerialName(value = "methods")
+    val methods: kotlin.collections.List<Method>,
+
+    @SerialName(value = "compiler")
+    val compiler: BlockchainAccountInspect.Compiler,
+
+    @SerialName(value = "disassembled_code")
+    val disassembledCode: kotlin.String? = null,
 
-    @Json(name = "compiler")
-    val compiler: BlockchainAccountInspect.Compiler? = null
+    @SerialName(value = "source")
+    val source: Source? = null
 
 ) {
 
     /**
      * 
      *
-     * Values: func
+     * Values: func,fift,tact.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = CompilerSerializer::class)
     enum class Compiler(val value: kotlin.String) {
-        @Json(name = "func") func("func");
+        @SerialName(value = "func") func("func"),
+        @SerialName(value = "fift") fift("fift"),
+        @SerialName(value = "tact") tact("tact"),
+        @SerialName(value = "unknown") unknown("unknown");
     }
+
+    internal object CompilerSerializer : KSerializer<Compiler> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Compiler {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Compiler.entries.firstOrNull { it.value == value }
+                ?: Compiler.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Compiler) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspectMethodsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspectMethodsInner.kt
deleted file mode 100644
index 7385f5189..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainAccountInspectMethodsInner.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param id 
- * @param method 
- */
-
-
-data class BlockchainAccountInspectMethodsInner (
-
-    @Json(name = "id")
-    val id: kotlin.Long,
-
-    @Json(name = "method")
-    val method: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlock.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlock.kt
index 5e37116d3..2da0d921d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlock.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlock.kt
@@ -17,136 +17,112 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockValueFlow
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param txQuantity 
- * @param valueFlow 
- * @param workchainId 
- * @param shard 
- * @param seqno 
- * @param rootHash 
- * @param fileHash 
- * @param globalId 
- * @param version 
- * @param afterMerge 
- * @param beforeSplit 
- * @param afterSplit 
- * @param wantSplit 
- * @param wantMerge 
- * @param keyBlock 
- * @param genUtime 
- * @param startLt 
- * @param endLt 
- * @param vertSeqno 
- * @param genCatchainSeqno 
- * @param minRefMcSeqno 
- * @param prevKeyBlockSeqno 
- * @param prevRefs 
- * @param inMsgDescrLength 
- * @param outMsgDescrLength 
- * @param randSeed 
- * @param createdBy 
- * @param genSoftwareVersion 
- * @param genSoftwareCapabilities 
- * @param masterRef 
- */
 
+@Serializable
 
 data class BlockchainBlock (
 
-    @Json(name = "tx_quantity")
+    @SerialName(value = "tx_quantity")
     val txQuantity: kotlin.Int,
 
-    @Json(name = "value_flow")
+    @SerialName(value = "value_flow")
     val valueFlow: BlockValueFlow,
 
-    @Json(name = "workchain_id")
+    @SerialName(value = "workchain_id")
     val workchainId: kotlin.Int,
 
-    @Json(name = "shard")
+    @SerialName(value = "shard")
     val shard: kotlin.String,
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Int,
 
-    @Json(name = "root_hash")
+    @SerialName(value = "root_hash")
     val rootHash: kotlin.String,
 
-    @Json(name = "file_hash")
+    @SerialName(value = "file_hash")
     val fileHash: kotlin.String,
 
-    @Json(name = "global_id")
+    @SerialName(value = "global_id")
     val globalId: kotlin.Int,
 
-    @Json(name = "version")
+    @SerialName(value = "version")
     val version: kotlin.Int,
 
-    @Json(name = "after_merge")
+    @SerialName(value = "after_merge")
     val afterMerge: kotlin.Boolean,
 
-    @Json(name = "before_split")
+    @SerialName(value = "before_split")
     val beforeSplit: kotlin.Boolean,
 
-    @Json(name = "after_split")
+    @SerialName(value = "after_split")
     val afterSplit: kotlin.Boolean,
 
-    @Json(name = "want_split")
+    @SerialName(value = "want_split")
     val wantSplit: kotlin.Boolean,
 
-    @Json(name = "want_merge")
+    @SerialName(value = "want_merge")
     val wantMerge: kotlin.Boolean,
 
-    @Json(name = "key_block")
+    @SerialName(value = "key_block")
     val keyBlock: kotlin.Boolean,
 
-    @Json(name = "gen_utime")
+    @SerialName(value = "gen_utime")
     val genUtime: kotlin.Long,
 
-    @Json(name = "start_lt")
+    @SerialName(value = "start_lt")
     val startLt: kotlin.Long,
 
-    @Json(name = "end_lt")
+    @SerialName(value = "end_lt")
     val endLt: kotlin.Long,
 
-    @Json(name = "vert_seqno")
+    @SerialName(value = "vert_seqno")
     val vertSeqno: kotlin.Int,
 
-    @Json(name = "gen_catchain_seqno")
+    @SerialName(value = "gen_catchain_seqno")
     val genCatchainSeqno: kotlin.Int,
 
-    @Json(name = "min_ref_mc_seqno")
+    @SerialName(value = "min_ref_mc_seqno")
     val minRefMcSeqno: kotlin.Int,
 
-    @Json(name = "prev_key_block_seqno")
+    @SerialName(value = "prev_key_block_seqno")
     val prevKeyBlockSeqno: kotlin.Int,
 
-    @Json(name = "prev_refs")
+    @SerialName(value = "prev_refs")
     val prevRefs: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "in_msg_descr_length")
+    @SerialName(value = "in_msg_descr_length")
     val inMsgDescrLength: kotlin.Long,
 
-    @Json(name = "out_msg_descr_length")
+    @SerialName(value = "out_msg_descr_length")
     val outMsgDescrLength: kotlin.Long,
 
-    @Json(name = "rand_seed")
+    @SerialName(value = "rand_seed")
     val randSeed: kotlin.String,
 
-    @Json(name = "created_by")
+    @SerialName(value = "created_by")
     val createdBy: kotlin.String,
 
-    @Json(name = "gen_software_version")
+    @SerialName(value = "gen_software_version")
     val genSoftwareVersion: kotlin.Int? = null,
 
-    @Json(name = "gen_software_capabilities")
+    @SerialName(value = "gen_software_capabilities")
     val genSoftwareCapabilities: kotlin.Long? = null,
 
-    @Json(name = "master_ref")
+    @SerialName(value = "master_ref")
     val masterRef: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShards.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShards.kt
index 488dc53c4..59562da31 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShards.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShards.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockchainBlockShardsShardsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param shards 
- */
 
+@Serializable
 
 data class BlockchainBlockShards (
 
-    @Json(name = "shards")
+    @SerialName(value = "shards")
     val shards: kotlin.collections.List<BlockchainBlockShardsShardsInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShardsShardsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShardsShardsInner.kt
index 95d855485..9187c13aa 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShardsShardsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlockShardsShardsInner.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockchainBlock
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param lastKnownBlockId 
- * @param lastKnownBlock 
- */
 
+@Serializable
 
 data class BlockchainBlockShardsShardsInner (
 
-    @Json(name = "last_known_block_id")
+    @SerialName(value = "last_known_block_id")
     val lastKnownBlockId: kotlin.String,
 
-    @Json(name = "last_known_block")
+    @SerialName(value = "last_known_block")
     val lastKnownBlock: BlockchainBlock
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlocks.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlocks.kt
index 8d9f3f968..94527c343 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlocks.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainBlocks.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockchainBlock
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param blocks 
- */
 
+@Serializable
 
 data class BlockchainBlocks (
 
-    @Json(name = "blocks")
+    @SerialName(value = "blocks")
     val blocks: kotlin.collections.List<BlockchainBlock>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig.kt
index f09bad85d..7d87d9c01 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig.kt
@@ -36,6 +36,7 @@ import io.tonapi.models.BlockchainConfig31
 import io.tonapi.models.BlockchainConfig40
 import io.tonapi.models.BlockchainConfig43
 import io.tonapi.models.BlockchainConfig44
+import io.tonapi.models.BlockchainConfig45
 import io.tonapi.models.BlockchainConfig5
 import io.tonapi.models.BlockchainConfig6
 import io.tonapi.models.BlockchainConfig7
@@ -45,198 +46,163 @@ import io.tonapi.models.BlockchainConfig8
 import io.tonapi.models.BlockchainConfig9
 import io.tonapi.models.ValidatorsSet
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param raw config boc in hex format
- * @param _0 config address
- * @param _1 elector address
- * @param _2 minter address
- * @param _4 dns root address
- * @param _44 
- * @param _3 The address of the transaction fee collector.
- * @param _5 
- * @param _6 
- * @param _7 
- * @param _8 
- * @param _9 
- * @param _10 
- * @param _11 
- * @param _12 
- * @param _13 
- * @param _14 
- * @param _15 
- * @param _16 
- * @param _17 
- * @param _18 
- * @param _20 
- * @param _21 
- * @param _22 
- * @param _23 
- * @param _24 
- * @param _25 
- * @param _28 
- * @param _29 
- * @param _31 
- * @param _32 
- * @param _33 
- * @param _34 
- * @param _35 
- * @param _36 
- * @param _37 
- * @param _40 
- * @param _43 
- * @param _71 
- * @param _72 
- * @param _73 
- * @param _79 
- * @param _81 
- * @param _82 
- */
 
+@Serializable
 
 data class BlockchainConfig (
 
     /* config boc in hex format */
-    @Json(name = "raw")
+    @SerialName(value = "raw")
     val raw: kotlin.String,
 
     /* config address */
-    @Json(name = "0")
+    @SerialName(value = "0")
     val _0: kotlin.String,
 
     /* elector address */
-    @Json(name = "1")
+    @SerialName(value = "1")
     val _1: kotlin.String,
 
     /* minter address */
-    @Json(name = "2")
+    @SerialName(value = "2")
     val _2: kotlin.String,
 
     /* dns root address */
-    @Json(name = "4")
+    @SerialName(value = "4")
     val _4: kotlin.String,
 
-    @Json(name = "44")
+    @SerialName(value = "44")
     val _44: BlockchainConfig44,
 
     /* The address of the transaction fee collector. */
-    @Json(name = "3")
+    @SerialName(value = "3")
     val _3: kotlin.String? = null,
 
-    @Json(name = "5")
+    @SerialName(value = "5")
     val _5: BlockchainConfig5? = null,
 
-    @Json(name = "6")
+    @SerialName(value = "6")
     val _6: BlockchainConfig6? = null,
 
-    @Json(name = "7")
+    @SerialName(value = "7")
     val _7: BlockchainConfig7? = null,
 
-    @Json(name = "8")
+    @SerialName(value = "8")
     val _8: BlockchainConfig8? = null,
 
-    @Json(name = "9")
+    @SerialName(value = "9")
     val _9: BlockchainConfig9? = null,
 
-    @Json(name = "10")
+    @SerialName(value = "10")
     val _10: BlockchainConfig10? = null,
 
-    @Json(name = "11")
+    @SerialName(value = "11")
     val _11: BlockchainConfig11? = null,
 
-    @Json(name = "12")
+    @SerialName(value = "12")
     val _12: BlockchainConfig12? = null,
 
-    @Json(name = "13")
+    @SerialName(value = "13")
     val _13: BlockchainConfig13? = null,
 
-    @Json(name = "14")
+    @SerialName(value = "14")
     val _14: BlockchainConfig14? = null,
 
-    @Json(name = "15")
+    @SerialName(value = "15")
     val _15: BlockchainConfig15? = null,
 
-    @Json(name = "16")
+    @SerialName(value = "16")
     val _16: BlockchainConfig16? = null,
 
-    @Json(name = "17")
+    @SerialName(value = "17")
     val _17: BlockchainConfig17? = null,
 
-    @Json(name = "18")
+    @SerialName(value = "18")
     val _18: BlockchainConfig18? = null,
 
-    @Json(name = "20")
+    @SerialName(value = "20")
     val _20: BlockchainConfig20? = null,
 
-    @Json(name = "21")
+    @SerialName(value = "21")
     val _21: BlockchainConfig21? = null,
 
-    @Json(name = "22")
+    @SerialName(value = "22")
     val _22: BlockchainConfig22? = null,
 
-    @Json(name = "23")
+    @SerialName(value = "23")
     val _23: BlockchainConfig23? = null,
 
-    @Json(name = "24")
+    @SerialName(value = "24")
     val _24: BlockchainConfig24? = null,
 
-    @Json(name = "25")
+    @SerialName(value = "25")
     val _25: BlockchainConfig25? = null,
 
-    @Json(name = "28")
+    @SerialName(value = "28")
     val _28: BlockchainConfig28? = null,
 
-    @Json(name = "29")
+    @SerialName(value = "29")
     val _29: BlockchainConfig29? = null,
 
-    @Json(name = "31")
+    @SerialName(value = "31")
     val _31: BlockchainConfig31? = null,
 
-    @Json(name = "32")
+    @SerialName(value = "32")
     val _32: ValidatorsSet? = null,
 
-    @Json(name = "33")
+    @SerialName(value = "33")
     val _33: ValidatorsSet? = null,
 
-    @Json(name = "34")
+    @SerialName(value = "34")
     val _34: ValidatorsSet? = null,
 
-    @Json(name = "35")
+    @SerialName(value = "35")
     val _35: ValidatorsSet? = null,
 
-    @Json(name = "36")
+    @SerialName(value = "36")
     val _36: ValidatorsSet? = null,
 
-    @Json(name = "37")
+    @SerialName(value = "37")
     val _37: ValidatorsSet? = null,
 
-    @Json(name = "40")
+    @SerialName(value = "40")
     val _40: BlockchainConfig40? = null,
 
-    @Json(name = "43")
+    @SerialName(value = "43")
     val _43: BlockchainConfig43? = null,
 
-    @Json(name = "71")
+    @SerialName(value = "45")
+    val _45: BlockchainConfig45? = null,
+
+    @SerialName(value = "71")
     val _71: BlockchainConfig71? = null,
 
-    @Json(name = "72")
+    @SerialName(value = "72")
     val _72: BlockchainConfig71? = null,
 
-    @Json(name = "73")
+    @SerialName(value = "73")
     val _73: BlockchainConfig71? = null,
 
-    @Json(name = "79")
+    @SerialName(value = "79")
     val _79: BlockchainConfig79? = null,
 
-    @Json(name = "81")
+    @SerialName(value = "81")
     val _81: BlockchainConfig79? = null,
 
-    @Json(name = "82")
+    @SerialName(value = "82")
     val _82: BlockchainConfig79? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig10.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig10.kt
index 0c2a8dc50..4b69b3072 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig10.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig10.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * List of critical TON parameters, the change of which significantly affects the network, so more voting rounds are held.
- *
- * @param criticalParams 
- */
 
+@Serializable
 
 data class BlockchainConfig10 (
 
-    @Json(name = "critical_params")
+    @SerialName(value = "critical_params")
     val criticalParams: kotlin.collections.List<kotlin.Int>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig11.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig11.kt
index 67f4e7289..d6c688fc0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig11.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig11.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.ConfigProposalSetup
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * This parameter indicates under what conditions proposals to change the TON configuration are accepted.
- *
- * @param normalParams 
- * @param criticalParams 
- */
 
+@Serializable
 
 data class BlockchainConfig11 (
 
-    @Json(name = "normal_params")
+    @SerialName(value = "normal_params")
     val normalParams: ConfigProposalSetup,
 
-    @Json(name = "critical_params")
+    @SerialName(value = "critical_params")
     val criticalParams: ConfigProposalSetup
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig12.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig12.kt
index 63f2434a0..4b70e7e7a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig12.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig12.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.WorkchainDescr
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * Workchains in the TON Blockchain
- *
- * @param workchains 
- */
 
+@Serializable
 
 data class BlockchainConfig12 (
 
-    @Json(name = "workchains")
+    @SerialName(value = "workchains")
     val workchains: kotlin.collections.List<WorkchainDescr>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig13.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig13.kt
index b0f1e0a0c..b80ca2d8f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig13.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig13.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The cost of filing complaints about incorrect operation of validators.
- *
- * @param deposit 
- * @param bitPrice 
- * @param cellPrice 
- */
 
+@Serializable
 
 data class BlockchainConfig13 (
 
-    @Json(name = "deposit")
+    @SerialName(value = "deposit")
     val deposit: kotlin.Long,
 
-    @Json(name = "bit_price")
+    @SerialName(value = "bit_price")
     val bitPrice: kotlin.Long,
 
-    @Json(name = "cell_price")
+    @SerialName(value = "cell_price")
     val cellPrice: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig14.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig14.kt
index 57243f0a1..8c7102afb 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig14.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig14.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The reward in nanoTons for block creation in the TON blockchain.
- *
- * @param masterchainBlockFee 
- * @param basechainBlockFee 
- */
 
+@Serializable
 
 data class BlockchainConfig14 (
 
-    @Json(name = "masterchain_block_fee")
+    @SerialName(value = "masterchain_block_fee")
     val masterchainBlockFee: kotlin.Long,
 
-    @Json(name = "basechain_block_fee")
+    @SerialName(value = "basechain_block_fee")
     val basechainBlockFee: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig15.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig15.kt
index f2d7e227f..62c1b438f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig15.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig15.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The reward in nanoTons for block creation in the TON blockchain.
- *
- * @param validatorsElectedFor 
- * @param electionsStartBefore 
- * @param electionsEndBefore 
- * @param stakeHeldFor 
- */
 
+@Serializable
 
 data class BlockchainConfig15 (
 
-    @Json(name = "validators_elected_for")
+    @SerialName(value = "validators_elected_for")
     val validatorsElectedFor: kotlin.Long,
 
-    @Json(name = "elections_start_before")
+    @SerialName(value = "elections_start_before")
     val electionsStartBefore: kotlin.Long,
 
-    @Json(name = "elections_end_before")
+    @SerialName(value = "elections_end_before")
     val electionsEndBefore: kotlin.Long,
 
-    @Json(name = "stake_held_for")
+    @SerialName(value = "stake_held_for")
     val stakeHeldFor: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig16.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig16.kt
index 9093a4ee6..d7919f706 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig16.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig16.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The limits on the number of validators in the TON blockchain.
- *
- * @param maxValidators 
- * @param maxMainValidators 
- * @param minValidators 
- */
 
+@Serializable
 
 data class BlockchainConfig16 (
 
-    @Json(name = "max_validators")
+    @SerialName(value = "max_validators")
     val maxValidators: kotlin.Int,
 
-    @Json(name = "max_main_validators")
+    @SerialName(value = "max_main_validators")
     val maxMainValidators: kotlin.Int,
 
-    @Json(name = "min_validators")
+    @SerialName(value = "min_validators")
     val minValidators: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig17.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig17.kt
index 1fc6e01f0..07d9c0b1e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig17.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig17.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The stake parameters configuration in the TON blockchain.
- *
- * @param minStake 
- * @param maxStake 
- * @param minTotalStake 
- * @param maxStakeFactor 
- */
 
+@Serializable
 
 data class BlockchainConfig17 (
 
-    @Json(name = "min_stake")
+    @SerialName(value = "min_stake")
     val minStake: kotlin.String,
 
-    @Json(name = "max_stake")
+    @SerialName(value = "max_stake")
     val maxStake: kotlin.String,
 
-    @Json(name = "min_total_stake")
+    @SerialName(value = "min_total_stake")
     val minTotalStake: kotlin.String,
 
-    @Json(name = "max_stake_factor")
+    @SerialName(value = "max_stake_factor")
     val maxStakeFactor: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18.kt
index df4349548..e2df65499 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockchainConfig18StoragePricesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The prices for data storage.
- *
- * @param storagePrices 
- */
 
+@Serializable
 
 data class BlockchainConfig18 (
 
-    @Json(name = "storage_prices")
+    @SerialName(value = "storage_prices")
     val storagePrices: kotlin.collections.List<BlockchainConfig18StoragePricesInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18StoragePricesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18StoragePricesInner.kt
index 700378c91..a3c5c9c2e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18StoragePricesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig18StoragePricesInner.kt
@@ -16,36 +16,37 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param utimeSince 
- * @param bitPricePs 
- * @param cellPricePs 
- * @param mcBitPricePs 
- * @param mcCellPricePs 
- */
 
+@Serializable
 
 data class BlockchainConfig18StoragePricesInner (
 
-    @Json(name = "utime_since")
+    @SerialName(value = "utime_since")
     val utimeSince: kotlin.Long,
 
-    @Json(name = "bit_price_ps")
+    @SerialName(value = "bit_price_ps")
     val bitPricePs: kotlin.Long,
 
-    @Json(name = "cell_price_ps")
+    @SerialName(value = "cell_price_ps")
     val cellPricePs: kotlin.Long,
 
-    @Json(name = "mc_bit_price_ps")
+    @SerialName(value = "mc_bit_price_ps")
     val mcBitPricePs: kotlin.Long,
 
-    @Json(name = "mc_cell_price_ps")
+    @SerialName(value = "mc_cell_price_ps")
     val mcCellPricePs: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig20.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig20.kt
index 55b00c1e5..7fa7f3662 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig20.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig20.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.GasLimitPrices
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The cost of computations in the masterchain. The complexity of any computation is estimated in gas units.
- *
- * @param gasLimitsPrices 
- */
 
+@Serializable
 
 data class BlockchainConfig20 (
 
-    @Json(name = "gas_limits_prices")
+    @SerialName(value = "gas_limits_prices")
     val gasLimitsPrices: GasLimitPrices
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig21.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig21.kt
index 8d7853adc..16121dd58 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig21.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig21.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.GasLimitPrices
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The cost of computations in the basechains. The complexity of any computation is estimated in gas units.
- *
- * @param gasLimitsPrices 
- */
 
+@Serializable
 
 data class BlockchainConfig21 (
 
-    @Json(name = "gas_limits_prices")
+    @SerialName(value = "gas_limits_prices")
     val gasLimitsPrices: GasLimitPrices
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig22.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig22.kt
index ed1829ab0..5ee06bffd 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig22.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig22.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockLimits
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The limits on the block in the masterchain, upon reaching which the block is finalized and the callback of the remaining messages (if any) is carried over to the next block.
- *
- * @param blockLimits 
- */
 
+@Serializable
 
 data class BlockchainConfig22 (
 
-    @Json(name = "block_limits")
+    @SerialName(value = "block_limits")
     val blockLimits: BlockLimits
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig23.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig23.kt
index 2751e1eaf..0eb3bf3a9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig23.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig23.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockLimits
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The limits on the block in the basechains, upon reaching which the block is finalized and the callback of the remaining messages (if any) is carried over to the next block.
- *
- * @param blockLimits 
- */
 
+@Serializable
 
 data class BlockchainConfig23 (
 
-    @Json(name = "block_limits")
+    @SerialName(value = "block_limits")
     val blockLimits: BlockLimits
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig24.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig24.kt
index f41c1911e..3d8685375 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig24.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig24.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.MsgForwardPrices
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The cost of sending messages in the masterchain of the TON blockchain.
- *
- * @param msgForwardPrices 
- */
 
+@Serializable
 
 data class BlockchainConfig24 (
 
-    @Json(name = "msg_forward_prices")
+    @SerialName(value = "msg_forward_prices")
     val msgForwardPrices: MsgForwardPrices
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig25.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig25.kt
index 6f22a80db..b0dd531dd 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig25.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig25.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.MsgForwardPrices
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The cost of sending messages in the basechains of the TON blockchain.
- *
- * @param msgForwardPrices 
- */
 
+@Serializable
 
 data class BlockchainConfig25 (
 
-    @Json(name = "msg_forward_prices")
+    @SerialName(value = "msg_forward_prices")
     val msgForwardPrices: MsgForwardPrices
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig28.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig28.kt
index 13d7243f3..9260ad9d1 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig28.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig28.kt
@@ -16,40 +16,40 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The configuration for the Catchain protocol.
- *
- * @param mcCatchainLifetime 
- * @param shardCatchainLifetime 
- * @param shardValidatorsLifetime 
- * @param shardValidatorsNum 
- * @param flags 
- * @param shuffleMcValidators 
- */
 
+@Serializable
 
 data class BlockchainConfig28 (
 
-    @Json(name = "mc_catchain_lifetime")
+    @SerialName(value = "mc_catchain_lifetime")
     val mcCatchainLifetime: kotlin.Long,
 
-    @Json(name = "shard_catchain_lifetime")
+    @SerialName(value = "shard_catchain_lifetime")
     val shardCatchainLifetime: kotlin.Long,
 
-    @Json(name = "shard_validators_lifetime")
+    @SerialName(value = "shard_validators_lifetime")
     val shardValidatorsLifetime: kotlin.Long,
 
-    @Json(name = "shard_validators_num")
+    @SerialName(value = "shard_validators_num")
     val shardValidatorsNum: kotlin.Long,
 
-    @Json(name = "flags")
+    @SerialName(value = "flags")
     val flags: kotlin.Int? = null,
 
-    @Json(name = "shuffle_mc_validators")
+    @SerialName(value = "shuffle_mc_validators")
     val shuffleMcValidators: kotlin.Boolean? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig29.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig29.kt
index 4a230b7cc..dd16acb7f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig29.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig29.kt
@@ -16,64 +16,58 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The configuration for the consensus protocol above catchain.
- *
- * @param roundCandidates 
- * @param nextCandidateDelayMs 
- * @param consensusTimeoutMs 
- * @param fastAttempts 
- * @param attemptDuration 
- * @param catchainMaxDeps 
- * @param maxBlockBytes 
- * @param maxCollatedBytes 
- * @param flags 
- * @param newCatchainIds 
- * @param protoVersion 
- * @param catchainMaxBlocksCoeff 
- */
 
+@Serializable
 
 data class BlockchainConfig29 (
 
-    @Json(name = "round_candidates")
+    @SerialName(value = "round_candidates")
     val roundCandidates: kotlin.Long,
 
-    @Json(name = "next_candidate_delay_ms")
+    @SerialName(value = "next_candidate_delay_ms")
     val nextCandidateDelayMs: kotlin.Long,
 
-    @Json(name = "consensus_timeout_ms")
+    @SerialName(value = "consensus_timeout_ms")
     val consensusTimeoutMs: kotlin.Long,
 
-    @Json(name = "fast_attempts")
+    @SerialName(value = "fast_attempts")
     val fastAttempts: kotlin.Long,
 
-    @Json(name = "attempt_duration")
+    @SerialName(value = "attempt_duration")
     val attemptDuration: kotlin.Long,
 
-    @Json(name = "catchain_max_deps")
+    @SerialName(value = "catchain_max_deps")
     val catchainMaxDeps: kotlin.Long,
 
-    @Json(name = "max_block_bytes")
+    @SerialName(value = "max_block_bytes")
     val maxBlockBytes: kotlin.Long,
 
-    @Json(name = "max_collated_bytes")
+    @SerialName(value = "max_collated_bytes")
     val maxCollatedBytes: kotlin.Long,
 
-    @Json(name = "flags")
+    @SerialName(value = "flags")
     val flags: kotlin.Int? = null,
 
-    @Json(name = "new_catchain_ids")
+    @SerialName(value = "new_catchain_ids")
     val newCatchainIds: kotlin.Boolean? = null,
 
-    @Json(name = "proto_version")
+    @SerialName(value = "proto_version")
     val protoVersion: kotlin.Long? = null,
 
-    @Json(name = "catchain_max_blocks_coeff")
+    @SerialName(value = "catchain_max_blocks_coeff")
     val catchainMaxBlocksCoeff: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig31.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig31.kt
index d7e62bbff..c648d8a16 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig31.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig31.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The configuration for the consensus protocol above catchain.
- *
- * @param fundamentalSmcAddr 
- */
 
+@Serializable
 
 data class BlockchainConfig31 (
 
-    @Json(name = "fundamental_smc_addr")
+    @SerialName(value = "fundamental_smc_addr")
     val fundamentalSmcAddr: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig40.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig40.kt
index 9608879ff..6bbe34331 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig40.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig40.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.MisbehaviourPunishmentConfig
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The configuration for punishment for improper behavior (non-validation). In the absence of the parameter, the default fine size is 101 TON
- *
- * @param misbehaviourPunishmentConfig 
- */
 
+@Serializable
 
 data class BlockchainConfig40 (
 
-    @Json(name = "misbehaviour_punishment_config")
+    @SerialName(value = "misbehaviour_punishment_config")
     val misbehaviourPunishmentConfig: MisbehaviourPunishmentConfig
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig43.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig43.kt
index 0158884c0..6f201b73f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig43.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig43.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.SizeLimitsConfig
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The size limits and some other characteristics of accounts and messages.
- *
- * @param sizeLimitsConfig 
- */
 
+@Serializable
 
 data class BlockchainConfig43 (
 
-    @Json(name = "size_limits_config")
+    @SerialName(value = "size_limits_config")
     val sizeLimitsConfig: SizeLimitsConfig
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig44.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig44.kt
index 92dd429ff..7c66f82e8 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig44.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig44.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * suspended accounts
- *
- * @param accounts 
- * @param suspendedUntil 
- */
 
+@Serializable
 
 data class BlockchainConfig44 (
 
-    @Json(name = "accounts")
+    @SerialName(value = "accounts")
     val accounts: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "suspended_until")
+    @SerialName(value = "suspended_until")
     val suspendedUntil: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45.kt
new file mode 100644
index 000000000..0dba63876
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45.kt
@@ -0,0 +1,41 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.BlockchainConfig45ContractsInner
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class BlockchainConfig45 (
+
+    @SerialName(value = "contracts")
+    val contracts: kotlin.collections.List<BlockchainConfig45ContractsInner>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45ContractsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45ContractsInner.kt
new file mode 100644
index 000000000..3daf7afb9
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig45ContractsInner.kt
@@ -0,0 +1,43 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class BlockchainConfig45ContractsInner (
+
+    @SerialName(value = "code_hash")
+    val codeHash: kotlin.String,
+
+    @SerialName(value = "gas_usage")
+    val gasUsage: kotlin.Long
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig5.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig5.kt
index 25974308d..4654440e9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig5.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig5.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param feeBurnNom 
- * @param feeBurnDenom 
- * @param blackholeAddr 
- */
 
+@Serializable
 
 data class BlockchainConfig5 (
 
-    @Json(name = "fee_burn_nom")
+    @SerialName(value = "fee_burn_nom")
     val feeBurnNom: kotlin.Long,
 
-    @Json(name = "fee_burn_denom")
+    @SerialName(value = "fee_burn_denom")
     val feeBurnDenom: kotlin.Long,
 
-    @Json(name = "blackhole_addr")
+    @SerialName(value = "blackhole_addr")
     val blackholeAddr: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig6.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig6.kt
index 54ff078bc..dcc755722 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig6.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig6.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * Minting fees of new currencies.
- *
- * @param mintNewPrice 
- * @param mintAddPrice 
- */
 
+@Serializable
 
 data class BlockchainConfig6 (
 
-    @Json(name = "mint_new_price")
+    @SerialName(value = "mint_new_price")
     val mintNewPrice: kotlin.Long,
 
-    @Json(name = "mint_add_price")
+    @SerialName(value = "mint_add_price")
     val mintAddPrice: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7.kt
index 9f68bc246..b4dca59a7 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockchainConfig7CurrenciesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The volume of each of the additional currencies in circulation.
- *
- * @param currencies 
- */
 
+@Serializable
 
 data class BlockchainConfig7 (
 
-    @Json(name = "currencies")
+    @SerialName(value = "currencies")
     val currencies: kotlin.collections.List<BlockchainConfig7CurrenciesInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig71.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig71.kt
index 2b95db0b8..12bebc5d1 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig71.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig71.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.OracleBridgeParams
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * Bridge parameters for wrapping TON in other networks.
- *
- * @param oracleBridgeParams 
- */
 
+@Serializable
 
 data class BlockchainConfig71 (
 
-    @Json(name = "oracle_bridge_params")
+    @SerialName(value = "oracle_bridge_params")
     val oracleBridgeParams: OracleBridgeParams
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig79.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig79.kt
index 56fc62002..696b685f9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig79.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig79.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.JettonBridgeParams
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * Bridge parameters for wrapping tokens from other networks into tokens on the TON network.
- *
- * @param jettonBridgeParams 
- */
 
+@Serializable
 
 data class BlockchainConfig79 (
 
-    @Json(name = "jetton_bridge_params")
+    @SerialName(value = "jetton_bridge_params")
     val jettonBridgeParams: JettonBridgeParams
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7CurrenciesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7CurrenciesInner.kt
index 407a69ea3..850c9699f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7CurrenciesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig7CurrenciesInner.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param currencyId 
- * @param amount 
- */
 
+@Serializable
 
 data class BlockchainConfig7CurrenciesInner (
 
-    @Json(name = "currency_id")
+    @SerialName(value = "currency_id")
     val currencyId: kotlin.Long,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig8.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig8.kt
index 1a42c92d6..019540f11 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig8.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig8.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * The network version and additional capabilities supported by the validators.
- *
- * @param version 
- * @param capabilities 
- */
 
+@Serializable
 
 data class BlockchainConfig8 (
 
-    @Json(name = "version")
+    @SerialName(value = "version")
     val version: kotlin.Long,
 
-    @Json(name = "capabilities")
+    @SerialName(value = "capabilities")
     val capabilities: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig9.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig9.kt
index 2432d02fb..399d1bfd8 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig9.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainConfig9.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * List of mandatory parameters of the blockchain config.
- *
- * @param mandatoryParams 
- */
 
+@Serializable
 
 data class BlockchainConfig9 (
 
-    @Json(name = "mandatory_params")
+    @SerialName(value = "mandatory_params")
     val mandatoryParams: kotlin.collections.List<kotlin.Int>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainLibrary.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainLibrary.kt
new file mode 100644
index 000000000..a2ad60724
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainLibrary.kt
@@ -0,0 +1,40 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class BlockchainLibrary (
+
+    @SerialName(value = "boc")
+    val boc: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccount.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccount.kt
index 6942c8a55..4cd5669d6 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccount.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccount.kt
@@ -18,61 +18,57 @@ package io.tonapi.models
 import io.tonapi.models.AccountStatus
 import io.tonapi.models.AccountStorageInfo
 import io.tonapi.models.BlockchainRawAccountLibrariesInner
+import io.tonapi.models.ExtraCurrency
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param balance 
- * @param lastTransactionLt 
- * @param status 
- * @param storage 
- * @param extraBalance 
- * @param code 
- * @param `data` 
- * @param lastTransactionHash 
- * @param frozenHash 
- * @param libraries 
- */
 
+@Serializable
 
 data class BlockchainRawAccount (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.Long,
 
-    @Json(name = "last_transaction_lt")
+    @SerialName(value = "last_transaction_lt")
     val lastTransactionLt: kotlin.Long,
 
-    @Json(name = "status")
+    @Contextual @SerialName(value = "status")
     val status: AccountStatus,
 
-    @Json(name = "storage")
+    @SerialName(value = "storage")
     val storage: AccountStorageInfo,
 
-    @Json(name = "extra_balance")
-    val extraBalance: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
+    @SerialName(value = "extra_balance")
+    val extraBalance: kotlin.collections.List<ExtraCurrency>? = null,
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: kotlin.String? = null,
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.String? = null,
 
-    @Json(name = "last_transaction_hash")
+    @SerialName(value = "last_transaction_hash")
     val lastTransactionHash: kotlin.String? = null,
 
-    @Json(name = "frozen_hash")
+    @SerialName(value = "frozen_hash")
     val frozenHash: kotlin.String? = null,
 
-    @Json(name = "libraries")
+    @SerialName(value = "libraries")
     val libraries: kotlin.collections.List<BlockchainRawAccountLibrariesInner>? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccountLibrariesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccountLibrariesInner.kt
index 9d1e86e0b..6267eca88 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccountLibrariesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BlockchainRawAccountLibrariesInner.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param `public` 
- * @param root 
- */
 
+@Serializable
 
 data class BlockchainRawAccountLibrariesInner (
 
-    @Json(name = "public")
+    @SerialName(value = "public")
     val `public`: kotlin.Boolean,
 
-    @Json(name = "root")
+    @SerialName(value = "root")
     val root: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/BouncePhaseType.kt b/tonapi/src/main/kotlin/io/tonapi/models/BouncePhaseType.kt
index 38bc00893..b04d9f33d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/BouncePhaseType.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/BouncePhaseType.kt
@@ -16,26 +16,33 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: trPhaseBounceNegfunds,trPhaseBounceNofunds,trPhaseBounceOk
+ * Values: TrPhaseBounceNegfunds,TrPhaseBounceNofunds,TrPhaseBounceOk.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = BouncePhaseTypeSerializer::class)
 enum class BouncePhaseType(val value: kotlin.String) {
 
-    @Json(name = "TrPhaseBounceNegfunds")
-    trPhaseBounceNegfunds("TrPhaseBounceNegfunds"),
+    @SerialName(value = "TrPhaseBounceNegfunds")
+    TrPhaseBounceNegfunds("TrPhaseBounceNegfunds"),
+
+    @SerialName(value = "TrPhaseBounceNofunds")
+    TrPhaseBounceNofunds("TrPhaseBounceNofunds"),
 
-    @Json(name = "TrPhaseBounceNofunds")
-    trPhaseBounceNofunds("TrPhaseBounceNofunds"),
+    @SerialName(value = "TrPhaseBounceOk")
+    TrPhaseBounceOk("TrPhaseBounceOk"),
 
-    @Json(name = "TrPhaseBounceOk")
-    trPhaseBounceOk("TrPhaseBounceOk");
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -57,10 +64,24 @@ enum class BouncePhaseType(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): BouncePhaseType? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object BouncePhaseTypeSerializer : KSerializer<BouncePhaseType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): BouncePhaseType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return BouncePhaseType.entries.firstOrNull { it.value == value }
+            ?: BouncePhaseType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: BouncePhaseType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ComputePhase.kt b/tonapi/src/main/kotlin/io/tonapi/models/ComputePhase.kt
index 5334ddb92..35d6912ab 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ComputePhase.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ComputePhase.kt
@@ -17,48 +17,46 @@ package io.tonapi.models
 
 import io.tonapi.models.ComputeSkipReason
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param skipped 
- * @param skipReason 
- * @param success 
- * @param gasFees 
- * @param gasUsed 
- * @param vmSteps 
- * @param exitCode 
- * @param exitCodeDescription 
- */
 
+@Serializable
 
 data class ComputePhase (
 
-    @Json(name = "skipped")
+    @SerialName(value = "skipped")
     val skipped: kotlin.Boolean,
 
-    @Json(name = "skip_reason")
+    @Contextual @SerialName(value = "skip_reason")
     val skipReason: ComputeSkipReason? = null,
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean? = null,
 
-    @Json(name = "gas_fees")
+    @SerialName(value = "gas_fees")
     val gasFees: kotlin.Long? = null,
 
-    @Json(name = "gas_used")
+    @SerialName(value = "gas_used")
     val gasUsed: kotlin.Long? = null,
 
-    @Json(name = "vm_steps")
+    @SerialName(value = "vm_steps")
     val vmSteps: kotlin.Int? = null,
 
-    @Json(name = "exit_code")
+    @SerialName(value = "exit_code")
     val exitCode: kotlin.Int? = null,
 
-    @Json(name = "exit_code_description")
+    @SerialName(value = "exit_code_description")
     val exitCodeDescription: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ComputeSkipReason.kt b/tonapi/src/main/kotlin/io/tonapi/models/ComputeSkipReason.kt
index 7e134887e..44dd72b5f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ComputeSkipReason.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ComputeSkipReason.kt
@@ -16,26 +16,36 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: noState,badState,noGas
+ * Values: cskip_no_state,cskip_bad_state,cskip_no_gas,cskip_suspended.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = ComputeSkipReasonSerializer::class)
 enum class ComputeSkipReason(val value: kotlin.String) {
 
-    @Json(name = "cskip_no_state")
-    noState("cskip_no_state"),
+    @SerialName(value = "cskip_no_state")
+    cskip_no_state("cskip_no_state"),
+
+    @SerialName(value = "cskip_bad_state")
+    cskip_bad_state("cskip_bad_state"),
+
+    @SerialName(value = "cskip_no_gas")
+    cskip_no_gas("cskip_no_gas"),
 
-    @Json(name = "cskip_bad_state")
-    badState("cskip_bad_state"),
+    @SerialName(value = "cskip_suspended")
+    cskip_suspended("cskip_suspended"),
 
-    @Json(name = "cskip_no_gas")
-    noGas("cskip_no_gas");
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -57,10 +67,24 @@ enum class ComputeSkipReason(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): ComputeSkipReason? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object ComputeSkipReasonSerializer : KSerializer<ComputeSkipReason> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): ComputeSkipReason {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return ComputeSkipReason.entries.firstOrNull { it.value == value }
+            ?: ComputeSkipReason.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: ComputeSkipReason) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ConfigProposalSetup.kt b/tonapi/src/main/kotlin/io/tonapi/models/ConfigProposalSetup.kt
index 8059e7036..632752101 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ConfigProposalSetup.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ConfigProposalSetup.kt
@@ -16,48 +16,46 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param minTotRounds 
- * @param maxTotRounds 
- * @param minWins 
- * @param maxLosses 
- * @param minStoreSec 
- * @param maxStoreSec 
- * @param bitPrice 
- * @param cellPrice 
- */
 
+@Serializable
 
 data class ConfigProposalSetup (
 
-    @Json(name = "min_tot_rounds")
+    @SerialName(value = "min_tot_rounds")
     val minTotRounds: kotlin.Int,
 
-    @Json(name = "max_tot_rounds")
+    @SerialName(value = "max_tot_rounds")
     val maxTotRounds: kotlin.Int,
 
-    @Json(name = "min_wins")
+    @SerialName(value = "min_wins")
     val minWins: kotlin.Int,
 
-    @Json(name = "max_losses")
+    @SerialName(value = "max_losses")
     val maxLosses: kotlin.Int,
 
-    @Json(name = "min_store_sec")
+    @SerialName(value = "min_store_sec")
     val minStoreSec: kotlin.Long,
 
-    @Json(name = "max_store_sec")
+    @SerialName(value = "max_store_sec")
     val maxStoreSec: kotlin.Long,
 
-    @Json(name = "bit_price")
+    @SerialName(value = "bit_price")
     val bitPrice: kotlin.Long,
 
-    @Json(name = "cell_price")
+    @SerialName(value = "cell_price")
     val cellPrice: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ContractDeployAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/ContractDeployAction.kt
index 893b04221..85e4974be 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ContractDeployAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ContractDeployAction.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param interfaces 
- */
 
+@Serializable
 
 data class ContractDeployAction (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "interfaces")
+    @SerialName(value = "interfaces")
     val interfaces: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/CreditPhase.kt b/tonapi/src/main/kotlin/io/tonapi/models/CreditPhase.kt
index 79cbed997..c056eef8c 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/CreditPhase.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/CreditPhase.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param feesCollected 
- * @param credit 
- */
 
+@Serializable
 
 data class CreditPhase (
 
-    @Json(name = "fees_collected")
+    @SerialName(value = "fees_collected")
     val feesCollected: kotlin.Long,
 
-    @Json(name = "credit")
+    @SerialName(value = "credit")
     val credit: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/CurrencyType.kt b/tonapi/src/main/kotlin/io/tonapi/models/CurrencyType.kt
new file mode 100644
index 000000000..186db9234
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/CurrencyType.kt
@@ -0,0 +1,90 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+/**
+ * 
+ *
+ * Values: native,extra_currency,jetton,fiat.unknown
+ */
+@Serializable(with = CurrencyTypeSerializer::class)
+enum class CurrencyType(val value: kotlin.String) {
+
+    @SerialName(value = "native")
+    native("native"),
+
+    @SerialName(value = "extra_currency")
+    extra_currency("extra_currency"),
+
+    @SerialName(value = "jetton")
+    jetton("jetton"),
+
+    @SerialName(value = "fiat")
+    fiat("fiat"),
+
+    @SerialName(value = "unknown")
+    unknown("unknown");
+
+    /**
+     * Override [toString()] to avoid using the enum variable name as the value, and instead use
+     * the actual value defined in the API spec file.
+     *
+     * This solves a problem when the variable name and its value are different, and ensures that
+     * the client sends the correct enum values to the server always.
+     */
+    override fun toString(): kotlin.String = value
+
+    companion object {
+        /**
+         * Converts the provided [data] to a [String] on success, null otherwise.
+         */
+        fun encode(data: kotlin.Any?): kotlin.String? = if (data is CurrencyType) "$data" else null
+
+        /**
+         * Returns a valid [CurrencyType] for [data], null otherwise.
+         */
+        fun decode(data: kotlin.Any?): CurrencyType? = data?.let {
+          val normalizedData = "$it".lowercase()
+          entries.firstOrNull { value ->
+            it == value || normalizedData == "$value".lowercase()
+          }
+        }
+    }
+}
+
+internal object CurrencyTypeSerializer : KSerializer<CurrencyType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): CurrencyType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return CurrencyType.entries.firstOrNull { it.value == value }
+            ?: CurrencyType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: CurrencyType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodeMessageRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodeMessageRequest.kt
deleted file mode 100644
index 177132120..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodeMessageRequest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param boc 
- */
-
-
-data class DecodeMessageRequest (
-
-    @Json(name = "boc")
-    val boc: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessage.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessage.kt
index 79ed72d8d..9637a9d5d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessage.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessage.kt
@@ -18,28 +18,31 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.DecodedMessageExtInMsgDecoded
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param destination 
- * @param destinationWalletVersion 
- * @param extInMsgDecoded 
- */
 
+@Serializable
 
 data class DecodedMessage (
 
-    @Json(name = "destination")
+    @SerialName(value = "destination")
     val destination: AccountAddress,
 
-    @Json(name = "destination_wallet_version")
+    @SerialName(value = "destination_wallet_version")
     val destinationWalletVersion: kotlin.String,
 
-    @Json(name = "ext_in_msg_decoded")
+    @SerialName(value = "ext_in_msg_decoded")
     val extInMsgDecoded: DecodedMessageExtInMsgDecoded? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecoded.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecoded.kt
index 5029b91e6..267db278a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecoded.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecoded.kt
@@ -18,29 +18,36 @@ package io.tonapi.models
 import io.tonapi.models.DecodedMessageExtInMsgDecodedWalletHighloadV2
 import io.tonapi.models.DecodedMessageExtInMsgDecodedWalletV3
 import io.tonapi.models.DecodedMessageExtInMsgDecodedWalletV4
+import io.tonapi.models.DecodedMessageExtInMsgDecodedWalletV5
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param walletV3 
- * @param walletV4 
- * @param walletHighloadV2 
- */
 
+@Serializable
 
 data class DecodedMessageExtInMsgDecoded (
 
-    @Json(name = "wallet_v3")
+    @SerialName(value = "wallet_v3")
     val walletV3: DecodedMessageExtInMsgDecodedWalletV3? = null,
 
-    @Json(name = "wallet_v4")
+    @SerialName(value = "wallet_v4")
     val walletV4: DecodedMessageExtInMsgDecodedWalletV4? = null,
 
-    @Json(name = "wallet_highload_v2")
+    @SerialName(value = "wallet_v5")
+    val walletV5: DecodedMessageExtInMsgDecodedWalletV5? = null,
+
+    @SerialName(value = "wallet_highload_v2")
     val walletHighloadV2: DecodedMessageExtInMsgDecodedWalletHighloadV2? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletHighloadV2.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletHighloadV2.kt
index b5b5b9a7b..467f9b229 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletHighloadV2.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletHighloadV2.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.DecodedRawMessage
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subwalletId 
- * @param boundedQueryId 
- * @param rawMessages 
- */
 
+@Serializable
 
 data class DecodedMessageExtInMsgDecodedWalletHighloadV2 (
 
-    @Json(name = "subwallet_id")
+    @SerialName(value = "subwallet_id")
     val subwalletId: kotlin.Long,
 
-    @Json(name = "bounded_query_id")
+    @SerialName(value = "bounded_query_id")
     val boundedQueryId: kotlin.String,
 
-    @Json(name = "raw_messages")
+    @SerialName(value = "raw_messages")
     val rawMessages: kotlin.collections.List<DecodedRawMessage>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV3.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV3.kt
index 437eba846..406e4cc7b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV3.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV3.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.DecodedRawMessage
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subwalletId 
- * @param validUntil 
- * @param seqno 
- * @param rawMessages 
- */
 
+@Serializable
 
 data class DecodedMessageExtInMsgDecodedWalletV3 (
 
-    @Json(name = "subwallet_id")
+    @SerialName(value = "subwallet_id")
     val subwalletId: kotlin.Long,
 
-    @Json(name = "valid_until")
+    @SerialName(value = "valid_until")
     val validUntil: kotlin.Long,
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Long,
 
-    @Json(name = "raw_messages")
+    @SerialName(value = "raw_messages")
     val rawMessages: kotlin.collections.List<DecodedRawMessage>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV4.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV4.kt
index 1cb9c74c0..f5c752e8f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV4.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV4.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.DecodedRawMessage
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subwalletId 
- * @param validUntil 
- * @param seqno 
- * @param op 
- * @param rawMessages 
- */
 
+@Serializable
 
 data class DecodedMessageExtInMsgDecodedWalletV4 (
 
-    @Json(name = "subwallet_id")
+    @SerialName(value = "subwallet_id")
     val subwalletId: kotlin.Long,
 
-    @Json(name = "valid_until")
+    @SerialName(value = "valid_until")
     val validUntil: kotlin.Long,
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Long,
 
-    @Json(name = "op")
+    @SerialName(value = "op")
     val op: kotlin.Int,
 
-    @Json(name = "raw_messages")
+    @SerialName(value = "raw_messages")
     val rawMessages: kotlin.collections.List<DecodedRawMessage>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV5.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV5.kt
new file mode 100644
index 000000000..b60a47c28
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedMessageExtInMsgDecodedWalletV5.kt
@@ -0,0 +1,44 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.DecodedRawMessage
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class DecodedMessageExtInMsgDecodedWalletV5 (
+
+    @SerialName(value = "valid_until")
+    val validUntil: kotlin.Long,
+
+    @SerialName(value = "raw_messages")
+    val rawMessages: kotlin.collections.List<DecodedRawMessage>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessage.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessage.kt
index 0d8d535b5..daf81e47e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessage.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessage.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.DecodedRawMessageMessage
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param message 
- * @param mode 
- */
 
+@Serializable
 
 data class DecodedRawMessage (
 
-    @Json(name = "message")
+    @SerialName(value = "message")
     val message: DecodedRawMessageMessage,
 
-    @Json(name = "mode")
+    @SerialName(value = "mode")
     val mode: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessageMessage.kt b/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessageMessage.kt
index 9a538c3ee..ebaf87e3d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessageMessage.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DecodedRawMessageMessage.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param boc 
- * @param decodedOpName 
- * @param opCode 
- * @param decodedBody 
- */
 
+@Serializable
 
 data class DecodedRawMessageMessage (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String,
 
-    @Json(name = "decoded_op_name")
+    @SerialName(value = "decoded_op_name")
     val decodedOpName: kotlin.String? = null,
 
-    @Json(name = "op_code")
+    @SerialName(value = "op_code")
     val opCode: kotlin.String? = null,
 
-    @Json(name = "decoded_body")
+    @Contextual @SerialName(value = "decoded_body")
     val decodedBody: kotlin.Any? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DepositStakeAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/DepositStakeAction.kt
index b2bb0bc52..74f45e7d5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DepositStakeAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DepositStakeAction.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.PoolImplementationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * validator's participation in elections
- *
- * @param amount 
- * @param staker 
- * @param pool 
- * @param implementation 
- */
 
+@Serializable
 
 data class DepositStakeAction (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "staker")
+    @SerialName(value = "staker")
     val staker: AccountAddress,
 
-    @Json(name = "pool")
+    @SerialName(value = "pool")
     val pool: AccountAddress,
 
-    @Json(name = "implementation")
+    @Contextual @SerialName(value = "implementation")
     val implementation: PoolImplementationType
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiring.kt b/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiring.kt
index c9663f4f2..464bf2e2f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiring.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiring.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.DnsExpiringItemsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param items 
- */
 
+@Serializable
 
 data class DnsExpiring (
 
-    @Json(name = "items")
+    @SerialName(value = "items")
     val items: kotlin.collections.List<DnsExpiringItemsInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiringItemsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiringItemsInner.kt
index 3c5e68fff..7c2c4a971 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiringItemsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DnsExpiringItemsInner.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.NftItem
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param expiringAt 
- * @param name 
- * @param dnsItem 
- */
 
+@Serializable
 
 data class DnsExpiringItemsInner (
 
-    @Json(name = "expiring_at")
+    @SerialName(value = "expiring_at")
     val expiringAt: kotlin.Long,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "dns_item")
+    @SerialName(value = "dns_item")
     val dnsItem: NftItem? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DnsRecord.kt b/tonapi/src/main/kotlin/io/tonapi/models/DnsRecord.kt
index aa6005d0f..a2d8dbe84 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DnsRecord.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DnsRecord.kt
@@ -17,33 +17,35 @@ package io.tonapi.models
 
 import io.tonapi.models.WalletDNS
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param sites 
- * @param wallet 
- * @param nextResolver 
- * @param storage tonstorage bag id
- */
 
+@Serializable
 
 data class DnsRecord (
 
-    @Json(name = "sites")
+    @SerialName(value = "sites")
     val sites: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "wallet")
+    @SerialName(value = "wallet")
     val wallet: WalletDNS? = null,
 
-    @Json(name = "next_resolver")
+    @SerialName(value = "next_resolver")
     val nextResolver: kotlin.String? = null,
 
     /* tonstorage bag id */
-    @Json(name = "storage")
+    @SerialName(value = "storage")
     val storage: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DomainBid.kt b/tonapi/src/main/kotlin/io/tonapi/models/DomainBid.kt
index 13bfcf238..8ece6bc35 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DomainBid.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DomainBid.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param success 
- * @param `value` 
- * @param txTime 
- * @param txHash 
- * @param bidder 
- */
 
+@Serializable
 
 data class DomainBid (
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean = false,
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.Long,
 
-    @Json(name = "txTime")
+    @SerialName(value = "txTime")
     val txTime: kotlin.Long,
 
-    @Json(name = "txHash")
+    @SerialName(value = "txHash")
     val txHash: kotlin.String,
 
-    @Json(name = "bidder")
+    @SerialName(value = "bidder")
     val bidder: AccountAddress
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DomainBids.kt b/tonapi/src/main/kotlin/io/tonapi/models/DomainBids.kt
index 90dc604d1..53725618f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DomainBids.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DomainBids.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.DomainBid
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param `data` 
- */
 
+@Serializable
 
 data class DomainBids (
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.collections.List<DomainBid>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DomainInfo.kt b/tonapi/src/main/kotlin/io/tonapi/models/DomainInfo.kt
index 98b98b653..21b38b2a3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DomainInfo.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DomainInfo.kt
@@ -17,29 +17,32 @@ package io.tonapi.models
 
 import io.tonapi.models.NftItem
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param name 
- * @param expiringAt date of expiring. optional. not all domain in ton has expiration date
- * @param item 
- */
 
+@Serializable
 
 data class DomainInfo (
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
     /* date of expiring. optional. not all domain in ton has expiration date */
-    @Json(name = "expiring_at")
+    @SerialName(value = "expiring_at")
     val expiringAt: kotlin.Long? = null,
 
-    @Json(name = "item")
+    @SerialName(value = "item")
     val item: NftItem? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DomainNames.kt b/tonapi/src/main/kotlin/io/tonapi/models/DomainNames.kt
index 6f219ede5..30f171135 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DomainNames.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DomainNames.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param domains 
- */
 
+@Serializable
 
 data class DomainNames (
 
-    @Json(name = "domains")
+    @SerialName(value = "domains")
     val domains: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/DomainRenewAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/DomainRenewAction.kt
index c0fc2a463..377ac074d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/DomainRenewAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/DomainRenewAction.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param domain 
- * @param contractAddress 
- * @param renewer 
- */
 
+@Serializable
 
 data class DomainRenewAction (
 
-    @Json(name = "domain")
+    @SerialName(value = "domain")
     val domain: kotlin.String,
 
-    @Json(name = "contract_address")
+    @SerialName(value = "contract_address")
     val contractAddress: kotlin.String,
 
-    @Json(name = "renewer")
+    @SerialName(value = "renewer")
     val renewer: AccountAddress
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/EcPreview.kt b/tonapi/src/main/kotlin/io/tonapi/models/EcPreview.kt
new file mode 100644
index 000000000..eead281ac
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/EcPreview.kt
@@ -0,0 +1,49 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class EcPreview (
+
+    @SerialName(value = "id")
+    val id: kotlin.Int,
+
+    @SerialName(value = "symbol")
+    val symbol: kotlin.String,
+
+    @SerialName(value = "decimals")
+    val decimals: kotlin.Int,
+
+    @SerialName(value = "image")
+    val image: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ElectionsDepositStakeAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/ElectionsDepositStakeAction.kt
index 28339925c..517ce2244 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ElectionsDepositStakeAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ElectionsDepositStakeAction.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param amount 
- * @param staker 
- */
 
+@Serializable
 
 data class ElectionsDepositStakeAction (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "staker")
+    @SerialName(value = "staker")
     val staker: AccountAddress
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ElectionsRecoverStakeAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/ElectionsRecoverStakeAction.kt
index b8823aa39..904c25be4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ElectionsRecoverStakeAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ElectionsRecoverStakeAction.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param amount 
- * @param staker 
- */
 
+@Serializable
 
 data class ElectionsRecoverStakeAction (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "staker")
+    @SerialName(value = "staker")
     val staker: AccountAddress
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToEventRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToEventRequest.kt
deleted file mode 100644
index 68ac99ff0..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToEventRequest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param boc 
- */
-
-
-data class EmulateMessageToEventRequest (
-
-    @Json(name = "boc")
-    val boc: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequest.kt
index c920aa846..b139068ae 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequest.kt
@@ -17,27 +17,29 @@ package io.tonapi.models
 
 import io.tonapi.models.EmulateMessageToWalletRequestParamsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param boc 
- * @param params additional per account configuration
- */
 
+@Serializable
 
 data class EmulateMessageToWalletRequest (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String,
 
     /* additional per account configuration */
-    @Json(name = "params")
-    val params: kotlin.collections.List<EmulateMessageToWalletRequestParamsInner>? = null,
+    @SerialName(value = "params")
+    val params: kotlin.collections.List<EmulateMessageToWalletRequestParamsInner>? = null
 
-    @Json(name = "safe_mode")
-    val safeMode: kotlin.Boolean? = null
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequestParamsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequestParamsInner.kt
index 8b8ee6eac..b5106fbd4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequestParamsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/EmulateMessageToWalletRequestParamsInner.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param balance 
- */
 
+@Serializable
 
 data class EmulateMessageToWalletRequestParamsInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/EncryptedComment.kt b/tonapi/src/main/kotlin/io/tonapi/models/EncryptedComment.kt
index 666e08a1a..9de470f18 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/EncryptedComment.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/EncryptedComment.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param encryptionType 
- * @param cipherText 
- */
 
+@Serializable
 
 data class EncryptedComment (
 
-    @Json(name = "encryption_type")
+    @SerialName(value = "encryption_type")
     val encryptionType: kotlin.String,
 
-    @Json(name = "cipher_text")
+    @SerialName(value = "cipher_text")
     val cipherText: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Error.kt b/tonapi/src/main/kotlin/io/tonapi/models/Error.kt
index 606ec9d81..3e398da12 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Error.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Error.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param error 
- */
 
+@Serializable
 
 data class Error (
 
-    @Json(name = "error")
+    @SerialName(value = "error")
     val error: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Event.kt b/tonapi/src/main/kotlin/io/tonapi/models/Event.kt
index dc906d010..5a334ef0f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Event.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Event.kt
@@ -18,46 +18,48 @@ package io.tonapi.models
 import io.tonapi.models.Action
 import io.tonapi.models.ValueFlow
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param eventId 
- * @param timestamp 
- * @param actions 
- * @param valueFlow 
- * @param isScam scam
- * @param lt 
- * @param inProgress Event is not finished yet. Transactions still happening
- */
 
+@Serializable
 
 data class Event (
 
-    @Json(name = "event_id")
+    @SerialName(value = "event_id")
     val eventId: kotlin.String,
 
-    @Json(name = "timestamp")
+    @SerialName(value = "timestamp")
     val timestamp: kotlin.Long,
 
-    @Json(name = "actions")
+    @SerialName(value = "actions")
     val actions: kotlin.collections.List<Action>,
 
-    @Json(name = "value_flow")
+    @SerialName(value = "value_flow")
     val valueFlow: kotlin.collections.List<ValueFlow>,
 
     /* scam */
-    @Json(name = "is_scam")
+    @SerialName(value = "is_scam")
     val isScam: kotlin.Boolean,
 
-    @Json(name = "lt")
+    @SerialName(value = "lt")
     val lt: kotlin.Long,
 
     /* Event is not finished yet. Transactions still happening */
-    @Json(name = "in_progress")
-    val inProgress: kotlin.Boolean
+    @SerialName(value = "in_progress")
+    val inProgress: kotlin.Boolean,
 
-)
+    @SerialName(value = "progress")
+    val progress: kotlin.Float
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArg.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArg.kt
new file mode 100644
index 000000000..0dd01a56d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArg.kt
@@ -0,0 +1,45 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.ExecGetMethodArgType
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class ExecGetMethodArg (
+
+    @Contextual @SerialName(value = "type")
+    val type: ExecGetMethodArgType,
+
+    /* String representation of the value according to the specified type */
+    @SerialName(value = "value")
+    val `value`: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArgType.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArgType.kt
new file mode 100644
index 000000000..5230ba75d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodArgType.kt
@@ -0,0 +1,99 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+/**
+ * Data type of the argument value: - `nan`: Not-a-Number value - `null`: Null value - `tinyint`: Decimal integer (e.g., `100500`) - `int257`: 257-bit integer in hex format with 0x prefix (e.g., `0xfa01d78381ae32`) - `slice`: TON blockchain address (e.g., `0:6e731f2e...`) - `cell_boc_base64`: Base64-encoded cell BOC (Binary Object Code) (e.g., `te6ccgEBAQEAAgAAAA==`) - `slice_boc_hex`: Hex-encoded slice BOC (e.g., `b5ee9c72...`) 
+ *
+ * Values: nan,`null`,tinyint,int257,slice,cell_boc_base64,slice_boc_hex.unknown
+ */
+@Serializable(with = ExecGetMethodArgTypeSerializer::class)
+enum class ExecGetMethodArgType(val value: kotlin.String) {
+
+    @SerialName(value = "nan")
+    nan("nan"),
+
+    @SerialName(value = "null")
+    `null`("null"),
+
+    @SerialName(value = "tinyint")
+    tinyint("tinyint"),
+
+    @SerialName(value = "int257")
+    int257("int257"),
+
+    @SerialName(value = "slice")
+    slice("slice"),
+
+    @SerialName(value = "cell_boc_base64")
+    cell_boc_base64("cell_boc_base64"),
+
+    @SerialName(value = "slice_boc_hex")
+    slice_boc_hex("slice_boc_hex"),
+
+    @SerialName(value = "unknown")
+    unknown("unknown");
+
+    /**
+     * Override [toString()] to avoid using the enum variable name as the value, and instead use
+     * the actual value defined in the API spec file.
+     *
+     * This solves a problem when the variable name and its value are different, and ensures that
+     * the client sends the correct enum values to the server always.
+     */
+    override fun toString(): kotlin.String = value
+
+    companion object {
+        /**
+         * Converts the provided [data] to a [String] on success, null otherwise.
+         */
+        fun encode(data: kotlin.Any?): kotlin.String? = if (data is ExecGetMethodArgType) "$data" else null
+
+        /**
+         * Returns a valid [ExecGetMethodArgType] for [data], null otherwise.
+         */
+        fun decode(data: kotlin.Any?): ExecGetMethodArgType? = data?.let {
+          val normalizedData = "$it".lowercase()
+          entries.firstOrNull { value ->
+            it == value || normalizedData == "$value".lowercase()
+          }
+        }
+    }
+}
+
+internal object ExecGetMethodArgTypeSerializer : KSerializer<ExecGetMethodArgType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): ExecGetMethodArgType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return ExecGetMethodArgType.entries.firstOrNull { it.value == value }
+            ?: ExecGetMethodArgType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: ExecGetMethodArgType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodWithBodyForBlockchainAccountRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodWithBodyForBlockchainAccountRequest.kt
new file mode 100644
index 000000000..d5603e5a6
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExecGetMethodWithBodyForBlockchainAccountRequest.kt
@@ -0,0 +1,41 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.ExecGetMethodArg
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class ExecGetMethodWithBodyForBlockchainAccountRequest (
+
+    @SerialName(value = "args")
+    val args: kotlin.collections.List<ExecGetMethodArg>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencies.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencies.kt
new file mode 100644
index 000000000..f25b69ed4
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencies.kt
@@ -0,0 +1,41 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.EcPreview
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class ExtraCurrencies (
+
+    @SerialName(value = "extra_currencies")
+    val extraCurrencies: kotlin.collections.List<EcPreview>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrency.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrency.kt
new file mode 100644
index 000000000..7b964afc8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrency.kt
@@ -0,0 +1,44 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.EcPreview
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class ExtraCurrency (
+
+    @SerialName(value = "amount")
+    val amount: kotlin.String,
+
+    @SerialName(value = "preview")
+    val preview: EcPreview
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencyTransferAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencyTransferAction.kt
new file mode 100644
index 000000000..7351d34e4
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ExtraCurrencyTransferAction.kt
@@ -0,0 +1,59 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.EcPreview
+import io.tonapi.models.EncryptedComment
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class ExtraCurrencyTransferAction (
+
+    @SerialName(value = "sender")
+    val sender: AccountAddress,
+
+    @SerialName(value = "recipient")
+    val recipient: AccountAddress,
+
+    /* amount in quanta of tokens */
+    @SerialName(value = "amount")
+    val amount: kotlin.String,
+
+    @SerialName(value = "currency")
+    val currency: EcPreview,
+
+    @SerialName(value = "comment")
+    val comment: kotlin.String? = null,
+
+    @SerialName(value = "encrypted_comment")
+    val encryptedComment: EncryptedComment? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/FoundAccounts.kt b/tonapi/src/main/kotlin/io/tonapi/models/FoundAccounts.kt
index d319d1db0..7796678e4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/FoundAccounts.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/FoundAccounts.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.FoundAccountsAddressesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param addresses 
- */
 
+@Serializable
 
 data class FoundAccounts (
 
-    @Json(name = "addresses")
+    @SerialName(value = "addresses")
     val addresses: kotlin.collections.List<FoundAccountsAddressesInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/FoundAccountsAddressesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/FoundAccountsAddressesInner.kt
index 6f7f078be..f2a2d4776 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/FoundAccountsAddressesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/FoundAccountsAddressesInner.kt
@@ -15,29 +15,36 @@
 
 package io.tonapi.models
 
+import io.tonapi.models.TrustType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param name 
- * @param preview 
- */
 
+@Serializable
 
 data class FoundAccountsAddressesInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "preview")
-    val preview: kotlin.String
+    @SerialName(value = "preview")
+    val preview: kotlin.String,
 
-)
+    @Contextual @SerialName(value = "trust")
+    val trust: TrustType
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GasLimitPrices.kt b/tonapi/src/main/kotlin/io/tonapi/models/GasLimitPrices.kt
index 3385ee989..b24466828 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GasLimitPrices.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GasLimitPrices.kt
@@ -16,52 +16,49 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param gasPrice 
- * @param gasLimit 
- * @param gasCredit 
- * @param blockGasLimit 
- * @param freezeDueLimit 
- * @param deleteDueLimit 
- * @param specialGasLimit 
- * @param flatGasLimit 
- * @param flatGasPrice 
- */
 
+@Serializable
 
 data class GasLimitPrices (
 
-    @Json(name = "gas_price")
+    @SerialName(value = "gas_price")
     val gasPrice: kotlin.Long,
 
-    @Json(name = "gas_limit")
+    @SerialName(value = "gas_limit")
     val gasLimit: kotlin.Long,
 
-    @Json(name = "gas_credit")
+    @SerialName(value = "gas_credit")
     val gasCredit: kotlin.Long,
 
-    @Json(name = "block_gas_limit")
+    @SerialName(value = "block_gas_limit")
     val blockGasLimit: kotlin.Long,
 
-    @Json(name = "freeze_due_limit")
+    @SerialName(value = "freeze_due_limit")
     val freezeDueLimit: kotlin.Long,
 
-    @Json(name = "delete_due_limit")
+    @SerialName(value = "delete_due_limit")
     val deleteDueLimit: kotlin.Long,
 
-    @Json(name = "special_gas_limit")
+    @SerialName(value = "special_gas_limit")
     val specialGasLimit: kotlin.Long? = null,
 
-    @Json(name = "flat_gas_limit")
+    @SerialName(value = "flat_gas_limit")
     val flatGasLimit: kotlin.Long? = null,
 
-    @Json(name = "flat_gas_price")
+    @SerialName(value = "flat_gas_price")
     val flatGasPrice: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GasRelayAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/GasRelayAction.kt
new file mode 100644
index 000000000..0fbdd72f1
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GasRelayAction.kt
@@ -0,0 +1,47 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class GasRelayAction (
+
+    @SerialName(value = "amount")
+    val amount: kotlin.Long,
+
+    @SerialName(value = "relayer")
+    val relayer: AccountAddress,
+
+    @SerialName(value = "target")
+    val target: AccountAddress
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfig.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfig.kt
index ddb69d1d4..5e99c9b55 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfig.kt
@@ -17,26 +17,30 @@ package io.tonapi.models
 
 import io.tonapi.models.GaslessConfigGasJettonsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param relayAddress sending excess to this address decreases the commission of a gasless transfer
- * @param gasJettons list of jettons, any of them can be used to pay for gas
- */
 
+@Serializable
 
 data class GaslessConfig (
 
     /* sending excess to this address decreases the commission of a gasless transfer */
-    @Json(name = "relay_address")
+    @SerialName(value = "relay_address")
     val relayAddress: kotlin.String,
 
     /* list of jettons, any of them can be used to pay for gas */
-    @Json(name = "gas_jettons")
+    @SerialName(value = "gas_jettons")
     val gasJettons: kotlin.collections.List<GaslessConfigGasJettonsInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfigGasJettonsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfigGasJettonsInner.kt
index 4e2b3ec3c..fd278de21 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfigGasJettonsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessConfigGasJettonsInner.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param masterId 
- */
 
+@Serializable
 
 data class GaslessConfigGasJettonsInner (
 
-    @Json(name = "master_id")
+    @SerialName(value = "master_id")
     val masterId: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequest.kt
index 78c46a32a..b5ff34288 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequest.kt
@@ -15,30 +15,40 @@
 
 package io.tonapi.models
 
-import io.tonapi.models.DecodeMessageRequest
+import io.tonapi.models.GaslessEstimateRequestMessagesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param walletAddress 
- * @param walletPublicKey 
- * @param messages 
- */
 
+@Serializable
 
 data class GaslessEstimateRequest (
 
-    @Json(name = "wallet_address")
+    @SerialName(value = "wallet_address")
     val walletAddress: kotlin.String,
 
-    @Json(name = "wallet_public_key")
+    @SerialName(value = "wallet_public_key")
     val walletPublicKey: kotlin.String,
 
-    @Json(name = "messages")
-    val messages: kotlin.collections.List<DecodeMessageRequest>
+    @SerialName(value = "messages")
+    val messages: kotlin.collections.List<GaslessEstimateRequestMessagesInner>,
 
-)
+    /* TONAPI verifies that the account has enough jettons to pay the commission and make a transfer. */
+    @SerialName(value = "throw_error_if_not_enough_jettons")
+    val throwErrorIfNotEnoughJettons: kotlin.Boolean? = false,
+
+    @SerialName(value = "return_emulation")
+    val returnEmulation: kotlin.Boolean? = false
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequestMessagesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequestMessagesInner.kt
index 1b86e157d..ce202b79f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequestMessagesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessEstimateRequestMessagesInner.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param boc 
- */
 
+@Serializable
 
 data class GaslessEstimateRequestMessagesInner (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessSendRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessSendRequest.kt
index 9e28b0318..af4be17d3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GaslessSendRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessSendRequest.kt
@@ -16,25 +16,29 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param walletPublicKey hex encoded public key
- * @param boc 
- */
 
+@Serializable
 
 data class GaslessSendRequest (
 
     /* hex encoded public key */
-    @Json(name = "wallet_public_key")
+    @SerialName(value = "wallet_public_key")
     val walletPublicKey: kotlin.String,
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GaslessTx.kt b/tonapi/src/main/kotlin/io/tonapi/models/GaslessTx.kt
new file mode 100644
index 000000000..0f5053fb4
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GaslessTx.kt
@@ -0,0 +1,40 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class GaslessTx (
+
+    @SerialName(value = "protocol_name")
+    val protocolName: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountDiff200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountDiff200Response.kt
index f40661543..0cdbf307d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountDiff200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountDiff200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param balanceChange 
- */
 
+@Serializable
 
 data class GetAccountDiff200Response (
 
-    @Json(name = "balance_change")
+    @SerialName(value = "balance_change")
     val balanceChange: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountInfoByStateInitRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountInfoByStateInitRequest.kt
index 065ea50a5..6b2c617a4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountInfoByStateInitRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountInfoByStateInitRequest.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param stateInit 
- */
 
+@Serializable
 
 data class GetAccountInfoByStateInitRequest (
 
-    @Json(name = "state_init")
+    @SerialName(value = "state_init")
     val stateInit: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountPublicKey200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountPublicKey200Response.kt
index ec5e70ca4..1cf480369 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountPublicKey200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountPublicKey200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param publicKey 
- */
 
+@Serializable
 
 data class GetAccountPublicKey200Response (
 
-    @Json(name = "public_key")
+    @SerialName(value = "public_key")
     val publicKey: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountsRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountsRequest.kt
index 74b08fdef..ba898c17a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetAccountsRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetAccountsRequest.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param accountIds 
- */
 
+@Serializable
 
 data class GetAccountsRequest (
 
-    @Json(name = "account_ids")
+    @SerialName(value = "account_ids")
     val accountIds: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetAllRawShardsInfo200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetAllRawShardsInfo200Response.kt
index a727b6348..681fff5f7 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetAllRawShardsInfo200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetAllRawShardsInfo200Response.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param proof 
- * @param `data` 
- */
 
+@Serializable
 
 data class GetAllRawShardsInfo200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: kotlin.String,
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetBlockchainBlockDefaultResponse.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetBlockchainBlockDefaultResponse.kt
deleted file mode 100644
index 7bd7b11f5..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetBlockchainBlockDefaultResponse.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param error 
- */
-
-
-data class GetBlockchainBlockDefaultResponse (
-
-    @Json(name = "error")
-    val error: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetChartRates200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetChartRates200Response.kt
index 136a7998e..09dfa41b5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetChartRates200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetChartRates200Response.kt
@@ -16,20 +16,26 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param points 
- */
 
+@Serializable
 
 data class GetChartRates200Response (
 
-    @Json(name = "points")
-    val points: kotlin.collections.Map<kotlin.String, kotlin.Any>
+    /* Each inner array is a pair [timestamp, price]:   • index 0 — Unix timestamp (int64)     • index 1 — token price (decimal) in the requested currency.  */
+    @SerialName(value = "points")
+    val points: kotlin.collections.List<kotlin.collections.List<kotlin.String>>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetInscriptionOpTemplate200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetInscriptionOpTemplate200Response.kt
deleted file mode 100644
index de3f58958..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetInscriptionOpTemplate200Response.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param comment 
- * @param destination 
- */
-
-
-data class GetInscriptionOpTemplate200Response (
-
-    @Json(name = "comment")
-    val comment: kotlin.String,
-
-    @Json(name = "destination")
-    val destination: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetMarketsRates200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetMarketsRates200Response.kt
index 88f8ad03c..ffad79baa 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetMarketsRates200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetMarketsRates200Response.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.MarketTonRates
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param markets 
- */
 
+@Serializable
 
 data class GetMarketsRates200Response (
 
-    @Json(name = "markets")
+    @SerialName(value = "markets")
     val markets: kotlin.collections.List<MarketTonRates>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetOpenapiJsonDefaultResponse.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetOpenapiJsonDefaultResponse.kt
new file mode 100644
index 000000000..e45c3599e
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetOpenapiJsonDefaultResponse.kt
@@ -0,0 +1,43 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+
+/**
+ * 
+ *
+ * @param error 
+ * @param errorCode 
+ */
+@Serializable
+
+data class GetOpenapiJsonDefaultResponse (
+
+    @SerialName(value = "error")
+    val error: kotlin.String,
+
+    @SerialName(value = "error_code")
+    val errorCode: kotlin.Long? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200Response.kt
index f86d5c6c1..799fc1f4f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200Response.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.GetOutMsgQueueSizes200ResponseShardsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param extMsgQueueSizeLimit 
- * @param shards 
- */
 
+@Serializable
 
 data class GetOutMsgQueueSizes200Response (
 
-    @Json(name = "ext_msg_queue_size_limit")
+    @SerialName(value = "ext_msg_queue_size_limit")
     val extMsgQueueSizeLimit: kotlin.Int,
 
-    @Json(name = "shards")
+    @SerialName(value = "shards")
     val shards: kotlin.collections.List<GetOutMsgQueueSizes200ResponseShardsInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200ResponseShardsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200ResponseShardsInner.kt
index 09d6a135a..16a3bf954 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200ResponseShardsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetOutMsgQueueSizes200ResponseShardsInner.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param propertySize 
- */
 
+@Serializable
 
 data class GetOutMsgQueueSizes200ResponseShardsInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "size")
+    @SerialName(value = "size")
     val propertySize: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRates200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRates200Response.kt
index 42b5a4c8b..096a8a283 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRates200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRates200Response.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.TokenRates
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param rates 
- */
 
+@Serializable
 
 data class GetRates200Response (
 
-    @Json(name = "rates")
+    @Contextual @SerialName(value = "rates")
     val rates: kotlin.collections.Map<kotlin.String, TokenRates>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawAccountState200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawAccountState200Response.kt
index 259b9735d..2c4ffb4e4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawAccountState200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawAccountState200Response.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param shardblk 
- * @param shardProof 
- * @param proof 
- * @param state 
- */
 
+@Serializable
 
 data class GetRawAccountState200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "shardblk")
+    @SerialName(value = "shardblk")
     val shardblk: BlockRaw,
 
-    @Json(name = "shard_proof")
+    @SerialName(value = "shard_proof")
     val shardProof: kotlin.String,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: kotlin.String,
 
-    @Json(name = "state")
+    @SerialName(value = "state")
     val state: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200Response.kt
index d0e789dfa..f0b6f2754 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200Response.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.GetRawBlockProof200ResponseStepsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param complete 
- * @param from 
- * @param to 
- * @param steps 
- */
 
+@Serializable
 
 data class GetRawBlockProof200Response (
 
-    @Json(name = "complete")
+    @SerialName(value = "complete")
     val complete: kotlin.Boolean,
 
-    @Json(name = "from")
+    @SerialName(value = "from")
     val from: BlockRaw,
 
-    @Json(name = "to")
+    @SerialName(value = "to")
     val to: BlockRaw,
 
-    @Json(name = "steps")
+    @SerialName(value = "steps")
     val steps: kotlin.collections.List<GetRawBlockProof200ResponseStepsInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInner.kt
index 0cc471cb6..4263ad666 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInner.kt
@@ -18,24 +18,28 @@ package io.tonapi.models
 import io.tonapi.models.GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack
 import io.tonapi.models.GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param liteServerBlockLinkBack 
- * @param liteServerBlockLinkForward 
- */
 
+@Serializable
 
 data class GetRawBlockProof200ResponseStepsInner (
 
-    @Json(name = "lite_server_block_link_back")
+    @SerialName(value = "lite_server_block_link_back")
     val liteServerBlockLinkBack: GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack,
 
-    @Json(name = "lite_server_block_link_forward")
+    @SerialName(value = "lite_server_block_link_forward")
     val liteServerBlockLinkForward: GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack.kt
index 3b6a48ad6..ec469106a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack.kt
@@ -17,40 +17,40 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param toKeyBlock 
- * @param from 
- * @param to 
- * @param destProof 
- * @param proof 
- * @param stateProof 
- */
 
+@Serializable
 
 data class GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkBack (
 
-    @Json(name = "to_key_block")
+    @SerialName(value = "to_key_block")
     val toKeyBlock: kotlin.Boolean,
 
-    @Json(name = "from")
+    @SerialName(value = "from")
     val from: BlockRaw,
 
-    @Json(name = "to")
+    @SerialName(value = "to")
     val to: BlockRaw,
 
-    @Json(name = "dest_proof")
+    @SerialName(value = "dest_proof")
     val destProof: kotlin.String,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: kotlin.String,
 
-    @Json(name = "state_proof")
+    @SerialName(value = "state_proof")
     val stateProof: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward.kt
index fe3211fa5..7e1a33e9b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward.kt
@@ -18,40 +18,40 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param toKeyBlock 
- * @param from 
- * @param to 
- * @param destProof 
- * @param configProof 
- * @param signatures 
- */
 
+@Serializable
 
 data class GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForward (
 
-    @Json(name = "to_key_block")
+    @SerialName(value = "to_key_block")
     val toKeyBlock: kotlin.Boolean,
 
-    @Json(name = "from")
+    @SerialName(value = "from")
     val from: BlockRaw,
 
-    @Json(name = "to")
+    @SerialName(value = "to")
     val to: BlockRaw,
 
-    @Json(name = "dest_proof")
+    @SerialName(value = "dest_proof")
     val destProof: kotlin.String,
 
-    @Json(name = "config_proof")
+    @SerialName(value = "config_proof")
     val configProof: kotlin.String,
 
-    @Json(name = "signatures")
+    @SerialName(value = "signatures")
     val signatures: GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures.kt
index 938884dcd..8bf089488 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param validatorSetHash 
- * @param catchainSeqno 
- * @param signatures 
- */
 
+@Serializable
 
 data class GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignatures (
 
-    @Json(name = "validator_set_hash")
+    @SerialName(value = "validator_set_hash")
     val validatorSetHash: kotlin.Long,
 
-    @Json(name = "catchain_seqno")
+    @SerialName(value = "catchain_seqno")
     val catchainSeqno: kotlin.Int,
 
-    @Json(name = "signatures")
+    @SerialName(value = "signatures")
     val signatures: kotlin.collections.List<GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner.kt
index 03e7a952d..eeaf2d501 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param nodeIdShort 
- * @param signature 
- */
 
+@Serializable
 
 data class GetRawBlockProof200ResponseStepsInnerLiteServerBlockLinkForwardSignaturesSignaturesInner (
 
-    @Json(name = "node_id_short")
+    @SerialName(value = "node_id_short")
     val nodeIdShort: kotlin.String,
 
-    @Json(name = "signature")
+    @SerialName(value = "signature")
     val signature: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlock200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlock200Response.kt
index 0bfa553fb..ce837153a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlock200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlock200Response.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param `data` 
- */
 
+@Serializable
 
 data class GetRawBlockchainBlock200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockHeader200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockHeader200Response.kt
index b1629cd6b..d3fa9eaf3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockHeader200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockHeader200Response.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param mode 
- * @param headerProof 
- */
 
+@Serializable
 
 data class GetRawBlockchainBlockHeader200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "mode")
+    @SerialName(value = "mode")
     val mode: kotlin.Int,
 
-    @Json(name = "header_proof")
+    @SerialName(value = "header_proof")
     val headerProof: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockState200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockState200Response.kt
index 68f1dfe78..a6d36e4f2 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockState200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawBlockchainBlockState200Response.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param rootHash 
- * @param fileHash 
- * @param `data` 
- */
 
+@Serializable
 
 data class GetRawBlockchainBlockState200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "root_hash")
+    @SerialName(value = "root_hash")
     val rootHash: kotlin.String,
 
-    @Json(name = "file_hash")
+    @SerialName(value = "file_hash")
     val fileHash: kotlin.String,
 
-    @Json(name = "data")
+    @SerialName(value = "data")
     val `data`: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawConfig200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawConfig200Response.kt
index 909b2744b..a541b22f6 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawConfig200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawConfig200Response.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param mode 
- * @param id 
- * @param stateProof 
- * @param configProof 
- */
 
+@Serializable
 
 data class GetRawConfig200Response (
 
-    @Json(name = "mode")
+    @SerialName(value = "mode")
     val mode: kotlin.Int,
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "state_proof")
+    @SerialName(value = "state_proof")
     val stateProof: kotlin.String,
 
-    @Json(name = "config_proof")
+    @SerialName(value = "config_proof")
     val configProof: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200Response.kt
index d81a0550f..4d303be14 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200Response.kt
@@ -18,36 +18,37 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.GetRawListBlockTransactions200ResponseIdsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param reqCount 
- * @param incomplete 
- * @param ids 
- * @param proof 
- */
 
+@Serializable
 
 data class GetRawListBlockTransactions200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "req_count")
+    @SerialName(value = "req_count")
     val reqCount: kotlin.Int,
 
-    @Json(name = "incomplete")
+    @SerialName(value = "incomplete")
     val incomplete: kotlin.Boolean,
 
-    @Json(name = "ids")
+    @SerialName(value = "ids")
     val ids: kotlin.collections.List<GetRawListBlockTransactions200ResponseIdsInner>,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200ResponseIdsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200ResponseIdsInner.kt
index 183916d95..f60a081e6 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200ResponseIdsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawListBlockTransactions200ResponseIdsInner.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param mode 
- * @param account 
- * @param lt 
- * @param hash 
- */
 
+@Serializable
 
 data class GetRawListBlockTransactions200ResponseIdsInner (
 
-    @Json(name = "mode")
+    @SerialName(value = "mode")
     val mode: kotlin.Int,
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: kotlin.String? = null,
 
-    @Json(name = "lt")
+    @SerialName(value = "lt")
     val lt: kotlin.Long? = null,
 
-    @Json(name = "hash")
+    @SerialName(value = "hash")
     val hash: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfo200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfo200Response.kt
index de7663bdd..a94dc6d63 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfo200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfo200Response.kt
@@ -18,28 +18,31 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.InitStateRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param last 
- * @param stateRootHash 
- * @param `init` 
- */
 
+@Serializable
 
 data class GetRawMasterchainInfo200Response (
 
-    @Json(name = "last")
+    @SerialName(value = "last")
     val last: BlockRaw,
 
-    @Json(name = "state_root_hash")
+    @SerialName(value = "state_root_hash")
     val stateRootHash: kotlin.String,
 
-    @Json(name = "init")
+    @SerialName(value = "init")
     val `init`: InitStateRaw
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfoExt200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfoExt200Response.kt
index 4d34555cf..de1f2bd0a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfoExt200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawMasterchainInfoExt200Response.kt
@@ -18,48 +18,46 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.InitStateRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param mode 
- * @param version 
- * @param capabilities 
- * @param last 
- * @param lastUtime 
- * @param now 
- * @param stateRootHash 
- * @param `init` 
- */
 
+@Serializable
 
 data class GetRawMasterchainInfoExt200Response (
 
-    @Json(name = "mode")
+    @SerialName(value = "mode")
     val mode: kotlin.Int,
 
-    @Json(name = "version")
+    @SerialName(value = "version")
     val version: kotlin.Int,
 
-    @Json(name = "capabilities")
+    @SerialName(value = "capabilities")
     val capabilities: kotlin.Long,
 
-    @Json(name = "last")
+    @SerialName(value = "last")
     val last: BlockRaw,
 
-    @Json(name = "last_utime")
+    @SerialName(value = "last_utime")
     val lastUtime: kotlin.Int,
 
-    @Json(name = "now")
+    @SerialName(value = "now")
     val now: kotlin.Int,
 
-    @Json(name = "state_root_hash")
+    @SerialName(value = "state_root_hash")
     val stateRootHash: kotlin.String,
 
-    @Json(name = "init")
+    @SerialName(value = "init")
     val `init`: InitStateRaw
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200Response.kt
index 6bfd86be1..1ce16f0d3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200Response.kt
@@ -18,24 +18,28 @@ package io.tonapi.models
 import io.tonapi.models.BlockRaw
 import io.tonapi.models.GetRawShardBlockProof200ResponseLinksInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param masterchainId 
- * @param links 
- */
 
+@Serializable
 
 data class GetRawShardBlockProof200Response (
 
-    @Json(name = "masterchain_id")
+    @SerialName(value = "masterchain_id")
     val masterchainId: BlockRaw,
 
-    @Json(name = "links")
+    @SerialName(value = "links")
     val links: kotlin.collections.List<GetRawShardBlockProof200ResponseLinksInner>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200ResponseLinksInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200ResponseLinksInner.kt
index 2ef9b4bfc..ede8b28f7 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200ResponseLinksInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardBlockProof200ResponseLinksInner.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param proof 
- */
 
+@Serializable
 
 data class GetRawShardBlockProof200ResponseLinksInner (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardInfo200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardInfo200Response.kt
index 8856e3080..d0c7f5986 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardInfo200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawShardInfo200Response.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param shardblk 
- * @param shardProof 
- * @param shardDescr 
- */
 
+@Serializable
 
 data class GetRawShardInfo200Response (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: BlockRaw,
 
-    @Json(name = "shardblk")
+    @SerialName(value = "shardblk")
     val shardblk: BlockRaw,
 
-    @Json(name = "shard_proof")
+    @SerialName(value = "shard_proof")
     val shardProof: kotlin.String,
 
-    @Json(name = "shard_descr")
+    @SerialName(value = "shard_descr")
     val shardDescr: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawTime200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawTime200Response.kt
index 936beb277..4cb5d5047 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawTime200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawTime200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param time 
- */
 
+@Serializable
 
 data class GetRawTime200Response (
 
-    @Json(name = "time")
+    @SerialName(value = "time")
     val time: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetRawTransactions200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetRawTransactions200Response.kt
index 7fbc9eafa..cfa27b613 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetRawTransactions200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetRawTransactions200Response.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.BlockRaw
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param ids 
- * @param transactions 
- */
 
+@Serializable
 
 data class GetRawTransactions200Response (
 
-    @Json(name = "ids")
+    @SerialName(value = "ids")
     val ids: kotlin.collections.List<BlockRaw>,
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolHistory200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolHistory200Response.kt
index 82f372100..4ebc47015 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolHistory200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolHistory200Response.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.ApyHistory
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param apy 
- */
 
+@Serializable
 
 data class GetStakingPoolHistory200Response (
 
-    @Json(name = "apy")
+    @SerialName(value = "apy")
     val apy: kotlin.collections.List<ApyHistory>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolInfo200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolInfo200Response.kt
index d9a0d9a3e..16e43f10f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolInfo200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPoolInfo200Response.kt
@@ -18,24 +18,28 @@ package io.tonapi.models
 import io.tonapi.models.PoolImplementation
 import io.tonapi.models.PoolInfo
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param implementation 
- * @param pool 
- */
 
+@Serializable
 
 data class GetStakingPoolInfo200Response (
 
-    @Json(name = "implementation")
+    @SerialName(value = "implementation")
     val implementation: PoolImplementation,
 
-    @Json(name = "pool")
+    @SerialName(value = "pool")
     val pool: PoolInfo
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPools200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPools200Response.kt
index 7662632c1..0ea18c231 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPools200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetStakingPools200Response.kt
@@ -18,24 +18,28 @@ package io.tonapi.models
 import io.tonapi.models.PoolImplementation
 import io.tonapi.models.PoolInfo
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param pools 
- * @param implementations 
- */
 
+@Serializable
 
 data class GetStakingPools200Response (
 
-    @Json(name = "pools")
+    @SerialName(value = "pools")
     val pools: kotlin.collections.List<PoolInfo>,
 
-    @Json(name = "implementations")
+    @Contextual @SerialName(value = "implementations")
     val implementations: kotlin.collections.Map<kotlin.String, PoolImplementation>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetStorageProviders200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetStorageProviders200Response.kt
index 5cf7bbb06..5cc326b2e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetStorageProviders200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetStorageProviders200Response.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.StorageProvider
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param providers 
- */
 
+@Serializable
 
 data class GetStorageProviders200Response (
 
-    @Json(name = "providers")
+    @SerialName(value = "providers")
     val providers: kotlin.collections.List<StorageProvider>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetTonConnectPayload200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetTonConnectPayload200Response.kt
index fce669d82..5ccf12c1d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetTonConnectPayload200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/GetTonConnectPayload200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param payload 
- */
 
+@Serializable
 
 data class GetTonConnectPayload200Response (
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/GetWalletBackup200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/GetWalletBackup200Response.kt
deleted file mode 100644
index 59a63ae72..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/GetWalletBackup200Response.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param dump 
- */
-
-
-data class GetWalletBackup200Response (
-
-    @Json(name = "dump")
-    val dump: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ImagePreview.kt b/tonapi/src/main/kotlin/io/tonapi/models/ImagePreview.kt
index edb47034e..5e9088e55 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ImagePreview.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ImagePreview.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param resolution 
- * @param url 
- */
 
+@Serializable
 
 data class ImagePreview (
 
-    @Json(name = "resolution")
+    @SerialName(value = "resolution")
     val resolution: kotlin.String,
 
-    @Json(name = "url")
+    @SerialName(value = "url")
     val url: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InitStateRaw.kt b/tonapi/src/main/kotlin/io/tonapi/models/InitStateRaw.kt
index 0a7c55750..2f36cb5d8 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/InitStateRaw.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/InitStateRaw.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param workchain 
- * @param rootHash 
- * @param fileHash 
- */
 
+@Serializable
 
 data class InitStateRaw (
 
-    @Json(name = "workchain")
+    @SerialName(value = "workchain")
     val workchain: kotlin.Int,
 
-    @Json(name = "root_hash")
+    @SerialName(value = "root_hash")
     val rootHash: kotlin.String,
 
-    @Json(name = "file_hash")
+    @SerialName(value = "file_hash")
     val fileHash: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InlineObject.kt b/tonapi/src/main/kotlin/io/tonapi/models/InlineObject.kt
new file mode 100644
index 000000000..b788d7659
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/InlineObject.kt
@@ -0,0 +1,43 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class InlineObject (
+
+    @SerialName(value = "error")
+    val error: kotlin.String,
+
+    @SerialName(value = "error_code")
+    val errorCode: kotlin.Long? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalance.kt b/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalance.kt
deleted file mode 100644
index dbb77ec98..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalance.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param type 
- * @param ticker 
- * @param balance 
- * @param decimals 
- */
-
-
-data class InscriptionBalance (
-
-    @Json(name = "type")
-    val type: InscriptionBalance.Type,
-
-    @Json(name = "ticker")
-    val ticker: kotlin.String,
-
-    @Json(name = "balance")
-    val balance: kotlin.String,
-
-    @Json(name = "decimals")
-    val decimals: kotlin.Int
-
-) {
-
-    /**
-     * 
-     *
-     * Values: ton20,gram20
-     */
-    @JsonClass(generateAdapter = false)
-    enum class Type(val value: kotlin.String) {
-        @Json(name = "ton20") ton20("ton20"),
-        @Json(name = "gram20") gram20("gram20");
-    }
-}
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalances.kt b/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalances.kt
deleted file mode 100644
index 2fcf22c7e..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionBalances.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-import io.tonapi.models.InscriptionBalance
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param inscriptions 
- */
-
-
-data class InscriptionBalances (
-
-    @Json(name = "inscriptions")
-    val inscriptions: kotlin.collections.List<InscriptionBalance>
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionMintAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/InscriptionMintAction.kt
deleted file mode 100644
index f614fd371..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionMintAction.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-import io.tonapi.models.AccountAddress
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param recipient 
- * @param amount amount in minimal particles
- * @param type 
- * @param ticker 
- * @param decimals 
- */
-
-
-data class InscriptionMintAction (
-
-    @Json(name = "recipient")
-    val recipient: AccountAddress,
-
-    /* amount in minimal particles */
-    @Json(name = "amount")
-    val amount: kotlin.String,
-
-    @Json(name = "type")
-    val type: InscriptionMintAction.Type,
-
-    @Json(name = "ticker")
-    val ticker: kotlin.String,
-
-    @Json(name = "decimals")
-    val decimals: kotlin.Int
-
-) {
-
-    /**
-     * 
-     *
-     * Values: ton20,gram20
-     */
-    @JsonClass(generateAdapter = false)
-    enum class Type(val value: kotlin.String) {
-        @Json(name = "ton20") ton20("ton20"),
-        @Json(name = "gram20") gram20("gram20");
-    }
-}
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionTransferAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/InscriptionTransferAction.kt
deleted file mode 100644
index 97d99c4d6..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/InscriptionTransferAction.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-import io.tonapi.models.AccountAddress
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param sender 
- * @param recipient 
- * @param amount amount in minimal particles
- * @param type 
- * @param ticker 
- * @param decimals 
- * @param comment 
- */
-
-
-data class InscriptionTransferAction (
-
-    @Json(name = "sender")
-    val sender: AccountAddress,
-
-    @Json(name = "recipient")
-    val recipient: AccountAddress,
-
-    /* amount in minimal particles */
-    @Json(name = "amount")
-    val amount: kotlin.String,
-
-    @Json(name = "type")
-    val type: InscriptionTransferAction.Type,
-
-    @Json(name = "ticker")
-    val ticker: kotlin.String,
-
-    @Json(name = "decimals")
-    val decimals: kotlin.Int,
-
-    @Json(name = "comment")
-    val comment: kotlin.String? = null
-
-) {
-
-    /**
-     * 
-     *
-     * Values: ton20,gram20
-     */
-    @JsonClass(generateAdapter = false)
-    enum class Type(val value: kotlin.String) {
-        @Json(name = "ton20") ton20("ton20"),
-        @Json(name = "gram20") gram20("gram20");
-    }
-}
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonBalance.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonBalance.kt
index dd97d8ddd..e65b683d5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonBalance.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonBalance.kt
@@ -20,40 +20,40 @@ import io.tonapi.models.JettonBalanceLock
 import io.tonapi.models.JettonPreview
 import io.tonapi.models.TokenRates
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param balance 
- * @param walletAddress 
- * @param jetton 
- * @param price 
- * @param extensions 
- * @param lock 
- */
 
+@Serializable
 
 data class JettonBalance (
 
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.String,
 
-    @Json(name = "wallet_address")
+    @SerialName(value = "wallet_address")
     val walletAddress: AccountAddress,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview,
 
-    @Json(name = "price")
+    @SerialName(value = "price")
     val price: TokenRates? = null,
 
-    @Json(name = "extensions")
+    @SerialName(value = "extensions")
     val extensions: kotlin.collections.List<kotlin.String>? = null,
 
-    @Json(name = "lock")
+    @SerialName(value = "lock")
     val lock: JettonBalanceLock? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonBalanceLock.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonBalanceLock.kt
index ecae52444..8c1f478be 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonBalanceLock.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonBalanceLock.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param amount 
- * @param till 
- */
 
+@Serializable
 
 data class JettonBalanceLock (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "till")
+    @SerialName(value = "till")
     val till: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgeParams.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgeParams.kt
index c929f80e0..560f5ab96 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgeParams.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgeParams.kt
@@ -18,44 +18,43 @@ package io.tonapi.models
 import io.tonapi.models.JettonBridgePrices
 import io.tonapi.models.Oracle
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param bridgeAddress 
- * @param oraclesAddress 
- * @param stateFlags 
- * @param oracles 
- * @param burnBridgeFee 
- * @param externalChainAddress 
- * @param prices 
- */
 
+@Serializable
 
 data class JettonBridgeParams (
 
-    @Json(name = "bridge_address")
+    @SerialName(value = "bridge_address")
     val bridgeAddress: kotlin.String,
 
-    @Json(name = "oracles_address")
+    @SerialName(value = "oracles_address")
     val oraclesAddress: kotlin.String,
 
-    @Json(name = "state_flags")
+    @SerialName(value = "state_flags")
     val stateFlags: kotlin.Int,
 
-    @Json(name = "oracles")
+    @SerialName(value = "oracles")
     val oracles: kotlin.collections.List<Oracle>,
 
-    @Json(name = "burn_bridge_fee")
+    @SerialName(value = "burn_bridge_fee")
     val burnBridgeFee: kotlin.Long? = null,
 
-    @Json(name = "external_chain_address")
+    @SerialName(value = "external_chain_address")
     val externalChainAddress: kotlin.String? = null,
 
-    @Json(name = "prices")
+    @SerialName(value = "prices")
     val prices: JettonBridgePrices? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgePrices.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgePrices.kt
index 88b21935b..2eb66d0fe 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgePrices.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonBridgePrices.kt
@@ -16,40 +16,40 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param bridgeBurnFee 
- * @param bridgeMintFee 
- * @param walletMinTonsForStorage 
- * @param walletGasConsumption 
- * @param minterMinTonsForStorage 
- * @param discoverGasConsumption 
- */
 
+@Serializable
 
 data class JettonBridgePrices (
 
-    @Json(name = "bridge_burn_fee")
+    @SerialName(value = "bridge_burn_fee")
     val bridgeBurnFee: kotlin.Long,
 
-    @Json(name = "bridge_mint_fee")
+    @SerialName(value = "bridge_mint_fee")
     val bridgeMintFee: kotlin.Long,
 
-    @Json(name = "wallet_min_tons_for_storage")
+    @SerialName(value = "wallet_min_tons_for_storage")
     val walletMinTonsForStorage: kotlin.Long,
 
-    @Json(name = "wallet_gas_consumption")
+    @SerialName(value = "wallet_gas_consumption")
     val walletGasConsumption: kotlin.Long,
 
-    @Json(name = "minter_min_tons_for_storage")
+    @SerialName(value = "minter_min_tons_for_storage")
     val minterMinTonsForStorage: kotlin.Long,
 
-    @Json(name = "discover_gas_consumption")
+    @SerialName(value = "discover_gas_consumption")
     val discoverGasConsumption: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonBurnAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonBurnAction.kt
index 1131c01e2..17d5b5f50 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonBurnAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonBurnAction.kt
@@ -18,33 +18,35 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonPreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param sender 
- * @param sendersWallet 
- * @param amount amount in quanta of tokens
- * @param jetton 
- */
 
+@Serializable
 
 data class JettonBurnAction (
 
-    @Json(name = "sender")
+    @SerialName(value = "sender")
     val sender: AccountAddress,
 
-    @Json(name = "senders_wallet")
+    @SerialName(value = "senders_wallet")
     val sendersWallet: kotlin.String,
 
     /* amount in quanta of tokens */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonHolders.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonHolders.kt
index 1e404421b..1cb54adf4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonHolders.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonHolders.kt
@@ -17,25 +17,29 @@ package io.tonapi.models
 
 import io.tonapi.models.JettonHoldersAddressesInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param addresses 
- * @param total total number of holders
- */
 
+@Serializable
 
 data class JettonHolders (
 
-    @Json(name = "addresses")
+    @SerialName(value = "addresses")
     val addresses: kotlin.collections.List<JettonHoldersAddressesInner>,
 
     /* total number of holders */
-    @Json(name = "total")
+    @SerialName(value = "total")
     val total: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonHoldersAddressesInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonHoldersAddressesInner.kt
index a6cf9c456..18e9da2dd 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonHoldersAddressesInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonHoldersAddressesInner.kt
@@ -17,29 +17,32 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param owner 
- * @param balance balance in the smallest jetton's units
- */
 
+@Serializable
 
 data class JettonHoldersAddressesInner (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "owner")
+    @SerialName(value = "owner")
     val owner: AccountAddress,
 
     /* balance in the smallest jetton's units */
-    @Json(name = "balance")
+    @SerialName(value = "balance")
     val balance: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonInfo.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonInfo.kt
index 8dd5f79ec..65bc2fdfa 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonInfo.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonInfo.kt
@@ -19,46 +19,43 @@ import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonMetadata
 import io.tonapi.models.JettonVerificationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param mintable 
- * @param totalSupply 
- * @param metadata 
- * @param verification 
- * @param holdersCount 
- * @param admin 
- */
 
+@Serializable
 
 data class JettonInfo (
 
-    @Json(name = "mintable")
+    @SerialName(value = "mintable")
     val mintable: kotlin.Boolean,
 
-    @Json(name = "total_supply")
+    @SerialName(value = "total_supply")
     val totalSupply: kotlin.String,
 
-    @Json(name = "metadata")
+    @SerialName(value = "metadata")
     val metadata: JettonMetadata,
 
-    @Json(name = "verification")
+    @SerialName(value = "preview")
+    val preview: kotlin.String,
+
+    @Contextual @SerialName(value = "verification")
     val verification: JettonVerificationType,
 
-    @Json(name = "holders_count")
+    @SerialName(value = "holders_count")
     val holdersCount: kotlin.Int,
 
-    @Json(name = "admin")
-    val admin: AccountAddress? = null,
+    @SerialName(value = "admin")
+    val admin: AccountAddress? = null
 
-    @Json(name = "custom_payload_api_uri")
-    val customPayloadApiUri: kotlin.String? = null,
+) {
 
-    @Json(name = "preview")
-    val preview: kotlin.String? = null
 
-)
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonMetadata.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonMetadata.kt
index f397d1cf4..aae1d1bb9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonMetadata.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonMetadata.kt
@@ -16,52 +16,53 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param name 
- * @param symbol 
- * @param decimals 
- * @param image 
- * @param description 
- * @param social 
- * @param websites 
- * @param catalogs 
- */
 
+@Serializable
 
 data class JettonMetadata (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "symbol")
+    @SerialName(value = "symbol")
     val symbol: kotlin.String,
 
-    @Json(name = "decimals")
+    @SerialName(value = "decimals")
     val decimals: kotlin.String,
 
-    @Json(name = "image")
+    /* this field currently returns a cached image URL (e.g., \"https://cache.tonapi.io/images/jetton.jpg\"). In the future, this will be replaced with the original URL from the metadata. The cached image is already available in the `preview` field of `JettonInfo` and will remain there. */
+    @SerialName(value = "image")
     val image: kotlin.String? = null,
 
-    @Json(name = "description")
+    @SerialName(value = "description")
     val description: kotlin.String? = null,
 
-    @Json(name = "social")
+    @SerialName(value = "social")
     val social: kotlin.collections.List<kotlin.String>? = null,
 
-    @Json(name = "websites")
+    @SerialName(value = "websites")
     val websites: kotlin.collections.List<kotlin.String>? = null,
 
-    @Json(name = "catalogs")
-    val catalogs: kotlin.collections.List<kotlin.String>? = null
+    @SerialName(value = "catalogs")
+    val catalogs: kotlin.collections.List<kotlin.String>? = null,
 
-)
+    @SerialName(value = "custom_payload_api_uri")
+    val customPayloadApiUri: kotlin.String? = null
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonMintAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonMintAction.kt
index dbe77a245..6ed16ae7e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonMintAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonMintAction.kt
@@ -18,33 +18,35 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonPreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param recipient 
- * @param recipientsWallet 
- * @param amount amount in quanta of tokens
- * @param jetton 
- */
 
+@Serializable
 
 data class JettonMintAction (
 
-    @Json(name = "recipient")
+    @SerialName(value = "recipient")
     val recipient: AccountAddress,
 
-    @Json(name = "recipients_wallet")
+    @SerialName(value = "recipients_wallet")
     val recipientsWallet: kotlin.String,
 
     /* amount in quanta of tokens */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonOperation.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonOperation.kt
new file mode 100644
index 000000000..97d10e309
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonOperation.kt
@@ -0,0 +1,98 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.JettonPreview
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class JettonOperation (
+
+    @SerialName(value = "operation")
+    val operation: JettonOperation.Operation,
+
+    @SerialName(value = "utime")
+    val utime: kotlin.Long,
+
+    @SerialName(value = "lt")
+    val lt: kotlin.Long,
+
+    @SerialName(value = "transaction_hash")
+    val transactionHash: kotlin.String,
+
+    @SerialName(value = "amount")
+    val amount: kotlin.String,
+
+    @SerialName(value = "jetton")
+    val jetton: JettonPreview,
+
+    @SerialName(value = "trace_id")
+    val traceId: kotlin.String,
+
+    @SerialName(value = "query_id")
+    val queryId: kotlin.String,
+
+    @SerialName(value = "source")
+    val source: AccountAddress? = null,
+
+    @SerialName(value = "destination")
+    val destination: AccountAddress? = null,
+
+    @Contextual @SerialName(value = "payload")
+    val payload: kotlin.Any? = null
+
+) {
+
+    /**
+     * 
+     *
+     * Values: transfer,mint,burn.unknown
+     */
+    @Serializable(with = OperationSerializer::class)
+    enum class Operation(val value: kotlin.String) {
+        @SerialName(value = "transfer") transfer("transfer"),
+        @SerialName(value = "mint") mint("mint"),
+        @SerialName(value = "burn") burn("burn"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object OperationSerializer : KSerializer<Operation> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Operation {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Operation.entries.firstOrNull { it.value == value }
+                ?: Operation.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Operation) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonOperations.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonOperations.kt
new file mode 100644
index 000000000..baef19c15
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonOperations.kt
@@ -0,0 +1,44 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.JettonOperation
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class JettonOperations (
+
+    @SerialName(value = "operations")
+    val operations: kotlin.collections.List<JettonOperation>,
+
+    @SerialName(value = "next_from")
+    val nextFrom: kotlin.Long? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonPreview.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonPreview.kt
index 74681a3dd..9ff01e295 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonPreview.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonPreview.kt
@@ -17,43 +17,46 @@ package io.tonapi.models
 
 import io.tonapi.models.JettonVerificationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param name 
- * @param symbol 
- * @param decimals 
- * @param image 
- * @param verification 
- */
 
+@Serializable
 
 data class JettonPreview (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "symbol")
+    @SerialName(value = "symbol")
     val symbol: kotlin.String,
 
-    @Json(name = "decimals")
+    @SerialName(value = "decimals")
     val decimals: kotlin.Int,
 
-    @Json(name = "image")
+    @SerialName(value = "image")
     val image: kotlin.String,
 
-    @Json(name = "verification")
+    @Contextual @SerialName(value = "verification")
     val verification: JettonVerificationType,
 
-    @Json(name = "custom_payload_api_uri")
+    @SerialName(value = "score")
+    val score: kotlin.Int,
+
+    @SerialName(value = "custom_payload_api_uri")
     val customPayloadApiUri: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonQuantity.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonQuantity.kt
index 92a4d983c..bfbe2c07e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonQuantity.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonQuantity.kt
@@ -18,28 +18,31 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonPreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param quantity 
- * @param walletAddress 
- * @param jetton 
- */
 
+@Serializable
 
 data class JettonQuantity (
 
-    @Json(name = "quantity")
+    @SerialName(value = "quantity")
     val quantity: kotlin.String,
 
-    @Json(name = "wallet_address")
+    @SerialName(value = "wallet_address")
     val walletAddress: AccountAddress,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonSwapAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonSwapAction.kt
index 6b04aa681..df6f1da9e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonSwapAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonSwapAction.kt
@@ -18,51 +18,45 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonPreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param dex 
- * @param amountIn 
- * @param amountOut 
- * @param userWallet 
- * @param router 
- * @param tonIn 
- * @param tonOut 
- * @param jettonMasterIn 
- * @param jettonMasterOut 
- */
 
+@Serializable
 
 data class JettonSwapAction (
 
-    @Json(name = "dex")
+    @SerialName(value = "dex")
     val dex: JettonSwapAction.Dex,
 
-    @Json(name = "amount_in")
+    @SerialName(value = "amount_in")
     val amountIn: kotlin.String,
 
-    @Json(name = "amount_out")
+    @SerialName(value = "amount_out")
     val amountOut: kotlin.String,
 
-    @Json(name = "user_wallet")
+    @SerialName(value = "user_wallet")
     val userWallet: AccountAddress,
 
-    @Json(name = "router")
+    @SerialName(value = "router")
     val router: AccountAddress,
 
-    @Json(name = "ton_in")
+    @SerialName(value = "ton_in")
     val tonIn: kotlin.Long? = null,
 
-    @Json(name = "ton_out")
+    @SerialName(value = "ton_out")
     val tonOut: kotlin.Long? = null,
 
-    @Json(name = "jetton_master_in")
+    @SerialName(value = "jetton_master_in")
     val jettonMasterIn: JettonPreview? = null,
 
-    @Json(name = "jetton_master_out")
+    @SerialName(value = "jetton_master_out")
     val jettonMasterOut: JettonPreview? = null
 
 ) {
@@ -70,13 +64,29 @@ data class JettonSwapAction (
     /**
      * 
      *
-     * Values: stonfi,dedust,megatonfi
+     * Values: stonfi,dedust,megatonfi.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = DexSerializer::class)
     enum class Dex(val value: kotlin.String) {
-        @Json(name = "stonfi") stonfi("stonfi"),
-        @Json(name = "dedust") dedust("dedust"),
-        @Json(name = "megatonfi") megatonfi("megatonfi");
+        @SerialName(value = "stonfi") stonfi("stonfi"),
+        @SerialName(value = "dedust") dedust("dedust"),
+        @SerialName(value = "megatonfi") megatonfi("megatonfi"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object DexSerializer : KSerializer<Dex> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Dex {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Dex.entries.firstOrNull { it.value == value }
+                ?: Dex.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Dex) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferAction.kt
index be1b8dddc..54a95039d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferAction.kt
@@ -20,53 +20,50 @@ import io.tonapi.models.EncryptedComment
 import io.tonapi.models.JettonPreview
 import io.tonapi.models.Refund
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param sendersWallet 
- * @param recipientsWallet 
- * @param amount amount in quanta of tokens
- * @param jetton 
- * @param sender 
- * @param recipient 
- * @param comment 
- * @param encryptedComment 
- * @param refund 
- */
 
+@Serializable
 
 data class JettonTransferAction (
 
-    @Json(name = "senders_wallet")
+    @SerialName(value = "senders_wallet")
     val sendersWallet: kotlin.String,
 
-    @Json(name = "recipients_wallet")
+    @SerialName(value = "recipients_wallet")
     val recipientsWallet: kotlin.String,
 
     /* amount in quanta of tokens */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview,
 
-    @Json(name = "sender")
+    @SerialName(value = "sender")
     val sender: AccountAddress? = null,
 
-    @Json(name = "recipient")
+    @SerialName(value = "recipient")
     val recipient: AccountAddress? = null,
 
-    @Json(name = "comment")
+    @SerialName(value = "comment")
     val comment: kotlin.String? = null,
 
-    @Json(name = "encrypted_comment")
+    @SerialName(value = "encrypted_comment")
     val encryptedComment: EncryptedComment? = null,
 
-    @Json(name = "refund")
+    @SerialName(value = "refund")
     val refund: Refund? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferPayload.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferPayload.kt
index 9cebef364..84374e3cc 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferPayload.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonTransferPayload.kt
@@ -16,26 +16,30 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param customPayload hex-encoded BoC
- * @param stateInit hex-encoded BoC
- */
 
+@Serializable
 
 data class JettonTransferPayload (
 
     /* hex-encoded BoC */
-    @Json(name = "custom_payload")
+    @SerialName(value = "custom_payload")
     val customPayload: kotlin.String? = null,
 
     /* hex-encoded BoC */
-    @Json(name = "state_init")
+    @SerialName(value = "state_init")
     val stateInit: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonVerificationType.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonVerificationType.kt
index de07b415a..e3ec5c8d5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonVerificationType.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonVerificationType.kt
@@ -16,30 +16,36 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: whitelist,blacklist,none
+ * Values: whitelist,blacklist,none.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = JettonVerificationTypeSerializer::class)
 enum class JettonVerificationType(val value: kotlin.String) {
 
-    @Json(name = "whitelist")
+    @SerialName(value = "whitelist")
     whitelist("whitelist"),
 
-    @Json(name = "blacklist")
+    @SerialName(value = "blacklist")
     blacklist("blacklist"),
 
-    @Json(name = "graylist")
-    graylist("graylist"),
+    @SerialName(value = "none")
+    none("none"),
 
-    @Json(name = "none")
-    none("none");
+    @SerialName(value = "graylist")
+    graylist("graylist"),
 
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -61,10 +67,24 @@ enum class JettonVerificationType(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): JettonVerificationType? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object JettonVerificationTypeSerializer : KSerializer<JettonVerificationType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): JettonVerificationType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return JettonVerificationType.entries.firstOrNull { it.value == value }
+            ?: JettonVerificationType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: JettonVerificationType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Jettons.kt b/tonapi/src/main/kotlin/io/tonapi/models/Jettons.kt
index 74b425cea..0b1a27cef 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Jettons.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Jettons.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.JettonInfo
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param jettons 
- */
 
+@Serializable
 
 data class Jettons (
 
-    @Json(name = "jettons")
+    @SerialName(value = "jettons")
     val jettons: kotlin.collections.List<JettonInfo>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/JettonsBalances.kt b/tonapi/src/main/kotlin/io/tonapi/models/JettonsBalances.kt
index f62c577ac..caa69b762 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/JettonsBalances.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/JettonsBalances.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.JettonBalance
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param balances 
- */
 
+@Serializable
 
 data class JettonsBalances (
 
-    @Json(name = "balances")
+    @SerialName(value = "balances")
     val balances: kotlin.collections.List<JettonBalance>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MarketTonRates.kt b/tonapi/src/main/kotlin/io/tonapi/models/MarketTonRates.kt
index 34f2ffbf9..b6200bc04 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MarketTonRates.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MarketTonRates.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param market 
- * @param usdPrice 
- * @param lastDateUpdate 
- */
 
+@Serializable
 
 data class MarketTonRates (
 
-    @Json(name = "market")
+    @SerialName(value = "market")
     val market: kotlin.String,
 
-    @Json(name = "usd_price")
-    val usdPrice: java.math.BigDecimal,
+    @SerialName(value = "usd_price")
+    val usdPrice: kotlin.String,
 
-    @Json(name = "last_date_update")
+    @SerialName(value = "last_date_update")
     val lastDateUpdate: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Message.kt b/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
index df636efdc..a841b60f0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
@@ -16,90 +16,79 @@
 package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
+import io.tonapi.models.ExtraCurrency
 import io.tonapi.models.StateInit
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param msgType 
- * @param createdLt 
- * @param ihrDisabled 
- * @param bounce 
- * @param bounced 
- * @param `value` 
- * @param fwdFee 
- * @param ihrFee 
- * @param importFee 
- * @param createdAt 
- * @param hash 
- * @param destination 
- * @param source 
- * @param opCode 
- * @param `init` 
- * @param rawBody hex-encoded BoC with raw message body
- * @param decodedOpName 
- * @param decodedBody 
- */
 
+@Serializable
 
 data class Message (
 
-    @Json(name = "msg_type")
+    @SerialName(value = "msg_type")
     val msgType: Message.MsgType,
 
-    @Json(name = "created_lt")
+    @SerialName(value = "created_lt")
     val createdLt: kotlin.Long,
 
-    @Json(name = "ihr_disabled")
+    @SerialName(value = "ihr_disabled")
     val ihrDisabled: kotlin.Boolean,
 
-    @Json(name = "bounce")
+    @SerialName(value = "bounce")
     val bounce: kotlin.Boolean,
 
-    @Json(name = "bounced")
+    @SerialName(value = "bounced")
     val bounced: kotlin.Boolean,
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.Long,
 
-    @Json(name = "fwd_fee")
+    @SerialName(value = "fwd_fee")
     val fwdFee: kotlin.Long,
 
-    @Json(name = "ihr_fee")
+    @SerialName(value = "ihr_fee")
     val ihrFee: kotlin.Long,
 
-    @Json(name = "import_fee")
+    @SerialName(value = "import_fee")
     val importFee: kotlin.Long,
 
-    @Json(name = "created_at")
+    @SerialName(value = "created_at")
     val createdAt: kotlin.Long,
 
-    @Json(name = "hash")
-    val hash: kotlin.String? = null,
+    @SerialName(value = "hash")
+    val hash: kotlin.String,
 
-    @Json(name = "destination")
+    @SerialName(value = "value_extra")
+    val valueExtra: kotlin.collections.List<ExtraCurrency>? = null,
+
+    @SerialName(value = "destination")
     val destination: AccountAddress? = null,
 
-    @Json(name = "source")
+    @SerialName(value = "source")
     val source: AccountAddress? = null,
 
-    @Json(name = "op_code")
+    @SerialName(value = "op_code")
     val opCode: kotlin.String? = null,
 
-    @Json(name = "init")
+    @SerialName(value = "init")
     val `init`: StateInit? = null,
 
     /* hex-encoded BoC with raw message body */
-    @Json(name = "raw_body")
+    @SerialName(value = "raw_body")
     val rawBody: kotlin.String? = null,
 
-    @Json(name = "decoded_op_name")
+    @SerialName(value = "decoded_op_name")
     val decodedOpName: kotlin.String? = null,
 
-    @Json(name = "decoded_body")
+    @Contextual @SerialName(value = "decoded_body")
     val decodedBody: kotlin.Any? = null
 
 ) {
@@ -107,13 +96,29 @@ data class Message (
     /**
      * 
      *
-     * Values: intMsg,extInMsg,extOutMsg
+     * Values: int_msg,ext_in_msg,ext_out_msg.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = MsgTypeSerializer::class)
     enum class MsgType(val value: kotlin.String) {
-        @Json(name = "int_msg") intMsg("int_msg"),
-        @Json(name = "ext_in_msg") extInMsg("ext_in_msg"),
-        @Json(name = "ext_out_msg") extOutMsg("ext_out_msg");
+        @SerialName(value = "int_msg") int_msg("int_msg"),
+        @SerialName(value = "ext_in_msg") ext_in_msg("ext_in_msg"),
+        @SerialName(value = "ext_out_msg") ext_out_msg("ext_out_msg"),
+        @SerialName(value = "unknown") unknown("unknown");
     }
+
+    internal object MsgTypeSerializer : KSerializer<MsgType> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): MsgType {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return MsgType.entries.firstOrNull { it.value == value }
+                ?: MsgType.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: MsgType) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MessageConsequences.kt b/tonapi/src/main/kotlin/io/tonapi/models/MessageConsequences.kt
index ac5a4c3da..a829754ca 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MessageConsequences.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MessageConsequences.kt
@@ -19,28 +19,31 @@ import io.tonapi.models.AccountEvent
 import io.tonapi.models.Risk
 import io.tonapi.models.Trace
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param trace 
- * @param risk 
- * @param event 
- */
 
+@Serializable
 
 data class MessageConsequences (
 
-    @Json(name = "trace")
+    @SerialName(value = "trace")
     val trace: Trace,
 
-    @Json(name = "risk")
+    @SerialName(value = "risk")
     val risk: Risk,
 
-    @Json(name = "event")
+    @SerialName(value = "event")
     val event: AccountEvent
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Metadata.kt b/tonapi/src/main/kotlin/io/tonapi/models/Metadata.kt
new file mode 100644
index 000000000..9c80dad03
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Metadata.kt
@@ -0,0 +1,45 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Metadata (
+
+    /* hex encoded bytes */
+    @SerialName(value = "encrypted_binary")
+    val encryptedBinary: kotlin.String,
+
+    /* hex encoded bytes */
+    @SerialName(value = "decryption_key")
+    val decryptionKey: kotlin.String? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Method.kt b/tonapi/src/main/kotlin/io/tonapi/models/Method.kt
new file mode 100644
index 000000000..12e358cef
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Method.kt
@@ -0,0 +1,43 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Method (
+
+    @SerialName(value = "id")
+    val id: kotlin.Long,
+
+    @SerialName(value = "method")
+    val method: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MethodExecutionResult.kt b/tonapi/src/main/kotlin/io/tonapi/models/MethodExecutionResult.kt
index c0945bba7..6164227d9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MethodExecutionResult.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MethodExecutionResult.kt
@@ -17,33 +17,35 @@ package io.tonapi.models
 
 import io.tonapi.models.TvmStackRecord
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param success 
- * @param exitCode tvm exit code
- * @param stack 
- * @param decoded 
- */
 
+@Serializable
 
 data class MethodExecutionResult (
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
     /* tvm exit code */
-    @Json(name = "exit_code")
+    @SerialName(value = "exit_code")
     val exitCode: kotlin.Int,
 
-    @Json(name = "stack")
+    @SerialName(value = "stack")
     val stack: kotlin.collections.List<TvmStackRecord>,
 
-    @Json(name = "decoded")
+    @Contextual @SerialName(value = "decoded")
     val decoded: kotlin.Any? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MisbehaviourPunishmentConfig.kt b/tonapi/src/main/kotlin/io/tonapi/models/MisbehaviourPunishmentConfig.kt
index 60b6e3b18..a1c7647ce 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MisbehaviourPunishmentConfig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MisbehaviourPunishmentConfig.kt
@@ -16,60 +16,55 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param defaultFlatFine 
- * @param defaultProportionalFine 
- * @param severityFlatMult 
- * @param severityProportionalMult 
- * @param unpunishableInterval 
- * @param longInterval 
- * @param longFlatMult 
- * @param longProportionalMult 
- * @param mediumInterval 
- * @param mediumFlatMult 
- * @param mediumProportionalMult 
- */
 
+@Serializable
 
 data class MisbehaviourPunishmentConfig (
 
-    @Json(name = "default_flat_fine")
+    @SerialName(value = "default_flat_fine")
     val defaultFlatFine: kotlin.Long,
 
-    @Json(name = "default_proportional_fine")
+    @SerialName(value = "default_proportional_fine")
     val defaultProportionalFine: kotlin.Long,
 
-    @Json(name = "severity_flat_mult")
+    @SerialName(value = "severity_flat_mult")
     val severityFlatMult: kotlin.Int,
 
-    @Json(name = "severity_proportional_mult")
+    @SerialName(value = "severity_proportional_mult")
     val severityProportionalMult: kotlin.Int,
 
-    @Json(name = "unpunishable_interval")
+    @SerialName(value = "unpunishable_interval")
     val unpunishableInterval: kotlin.Int,
 
-    @Json(name = "long_interval")
+    @SerialName(value = "long_interval")
     val longInterval: kotlin.Int,
 
-    @Json(name = "long_flat_mult")
+    @SerialName(value = "long_flat_mult")
     val longFlatMult: kotlin.Int,
 
-    @Json(name = "long_proportional_mult")
+    @SerialName(value = "long_proportional_mult")
     val longProportionalMult: kotlin.Int,
 
-    @Json(name = "medium_interval")
+    @SerialName(value = "medium_interval")
     val mediumInterval: kotlin.Int,
 
-    @Json(name = "medium_flat_mult")
+    @SerialName(value = "medium_flat_mult")
     val mediumFlatMult: kotlin.Int,
 
-    @Json(name = "medium_proportional_mult")
+    @SerialName(value = "medium_proportional_mult")
     val mediumProportionalMult: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MsgForwardPrices.kt b/tonapi/src/main/kotlin/io/tonapi/models/MsgForwardPrices.kt
index 69918ac96..88bca3c6b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MsgForwardPrices.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MsgForwardPrices.kt
@@ -16,40 +16,40 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param lumpPrice 
- * @param bitPrice 
- * @param cellPrice 
- * @param ihrPriceFactor 
- * @param firstFrac 
- * @param nextFrac 
- */
 
+@Serializable
 
 data class MsgForwardPrices (
 
-    @Json(name = "lump_price")
+    @SerialName(value = "lump_price")
     val lumpPrice: kotlin.Long,
 
-    @Json(name = "bit_price")
+    @SerialName(value = "bit_price")
     val bitPrice: kotlin.Long,
 
-    @Json(name = "cell_price")
+    @SerialName(value = "cell_price")
     val cellPrice: kotlin.Long,
 
-    @Json(name = "ihr_price_factor")
+    @SerialName(value = "ihr_price_factor")
     val ihrPriceFactor: kotlin.Long,
 
-    @Json(name = "first_frac")
+    @SerialName(value = "first_frac")
     val firstFrac: kotlin.Long,
 
-    @Json(name = "next_frac")
+    @SerialName(value = "next_frac")
     val nextFrac: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Multisig.kt b/tonapi/src/main/kotlin/io/tonapi/models/Multisig.kt
index 10358bf31..145b698d9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Multisig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Multisig.kt
@@ -17,40 +17,40 @@ package io.tonapi.models
 
 import io.tonapi.models.MultisigOrder
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param seqno 
- * @param threshold 
- * @param signers 
- * @param proposers 
- * @param orders 
- */
 
+@Serializable
 
 data class Multisig (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "seqno")
-    val seqno: kotlin.Long,
+    @SerialName(value = "seqno")
+    val seqno: kotlin.String,
 
-    @Json(name = "threshold")
+    @SerialName(value = "threshold")
     val threshold: kotlin.Int,
 
-    @Json(name = "signers")
+    @SerialName(value = "signers")
     val signers: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "proposers")
+    @SerialName(value = "proposers")
     val proposers: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "orders")
+    @SerialName(value = "orders")
     val orders: kotlin.collections.List<MultisigOrder>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrder.kt b/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrder.kt
index a233af125..85eb8a7a9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrder.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrder.kt
@@ -15,45 +15,61 @@
 
 package io.tonapi.models
 
+import io.tonapi.models.MultisigOrderChangingParameters
+import io.tonapi.models.Risk
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param orderSeqno 
- * @param threshold 
- * @param sentForExecution 
- * @param signers 
- * @param approvalsNum 
- * @param expirationDate 
- */
 
+@Serializable
 
 data class MultisigOrder (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "order_seqno")
-    val orderSeqno: kotlin.Long,
+    @SerialName(value = "order_seqno")
+    val orderSeqno: kotlin.String,
 
-    @Json(name = "threshold")
+    @SerialName(value = "threshold")
     val threshold: kotlin.Int,
 
-    @Json(name = "sent_for_execution")
+    @SerialName(value = "sent_for_execution")
     val sentForExecution: kotlin.Boolean,
 
-    @Json(name = "signers")
+    @SerialName(value = "signers")
     val signers: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "approvals_num")
+    @SerialName(value = "approvals_num")
     val approvalsNum: kotlin.Int,
 
-    @Json(name = "expiration_date")
-    val expirationDate: kotlin.Long
+    @SerialName(value = "expiration_date")
+    val expirationDate: kotlin.Long,
 
-)
+    @SerialName(value = "risk")
+    val risk: Risk,
+
+    @SerialName(value = "creation_date")
+    val creationDate: kotlin.Long,
+
+    @SerialName(value = "signed_by")
+    val signedBy: kotlin.collections.List<kotlin.String>,
+
+    @SerialName(value = "multisig_address")
+    val multisigAddress: kotlin.String,
+
+    @SerialName(value = "changing_parameters")
+    val changingParameters: MultisigOrderChangingParameters? = null
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrderChangingParameters.kt b/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrderChangingParameters.kt
new file mode 100644
index 000000000..dbcc380a0
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/MultisigOrderChangingParameters.kt
@@ -0,0 +1,46 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class MultisigOrderChangingParameters (
+
+    @SerialName(value = "threshold")
+    val threshold: kotlin.Int,
+
+    @SerialName(value = "signers")
+    val signers: kotlin.collections.List<kotlin.String>,
+
+    @SerialName(value = "proposers")
+    val proposers: kotlin.collections.List<kotlin.String>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Multisigs.kt b/tonapi/src/main/kotlin/io/tonapi/models/Multisigs.kt
index 2f699fb57..595848858 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Multisigs.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Multisigs.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.Multisig
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param multisigs 
- */
 
+@Serializable
 
 data class Multisigs (
 
-    @Json(name = "multisigs")
+    @SerialName(value = "multisigs")
     val multisigs: kotlin.collections.List<Multisig>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftCollection.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftCollection.kt
index 53268bfd3..b1133577f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftCollection.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftCollection.kt
@@ -18,43 +18,39 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.ImagePreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param nextItemIndex 
- * @param rawCollectionContent 
- * @param approvedBy 
- * @param owner 
- * @param metadata 
- * @param previews 
- */
 
+@Serializable
 
 data class NftCollection (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "next_item_index")
+    @SerialName(value = "next_item_index")
     val nextItemIndex: kotlin.Long,
 
-    @Json(name = "raw_collection_content")
+    @SerialName(value = "raw_collection_content")
     val rawCollectionContent: kotlin.String,
 
-    @Json(name = "approved_by")
+    @SerialName(value = "approved_by")
     val approvedBy: kotlin.collections.List<NftCollection.ApprovedBy>,
 
-    @Json(name = "owner")
+    @SerialName(value = "owner")
     val owner: AccountAddress? = null,
 
-    @Json(name = "metadata")
-    val metadata: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null,
+    @Contextual @SerialName(value = "metadata")
+    val metadata: kotlin.collections.Map<kotlin.String, io.JsonAny>? = null,
 
-    @Json(name = "previews")
+    @SerialName(value = "previews")
     val previews: kotlin.collections.List<ImagePreview>? = null
 
 ) {
@@ -62,13 +58,28 @@ data class NftCollection (
     /**
      * 
      *
-     * Values: getgems,tonkeeper,tonPeriodDiamonds
+     * Values: getgems,tonkeeper.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = ApprovedBySerializer::class)
     enum class ApprovedBy(val value: kotlin.String) {
-        @Json(name = "getgems") getgems("getgems"),
-        @Json(name = "tonkeeper") tonkeeper("tonkeeper"),
-        @Json(name = "ton.diamonds") tonPeriodDiamonds("ton.diamonds");
+        @SerialName(value = "getgems") getgems("getgems"),
+        @SerialName(value = "tonkeeper") tonkeeper("tonkeeper"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object ApprovedBySerializer : KSerializer<ApprovedBy> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): ApprovedBy {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return ApprovedBy.entries.firstOrNull { it.value == value }
+                ?: ApprovedBy.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: ApprovedBy) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftCollections.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftCollections.kt
index fe107ce57..5f895e91f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftCollections.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftCollections.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.NftCollection
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param nftCollections 
- */
 
+@Serializable
 
 data class NftCollections (
 
-    @Json(name = "nft_collections")
+    @SerialName(value = "nft_collections")
     val nftCollections: kotlin.collections.List<NftCollection>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftItem.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftItem.kt
index 86c57f22d..256e9476c 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftItem.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftItem.kt
@@ -21,77 +21,86 @@ import io.tonapi.models.NftItemCollection
 import io.tonapi.models.Sale
 import io.tonapi.models.TrustType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param index 
- * @param verified 
- * @param metadata 
- * @param approvedBy 
- * @param trust 
- * @param owner 
- * @param collection 
- * @param sale 
- * @param previews 
- * @param dns 
- * @param includeCnft 
- */
 
+@Serializable
 
 data class NftItem (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "index")
+    @SerialName(value = "index")
     val index: kotlin.Long,
 
-    @Json(name = "verified")
+    /* Collection master contract confirmed that this item is part of collection */
+    @SerialName(value = "verified")
     val verified: kotlin.Boolean,
 
-    @Json(name = "metadata")
-    val metadata: kotlin.collections.Map<kotlin.String, kotlin.Any>,
+    @Contextual @SerialName(value = "metadata")
+    val metadata: kotlin.collections.Map<kotlin.String, io.JsonAny>,
 
-    @Json(name = "approved_by")
+    /* Please use trust field */
+    @SerialName(value = "approved_by")
+    @Deprecated(message = "This property is deprecated.")
     val approvedBy: kotlin.collections.List<NftItem.ApprovedBy>,
 
-    @Json(name = "trust")
-    val trust: String,
+    @Contextual @SerialName(value = "trust")
+    val trust: TrustType,
 
-    @Json(name = "owner")
+    @SerialName(value = "owner")
     val owner: AccountAddress? = null,
 
-    @Json(name = "collection")
+    @SerialName(value = "collection")
     val collection: NftItemCollection? = null,
 
-    @Json(name = "sale")
+    @SerialName(value = "sale")
     val sale: Sale? = null,
 
-    @Json(name = "previews")
+    @SerialName(value = "previews")
     val previews: kotlin.collections.List<ImagePreview>? = null,
 
-    @Json(name = "dns")
+    @SerialName(value = "dns")
     val dns: kotlin.String? = null,
 
-    @Json(name = "include_cnft")
+    @SerialName(value = "include_cnft")
     val includeCnft: kotlin.Boolean? = null
 
 ) {
 
     /**
-     * 
+     * Please use trust field
      *
-     * Values: getgems,tonkeeper,tonPeriodDiamonds
+     * Values: getgems,tonkeeper.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = ApprovedBySerializer::class)
     enum class ApprovedBy(val value: kotlin.String) {
-        @Json(name = "getgems") getgems("getgems"),
-        @Json(name = "tonkeeper") tonkeeper("tonkeeper"),
-        @Json(name = "ton.diamonds") tonPeriodDiamonds("ton.diamonds");
+        @SerialName(value = "getgems") getgems("getgems"),
+        @SerialName(value = "tonkeeper") tonkeeper("tonkeeper"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object ApprovedBySerializer : KSerializer<ApprovedBy> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): ApprovedBy {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return ApprovedBy.entries.firstOrNull { it.value == value }
+                ?: ApprovedBy.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: ApprovedBy) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftItemCollection.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftItemCollection.kt
index 27dd5051d..f0b1eabf0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftItemCollection.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftItemCollection.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param name 
- * @param description 
- */
 
+@Serializable
 
 data class NftItemCollection (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "description")
+    @SerialName(value = "description")
     val description: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftItemTransferAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftItemTransferAction.kt
index 6ab481aa4..7b20f8319 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftItemTransferAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftItemTransferAction.kt
@@ -19,45 +19,44 @@ import io.tonapi.models.AccountAddress
 import io.tonapi.models.EncryptedComment
 import io.tonapi.models.Refund
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param nft 
- * @param sender 
- * @param recipient 
- * @param comment 
- * @param encryptedComment 
- * @param payload raw hex encoded payload
- * @param refund 
- */
 
+@Serializable
 
 data class NftItemTransferAction (
 
-    @Json(name = "nft")
+    @SerialName(value = "nft")
     val nft: kotlin.String,
 
-    @Json(name = "sender")
+    @SerialName(value = "sender")
     val sender: AccountAddress? = null,
 
-    @Json(name = "recipient")
+    @SerialName(value = "recipient")
     val recipient: AccountAddress? = null,
 
-    @Json(name = "comment")
+    @SerialName(value = "comment")
     val comment: kotlin.String? = null,
 
-    @Json(name = "encrypted_comment")
+    @SerialName(value = "encrypted_comment")
     val encryptedComment: EncryptedComment? = null,
 
     /* raw hex encoded payload */
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String? = null,
 
-    @Json(name = "refund")
+    @SerialName(value = "refund")
     val refund: Refund? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftItems.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftItems.kt
index fa1caf789..a479f46f3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftItems.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftItems.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.NftItem
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param nftItems 
- */
 
+@Serializable
 
 data class NftItems (
 
-    @Json(name = "nft_items")
+    @SerialName(value = "nft_items")
     val nftItems: kotlin.collections.List<NftItem>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftOperation.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftOperation.kt
new file mode 100644
index 000000000..d65b8cea8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftOperation.kt
@@ -0,0 +1,60 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.NftItem
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class NftOperation (
+
+    @SerialName(value = "operation")
+    val operation: kotlin.String,
+
+    @SerialName(value = "utime")
+    val utime: kotlin.Long,
+
+    @SerialName(value = "lt")
+    val lt: kotlin.Long,
+
+    @SerialName(value = "transaction_hash")
+    val transactionHash: kotlin.String,
+
+    @SerialName(value = "item")
+    val item: NftItem,
+
+    @SerialName(value = "source")
+    val source: AccountAddress? = null,
+
+    @SerialName(value = "destination")
+    val destination: AccountAddress? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftOperations.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftOperations.kt
new file mode 100644
index 000000000..f82976a07
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftOperations.kt
@@ -0,0 +1,44 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.NftOperation
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class NftOperations (
+
+    @SerialName(value = "operations")
+    val operations: kotlin.collections.List<NftOperation>,
+
+    @SerialName(value = "next_from")
+    val nextFrom: kotlin.Long? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/NftPurchaseAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/NftPurchaseAction.kt
index dd6d277b2..fa70e858c 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/NftPurchaseAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/NftPurchaseAction.kt
@@ -19,35 +19,33 @@ import io.tonapi.models.AccountAddress
 import io.tonapi.models.NftItem
 import io.tonapi.models.Price
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param auctionType 
- * @param amount 
- * @param nft 
- * @param seller 
- * @param buyer 
- */
 
+@Serializable
 
 data class NftPurchaseAction (
 
-    @Json(name = "auction_type")
-    val auctionType: String,
+    @SerialName(value = "auction_type")
+    val auctionType: NftPurchaseAction.AuctionType,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: Price,
 
-    @Json(name = "nft")
+    @SerialName(value = "nft")
     val nft: NftItem,
 
-    @Json(name = "seller")
+    @SerialName(value = "seller")
     val seller: AccountAddress,
 
-    @Json(name = "buyer")
+    @SerialName(value = "buyer")
     val buyer: AccountAddress
 
 ) {
@@ -55,14 +53,30 @@ data class NftPurchaseAction (
     /**
      * 
      *
-     * Values: dNSPeriodTon,dNSPeriodTg,nUMBERPeriodTg,getgems
+     * Values: DNSPeriodTon,DNSPeriodTg,NUMBERPeriodTg,getgems.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = AuctionTypeSerializer::class)
     enum class AuctionType(val value: kotlin.String) {
-        @Json(name = "DNS.ton") dNSPeriodTon("DNS.ton"),
-        @Json(name = "DNS.tg") dNSPeriodTg("DNS.tg"),
-        @Json(name = "NUMBER.tg") nUMBERPeriodTg("NUMBER.tg"),
-        @Json(name = "getgems") getgems("getgems");
+        @SerialName(value = "DNS.ton") DNSPeriodTon("DNS.ton"),
+        @SerialName(value = "DNS.tg") DNSPeriodTg("DNS.tg"),
+        @SerialName(value = "NUMBER.tg") NUMBERPeriodTg("NUMBER.tg"),
+        @SerialName(value = "getgems") getgems("getgems"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object AuctionTypeSerializer : KSerializer<AuctionType> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): AuctionType {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return AuctionType.entries.firstOrNull { it.value == value }
+                ?: AuctionType.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: AuctionType) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Oracle.kt b/tonapi/src/main/kotlin/io/tonapi/models/Oracle.kt
index 8f3e817a6..e7c2e5bc5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Oracle.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Oracle.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param secpPubkey 
- */
 
+@Serializable
 
 data class Oracle (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "secp_pubkey")
+    @SerialName(value = "secp_pubkey")
     val secpPubkey: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/OracleBridgeParams.kt b/tonapi/src/main/kotlin/io/tonapi/models/OracleBridgeParams.kt
index 9bd74c80d..36f8e4143 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/OracleBridgeParams.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/OracleBridgeParams.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.Oracle
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param bridgeAddr 
- * @param oracleMultisigAddress 
- * @param externalChainAddress 
- * @param oracles 
- */
 
+@Serializable
 
 data class OracleBridgeParams (
 
-    @Json(name = "bridge_addr")
+    @SerialName(value = "bridge_addr")
     val bridgeAddr: kotlin.String,
 
-    @Json(name = "oracle_multisig_address")
+    @SerialName(value = "oracle_multisig_address")
     val oracleMultisigAddress: kotlin.String,
 
-    @Json(name = "external_chain_address")
+    @SerialName(value = "external_chain_address")
     val externalChainAddress: kotlin.String,
 
-    @Json(name = "oracles")
+    @SerialName(value = "oracles")
     val oracles: kotlin.collections.List<Oracle>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementation.kt b/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementation.kt
index 5c4ef4f6a..8a88877c3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementation.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementation.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param name 
- * @param description 
- * @param url 
- * @param socials 
- */
 
+@Serializable
 
 data class PoolImplementation (
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "description")
+    @SerialName(value = "description")
     val description: kotlin.String,
 
-    @Json(name = "url")
+    @SerialName(value = "url")
     val url: kotlin.String,
 
-    @Json(name = "socials")
+    @SerialName(value = "socials")
     val socials: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementationType.kt b/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementationType.kt
index 47888ed2a..3b9944bb3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementationType.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/PoolImplementationType.kt
@@ -16,26 +16,33 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: whales,tf,liquidTF
+ * Values: whales,tf,liquidTF.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = PoolImplementationTypeSerializer::class)
 enum class PoolImplementationType(val value: kotlin.String) {
 
-    @Json(name = "whales")
+    @SerialName(value = "whales")
     whales("whales"),
 
-    @Json(name = "tf")
+    @SerialName(value = "tf")
     tf("tf"),
 
-    @Json(name = "liquidTF")
-    liquidTF("liquidTF");
+    @SerialName(value = "liquidTF")
+    liquidTF("liquidTF"),
+
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -57,10 +64,24 @@ enum class PoolImplementationType(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): PoolImplementationType? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object PoolImplementationTypeSerializer : KSerializer<PoolImplementationType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): PoolImplementationType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return PoolImplementationType.entries.firstOrNull { it.value == value }
+            ?: PoolImplementationType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: PoolImplementationType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/PoolInfo.kt b/tonapi/src/main/kotlin/io/tonapi/models/PoolInfo.kt
index 8076f611d..60061cd7d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/PoolInfo.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/PoolInfo.kt
@@ -17,85 +17,76 @@ package io.tonapi.models
 
 import io.tonapi.models.PoolImplementationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param name 
- * @param totalAmount 
- * @param implementation 
- * @param apy APY in percent
- * @param minStake 
- * @param cycleStart current nomination cycle beginning timestamp
- * @param cycleEnd current nomination cycle ending timestamp
- * @param verified this pool has verified source code or managed by trusted company
- * @param currentNominators current number of nominators
- * @param maxNominators maximum number of nominators
- * @param nominatorsStake total stake of all nominators
- * @param validatorStake stake of validator
- * @param liquidJettonMaster for liquid staking master account of jetton
- * @param cycleLength 
- */
 
+@Serializable
 
 data class PoolInfo (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "name")
+    @SerialName(value = "name")
     val name: kotlin.String,
 
-    @Json(name = "total_amount")
+    @SerialName(value = "total_amount")
     val totalAmount: kotlin.Long,
 
-    @Json(name = "implementation")
+    @Contextual @SerialName(value = "implementation")
     val implementation: PoolImplementationType,
 
     /* APY in percent */
-    @Json(name = "apy")
-    val apy: java.math.BigDecimal,
+    @SerialName(value = "apy")
+    val apy: kotlin.String,
 
-    @Json(name = "min_stake")
+    @SerialName(value = "min_stake")
     val minStake: kotlin.Long,
 
     /* current nomination cycle beginning timestamp */
-    @Json(name = "cycle_start")
+    @SerialName(value = "cycle_start")
     val cycleStart: kotlin.Long,
 
     /* current nomination cycle ending timestamp */
-    @Json(name = "cycle_end")
+    @SerialName(value = "cycle_end")
     val cycleEnd: kotlin.Long,
 
     /* this pool has verified source code or managed by trusted company */
-    @Json(name = "verified")
+    @SerialName(value = "verified")
     val verified: kotlin.Boolean,
 
     /* current number of nominators */
-    @Json(name = "current_nominators")
+    @SerialName(value = "current_nominators")
     val currentNominators: kotlin.Int,
 
     /* maximum number of nominators */
-    @Json(name = "max_nominators")
+    @SerialName(value = "max_nominators")
     val maxNominators: kotlin.Int,
 
     /* total stake of all nominators */
-    @Json(name = "nominators_stake")
+    @SerialName(value = "nominators_stake")
     val nominatorsStake: kotlin.Long,
 
     /* stake of validator */
-    @Json(name = "validator_stake")
+    @SerialName(value = "validator_stake")
     val validatorStake: kotlin.Long,
 
     /* for liquid staking master account of jetton */
-    @Json(name = "liquid_jetton_master")
+    @SerialName(value = "liquid_jetton_master")
     val liquidJettonMaster: kotlin.String? = null,
 
-    @Json(name = "cycle_length")
+    @SerialName(value = "cycle_length")
     val cycleLength: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Price.kt b/tonapi/src/main/kotlin/io/tonapi/models/Price.kt
index 783004ab9..13e6abff4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Price.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Price.kt
@@ -15,25 +15,46 @@
 
 package io.tonapi.models
 
+import io.tonapi.models.CurrencyType
+import io.tonapi.models.TrustType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param `value` 
- * @param tokenName 
- */
 
+@Serializable
 
 data class Price (
 
-    @Json(name = "value")
+    @Contextual @SerialName(value = "currency_type")
+    val currencyType: CurrencyType,
+
+    @SerialName(value = "value")
     val `value`: kotlin.String,
 
-    @Json(name = "token_name")
-    val tokenName: kotlin.String
+    @SerialName(value = "decimals")
+    val decimals: kotlin.Int,
 
-)
+    @SerialName(value = "token_name")
+    val tokenName: kotlin.String,
+
+    @Contextual @SerialName(value = "verification")
+    val verification: TrustType,
+
+    @SerialName(value = "image")
+    val image: kotlin.String,
+
+    @SerialName(value = "jetton")
+    val jetton: kotlin.String? = null
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Purchase.kt b/tonapi/src/main/kotlin/io/tonapi/models/Purchase.kt
new file mode 100644
index 000000000..c6257eaf8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Purchase.kt
@@ -0,0 +1,64 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.Metadata
+import io.tonapi.models.Price
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Purchase (
+
+    @SerialName(value = "event_id")
+    val eventId: kotlin.String,
+
+    @SerialName(value = "invoice_id")
+    val invoiceId: kotlin.String,
+
+    @SerialName(value = "source")
+    val source: AccountAddress,
+
+    @SerialName(value = "destination")
+    val destination: AccountAddress,
+
+    @SerialName(value = "lt")
+    val lt: kotlin.Long,
+
+    @SerialName(value = "utime")
+    val utime: kotlin.Long,
+
+    @SerialName(value = "amount")
+    val amount: Price,
+
+    @SerialName(value = "metadata")
+    val metadata: Metadata
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/PurchaseAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/PurchaseAction.kt
new file mode 100644
index 000000000..838841531
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/PurchaseAction.kt
@@ -0,0 +1,55 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.Metadata
+import io.tonapi.models.Price
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class PurchaseAction (
+
+    @SerialName(value = "source")
+    val source: AccountAddress,
+
+    @SerialName(value = "destination")
+    val destination: AccountAddress,
+
+    @SerialName(value = "invoice_id")
+    val invoiceId: kotlin.String,
+
+    @SerialName(value = "amount")
+    val amount: Price,
+
+    @SerialName(value = "metadata")
+    val metadata: Metadata
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/RawBlockchainConfig.kt b/tonapi/src/main/kotlin/io/tonapi/models/RawBlockchainConfig.kt
index 719b915fc..5cabc22c4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/RawBlockchainConfig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/RawBlockchainConfig.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param config 
- */
 
+@Serializable
 
 data class RawBlockchainConfig (
 
-    @Json(name = "config")
-    val config: kotlin.collections.Map<kotlin.String, kotlin.Any>
+    @Contextual @SerialName(value = "config")
+    val config: kotlin.collections.Map<kotlin.String, io.JsonAny>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlock.kt b/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlock.kt
index 97e5ddbb3..ee8f7c17a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlock.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlock.kt
@@ -16,48 +16,46 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param workchainId 
- * @param shard 
- * @param seqno 
- * @param txQuantity 
- * @param utime 
- * @param shardsBlocks 
- * @param parent 
- * @param masterRef 
- */
 
+@Serializable
 
 data class ReducedBlock (
 
-    @Json(name = "workchain_id")
+    @SerialName(value = "workchain_id")
     val workchainId: kotlin.Int,
 
-    @Json(name = "shard")
+    @SerialName(value = "shard")
     val shard: kotlin.String,
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Int,
 
-    @Json(name = "tx_quantity")
+    @SerialName(value = "tx_quantity")
     val txQuantity: kotlin.Int,
 
-    @Json(name = "utime")
+    @SerialName(value = "utime")
     val utime: kotlin.Long,
 
-    @Json(name = "shards_blocks")
+    @SerialName(value = "shards_blocks")
     val shardsBlocks: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "parent")
+    @SerialName(value = "parent")
     val parent: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "master_ref")
+    @SerialName(value = "master_ref")
     val masterRef: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlocks.kt b/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlocks.kt
index 196407968..2fd93787f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlocks.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ReducedBlocks.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.ReducedBlock
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param blocks 
- */
 
+@Serializable
 
 data class ReducedBlocks (
 
-    @Json(name = "blocks")
+    @SerialName(value = "blocks")
     val blocks: kotlin.collections.List<ReducedBlock>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Refund.kt b/tonapi/src/main/kotlin/io/tonapi/models/Refund.kt
index 82ac510f6..a8ee0fcfc 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Refund.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Refund.kt
@@ -16,23 +16,24 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param type 
- * @param origin 
- */
 
+@Serializable
 
 data class Refund (
 
-    @Json(name = "type")
-    val type: String,
+    @SerialName(value = "type")
+    val type: Refund.Type,
 
-    @Json(name = "origin")
+    @SerialName(value = "origin")
     val origin: kotlin.String
 
 ) {
@@ -40,13 +41,29 @@ data class Refund (
     /**
      * 
      *
-     * Values: dNSPeriodTon,dNSPeriodTg,getGems
+     * Values: DNSPeriodTon,DNSPeriodTg,GetGems.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = TypeSerializer::class)
     enum class Type(val value: kotlin.String) {
-        @Json(name = "DNS.ton") dNSPeriodTon("DNS.ton"),
-        @Json(name = "DNS.tg") dNSPeriodTg("DNS.tg"),
-        @Json(name = "GetGems") getGems("GetGems");
+        @SerialName(value = "DNS.ton") DNSPeriodTon("DNS.ton"),
+        @SerialName(value = "DNS.tg") DNSPeriodTg("DNS.tg"),
+        @SerialName(value = "GetGems") GetGems("GetGems"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object TypeSerializer : KSerializer<Type> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Type {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Type.entries.firstOrNull { it.value == value }
+                ?: Type.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Type) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Risk.kt b/tonapi/src/main/kotlin/io/tonapi/models/Risk.kt
index d89625943..103f07d44 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Risk.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Risk.kt
@@ -18,33 +18,35 @@ package io.tonapi.models
 import io.tonapi.models.JettonQuantity
 import io.tonapi.models.NftItem
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * Risk specifies assets that could be lost if a message would be sent to a malicious smart contract. It makes sense to understand the risk BEFORE sending a message to the blockchain.
- *
- * @param transferAllRemainingBalance transfer all the remaining balance of the wallet.
- * @param ton 
- * @param jettons 
- * @param nfts 
- */
 
+@Serializable
 
 data class Risk (
 
     /* transfer all the remaining balance of the wallet. */
-    @Json(name = "transfer_all_remaining_balance")
+    @SerialName(value = "transfer_all_remaining_balance")
     val transferAllRemainingBalance: kotlin.Boolean,
 
-    @Json(name = "ton")
+    @SerialName(value = "ton")
     val ton: kotlin.Long,
 
-    @Json(name = "jettons")
+    @SerialName(value = "jettons")
     val jettons: kotlin.collections.List<JettonQuantity>,
 
-    @Json(name = "nfts")
+    @SerialName(value = "nfts")
     val nfts: kotlin.collections.List<NftItem>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Sale.kt b/tonapi/src/main/kotlin/io/tonapi/models/Sale.kt
index 4ea10f16a..8d00866a9 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Sale.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Sale.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.Price
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param market 
- * @param price 
- * @param owner 
- */
 
+@Serializable
 
 data class Sale (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "market")
+    @SerialName(value = "market")
     val market: AccountAddress,
 
-    @Json(name = "price")
+    @SerialName(value = "price")
     val price: Price,
 
-    @Json(name = "owner")
+    @SerialName(value = "owner")
     val owner: AccountAddress? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SendBlockchainMessageRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/SendBlockchainMessageRequest.kt
index 458e5526c..d715bec36 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SendBlockchainMessageRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SendBlockchainMessageRequest.kt
@@ -16,36 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param boc 
- * @param batch 
- */
 
+@Serializable
 
 data class SendBlockchainMessageRequest (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String? = null,
 
-    @Json(name = "batch")
+    @SerialName(value = "batch")
     val batch: kotlin.collections.List<kotlin.String>? = null,
 
-    @Json(name = "message")
-    val version: kotlin.String? = null,
+    @SerialName(value = "meta")
+    val meta: kotlin.collections.Map<kotlin.String, kotlin.String>? = null
 
-    @Json(name = "platform")
-    val platform: kotlin.String? = null,
+) {
 
-    @Json(name = "source")
-    val source: kotlin.String? = null,
 
-    @Json(name = "confirmation_time")
-    val confirmationTime: kotlin.Double? = null
-
-)
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessage200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessage200Response.kt
index 8cac622d8..ecde92c1a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessage200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessage200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param code 
- */
 
+@Serializable
 
 data class SendRawMessage200Response (
 
-    @Json(name = "code")
+    @SerialName(value = "code")
     val code: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessageRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessageRequest.kt
index 8a3aed2a0..8ab92f6a2 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessageRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SendRawMessageRequest.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param body 
- */
 
+@Serializable
 
 data class SendRawMessageRequest (
 
-    @Json(name = "body")
+    @SerialName(value = "body")
     val body: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Seqno.kt b/tonapi/src/main/kotlin/io/tonapi/models/Seqno.kt
index de3388eaa..d6f1c770d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Seqno.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Seqno.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param seqno 
- */
 
+@Serializable
 
 data class Seqno (
 
-    @Json(name = "seqno")
+    @SerialName(value = "seqno")
     val seqno: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ServiceStatus.kt b/tonapi/src/main/kotlin/io/tonapi/models/ServiceStatus.kt
index 2cdfba20a..b837a0094 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ServiceStatus.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ServiceStatus.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param restOnline 
- * @param indexingLatency 
- * @param lastKnownMasterchainSeqno 
- */
 
+@Serializable
 
 data class ServiceStatus (
 
-    @Json(name = "rest_online")
+    @SerialName(value = "rest_online")
     val restOnline: kotlin.Boolean = true,
 
-    @Json(name = "indexing_latency")
+    @SerialName(value = "indexing_latency")
     val indexingLatency: kotlin.Int,
 
-    @Json(name = "last_known_masterchain_seqno")
+    @SerialName(value = "last_known_masterchain_seqno")
     val lastKnownMasterchainSeqno: kotlin.Int
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SignRawMessage.kt b/tonapi/src/main/kotlin/io/tonapi/models/SignRawMessage.kt
index 8c9e7f812..5c291ced5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SignRawMessage.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SignRawMessage.kt
@@ -16,35 +16,37 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param amount Number of nanocoins to send. Decimal string.
- * @param payload Raw one-cell BoC encoded in hex.
- * @param stateInit Raw once-cell BoC encoded in hex.
- */
 
+@Serializable
 
 data class SignRawMessage (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
     /* Number of nanocoins to send. Decimal string. */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.String,
 
     /* Raw one-cell BoC encoded in hex. */
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String? = null,
 
     /* Raw once-cell BoC encoded in hex. */
-    @Json(name = "stateInit")
+    @SerialName(value = "stateInit")
     val stateInit: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SignRawParams.kt b/tonapi/src/main/kotlin/io/tonapi/models/SignRawParams.kt
index e79beed6c..7b8ed5fd2 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SignRawParams.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SignRawParams.kt
@@ -15,39 +15,47 @@
 
 package io.tonapi.models
 
+import io.tonapi.models.MessageConsequences
 import io.tonapi.models.SignRawMessage
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param relayAddress 
- * @param commission Commission for the transaction. In nanocoins.
- * @param from 
- * @param validUntil 
- * @param messages 
- */
 
+@Serializable
 
 data class SignRawParams (
 
-    @Json(name = "relay_address")
+    @SerialName(value = "protocol_name")
+    val protocolName: kotlin.String,
+
+    @SerialName(value = "relay_address")
     val relayAddress: kotlin.String,
 
     /* Commission for the transaction. In nanocoins. */
-    @Json(name = "commission")
+    @SerialName(value = "commission")
     val commission: kotlin.String,
 
-    @Json(name = "from")
+    @SerialName(value = "from")
     val from: kotlin.String,
 
-    @Json(name = "valid_until")
+    @SerialName(value = "valid_until")
     val validUntil: kotlin.Long,
 
-    @Json(name = "messages")
-    val messages: kotlin.collections.List<SignRawMessage>
+    @SerialName(value = "messages")
+    val messages: kotlin.collections.List<SignRawMessage>,
 
-)
+    @SerialName(value = "emulation")
+    val emulation: MessageConsequences? = null
+
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SizeLimitsConfig.kt b/tonapi/src/main/kotlin/io/tonapi/models/SizeLimitsConfig.kt
index e647f49c7..f8811aeeb 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SizeLimitsConfig.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SizeLimitsConfig.kt
@@ -16,48 +16,46 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param maxMsgBits 
- * @param maxMsgCells 
- * @param maxLibraryCells 
- * @param maxVmDataDepth 
- * @param maxExtMsgSize 
- * @param maxExtMsgDepth 
- * @param maxAccStateCells 
- * @param maxAccStateBits 
- */
 
+@Serializable
 
 data class SizeLimitsConfig (
 
-    @Json(name = "max_msg_bits")
+    @SerialName(value = "max_msg_bits")
     val maxMsgBits: kotlin.Long,
 
-    @Json(name = "max_msg_cells")
+    @SerialName(value = "max_msg_cells")
     val maxMsgCells: kotlin.Long,
 
-    @Json(name = "max_library_cells")
+    @SerialName(value = "max_library_cells")
     val maxLibraryCells: kotlin.Long,
 
-    @Json(name = "max_vm_data_depth")
+    @SerialName(value = "max_vm_data_depth")
     val maxVmDataDepth: kotlin.Int,
 
-    @Json(name = "max_ext_msg_size")
+    @SerialName(value = "max_ext_msg_size")
     val maxExtMsgSize: kotlin.Long,
 
-    @Json(name = "max_ext_msg_depth")
+    @SerialName(value = "max_ext_msg_depth")
     val maxExtMsgDepth: kotlin.Int,
 
-    @Json(name = "max_acc_state_cells")
+    @SerialName(value = "max_acc_state_cells")
     val maxAccStateCells: kotlin.Long? = null,
 
-    @Json(name = "max_acc_state_bits")
+    @SerialName(value = "max_acc_state_bits")
     val maxAccStateBits: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SmartContractAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/SmartContractAction.kt
index 9f1e30bc6..a87522cb0 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SmartContractAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SmartContractAction.kt
@@ -18,41 +18,41 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.Refund
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param executor 
- * @param `contract` 
- * @param tonAttached amount in nanotons
- * @param operation 
- * @param payload 
- * @param refund 
- */
 
+@Serializable
 
 data class SmartContractAction (
 
-    @Json(name = "executor")
+    @SerialName(value = "executor")
     val executor: AccountAddress,
 
-    @Json(name = "contract")
+    @SerialName(value = "contract")
     val `contract`: AccountAddress,
 
     /* amount in nanotons */
-    @Json(name = "ton_attached")
+    @SerialName(value = "ton_attached")
     val tonAttached: kotlin.Long,
 
-    @Json(name = "operation")
+    @SerialName(value = "operation")
     val operation: kotlin.String,
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String? = null,
 
-    @Json(name = "refund")
+    @SerialName(value = "refund")
     val refund: Refund? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Source.kt b/tonapi/src/main/kotlin/io/tonapi/models/Source.kt
new file mode 100644
index 000000000..4fbff0374
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Source.kt
@@ -0,0 +1,41 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.SourceFile
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Source (
+
+    @SerialName(value = "files")
+    val files: kotlin.collections.List<SourceFile>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SourceFile.kt b/tonapi/src/main/kotlin/io/tonapi/models/SourceFile.kt
new file mode 100644
index 000000000..f47f15108
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SourceFile.kt
@@ -0,0 +1,52 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class SourceFile (
+
+    @SerialName(value = "name")
+    val name: kotlin.String,
+
+    @SerialName(value = "content")
+    val content: kotlin.String,
+
+    @SerialName(value = "is_entrypoint")
+    val isEntrypoint: kotlin.Boolean,
+
+    @SerialName(value = "is_std_lib")
+    val isStdLib: kotlin.Boolean,
+
+    @SerialName(value = "include_in_command")
+    val includeInCommand: kotlin.Boolean
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt b/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
index 6ee498353..a827b4e91 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param boc 
- * @param interfaces 
- */
 
+@Serializable
 
 data class StateInit (
 
-    @Json(name = "boc")
+    @SerialName(value = "boc")
     val boc: kotlin.String,
 
-    @Json(name = "interfaces")
-    val interfaces: kotlin.collections.List<kotlin.String>? = null
+    @SerialName(value = "interfaces")
+    val interfaces: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/StatusDefaultResponse.kt b/tonapi/src/main/kotlin/io/tonapi/models/StatusDefaultResponse.kt
deleted file mode 100644
index c580b11d5..000000000
--- a/tonapi/src/main/kotlin/io/tonapi/models/StatusDefaultResponse.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- * Please note:
- * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * Do not edit this file manually.
- *
- */
-
-@file:Suppress(
-    "ArrayInDataClass",
-    "EnumEntryName",
-    "RemoveRedundantQualifierName",
-    "UnusedImport"
-)
-
-package io.tonapi.models
-
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * 
- *
- * @param error 
- */
-
-
-data class StatusDefaultResponse (
-
-    @Json(name = "error")
-    val error: kotlin.String
-
-)
-
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/StoragePhase.kt b/tonapi/src/main/kotlin/io/tonapi/models/StoragePhase.kt
index bf55dec9e..8aa730a9e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/StoragePhase.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/StoragePhase.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.AccStatusChange
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param feesCollected 
- * @param statusChange 
- * @param feesDue 
- */
 
+@Serializable
 
 data class StoragePhase (
 
-    @Json(name = "fees_collected")
+    @SerialName(value = "fees_collected")
     val feesCollected: kotlin.Long,
 
-    @Json(name = "status_change")
+    @Contextual @SerialName(value = "status_change")
     val statusChange: AccStatusChange,
 
-    @Json(name = "fees_due")
+    @SerialName(value = "fees_due")
     val feesDue: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/StorageProvider.kt b/tonapi/src/main/kotlin/io/tonapi/models/StorageProvider.kt
index 5980e28cd..adb38ead3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/StorageProvider.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/StorageProvider.kt
@@ -16,40 +16,40 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param acceptNewContracts 
- * @param ratePerMbDay 
- * @param maxSpan 
- * @param minimalFileSize 
- * @param maximalFileSize 
- */
 
+@Serializable
 
 data class StorageProvider (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "accept_new_contracts")
+    @SerialName(value = "accept_new_contracts")
     val acceptNewContracts: kotlin.Boolean,
 
-    @Json(name = "rate_per_mb_day")
+    @SerialName(value = "rate_per_mb_day")
     val ratePerMbDay: kotlin.Long,
 
-    @Json(name = "max_span")
+    @SerialName(value = "max_span")
     val maxSpan: kotlin.Long,
 
-    @Json(name = "minimal_file_size")
+    @SerialName(value = "minimal_file_size")
     val minimalFileSize: kotlin.Long,
 
-    @Json(name = "maximal_file_size")
+    @SerialName(value = "maximal_file_size")
     val maximalFileSize: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Subscription.kt b/tonapi/src/main/kotlin/io/tonapi/models/Subscription.kt
index 4aa859be5..4ecf53d93 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Subscription.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Subscription.kt
@@ -15,61 +15,86 @@
 
 package io.tonapi.models
 
+import io.tonapi.models.AccountAddress
+import io.tonapi.models.Metadata
+import io.tonapi.models.Price
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param walletAddress 
- * @param beneficiaryAddress 
- * @param amount 
- * @param period 
- * @param startTime 
- * @param timeout 
- * @param lastPaymentTime 
- * @param lastRequestTime 
- * @param subscriptionId 
- * @param failedAttempts 
- */
 
+@Serializable
 
 data class Subscription (
 
-    @Json(name = "address")
-    val address: kotlin.String,
+    /* type of subscription */
+    @SerialName(value = "type")
+    val type: kotlin.String,
 
-    @Json(name = "wallet_address")
-    val walletAddress: kotlin.String,
+    @SerialName(value = "status")
+    val status: Subscription.Status,
 
-    @Json(name = "beneficiary_address")
-    val beneficiaryAddress: kotlin.String,
+    /* payment period in seconds */
+    @SerialName(value = "period")
+    val period: kotlin.Long,
 
-    @Json(name = "amount")
-    val amount: kotlin.Long,
+    /* common identifier */
+    @SerialName(value = "subscription_id")
+    val subscriptionId: kotlin.String,
 
-    @Json(name = "period")
-    val period: kotlin.Long,
+    @SerialName(value = "payment_per_period")
+    val paymentPerPeriod: Price,
 
-    @Json(name = "start_time")
-    val startTime: kotlin.Long,
+    @SerialName(value = "wallet")
+    val wallet: AccountAddress,
 
-    @Json(name = "timeout")
-    val timeout: kotlin.Long,
+    @SerialName(value = "next_charge_at")
+    val nextChargeAt: kotlin.Long,
 
-    @Json(name = "last_payment_time")
-    val lastPaymentTime: kotlin.Long,
+    @SerialName(value = "metadata")
+    val metadata: Metadata,
 
-    @Json(name = "last_request_time")
-    val lastRequestTime: kotlin.Long,
+    @SerialName(value = "address")
+    val address: kotlin.String? = null,
 
-    @Json(name = "subscription_id")
-    val subscriptionId: kotlin.Long,
+    @SerialName(value = "beneficiary")
+    val beneficiary: AccountAddress? = null
 
-    @Json(name = "failed_attempts")
-    val failedAttempts: kotlin.Int
+) {
 
-)
+    /**
+     * 
+     *
+     * Values: not_ready,active,suspended,cancelled.unknown
+     */
+    @Serializable(with = StatusSerializer::class)
+    enum class Status(val value: kotlin.String) {
+        @SerialName(value = "not_ready") not_ready("not_ready"),
+        @SerialName(value = "active") active("active"),
+        @SerialName(value = "suspended") suspended("suspended"),
+        @SerialName(value = "cancelled") cancelled("cancelled"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object StatusSerializer : KSerializer<Status> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Status {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Status.entries.firstOrNull { it.value == value }
+                ?: Status.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Status) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
+    }
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/SubscriptionAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/SubscriptionAction.kt
index c73bfff50..bfa5f05e6 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/SubscriptionAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/SubscriptionAction.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subscriber 
- * @param subscription 
- * @param beneficiary 
- * @param amount 
- * @param initial 
- */
 
+@Serializable
 
 data class SubscriptionAction (
 
-    @Json(name = "subscriber")
+    @SerialName(value = "subscriber")
     val subscriber: AccountAddress,
 
-    @Json(name = "subscription")
+    @SerialName(value = "subscription")
     val subscription: kotlin.String,
 
-    @Json(name = "beneficiary")
+    @SerialName(value = "beneficiary")
     val beneficiary: AccountAddress,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "initial")
+    @SerialName(value = "initial")
     val initial: kotlin.Boolean
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Subscriptions.kt b/tonapi/src/main/kotlin/io/tonapi/models/Subscriptions.kt
index 000986bac..daa9e1d19 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Subscriptions.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Subscriptions.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.Subscription
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subscriptions 
- */
 
+@Serializable
 
 data class Subscriptions (
 
-    @Json(name = "subscriptions")
+    @SerialName(value = "subscriptions")
     val subscriptions: kotlin.collections.List<Subscription>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TokenRates.kt b/tonapi/src/main/kotlin/io/tonapi/models/TokenRates.kt
index f7c1e449b..015fc45ed 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TokenRates.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TokenRates.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param prices 
- * @param diff24h 
- * @param diff7d 
- * @param diff30d 
- */
 
+@Serializable
 
 data class TokenRates (
 
-    @Json(name = "prices")
-    val prices: kotlin.collections.Map<kotlin.String, java.math.BigDecimal>? = null,
+    @SerialName(value = "prices")
+    val prices: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
 
-    @Json(name = "diff_24h")
+    @SerialName(value = "diff_24h")
     val diff24h: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
 
-    @Json(name = "diff_7d")
+    @SerialName(value = "diff_7d")
     val diff7d: kotlin.collections.Map<kotlin.String, kotlin.String>? = null,
 
-    @Json(name = "diff_30d")
+    @SerialName(value = "diff_30d")
     val diff30d: kotlin.collections.Map<kotlin.String, kotlin.String>? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProof200Response.kt b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProof200Response.kt
index 3bd2fe8b9..20c7e504f 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProof200Response.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProof200Response.kt
@@ -16,20 +16,25 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param token 
- */
 
+@Serializable
 
 data class TonConnectProof200Response (
 
-    @Json(name = "token")
+    @SerialName(value = "token")
     val token: kotlin.String
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequest.kt b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequest.kt
index c8343756c..5cbaddfe5 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequest.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequest.kt
@@ -17,24 +17,28 @@ package io.tonapi.models
 
 import io.tonapi.models.TonConnectProofRequestProof
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param proof 
- */
 
+@Serializable
 
 data class TonConnectProofRequest (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "proof")
+    @SerialName(value = "proof")
     val proof: TonConnectProofRequestProof
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProof.kt b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProof.kt
index ecc7e092c..d11ea587b 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProof.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProof.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.TonConnectProofRequestProofDomain
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param timestamp 
- * @param domain 
- * @param signature 
- * @param payload 
- * @param stateInit 
- */
 
+@Serializable
 
 data class TonConnectProofRequestProof (
 
-    @Json(name = "timestamp")
+    @SerialName(value = "timestamp")
     val timestamp: kotlin.Long,
 
-    @Json(name = "domain")
+    @SerialName(value = "domain")
     val domain: TonConnectProofRequestProofDomain,
 
-    @Json(name = "signature")
+    @SerialName(value = "signature")
     val signature: kotlin.String,
 
-    @Json(name = "payload")
+    @SerialName(value = "payload")
     val payload: kotlin.String,
 
-    @Json(name = "state_init")
+    @SerialName(value = "state_init")
     val stateInit: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProofDomain.kt b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProofDomain.kt
index 492d9f719..1c8570f99 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProofDomain.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TonConnectProofRequestProofDomain.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param `value` 
- * @param lengthBytes 
- */
 
+@Serializable
 
 data class TonConnectProofRequestProofDomain (
 
-    @Json(name = "value")
+    @SerialName(value = "value")
     val `value`: kotlin.String,
 
-    @Json(name = "length_bytes")
+    @SerialName(value = "length_bytes")
     val lengthBytes: kotlin.Int? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TonTransferAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/TonTransferAction.kt
index 429b4a44b..5a9b58129 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TonTransferAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TonTransferAction.kt
@@ -19,41 +19,41 @@ import io.tonapi.models.AccountAddress
 import io.tonapi.models.EncryptedComment
 import io.tonapi.models.Refund
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param sender 
- * @param recipient 
- * @param amount amount in nanotons
- * @param comment 
- * @param encryptedComment 
- * @param refund 
- */
 
+@Serializable
 
 data class TonTransferAction (
 
-    @Json(name = "sender")
+    @SerialName(value = "sender")
     val sender: AccountAddress,
 
-    @Json(name = "recipient")
+    @SerialName(value = "recipient")
     val recipient: AccountAddress,
 
     /* amount in nanotons */
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "comment")
+    @SerialName(value = "comment")
     val comment: kotlin.String? = null,
 
-    @Json(name = "encrypted_comment")
+    @SerialName(value = "encrypted_comment")
     val encryptedComment: EncryptedComment? = null,
 
-    @Json(name = "refund")
+    @SerialName(value = "refund")
     val refund: Refund? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Trace.kt b/tonapi/src/main/kotlin/io/tonapi/models/Trace.kt
index 44013185b..3bca822c3 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Trace.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Trace.kt
@@ -17,32 +17,34 @@ package io.tonapi.models
 
 import io.tonapi.models.Transaction
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param transaction 
- * @param interfaces 
- * @param children 
- * @param emulated 
- */
 
+@Serializable
 
 data class Trace (
 
-    @Json(name = "transaction")
+    @SerialName(value = "transaction")
     val transaction: Transaction,
 
-    @Json(name = "interfaces")
+    @SerialName(value = "interfaces")
     val interfaces: kotlin.collections.List<kotlin.String>,
 
-    @Json(name = "children")
+    @SerialName(value = "children")
     val children: kotlin.collections.List<Trace>? = null,
 
-    @Json(name = "emulated")
+    @SerialName(value = "emulated")
     val emulated: kotlin.Boolean? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TraceID.kt b/tonapi/src/main/kotlin/io/tonapi/models/TraceID.kt
index d4a6709ca..733fdd329 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TraceID.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TraceID.kt
@@ -16,24 +16,28 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param id 
- * @param utime 
- */
 
+@Serializable
 
 data class TraceID (
 
-    @Json(name = "id")
+    @SerialName(value = "id")
     val id: kotlin.String,
 
-    @Json(name = "utime")
+    @SerialName(value = "utime")
     val utime: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TraceIDs.kt b/tonapi/src/main/kotlin/io/tonapi/models/TraceIDs.kt
index 74d984256..0dfac6f57 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TraceIDs.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TraceIDs.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.TraceID
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param traces 
- */
 
+@Serializable
 
 data class TraceIDs (
 
-    @Json(name = "traces")
+    @SerialName(value = "traces")
     val traces: kotlin.collections.List<TraceID>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt b/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
index 710dde387..0ba1f6d79 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
@@ -25,117 +25,98 @@ import io.tonapi.models.Message
 import io.tonapi.models.StoragePhase
 import io.tonapi.models.TransactionType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param hash 
- * @param lt 
- * @param account 
- * @param success 
- * @param utime 
- * @param origStatus 
- * @param endStatus 
- * @param totalFees 
- * @param endBalance 
- * @param transactionType 
- * @param stateUpdateOld 
- * @param stateUpdateNew 
- * @param outMsgs 
- * @param block 
- * @param aborted 
- * @param destroyed 
- * @param raw hex encoded boc with raw transaction
- * @param inMsg 
- * @param prevTransHash 
- * @param prevTransLt 
- * @param computePhase 
- * @param storagePhase 
- * @param creditPhase 
- * @param actionPhase 
- * @param bouncePhase 
- */
 
+@Serializable
 
 data class Transaction (
 
-    @Json(name = "hash")
-    val hash: kotlin.String? = null,
+    @SerialName(value = "hash")
+    val hash: kotlin.String,
 
-    @Json(name = "lt")
+    @SerialName(value = "lt")
     val lt: kotlin.Long,
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: AccountAddress,
 
-    @Json(name = "success")
+    @SerialName(value = "success")
     val success: kotlin.Boolean,
 
-    @Json(name = "utime")
+    @SerialName(value = "utime")
     val utime: kotlin.Long,
 
-    @Json(name = "orig_status")
+    @Contextual @SerialName(value = "orig_status")
     val origStatus: AccountStatus,
 
-    @Json(name = "end_status")
+    @Contextual @SerialName(value = "end_status")
     val endStatus: AccountStatus,
 
-    @Json(name = "total_fees")
+    @SerialName(value = "total_fees")
     val totalFees: kotlin.Long,
 
-    @Json(name = "end_balance")
+    @SerialName(value = "end_balance")
     val endBalance: kotlin.Long,
 
-    @Json(name = "transaction_type")
+    @Contextual @SerialName(value = "transaction_type")
     val transactionType: TransactionType,
 
-    @Json(name = "state_update_old")
+    @SerialName(value = "state_update_old")
     val stateUpdateOld: kotlin.String,
 
-    @Json(name = "state_update_new")
+    @SerialName(value = "state_update_new")
     val stateUpdateNew: kotlin.String,
 
-    @Json(name = "out_msgs")
+    @SerialName(value = "out_msgs")
     val outMsgs: kotlin.collections.List<Message>,
 
-    @Json(name = "block")
+    @SerialName(value = "block")
     val block: kotlin.String,
 
-    @Json(name = "aborted")
+    @SerialName(value = "aborted")
     val aborted: kotlin.Boolean,
 
-    @Json(name = "destroyed")
+    @SerialName(value = "destroyed")
     val destroyed: kotlin.Boolean,
 
     /* hex encoded boc with raw transaction */
-    @Json(name = "raw")
-    val raw: kotlin.String? = null,
+    @SerialName(value = "raw")
+    val raw: kotlin.String,
 
-    @Json(name = "in_msg")
+    @SerialName(value = "in_msg")
     val inMsg: Message? = null,
 
-    @Json(name = "prev_trans_hash")
+    @SerialName(value = "prev_trans_hash")
     val prevTransHash: kotlin.String? = null,
 
-    @Json(name = "prev_trans_lt")
+    @SerialName(value = "prev_trans_lt")
     val prevTransLt: kotlin.Long? = null,
 
-    @Json(name = "compute_phase")
+    @SerialName(value = "compute_phase")
     val computePhase: ComputePhase? = null,
 
-    @Json(name = "storage_phase")
+    @SerialName(value = "storage_phase")
     val storagePhase: StoragePhase? = null,
 
-    @Json(name = "credit_phase")
+    @SerialName(value = "credit_phase")
     val creditPhase: CreditPhase? = null,
 
-    @Json(name = "action_phase")
+    @SerialName(value = "action_phase")
     val actionPhase: ActionPhase? = null,
 
-    @Json(name = "bounce_phase")
+    @Contextual @SerialName(value = "bounce_phase")
     val bouncePhase: BouncePhaseType? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TransactionType.kt b/tonapi/src/main/kotlin/io/tonapi/models/TransactionType.kt
index f9ed7da4d..462f9694a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TransactionType.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TransactionType.kt
@@ -16,38 +16,45 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: transOrd,transTickTock,transSplitPrepare,transSplitInstall,transMergePrepare,transMergeInstall,transStorage
+ * Values: TransOrd,TransTickTock,TransSplitPrepare,TransSplitInstall,TransMergePrepare,TransMergeInstall,TransStorage.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = TransactionTypeSerializer::class)
 enum class TransactionType(val value: kotlin.String) {
 
-    @Json(name = "TransOrd")
-    transOrd("TransOrd"),
+    @SerialName(value = "TransOrd")
+    TransOrd("TransOrd"),
+
+    @SerialName(value = "TransTickTock")
+    TransTickTock("TransTickTock"),
 
-    @Json(name = "TransTickTock")
-    transTickTock("TransTickTock"),
+    @SerialName(value = "TransSplitPrepare")
+    TransSplitPrepare("TransSplitPrepare"),
 
-    @Json(name = "TransSplitPrepare")
-    transSplitPrepare("TransSplitPrepare"),
+    @SerialName(value = "TransSplitInstall")
+    TransSplitInstall("TransSplitInstall"),
 
-    @Json(name = "TransSplitInstall")
-    transSplitInstall("TransSplitInstall"),
+    @SerialName(value = "TransMergePrepare")
+    TransMergePrepare("TransMergePrepare"),
 
-    @Json(name = "TransMergePrepare")
-    transMergePrepare("TransMergePrepare"),
+    @SerialName(value = "TransMergeInstall")
+    TransMergeInstall("TransMergeInstall"),
 
-    @Json(name = "TransMergeInstall")
-    transMergeInstall("TransMergeInstall"),
+    @SerialName(value = "TransStorage")
+    TransStorage("TransStorage"),
 
-    @Json(name = "TransStorage")
-    transStorage("TransStorage");
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -69,10 +76,24 @@ enum class TransactionType(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): TransactionType? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object TransactionTypeSerializer : KSerializer<TransactionType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): TransactionType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return TransactionType.entries.firstOrNull { it.value == value }
+            ?: TransactionType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: TransactionType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Transactions.kt b/tonapi/src/main/kotlin/io/tonapi/models/Transactions.kt
index 642dcd2ba..2d1011e2e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Transactions.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Transactions.kt
@@ -17,20 +17,25 @@ package io.tonapi.models
 
 import io.tonapi.models.Transaction
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param transactions 
- */
 
+@Serializable
 
 data class Transactions (
 
-    @Json(name = "transactions")
+    @SerialName(value = "transactions")
     val transactions: kotlin.collections.List<Transaction>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TrustType.kt b/tonapi/src/main/kotlin/io/tonapi/models/TrustType.kt
index d93695bb6..47600bc8e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TrustType.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TrustType.kt
@@ -16,29 +16,36 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * 
  *
- * Values: whitelist,graylist,blacklist,none
+ * Values: whitelist,graylist,blacklist,none.unknown
  */
-
-@JsonClass(generateAdapter = false)
+@Serializable(with = TrustTypeSerializer::class)
 enum class TrustType(val value: kotlin.String) {
 
-    @Json(name = "whitelist")
+    @SerialName(value = "whitelist")
     whitelist("whitelist"),
 
-    @Json(name = "graylist")
+    @SerialName(value = "graylist")
     graylist("graylist"),
 
-    @Json(name = "blacklist")
+    @SerialName(value = "blacklist")
     blacklist("blacklist"),
 
-    @Json(name = "none")
-    none("none");
+    @SerialName(value = "none")
+    none("none"),
+
+    @SerialName(value = "unknown")
+    unknown("unknown");
 
     /**
      * Override [toString()] to avoid using the enum variable name as the value, and instead use
@@ -60,10 +67,24 @@ enum class TrustType(val value: kotlin.String) {
          */
         fun decode(data: kotlin.Any?): TrustType? = data?.let {
           val normalizedData = "$it".lowercase()
-          values().firstOrNull { value ->
+          entries.firstOrNull { value ->
             it == value || normalizedData == "$value".lowercase()
           }
         }
     }
 }
 
+internal object TrustTypeSerializer : KSerializer<TrustType> {
+    override val descriptor = kotlin.String.serializer().descriptor
+
+    override fun deserialize(decoder: Decoder): TrustType {
+        val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+        return TrustType.entries.firstOrNull { it.value == value }
+            ?: TrustType.unknown
+    }
+
+    override fun serialize(encoder: Encoder, value: TrustType) {
+        encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+    }
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/TvmStackRecord.kt b/tonapi/src/main/kotlin/io/tonapi/models/TvmStackRecord.kt
index 70e9bf916..4a295e7c2 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/TvmStackRecord.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/TvmStackRecord.kt
@@ -16,35 +16,33 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param type 
- * @param cell 
- * @param slice 
- * @param num 
- * @param tuple 
- */
 
+@Serializable
 
 data class TvmStackRecord (
 
-    @Json(name = "type")
+    @SerialName(value = "type")
     val type: TvmStackRecord.Type,
 
-    @Json(name = "cell")
+    @SerialName(value = "cell")
     val cell: kotlin.String? = null,
 
-    @Json(name = "slice")
+    @SerialName(value = "slice")
     val slice: kotlin.String? = null,
 
-    @Json(name = "num")
+    @SerialName(value = "num")
     val num: kotlin.String? = null,
 
-    @Json(name = "tuple")
+    @SerialName(value = "tuple")
     val tuple: kotlin.collections.List<TvmStackRecord>? = null
 
 ) {
@@ -52,15 +50,31 @@ data class TvmStackRecord (
     /**
      * 
      *
-     * Values: cell,num,nan,`null`,tuple
+     * Values: cell,num,nan,`null`,tuple.unknown
      */
-    @JsonClass(generateAdapter = false)
+    @Serializable(with = TypeSerializer::class)
     enum class Type(val value: kotlin.String) {
-        @Json(name = "cell") cell("cell"),
-        @Json(name = "num") num("num"),
-        @Json(name = "nan") nan("nan"),
-        @Json(name = "null") `null`("null"),
-        @Json(name = "tuple") tuple("tuple");
+        @SerialName(value = "cell") cell("cell"),
+        @SerialName(value = "num") num("num"),
+        @SerialName(value = "nan") nan("nan"),
+        @SerialName(value = "null") `null`("null"),
+        @SerialName(value = "tuple") tuple("tuple"),
+        @SerialName(value = "unknown") unknown("unknown");
+    }
+
+    internal object TypeSerializer : KSerializer<Type> {
+        override val descriptor = kotlin.String.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): Type {
+            val value = decoder.decodeSerializableValue(kotlin.String.serializer())
+            return Type.entries.firstOrNull { it.value == value }
+                ?: Type.unknown
+        }
+
+        override fun serialize(encoder: Encoder, value: Type) {
+            encoder.encodeSerializableValue(kotlin.String.serializer(), value.value)
+        }
     }
+
 }
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/UnSubscriptionAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/UnSubscriptionAction.kt
index 7769de767..2cffbf60e 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/UnSubscriptionAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/UnSubscriptionAction.kt
@@ -17,28 +17,31 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param subscriber 
- * @param subscription 
- * @param beneficiary 
- */
 
+@Serializable
 
 data class UnSubscriptionAction (
 
-    @Json(name = "subscriber")
+    @SerialName(value = "subscriber")
     val subscriber: AccountAddress,
 
-    @Json(name = "subscription")
+    @SerialName(value = "subscription")
     val subscription: kotlin.String,
 
-    @Json(name = "beneficiary")
+    @SerialName(value = "beneficiary")
     val beneficiary: AccountAddress
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Validator.kt b/tonapi/src/main/kotlin/io/tonapi/models/Validator.kt
index 350d34009..17e40f005 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Validator.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Validator.kt
@@ -16,32 +16,34 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param adnlAddress 
- * @param stake 
- * @param maxFactor 
- */
 
+@Serializable
 
 data class Validator (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "adnl_address")
+    @SerialName(value = "adnl_address")
     val adnlAddress: kotlin.String,
 
-    @Json(name = "stake")
+    @SerialName(value = "stake")
     val stake: kotlin.Long,
 
-    @Json(name = "max_factor")
+    @SerialName(value = "max_factor")
     val maxFactor: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Validators.kt b/tonapi/src/main/kotlin/io/tonapi/models/Validators.kt
index b3e62f9ab..18b9faa8a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Validators.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Validators.kt
@@ -17,36 +17,37 @@ package io.tonapi.models
 
 import io.tonapi.models.Validator
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param electAt 
- * @param electClose 
- * @param minStake 
- * @param totalStake 
- * @param validators 
- */
 
+@Serializable
 
 data class Validators (
 
-    @Json(name = "elect_at")
+    @SerialName(value = "elect_at")
     val electAt: kotlin.Long,
 
-    @Json(name = "elect_close")
+    @SerialName(value = "elect_close")
     val electClose: kotlin.Long,
 
-    @Json(name = "min_stake")
+    @SerialName(value = "min_stake")
     val minStake: kotlin.Long,
 
-    @Json(name = "total_stake")
+    @SerialName(value = "total_stake")
     val totalStake: kotlin.Long,
 
-    @Json(name = "validators")
+    @SerialName(value = "validators")
     val validators: kotlin.collections.List<Validator>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSet.kt b/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSet.kt
index aa9048fd4..044ecacad 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSet.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSet.kt
@@ -17,40 +17,40 @@ package io.tonapi.models
 
 import io.tonapi.models.ValidatorsSetListInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param utimeSince 
- * @param utimeUntil 
- * @param total 
- * @param main 
- * @param list 
- * @param totalWeight 
- */
 
+@Serializable
 
 data class ValidatorsSet (
 
-    @Json(name = "utime_since")
+    @SerialName(value = "utime_since")
     val utimeSince: kotlin.Int,
 
-    @Json(name = "utime_until")
+    @SerialName(value = "utime_until")
     val utimeUntil: kotlin.Int,
 
-    @Json(name = "total")
+    @SerialName(value = "total")
     val total: kotlin.Int,
 
-    @Json(name = "main")
+    @SerialName(value = "main")
     val main: kotlin.Int,
 
-    @Json(name = "list")
+    @SerialName(value = "list")
     val list: kotlin.collections.List<ValidatorsSetListInner>,
 
-    @Json(name = "total_weight")
+    @SerialName(value = "total_weight")
     val totalWeight: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSetListInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSetListInner.kt
index 7573be370..c4c4e70fb 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSetListInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ValidatorsSetListInner.kt
@@ -16,28 +16,31 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param publicKey 
- * @param weight 
- * @param adnlAddr 
- */
 
+@Serializable
 
 data class ValidatorsSetListInner (
 
-    @Json(name = "public_key")
+    @SerialName(value = "public_key")
     val publicKey: kotlin.String,
 
-    @Json(name = "weight")
+    @SerialName(value = "weight")
     val weight: kotlin.Long,
 
-    @Json(name = "adnl_addr")
+    @SerialName(value = "adnl_addr")
     val adnlAddr: kotlin.String? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ValueFlow.kt b/tonapi/src/main/kotlin/io/tonapi/models/ValueFlow.kt
index 986be96d7..3b793406a 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ValueFlow.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ValueFlow.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.ValueFlowJettonsInner
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param account 
- * @param ton 
- * @param fees 
- * @param jettons 
- */
 
+@Serializable
 
 data class ValueFlow (
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: AccountAddress,
 
-    @Json(name = "ton")
+    @SerialName(value = "ton")
     val ton: kotlin.Long,
 
-    @Json(name = "fees")
+    @SerialName(value = "fees")
     val fees: kotlin.Long,
 
-    @Json(name = "jettons")
+    @SerialName(value = "jettons")
     val jettons: kotlin.collections.List<ValueFlowJettonsInner>? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/ValueFlowJettonsInner.kt b/tonapi/src/main/kotlin/io/tonapi/models/ValueFlowJettonsInner.kt
index e24d74f3d..7aef56e67 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/ValueFlowJettonsInner.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/ValueFlowJettonsInner.kt
@@ -18,28 +18,35 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.JettonPreview
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param account 
- * @param jetton 
- * @param quantity 
- */
 
+@Serializable
 
 data class ValueFlowJettonsInner (
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: AccountAddress,
 
-    @Json(name = "jetton")
+    @SerialName(value = "jetton")
     val jetton: JettonPreview,
 
-    @Json(name = "quantity")
+    @SerialName(value = "qty")
+    val qty: kotlin.String,
+
+    @SerialName(value = "quantity")
+    @Deprecated(message = "This property is deprecated.")
     val quantity: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Wallet.kt b/tonapi/src/main/kotlin/io/tonapi/models/Wallet.kt
new file mode 100644
index 000000000..52b787fec
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Wallet.kt
@@ -0,0 +1,84 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountStatus
+import io.tonapi.models.WalletPlugin
+import io.tonapi.models.WalletStats
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Wallet (
+
+    @SerialName(value = "address")
+    val address: kotlin.String,
+
+    @SerialName(value = "is_wallet")
+    val isWallet: kotlin.Boolean,
+
+    @SerialName(value = "balance")
+    val balance: kotlin.Long,
+
+    @SerialName(value = "stats")
+    val stats: WalletStats,
+
+    @SerialName(value = "plugins")
+    val plugins: kotlin.collections.List<WalletPlugin>,
+
+    @Contextual @SerialName(value = "status")
+    val status: AccountStatus,
+
+    /* unix timestamp */
+    @SerialName(value = "last_activity")
+    val lastActivity: kotlin.Long,
+
+    @SerialName(value = "get_methods")
+    @Deprecated(message = "This property is deprecated.")
+    val getMethods: kotlin.collections.List<kotlin.String>,
+
+    @SerialName(value = "last_lt")
+    val lastLt: kotlin.Long,
+
+    @SerialName(value = "name")
+    val name: kotlin.String? = null,
+
+    @SerialName(value = "icon")
+    val icon: kotlin.String? = null,
+
+    @SerialName(value = "is_suspended")
+    val isSuspended: kotlin.Boolean? = null,
+
+    @SerialName(value = "signature_disabled")
+    val signatureDisabled: kotlin.Boolean? = null,
+
+    @SerialName(value = "interfaces")
+    val interfaces: kotlin.collections.List<kotlin.String>? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WalletDNS.kt b/tonapi/src/main/kotlin/io/tonapi/models/WalletDNS.kt
index 91a25716a..47ce5c7a4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/WalletDNS.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WalletDNS.kt
@@ -17,40 +17,40 @@ package io.tonapi.models
 
 import io.tonapi.models.AccountAddress
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param address 
- * @param account 
- * @param isWallet 
- * @param hasMethodPubkey 
- * @param hasMethodSeqno 
- * @param names 
- */
 
+@Serializable
 
 data class WalletDNS (
 
-    @Json(name = "address")
+    @SerialName(value = "address")
     val address: kotlin.String,
 
-    @Json(name = "account")
+    @SerialName(value = "account")
     val account: AccountAddress,
 
-    @Json(name = "is_wallet")
+    @SerialName(value = "is_wallet")
     val isWallet: kotlin.Boolean,
 
-    @Json(name = "has_method_pubkey")
+    @SerialName(value = "has_method_pubkey")
     val hasMethodPubkey: kotlin.Boolean,
 
-    @Json(name = "has_method_seqno")
+    @SerialName(value = "has_method_seqno")
     val hasMethodSeqno: kotlin.Boolean,
 
-    @Json(name = "names")
+    @SerialName(value = "names")
     val names: kotlin.collections.List<kotlin.String>
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WalletPlugin.kt b/tonapi/src/main/kotlin/io/tonapi/models/WalletPlugin.kt
new file mode 100644
index 000000000..8e9879e0f
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WalletPlugin.kt
@@ -0,0 +1,47 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.AccountStatus
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class WalletPlugin (
+
+    @SerialName(value = "address")
+    val address: kotlin.String,
+
+    @SerialName(value = "type")
+    val type: kotlin.String,
+
+    @Contextual @SerialName(value = "status")
+    val status: AccountStatus
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WalletStats.kt b/tonapi/src/main/kotlin/io/tonapi/models/WalletStats.kt
new file mode 100644
index 000000000..b167002d3
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WalletStats.kt
@@ -0,0 +1,49 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class WalletStats (
+
+    @SerialName(value = "nfts_count")
+    val nftsCount: kotlin.Int,
+
+    @SerialName(value = "jettons_count")
+    val jettonsCount: kotlin.Int,
+
+    @SerialName(value = "multisig_count")
+    val multisigCount: kotlin.Int,
+
+    @SerialName(value = "staking_count")
+    val stakingCount: kotlin.Int
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Wallets.kt b/tonapi/src/main/kotlin/io/tonapi/models/Wallets.kt
new file mode 100644
index 000000000..a45ea8386
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Wallets.kt
@@ -0,0 +1,41 @@
+/**
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ *
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
+package io.tonapi.models
+
+import io.tonapi.models.Wallet
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+
+@Serializable
+
+data class Wallets (
+
+    @SerialName(value = "accounts")
+    val accounts: kotlin.collections.List<Wallet>
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeAction.kt
index 1e7f95f5c..1585dbc10 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeAction.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.PoolImplementationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * validator's participation in elections
- *
- * @param amount 
- * @param staker 
- * @param pool 
- * @param implementation 
- */
 
+@Serializable
 
 data class WithdrawStakeAction (
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long,
 
-    @Json(name = "staker")
+    @SerialName(value = "staker")
     val staker: AccountAddress,
 
-    @Json(name = "pool")
+    @SerialName(value = "pool")
     val pool: AccountAddress,
 
-    @Json(name = "implementation")
+    @Contextual @SerialName(value = "implementation")
     val implementation: PoolImplementationType
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeRequestAction.kt b/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeRequestAction.kt
index d7d126857..31dce79c4 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeRequestAction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WithdrawStakeRequestAction.kt
@@ -18,32 +18,34 @@ package io.tonapi.models
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.PoolImplementationType
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * validator's participation in elections
- *
- * @param staker 
- * @param pool 
- * @param implementation 
- * @param amount 
- */
 
+@Serializable
 
 data class WithdrawStakeRequestAction (
 
-    @Json(name = "staker")
+    @SerialName(value = "staker")
     val staker: AccountAddress,
 
-    @Json(name = "pool")
+    @SerialName(value = "pool")
     val pool: AccountAddress,
 
-    @Json(name = "implementation")
+    @Contextual @SerialName(value = "implementation")
     val implementation: PoolImplementationType,
 
-    @Json(name = "amount")
+    @SerialName(value = "amount")
     val amount: kotlin.Long? = null
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/WorkchainDescr.kt b/tonapi/src/main/kotlin/io/tonapi/models/WorkchainDescr.kt
index 5aa18b8a3..c471b692d 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/WorkchainDescr.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/WorkchainDescr.kt
@@ -16,64 +16,58 @@
 package io.tonapi.models
 
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
-/**
- * 
- *
- * @param workchain 
- * @param enabledSince 
- * @param actualMinSplit 
- * @param minSplit 
- * @param maxSplit 
- * @param basic 
- * @param active 
- * @param acceptMsgs 
- * @param flags 
- * @param zerostateRootHash 
- * @param zerostateFileHash 
- * @param version 
- */
 
+@Serializable
 
 data class WorkchainDescr (
 
-    @Json(name = "workchain")
+    @SerialName(value = "workchain")
     val workchain: kotlin.Int,
 
-    @Json(name = "enabled_since")
+    @SerialName(value = "enabled_since")
     val enabledSince: kotlin.Long,
 
-    @Json(name = "actual_min_split")
+    @SerialName(value = "actual_min_split")
     val actualMinSplit: kotlin.Int,
 
-    @Json(name = "min_split")
+    @SerialName(value = "min_split")
     val minSplit: kotlin.Int,
 
-    @Json(name = "max_split")
+    @SerialName(value = "max_split")
     val maxSplit: kotlin.Int,
 
-    @Json(name = "basic")
+    @SerialName(value = "basic")
     val basic: kotlin.Int,
 
-    @Json(name = "active")
+    @SerialName(value = "active")
     val active: kotlin.Boolean,
 
-    @Json(name = "accept_msgs")
+    @SerialName(value = "accept_msgs")
     val acceptMsgs: kotlin.Boolean,
 
-    @Json(name = "flags")
+    @SerialName(value = "flags")
     val flags: kotlin.Int,
 
-    @Json(name = "zerostate_root_hash")
+    @SerialName(value = "zerostate_root_hash")
     val zerostateRootHash: kotlin.String,
 
-    @Json(name = "zerostate_file_hash")
+    @SerialName(value = "zerostate_file_hash")
     val zerostateFileHash: kotlin.String,
 
-    @Json(name = "version")
+    @SerialName(value = "version")
     val version: kotlin.Long
 
-)
+) {
+
+
+}
 
diff --git a/tonapi/templates/data_class.mustache b/tonapi/templates/data_class.mustache
new file mode 100644
index 000000000..0892d1ef3
--- /dev/null
+++ b/tonapi/templates/data_class.mustache
@@ -0,0 +1,338 @@
+{{^multiplatform}}
+{{#kotlinx_serialization}}
+import {{#serializableModel}}kotlinx.serialization.Serializable as KSerializable{{/serializableModel}}{{^serializableModel}}kotlinx.serialization.Serializable{{/serializableModel}}
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Contextual
+{{#enumUnknownDefaultCase}}
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+{{/enumUnknownDefaultCase}}
+{{#hasEnums}}
+{{/hasEnums}}
+{{/kotlinx_serialization}}
+{{#parcelizeModels}}
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+{{/parcelizeModels}}
+{{/multiplatform}}
+{{#multiplatform}}
+import kotlinx.serialization.*
+import kotlinx.serialization.descriptors.*
+import kotlinx.serialization.encoding.*
+{{/multiplatform}}
+{{#serializableModel}}
+import java.io.Serializable
+{{/serializableModel}}
+{{#generateRoomModels}}
+import {{roomModelPackage}}.{{classname}}RoomModel
+import io.infrastructure.ITransformForStorage
+{{/generateRoomModels}}
+
+{{#parcelizeModels}}@Parcelize{{/parcelizeModels}}
+{{#multiplatform}}{{^discriminator}}@Serializable{{/discriminator}}{{/multiplatform}}{{#kotlinx_serialization}}{{#serializableModel}}@KSerializable{{/serializableModel}}{{^serializableModel}}@Serializable{{/serializableModel}}{{/kotlinx_serialization}}{{#moshi}}{{#moshiCodeGen}}@JsonClass(generateAdapter = true){{/moshiCodeGen}}{{/moshi}}{{#jackson}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{/jackson}}
+{{#isDeprecated}}
+@Deprecated(message = "This schema is deprecated.")
+{{/isDeprecated}}
+{{>additionalModelTypeAnnotations}}
+{{#vendorExtensions.x-class-extra-annotation}}
+{{{vendorExtensions.x-class-extra-annotation}}}
+{{/vendorExtensions.x-class-extra-annotation}}
+{{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}{{#discriminator}}interface{{/discriminator}}{{^discriminator}}{{#hasVars}}data {{/hasVars}}class{{/discriminator}} {{classname}}{{^discriminator}} (
+
+{{#allVars}}
+{{#required}}{{>data_class_req_var}}{{/required}}{{^required}}{{>data_class_opt_var}}{{/required}}{{^-last}},{{/-last}}
+
+{{/allVars}}
+){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#generateRoomModels}}{{#parent}}, {{/parent}}{{^discriminator}}{{^parent}}:{{/parent}} ITransformForStorage<{{classname}}RoomModel>{{/discriminator}}{{/generateRoomModels}}{{#vendorExtensions.x-has-data-class-body}} {
+{{/vendorExtensions.x-has-data-class-body}}
+{{#generateRoomModels}}
+    companion object { }
+    {{^discriminator}}override fun toRoomModel(): {{classname}}RoomModel =
+        {{classname}}RoomModel(roomTableId = 0,
+        {{#allVars}}{{#items.isPrimitiveType}}{{#isArray}}{{#isList}}{{name}} = this.{{name}},{{/isList}}{{/isArray}}{{/items.isPrimitiveType}}{{^isEnum}}{{^isArray}}{{name}} = this.{{name}},{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{name}} = this.{{name}},{{/isArray}}{{/isEnum}}
+        {{/allVars}}
+        ){{/discriminator}}
+{{/generateRoomModels}}
+{{#serializableModel}}
+    {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}companion object {
+        private const val serialVersionUID: Long = 123
+    }
+{{/serializableModel}}
+{{#discriminator}}{{#vars}}{{#required}}
+{{>interface_req_var}}{{/required}}{{^required}}
+{{>interface_opt_var}}{{/required}}{{/vars}}{{/discriminator}}
+{{#hasEnums}}
+{{#vars}}
+{{#isEnum}}
+    /**
+     * {{{description}}}
+     *
+     * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
+     */
+    {{^multiplatform}}
+    {{#kotlinx_serialization}}
+    {{#serializableModel}}@KSerializable{{/serializableModel}}{{^serializableModel}}@Serializable{{#enumUnknownDefaultCase}}(with = {{{nameInPascalCase}}}Serializer::class){{/enumUnknownDefaultCase}}{{/serializableModel}}
+    {{/kotlinx_serialization}}
+    {{#moshi}}
+    @JsonClass(generateAdapter = false)
+    {{/moshi}}
+    {{/multiplatform}}
+    {{#multiplatform}}
+    @Serializable
+    {{/multiplatform}}
+    {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}enum class {{{nameInPascalCase}}}({{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}val value: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}) {
+    {{#allowableValues}}
+    {{#enumVars}}
+        {{^multiplatform}}
+        {{#moshi}}
+        @Json(name = {{#lambda.doublequote}}{{{value}}}{{/lambda.doublequote}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+        {{/moshi}}
+        {{#gson}}
+        @SerializedName(value = {{#lambda.doublequote}}{{{value}}}{{/lambda.doublequote}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+        {{/gson}}
+        {{#jackson}}
+        @JsonProperty(value = {{#lambda.doublequote}}{{{value}}}{{/lambda.doublequote}}) {{#enumUnknownDefaultCase}}{{#-last}}@JsonEnumDefaultValue {{/-last}}{{/enumUnknownDefaultCase}}{{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+        {{/jackson}}
+        {{#kotlinx_serialization}}
+        @SerialName(value = {{#lambda.doublequote}}{{{value}}}{{/lambda.doublequote}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+        {{/kotlinx_serialization}}
+        {{/multiplatform}}
+        {{#multiplatform}}
+        @SerialName(value = {{#lambda.doublequote}}{{{value}}}{{/lambda.doublequote}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+        {{/multiplatform}}
+    {{/enumVars}}
+    {{/allowableValues}}
+    }
+    {{#kotlinx_serialization}}
+    {{#enumUnknownDefaultCase}}
+
+    internal object {{nameInPascalCase}}Serializer : KSerializer<{{nameInPascalCase}}> {
+        override val descriptor = {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer().descriptor
+
+        override fun deserialize(decoder: Decoder): {{nameInPascalCase}} {
+            val value = decoder.decodeSerializableValue({{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer())
+            return {{nameInPascalCase}}.entries.firstOrNull { it.value == value }
+                ?: {{nameInPascalCase}}.{{#allowableValues}}{{#enumVars}}{{#-last}}{{&name}}{{/-last}}{{/enumVars}}{{/allowableValues}}
+        }
+
+        override fun serialize(encoder: Encoder, value: {{nameInPascalCase}}) {
+            encoder.encodeSerializableValue({{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}.serializer(), value.value)
+        }
+    }
+    {{/enumUnknownDefaultCase}}
+    {{/kotlinx_serialization}}
+{{/isEnum}}
+{{/vars}}
+{{/hasEnums}}
+{{#generateOneOfAnyOfWrappers}}
+    {{#gson}}
+
+    class CustomTypeAdapterFactory : TypeAdapterFactory {
+        override fun <T> create(gson: Gson, type: TypeToken<T>): TypeAdapter<T>? {
+            if (!{{classname}}::class.java.isAssignableFrom(type.rawType)) {
+              return null // this class only serializes '{{classname}}' and its subtypes
+            }
+            val elementAdapter = gson.getAdapter(JsonElement::class.java)
+            val thisAdapter = gson.getDelegateAdapter(this, TypeToken.get({{classname}}::class.java))
+
+            @Suppress("UNCHECKED_CAST")
+            return object : TypeAdapter<{{classname}}>() {
+                @Throws(IOException::class)
+                override fun write(out: JsonWriter, value: {{classname}}) {
+                    val obj = thisAdapter.toJsonTree(value).getAsJsonObject()
+                    elementAdapter.write(out, obj)
+                }
+
+                @Throws(IOException::class)
+                override fun read(jsonReader: JsonReader): {{classname}}  {
+                    val jsonElement = elementAdapter.read(jsonReader)
+                    validateJsonElement(jsonElement)
+                    return thisAdapter.fromJsonTree(jsonElement)
+                }
+            }.nullSafe() as TypeAdapter<T>
+        }
+    }
+
+    companion object {
+        var openapiFields = HashSet<String>()
+        var openapiRequiredFields = HashSet<String>()
+
+        init {
+            {{#allVars}}
+            {{#-first}}
+            // a set of all properties/fields (JSON key names)
+            {{/-first}}
+            openapiFields.add("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")
+            {{/allVars}}
+
+            {{#requiredVars}}
+            {{#-first}}
+            // a set of required properties/fields (JSON key names)
+            {{/-first}}
+            openapiRequiredFields.add("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}")
+            {{/requiredVars}}
+        }
+
+       /**
+        * Validates the JSON Element and throws an exception if issues found
+        *
+        * @param jsonElement JSON Element
+        * @throws IOException if the JSON Element is invalid with respect to {{classname}}
+        */
+        @Throws(IOException::class)
+        fun validateJsonElement(jsonElement: JsonElement?) {
+            if (jsonElement == null) {
+              require(openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
+                String.format("The required field(s) %s in {{{classname}}} is not found in the empty JSON string", {{classname}}.openapiRequiredFields.toString())
+              }
+            }
+            {{^hasChildren}}
+            {{#requiredVars}}
+            {{#-first}}
+
+            // check to make sure all required properties/fields are present in the JSON string
+            for (requiredField in openapiRequiredFields) {
+              requireNotNull(jsonElement!!.getAsJsonObject()[requiredField]) {
+                String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())
+              }
+            }
+            {{/-first}}
+            {{/requiredVars}}
+            {{/hasChildren}}
+            {{^discriminator}}
+            {{#hasVars}}
+            val jsonObj = jsonElement!!.getAsJsonObject()
+            {{/hasVars}}
+            {{#vars}}
+            {{#isArray}}
+            {{#items.isModel}}
+            {{#required}}
+            // ensure the json data is an array
+            if (!jsonObj.get("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").isJsonArray) {
+              throw IllegalArgumentException(String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString()))
+            }
+
+            // validate the required field `{{{baseName}}}` (array)
+            for (i in 0 until jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").size()) {
+              {{{items.dataType}}}.validateJsonElement(jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").get(i))
+            }
+            {{/required}}
+            {{^required}}
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+              if (jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}") != null) {
+                // ensure the json data is an array
+                require(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonArray) {
+                  String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+                }
+
+                // validate the optional field `{{{baseName}}}` (array)
+                for (i in 0 until jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").size()) {
+                  {{{items.dataType}}}.validateJsonElement(jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").get(i))
+                }
+              }
+            }
+            {{/required}}
+            {{/items.isModel}}
+            {{^items.isModel}}
+            {{^required}}
+            // ensure the optional json data is an array if present
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+              require(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonArray()) {
+                String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+              }
+            }
+            {{/required}}
+            {{#required}}
+            // ensure the required json array is present
+            requireNotNull(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"]) {
+              "Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `null`"
+            }
+            require(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonArray()) {
+              String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be an array in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+            }
+            {{/required}}
+            {{#items.isPrimitiveType}}
+            // ensure the items in json array are primitive
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null) {
+              for (i in 0 until jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").size()) {
+                require(jsonObj.getAsJsonArray("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").get(i).isJsonPrimitive) {
+                  String.format("Expected the property in array `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be primitive")
+                }
+              }
+            }
+            {{/items.isPrimitiveType}}
+            {{/items.isModel}}
+            {{/isArray}}
+            {{^isContainer}}
+            {{#isString}}
+            {{#notRequiredOrIsNullable}}
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+              require(jsonObj.get("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}").isJsonPrimitive) {
+                String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be a primitive type in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+              }
+            }
+            {{/notRequiredOrIsNullable}}
+            {{^notRequiredOrIsNullable}}
+            require(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonPrimitive) {
+              String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be a primitive type in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+            }
+            {{/notRequiredOrIsNullable}}
+            {{/isString}}
+            {{#isModel}}
+            {{#required}}
+            // validate the required field `{{{baseName}}}`
+            {{{dataType}}}.validateJsonElement(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"])
+            {{/required}}
+            {{^required}}
+            // validate the optional field `{{{baseName}}}`
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+              {{{dataType}}}.validateJsonElement(jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"])
+            }
+            {{/required}}
+            {{/isModel}}
+            {{#isEnum}}
+            {{#required}}
+            // validate the required field `{{{baseName}}}`
+            require({{{datatypeWithEnum}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
+                String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{datatypeWithEnum}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+            }
+            {{/required}}
+            {{^required}}
+            // validate the optional field `{{{baseName}}}`
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+                require({{{datatypeWithEnum}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
+                    String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{datatypeWithEnum}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+                }
+            }
+            {{/required}}
+            {{/isEnum}}
+            {{#isEnumRef}}
+            {{#required}}
+            // validate the required field `{{{baseName}}}`
+            require({{{dataType}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
+                String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{dataType}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+            }
+            {{/required}}
+            {{^required}}
+            // validate the optional field `{{{baseName}}}`
+            if (jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] != null && !jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].isJsonNull) {
+                require({{{dataType}}}.values().any { it.value == jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].asString }) {
+                    String.format("Expected the field `{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}` to be valid `{{{dataType}}}` enum value in the JSON string but got `%s`", jsonObj["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"].toString())
+                }
+            }
+            {{/required}}
+            {{/isEnumRef}}
+            {{/isContainer}}
+            {{/vars}}
+            {{/discriminator}}
+        }
+    }
+    {{/gson}}
+{{/generateOneOfAnyOfWrappers}}
+
+{{#vendorExtensions.x-has-data-class-body}}
+}
+{{/vendorExtensions.x-has-data-class-body}}
diff --git a/tonapi/templates/data_class_opt_var.mustache b/tonapi/templates/data_class_opt_var.mustache
new file mode 100644
index 000000000..897b18f9e
--- /dev/null
+++ b/tonapi/templates/data_class_opt_var.mustache
@@ -0,0 +1,24 @@
+{{#description}}
+    /* {{{.}}} */
+{{/description}}
+    {{^multiplatform}}
+    {{#moshi}}
+    @Json(name = "{{{vendorExtensions.x-base-name-literal}}}")
+    {{/moshi}}
+    {{#gson}}
+    @SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
+    {{/gson}}
+    {{#jackson}}
+    @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
+    {{/jackson}}
+    {{#kotlinx_serialization}}
+    {{^isEnum}}{{^isArray}}{{^isPrimitiveType}}{{^isModel}}@Contextual {{/isModel}}{{/isPrimitiveType}}{{/isArray}}{{/isEnum}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}")
+    {{/kotlinx_serialization}}
+    {{/multiplatform}}
+    {{#vendorExtensions.x-field-extra-annotation}}
+    {{{vendorExtensions.x-field-extra-annotation}}}
+    {{/vendorExtensions.x-field-extra-annotation}}
+    {{#deprecated}}
+    @Deprecated(message = "This property is deprecated.")
+    {{/deprecated}}
+    {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#uniqueItems}}kotlin.collections.{{#modelMutable}}Mutable{{/modelMutable}}Set{{/uniqueItems}}{{^uniqueItems}}kotlin.collections.{{#modelMutable}}Mutable{{/modelMutable}}List{{/uniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInPascalCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInPascalCase}}}{{/isArray}}{{/isEnum}}? = {{^defaultValue}}null{{/defaultValue}}{{#defaultValue}}{{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{^multiplatform}}{{{dataType}}}("{{{defaultValue}}}"){{/multiplatform}}{{#multiplatform}}({{{defaultValue}}}).toDouble(){{/multiplatform}}{{/isNumber}}{{/defaultValue}}
\ No newline at end of file
diff --git a/tonapi/templates/data_class_req_var.mustache b/tonapi/templates/data_class_req_var.mustache
new file mode 100644
index 000000000..811867dfc
--- /dev/null
+++ b/tonapi/templates/data_class_req_var.mustache
@@ -0,0 +1,24 @@
+{{#description}}
+    /* {{{.}}} */
+{{/description}}
+    {{^multiplatform}}
+    {{#moshi}}
+    @Json(name = "{{{vendorExtensions.x-base-name-literal}}}")
+    {{/moshi}}
+    {{#gson}}
+    @SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
+    {{/gson}}
+    {{#jackson}}
+    @get:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
+    {{/jackson}}
+    {{#kotlinx_serialization}}
+    {{^isEnum}}{{^isArray}}{{^isPrimitiveType}}{{^isModel}}@Contextual {{/isModel}}{{/isPrimitiveType}}{{/isArray}}{{/isEnum}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}")
+    {{/kotlinx_serialization}}
+    {{/multiplatform}}
+    {{#vendorExtensions.x-field-extra-annotation}}
+    {{{vendorExtensions.x-field-extra-annotation}}}
+    {{/vendorExtensions.x-field-extra-annotation}}
+    {{#deprecated}}
+    @Deprecated(message = "This property is deprecated.")
+    {{/deprecated}}
+    {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#uniqueItems}}kotlin.collections.{{#modelMutable}}Mutable{{/modelMutable}}Set{{/uniqueItems}}{{^uniqueItems}}kotlin.collections.{{#modelMutable}}Mutable{{/modelMutable}}List{{/uniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInPascalCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInPascalCase}}}{{/isArray}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{^isNumber}}{{{defaultValue}}}{{/isNumber}}{{#isNumber}}{{^multiplatform}}{{{dataType}}}("{{{defaultValue}}}"){{/multiplatform}}{{#multiplatform}}({{{defaultValue}}}).toDouble(){{/multiplatform}}{{/isNumber}}{{/defaultValue}}
\ No newline at end of file
diff --git a/tonapi/templates/libraries/jvm-okhttp/api.mustache b/tonapi/templates/libraries/jvm-okhttp/api.mustache
new file mode 100644
index 000000000..86a54d587
--- /dev/null
+++ b/tonapi/templates/libraries/jvm-okhttp/api.mustache
@@ -0,0 +1,252 @@
+{{>licenseInfo}}
+package {{apiPackage}}
+
+import java.io.IOException
+import okhttp3.Call
+import okhttp3.HttpUrl
+
+{{#imports}}import {{import}}
+{{/imports}}
+
+{{^multiplatform}}
+{{#gson}}
+import com.google.gson.annotations.SerializedName
+{{/gson}}
+{{#moshi}}
+import com.squareup.moshi.Json
+{{/moshi}}
+{{#jackson}}
+import com.fasterxml.jackson.annotation.JsonProperty
+{{/jackson}}
+{{#kotlinx_serialization}}
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+{{/kotlinx_serialization}}
+{{/multiplatform}}
+{{#multiplatform}}
+import kotlinx.serialization.*
+{{/multiplatform}}
+
+{{^doNotUseRxAndCoroutines}}
+{{#useCoroutines}}
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+{{/useCoroutines}}
+{{/doNotUseRxAndCoroutines}}
+import io.infrastructure.ApiClient
+import io.infrastructure.ApiResponse
+import io.infrastructure.ClientException
+import io.infrastructure.ClientError
+import io.infrastructure.ServerException
+import io.infrastructure.ServerError
+import io.infrastructure.MultiValueMap
+import io.infrastructure.PartConfig
+import io.infrastructure.RequestConfig
+import io.infrastructure.RequestMethod
+import io.infrastructure.ResponseType
+import io.infrastructure.Success
+import io.infrastructure.toMultiValue
+
+{{#operations}}
+{{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}class {{classname}}(basePath: kotlin.String = defaultBasePath, client: Call.Factory = ApiClient.defaultClient) : ApiClient(basePath, client) {
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}companion object {
+        @JvmStatic
+        {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}val defaultBasePath: String by lazy {
+            System.getProperties().getProperty(ApiClient.baseUrlKey, "{{{basePath}}}")
+        }
+    }
+
+    {{#operation}}
+    {{#allParams}}
+    {{#isEnum}}
+    /**
+     * enum for parameter {{paramName}}
+     */
+     {{#nonPublicApi}}internal {{/nonPublicApi}}{{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}enum class {{enumName}}{{operationIdCamelCase}}({{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}val value: {{^isContainer}}{{dataType}}{{/isContainer}}{{#isContainer}}kotlin.String{{/isContainer}}) {
+     {{^enumUnknownDefaultCase}}
+     {{#allowableValues}}
+     {{#enumVars}}
+         {{^multiplatform}}
+         {{#moshi}}
+         @Json(name = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/moshi}}
+         {{#gson}}
+         @SerializedName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/gson}}
+         {{#jackson}}
+         @JsonProperty(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/jackson}}
+         {{#kotlinx_serialization}}
+         @SerialName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/kotlinx_serialization}}
+         {{/multiplatform}}
+         {{#multiplatform}}
+         @SerialName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/multiplatform}}
+     {{/enumVars}}
+     {{/allowableValues}}
+     {{/enumUnknownDefaultCase}}
+     {{#enumUnknownDefaultCase}}
+     {{#allowableValues}}
+     {{#enumVars}}
+         {{^multiplatform}}
+         {{#moshi}}
+         @Json(name = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/moshi}}
+         {{#gson}}
+         @SerializedName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/gson}}
+         {{#jackson}}
+         @JsonProperty(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/jackson}}
+         {{#kotlinx_serialization}}
+         @SerialName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/kotlinx_serialization}}
+         {{/multiplatform}}
+         {{#multiplatform}}
+         @SerialName(value = {{^isString}}"{{/isString}}{{{value}}}{{^isString}}"{{/isString}}) {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+         {{/multiplatform}}
+     {{/enumVars}}
+     {{/allowableValues}}
+     {{/enumUnknownDefaultCase}}
+
+        /**
+         * Override [toString()] to avoid using the enum variable name as the value, and instead use
+         * the actual value defined in the API spec file.
+         *
+         * This solves a problem when the variable name and its value are different, and ensures that
+         * the client sends the correct enum values to the server always.
+         */
+        override fun toString(): kotlin.String = "$value"
+     }
+
+    {{/isEnum}}
+    {{/allParams}}
+    {{#returnType}}
+    @Suppress("UNCHECKED_CAST"){{/returnType}}
+    @Throws(IllegalStateException::class, IOException::class, UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    {{#isDeprecated}}
+    @Deprecated(message = "This operation is deprecated.")
+    {{/isDeprecated}}
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#required}}{{#defaultValue}} = {{^isNumber}}{{#isEnum}}{{enumName}}{{operationIdCamelCase}}.{{enumDefaultValue}}{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}}{{/required}}{{^required}}?{{#defaultValue}} = {{^isNumber}}{{#isEnum}}{{enumName}}{{operationIdCamelCase}}.{{enumDefaultValue}}{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/isNumber}}{{#isNumber}}{{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{/defaultValue}}{{^defaultValue}} = null{{/defaultValue}}{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
+        {{#isDeprecated}}
+        @Suppress("DEPRECATION")
+        {{/isDeprecated}}
+        val localVarResponse = {{operationId}}WithHttpInfo({{#allParams}}{{{paramName}}} = {{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}})
+
+        return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} when (localVarResponse.responseType) {
+            ResponseType.Success -> {{#returnType}}(localVarResponse as Success<*>).data as {{{returnType}}}{{#nullableReturnType}}?{{/nullableReturnType}}{{/returnType}}{{^returnType}}Unit{{/returnType}}
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()} ${localVarError.body}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    {{#returnType}}
+    @Suppress("UNCHECKED_CAST"){{/returnType}}
+    @Throws(IllegalStateException::class, IOException::class)
+    {{#isDeprecated}}
+    @Deprecated(message = "This operation is deprecated.")
+    {{/isDeprecated}}
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}suspend {{/useCoroutines}}{{/doNotUseRxAndCoroutines}}fun {{operationId}}WithHttpInfo({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : ApiResponse<{{#returnType}}{{{returnType}}}?{{/returnType}}{{^returnType}}Unit?{{/returnType}}>{{^doNotUseRxAndCoroutines}}{{#useCoroutines}} = withContext(Dispatchers.IO){{/useCoroutines}}{{/doNotUseRxAndCoroutines}} {
+        {{#isDeprecated}}
+        @Suppress("DEPRECATION")
+        {{/isDeprecated}}
+        val localVariableConfig = {{operationId}}RequestConfig({{#allParams}}{{{paramName}}} = {{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}})
+
+        return{{^doNotUseRxAndCoroutines}}{{#useCoroutines}}@withContext{{/useCoroutines}}{{/doNotUseRxAndCoroutines}} request<{{#hasBodyParam}}{{#bodyParams}}{{{dataType}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}Unit{{/hasFormParams}}{{#hasFormParams}}Map<String, PartConfig<*>>{{/hasFormParams}}{{/hasBodyParam}}, {{{returnType}}}{{^returnType}}Unit{{/returnType}}>(
+            localVariableConfig
+        )
+    }
+
+    {{#isDeprecated}}
+    @Deprecated(message = "This operation is deprecated.")
+    {{/isDeprecated}}
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}fun {{operationId}}RequestConfig({{#allParams}}{{{paramName}}}: {{#isEnum}}{{#isContainer}}kotlin.collections.List<{{enumName}}{{operationIdCamelCase}}>{{/isContainer}}{{^isContainer}}{{enumName}}{{operationIdCamelCase}}{{/isContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : RequestConfig<{{#hasBodyParam}}{{#bodyParams}}{{{dataType}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{^hasFormParams}}Unit{{/hasFormParams}}{{#hasFormParams}}Map<String, PartConfig<*>>{{/hasFormParams}}{{/hasBodyParam}}> {
+        val localVariableBody = {{#hasBodyParam}}{{!
+          }}{{#bodyParams}}{{{paramName}}}{{/bodyParams}}{{/hasBodyParam}}{{^hasBodyParam}}{{!
+          }}{{^hasFormParams}}null{{/hasFormParams}}{{!
+          }}{{#hasFormParams}}mapOf({{#formParams}}
+            "{{#lambda.escapeDollar}}{{{baseName}}}{{/lambda.escapeDollar}}" to PartConfig(body = {{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}, headers = mutableMapOf({{#contentType}}"Content-Type" to "{{contentType}}"{{/contentType}})),{{!
+            }}{{/formParams}}){{/hasFormParams}}{{!
+        }}{{/hasBodyParam}}
+        val localVariableQuery: MultiValueMap = {{^hasQueryParams}}mutableMapOf()
+{{/hasQueryParams}}{{#hasQueryParams}}mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                {{#queryParams}}
+                {{^required}}
+                if ({{{paramName}}} != null) {
+                    {{#isModel}}
+                    {{#vars}}
+                    if ({{{paramName}}}.{{name}} != null) {
+                        put("{{#isDeepObject}}{{{paramName}}}[{{/isDeepObject}}{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}{{#isDeepObject}}]{{/isDeepObject}}", {{#isContainer}}toMultiValue({{{paramName}}}.{{name}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.{{name}}.value{{/isString}}{{^isString}}{{{paramName}}}.{{name}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.{{name}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                    }
+                    {{/vars}}
+                    {{/isModel}}
+                    {{^isModel}}
+                    put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                    {{/isModel}}
+                }
+                {{/required}}
+                {{#required}}
+                {{#isNullable}}
+                if ({{{paramName}}} != null) {
+                    {{#isModel}}
+                    {{#vars}}
+                    if ({{{paramName}}}.{{name}} != null) {
+                        put("{{#isDeepObject}}{{{paramName}}}[{{/isDeepObject}}{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}{{#isDeepObject}}]{{/isDeepObject}}", {{#isContainer}}toMultiValue({{{paramName}}}.{{name}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.{{name}}.value{{/isString}}{{^isString}}{{{paramName}}}.{{name}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.{{name}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                    }
+                    {{/vars}}
+                    {{/isModel}}
+                    {{^isModel}}
+                    put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                    {{/isModel}}
+                }
+                {{/isNullable}}
+                {{^isNullable}}
+                {{#isModel}}
+                {{#vars}}
+                if ({{{paramName}}}.{{name}} != null) {
+                    put("{{#isDeepObject}}{{{paramName}}}[{{/isDeepObject}}{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}{{#isDeepObject}}]{{/isDeepObject}}", {{#isContainer}}toMultiValue({{{paramName}}}.{{name}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}.{{name}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.{{name}}.value{{/isString}}{{^isString}}{{{paramName}}}.{{name}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.{{name}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                }
+                {{/vars}}
+                {{/isModel}}
+                {{^isModel}}
+                put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}})
+                {{/isModel}}
+                {{/isNullable}}
+                {{/required}}
+                {{/queryParams}}
+            }
+            {{/hasQueryParams}}
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf({{#hasFormParams}}"Content-Type" to {{^consumes}}"multipart/form-data"{{/consumes}}{{#consumes.0}}"{{{mediaType}}}"{{/consumes.0}}{{/hasFormParams}})
+        {{#headerParams}}
+        {{{paramName}}}{{^required}}?{{/required}}.apply { localVariableHeaders["{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"] = {{#isContainer}}this.joinToString(separator = collectionDelimiter("{{collectionFormat}}")){{/isContainer}}{{^isContainer}}this.toString(){{/isContainer}} }
+        {{/headerParams}}
+        {{^hasFormParams}}{{#hasConsumes}}{{#consumes}}localVariableHeaders["Content-Type"] = "{{{mediaType}}}"
+        {{/consumes}}{{/hasConsumes}}{{/hasFormParams}}{{#hasProduces}}localVariableHeaders["Accept"] = "{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}"
+{{/hasProduces}}
+
+        return RequestConfig(
+            method = RequestMethod.{{httpMethod}},
+            path = "{{{path}}}"{{#pathParams}}.replace("{"+"{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}"+"}", encodeURIComponent({{#isContainer}}{{paramName}}.joinToString(","){{/isContainer}}{{^isContainer}}{{{paramName}}}{{#isEnum}}{{^required}}?{{/required}}.value{{/isEnum}}.toString(){{/isContainer}})){{/pathParams}},
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}},
+            body = localVariableBody
+        )
+    }
+
+    {{/operation}}
+
+    private fun encodeURIComponent(uriComponent: kotlin.String): kotlin.String =
+        HttpUrl.Builder().scheme("http").host("localhost").addPathSegment(uriComponent).build().encodedPathSegments[0]
+}
+{{/operations}}
diff --git a/tonapi/tonapi.sh b/tonapi/tonapi.sh
index 797c385d5..9babd8f06 100644
--- a/tonapi/tonapi.sh
+++ b/tonapi/tonapi.sh
@@ -1,16 +1,3 @@
-curl -o openapi.yml 'https://raw.githubusercontent.com/tonkeeper/opentonapi/master/api/openapi.yml'
+#!/bin/bash
 
-openapi-generator generate -i openapi.yml -g kotlin --additional-properties packageName=io.tonapi
-
-
-rm -rf openapi.yml
-rm -rf settings.gradle
-rm -rf docs
-rm -rf gradle
-rm -rf .openapi-generator
-rm -rf README.md
-rm -rf build.gradle
-rm -rf .openapi-generator-ignore
-rm -rf gradlew
-rm -rf gradlew.bat
-rm -rf src/test
+bash generate.sh "https://raw.githubusercontent.com/tonkeeper/opentonapi/master/api/openapi.yml" "tonapi"
\ No newline at end of file
diff --git a/tonapi/upd.sh b/tonapi/upd.sh
index 1ea4183de..19164e177 100644
--- a/tonapi/upd.sh
+++ b/tonapi/upd.sh
@@ -1,23 +1,4 @@
-curl -o openapi.yml 'https://raw.githubusercontent.com/tonkeeper/opentonapi/master/api/openapi.yml'
-curl -o battery-api.yml 'https://raw.githubusercontent.com/tonkeeper/custodial-battery/master/api/battery-api.yml'
+#!/bin/bash
 
-openapi-generator generate -i openapi.yml -g kotlin --additional-properties packageName=io.tonapi
-openapi-generator generate -i battery-api.yml -g kotlin --additional-properties packageName=io.batteryapi
-
-# Rename the file
-mv src/main/kotlin/io/batteryapi/apis/DefaultApi.kt src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
-# Replace the class name inside the file
-sed -i '' 's/class DefaultApi/class BatteryApi/' src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
-
-rm -rf openapi.yml
-rm -rf battery-api.yml
-rm -rf settings.gradle
-rm -rf docs
-rm -rf gradle
-rm -rf .openapi-generator
-rm -rf README.md
-rm -rf build.gradle
-rm -rf .openapi-generator-ignore
-rm -rf gradlew
-rm -rf gradlew.bat
-rm -rf src/test
+bash tonapi.sh
+bash battery.sh
\ No newline at end of file
diff --git a/ui/blur/build.gradle.kts b/ui/blur/build.gradle.kts
index dced28b15..67a0d2229 100644
--- a/ui/blur/build.gradle.kts
+++ b/ui/blur/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 android {
     namespace = "com.tonapps.ui.blur"
     compileSdk = Build.compileSdkVersion
+    ndkVersion = Build.ndkVersion
 
     defaultConfig {
         minSdk = Build.minSdkVersion
@@ -33,5 +34,5 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.annotation)
+    implementation(libs.androidX.annotation)
 }
diff --git a/ui/shimmer/build.gradle.kts b/ui/shimmer/build.gradle.kts
index 598e9f44d..2995a4108 100644
--- a/ui/shimmer/build.gradle.kts
+++ b/ui/shimmer/build.gradle.kts
@@ -21,5 +21,5 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.annotation)
+    implementation(libs.androidX.annotation)
 }
\ No newline at end of file
diff --git a/ui/uikit/color/build.gradle.kts b/ui/uikit/color/build.gradle.kts
index ab49a85c9..d96c41041 100644
--- a/ui/uikit/color/build.gradle.kts
+++ b/ui/uikit/color/build.gradle.kts
@@ -15,5 +15,5 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.annotation)
+    implementation(libs.androidX.annotation)
 }
diff --git a/ui/uikit/color/src/main/res/values/colors_light.xml b/ui/uikit/color/src/main/res/values/colors_light.xml
index 82800e7c4..6b1728390 100644
--- a/ui/uikit/color/src/main/res/values/colors_light.xml
+++ b/ui/uikit/color/src/main/res/values/colors_light.xml
@@ -23,14 +23,20 @@
     <color name="buttonPrimaryBackgroundHighlightedLight">#1F8AFF</color>
     <color name="buttonPrimaryForegroundLight">#FFFFFF</color>
 
-    <color name="buttonSecondaryBackgroundLight">#29818C99</color>
-    <color name="buttonSecondaryBackgroundDisabledLight">#1F818C99</color>
-    <color name="buttonSecondaryBackgroundHighlightedLight">#3D818C99</color>
+    <!--color name="buttonSecondaryBackgroundLight">#29818C99</color-->
+    <color name="buttonSecondaryBackgroundLight">#D3D4DB</color>
+    <!--color name="buttonSecondaryBackgroundDisabledLight">#1F818C99</color-->
+    <color name="buttonSecondaryBackgroundDisabledLight">#D8D9E0</color>
+    <!--color name="buttonSecondaryBackgroundHighlightedLight">#3D818C99</color-->
+    <color name="buttonSecondaryBackgroundHighlightedLight">#C9CAD1</color>
     <color name="buttonSecondaryForegroundLight">#000000</color>
 
-    <color name="buttonTertiaryBackgroundLight">#1F818C99</color>
-    <color name="buttonTertiaryBackgroundDisabledLight">#14818C99</color>
-    <color name="buttonTertiaryBackgroundHighlightedLight">#33818C99</color>
+    <!--color name="buttonTertiaryBackgroundLight">#1F818C99</color-->
+    <color name="buttonTertiaryBackgroundLight">#D3D4DB</color>
+    <!--color name="buttonTertiaryBackgroundDisabledLight">#14818C99</color-->
+    <color name="buttonTertiaryBackgroundDisabledLight">#D8D9E0</color>
+    <!--color name="buttonTertiaryBackgroundHighlightedLight">#33818C99</color-->
+    <color name="buttonTertiaryBackgroundHighlightedLight">#C9CAD1</color>
     <color name="buttonTertiaryForegroundLight">#000000</color>
 
     <color name="buttonGreenBackgroundLight">#25B86F</color>
diff --git a/ui/uikit/core/build.gradle.kts b/ui/uikit/core/build.gradle.kts
index 470527b57..901b44ef4 100644
--- a/ui/uikit/core/build.gradle.kts
+++ b/ui/uikit/core/build.gradle.kts
@@ -17,21 +17,21 @@ android {
 }
 
 dependencies {
-    api(project(Dependence.UIKit.color))
-    api(project(Dependence.UIKit.icon))
-    api(project(Dependence.UIKit.list))
-    api(project(Dependence.Module.shimmer))
+    api(project(ProjectModules.UIKit.color))
+    api(project(ProjectModules.UIKit.icon))
+    api(project(ProjectModules.UIKit.list))
+    api(project(ProjectModules.Module.shimmer))
 
-    implementation(Dependence.KotlinX.coroutines)
-    implementation(Dependence.AndroidX.core)
-    implementation(Dependence.AndroidX.webkit)
-    implementation(Dependence.AndroidX.activity)
-    implementation(Dependence.AndroidX.fragment)
-    implementation(Dependence.AndroidX.appCompat)
-    implementation(Dependence.AndroidX.splashscreen)
-    implementation(Dependence.UI.flexbox)
-    implementation(Dependence.UI.material)
-    implementation(Dependence.fresco) {
+    implementation(libs.kotlinX.coroutines.android)
+    implementation(libs.androidX.core)
+    implementation(libs.androidX.webkit)
+    implementation(libs.androidX.activity)
+    implementation(libs.androidX.fragment)
+    implementation(libs.androidX.appCompat)
+    implementation(libs.androidX.splashscreen)
+    implementation(libs.flexbox)
+    implementation(libs.material)
+    implementation(libs.fresco) {
         exclude(group = "com.facebook.soloader", module = "soloader")
         exclude(group = "com.facebook.fresco", module = "soloader")
         exclude(group = "com.facebook.fresco", module = "nativeimagefilters")
@@ -40,11 +40,11 @@ dependencies {
         exclude(group = "com.facebook.fresco", module = "imagepipeline-native")
     }
 
-    implementation(platform(Dependence.AndroidX.Compose.bom))
-    implementation(Dependence.AndroidX.Compose.foundation)
-    implementation(Dependence.AndroidX.Compose.foundationLayout)
-    implementation(Dependence.AndroidX.Compose.ui)
-    implementation(Dependence.AndroidX.Compose.material3)
-    implementation(Dependence.AndroidX.Compose.preview)
-    debugImplementation(Dependence.AndroidX.Compose.debugTooling)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.foundation)
+    implementation(libs.compose.foundationLayout)
+    implementation(libs.compose.ui)
+    implementation(libs.compose.material3)
+    implementation(libs.compose.preview)
+    debugImplementation(libs.compose.debugTooling)
 }
diff --git a/ui/uikit/core/src/main/java/uikit/UiButtonState.kt b/ui/uikit/core/src/main/java/uikit/UiButtonState.kt
new file mode 100644
index 000000000..1c397a345
--- /dev/null
+++ b/ui/uikit/core/src/main/java/uikit/UiButtonState.kt
@@ -0,0 +1,6 @@
+package uikit
+
+sealed class UiButtonState {
+    data class Default(val enabled: Boolean = true) : UiButtonState()
+    data object Loading : UiButtonState()
+}
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt b/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt
index bbe06fbf0..a0ce485f6 100644
--- a/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt
+++ b/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt
@@ -376,6 +376,10 @@ open class BaseFragment(
         return ContextCompat.checkSelfPermission(requireContext(), permission) == PackageManager.PERMISSION_GRANTED
     }
 
+    fun hasPermissions(permissions: Array<String>): Boolean {
+        return permissions.all { hasPermission(it) }
+    }
+
     fun getCurrentFocus(): EditText? {
         return requireActivity().currentFocus as? EditText
     }
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/Context.kt b/ui/uikit/core/src/main/java/uikit/extensions/Context.kt
index f8f7b92cc..3b6aca069 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/Context.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/Context.kt
@@ -10,6 +10,7 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.RippleDrawable
+import android.provider.Settings
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
@@ -38,6 +39,12 @@ import com.tonapps.uikit.color.textTertiaryColor
 import uikit.navigation.Navigation.Companion.navigation
 import uikit.navigation.NavigationActivity
 
+val Context.navigationMode: Int
+    get() = Settings.Secure.getInt(contentResolver,"navigation_mode", 0)
+
+val Context.gestureNavigationEnabled: Boolean
+    get() = navigationMode == 2
+
 fun Context.inflate(
     @LayoutRes layoutId: Int,
     root: ViewGroup? = null,
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/LifecycleOwner.kt b/ui/uikit/core/src/main/java/uikit/extensions/LifecycleOwner.kt
index 8121dcfcc..7ff681573 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/LifecycleOwner.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/LifecycleOwner.kt
@@ -17,4 +17,4 @@ fun <T> LifecycleOwner.collectFlow(flow: Flow<T>, action: suspend (T) -> Unit):
 
 fun <T> ViewModel.collectFlow(flow: Flow<T>, action: suspend (T) -> Unit): Job {
     return flow.onEach(action).launchIn(viewModelScope)
-}
+}
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/RecyclerView.kt b/ui/uikit/core/src/main/java/uikit/extensions/RecyclerView.kt
index 2e2b14034..56fd4bde7 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/RecyclerView.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/RecyclerView.kt
@@ -1,5 +1,7 @@
 package uikit.extensions
 
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -47,3 +49,20 @@ fun RecyclerView.hideKeyboardWhenScroll() {
     })
 }
 
+fun RecyclerView.smartScrollTo(position: Int) {
+    val layoutManager = layoutManager as? LinearLayoutManager ?: return
+    val firstVisible = layoutManager.findFirstVisibleItemPosition()
+    val lastVisible = layoutManager.findLastVisibleItemPosition()
+
+    if (position in firstVisible..lastVisible) {
+        return
+    }
+    if (position < firstVisible) {
+        val scrollTo = maxOf(0, position - 3)
+        layoutManager.scrollToPositionWithOffset(scrollTo, 0)
+    } else {
+        val scrollTo = maxOf(0, position - 3)
+        layoutManager.scrollToPositionWithOffset(scrollTo, 0)
+    }
+}
+
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/SpannableStringBuilder.kt b/ui/uikit/core/src/main/java/uikit/extensions/SpannableStringBuilder.kt
index d9a898451..f9fc23415 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/SpannableStringBuilder.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/SpannableStringBuilder.kt
@@ -1,6 +1,7 @@
 package uikit.extensions
 
 import android.content.Context
+import android.graphics.Color
 import android.text.SpannableStringBuilder
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
@@ -14,6 +15,7 @@ import com.tonapps.uikit.color.accentRedColor
 import com.tonapps.uikit.color.backgroundContentTintColor
 import com.tonapps.uikit.color.textSecondaryColor
 import uikit.span.BadgeSpan
+import uikit.span.ClickableSpanCompat
 import uikit.span.EllipsisSpan
 
 inline fun SpannableStringBuilder.badge(
@@ -81,4 +83,9 @@ inline fun SpannableStringBuilder.ellipsis(
     builderAction: SpannableStringBuilder.() -> Unit
 ): SpannableStringBuilder = inSpans(EllipsisSpan(maxWidth, ellipsis), builderAction = builderAction)
 
+inline fun SpannableStringBuilder.clickable(
+    color: Int = Color.TRANSPARENT,
+    noinline onClick: () -> Unit,
+    builderAction: SpannableStringBuilder.() -> Unit
+): SpannableStringBuilder = inSpans(ClickableSpanCompat(color, onClick), builderAction = builderAction)
 
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/String.kt b/ui/uikit/core/src/main/java/uikit/extensions/String.kt
index f0331e801..541591236 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/String.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/String.kt
@@ -1,10 +1,13 @@
 package uikit.extensions
 
 import android.content.Context
+import android.graphics.Color
 import android.text.SpannableStringBuilder
 import android.text.Spanned
+import androidx.annotation.ColorInt
 import androidx.annotation.StringRes
 import androidx.core.text.HtmlCompat
+import com.tonapps.uikit.color.accentBlueColor
 
 fun String.parseWords(): List<String> {
     val words = split(",", "\n", " ").map {
@@ -23,42 +26,42 @@ fun String.html(): Spanned {
     return HtmlCompat.fromHtml(this, HtmlCompat.FROM_HTML_MODE_COMPACT)
 }
 
+fun CharSequence.spannableStringBuilder(): SpannableStringBuilder {
+    if (this is SpannableStringBuilder) {
+        return this
+    }
+    return SpannableStringBuilder(this)
+}
+
 fun CharSequence.withDefaultBadge(
     context: Context,
     @StringRes resId: Int
-): CharSequence {
-    val builder = SpannableStringBuilder(this)
-    builder.append(" ")
-    builder.badgeDefault(context) { append(context.getString(resId)) }
-    return builder
+) = spannableStringBuilder().append(" ").badgeDefault(context) {
+    append(context.getString(resId))
 }
 
 fun CharSequence.withGreenBadge(
     context: Context,
     @StringRes resId: Int
-): CharSequence {
-    val builder = SpannableStringBuilder(this)
-    builder.append(" ")
-    builder.badgeGreen(context) { append(context.getString(resId)) }
-    return builder
+) = spannableStringBuilder().append(" ").badgeGreen(context) {
+    append(context.getString(resId))
 }
 
 fun CharSequence.withRedBadge(
     context: Context,
     @StringRes resId: Int
-): CharSequence {
-    val builder = SpannableStringBuilder(this)
-    builder.append(" ")
-    builder.badgeRed(context) { append(context.getString(resId)) }
-    return builder
-}
+) = spannableStringBuilder().append(" ").badgeRed(context) { append(context.getString(resId)) }
 
 fun CharSequence.withBlueBadge(
     context: Context,
     @StringRes resId: Int
-): CharSequence {
-    val builder = SpannableStringBuilder(this)
-    builder.append(" ")
-    builder.badgeBlue(context) { append(context.getString(resId)) }
-    return builder
-}
\ No newline at end of file
+) = spannableStringBuilder().append(" ").badgeBlue(context) { append(context.getString(resId)) }
+
+fun CharSequence.withClickable(
+    context: Context,
+    @StringRes resId: Int,
+    @ColorInt color: Int = context.accentBlueColor,
+    onClick: () -> Unit = {}
+) = spannableStringBuilder().append(" ").clickable(color, onClick) { append(context.getString(resId)) }
+
+fun CharSequence.withInterpunct() = spannableStringBuilder().append(" · ")
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/View.kt b/ui/uikit/core/src/main/java/uikit/extensions/View.kt
index a3c385175..7c211e9f2 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/View.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/View.kt
@@ -1,5 +1,6 @@
 package uikit.extensions
 
+import android.animation.Animator
 import android.animation.ValueAnimator
 import android.graphics.Bitmap
 import android.graphics.Canvas
@@ -93,6 +94,12 @@ val View.statusBarHeight: Int
         return top
     }
 
+val View.bottomBarsOffset: Int
+    get() {
+        val insets = getRootWindowInsetsCompat()?.getInsets(WindowInsetsCompat.Type.systemBars()) ?: return 0
+        return insets.bottom
+    }
+
 fun ViewGroup.inflate(
     @LayoutRes
     layoutRes: Int
@@ -193,6 +200,10 @@ fun View.getDrawable(@DrawableRes resId: Int): Drawable {
     }
 }
 
+fun View.withAnimation(duration: Long = 120) {
+    withAnimation(duration) { }
+}
+
 fun View.withAnimation(duration: Long = 120, block: () -> Unit) {
     if (this !is ViewGroup) {
         block()
@@ -297,7 +308,7 @@ fun View.startSnakeAnimation(
     count: Int = 3,
     offset: Int = 16.dp,
     duration: Long = 400
-) {
+): Animator {
     val animator = ValueAnimator.ofFloat(0f, 1f)
     animator.addUpdateListener { animation ->
         val x = animation.animatedValue as Float
@@ -308,11 +319,13 @@ fun View.startSnakeAnimation(
     }
     animator.duration = duration
     animator.start()
+    return animator
 }
 
-fun View.reject() {
-    startSnakeAnimation()
+fun View.reject(): Animator {
+    val animator = startSnakeAnimation()
     hapticReject()
+    return animator
 }
 
 inline fun View.doKeyboardAnimation(
@@ -336,6 +349,23 @@ fun View.pinToBottomInsets() {
     }
 }
 
+fun ViewGroup.viewMoveTo(child: View, toIndex: Int) {
+    val currentIndex = indexOfChild(child)
+    if (currentIndex == toIndex) {
+        return
+    }
+    removeViewAt(currentIndex)
+    addView(child, toIndex)
+}
+
+inline fun ViewGroup.removeViews(predicate: (View) -> Boolean) {
+    for (i in childCount - 1 downTo 0) {
+        if (predicate(getChildAt(i))) {
+            removeViewAt(i)
+        }
+    }
+}
+
 fun View.applyBottomInsets() {
     ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
         view.translationY = -insets.bottomBarsOffset.toFloat()
@@ -426,3 +456,11 @@ fun View.hideKeyboard(ignoreFocus: Boolean = true) {
         controller.hide(WindowInsetsCompat.Type.ime())
     }
 }
+
+fun View.rotate180Animation() {
+    with(animate()) {
+        cancel()
+        rotation = 0f
+        rotationBy(180f).start()
+    }
+}
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/navigation/NavigationActivity.kt b/ui/uikit/core/src/main/java/uikit/navigation/NavigationActivity.kt
index dcfeb1e6f..5449dfb2a 100644
--- a/ui/uikit/core/src/main/java/uikit/navigation/NavigationActivity.kt
+++ b/ui/uikit/core/src/main/java/uikit/navigation/NavigationActivity.kt
@@ -131,6 +131,12 @@ abstract class NavigationActivity: BaseActivity(), Navigation, ViewTreeObserver.
         }
     }
 
+    fun addScreenDelay(fragment: BaseFragment) {
+        baseView.postDelayed({
+            add(fragment)
+        }, 800)
+    }
+
     fun setPrimaryFragment(
         fragment: BaseFragment,
         recreate: Boolean = false,
diff --git a/ui/uikit/core/src/main/java/uikit/span/ClickableSpanCompat.kt b/ui/uikit/core/src/main/java/uikit/span/ClickableSpanCompat.kt
index bb2a5d9f5..38012560d 100644
--- a/ui/uikit/core/src/main/java/uikit/span/ClickableSpanCompat.kt
+++ b/ui/uikit/core/src/main/java/uikit/span/ClickableSpanCompat.kt
@@ -6,8 +6,8 @@ import android.text.style.ClickableSpan
 import android.view.View
 
 class ClickableSpanCompat(
-    private val color: Int = Color.TRANSPARENT,
-    private val onClick: () -> Unit
+    val color: Int = Color.TRANSPARENT,
+    val onClick: () -> Unit
 ): ClickableSpan() {
 
     override fun updateDrawState(ds: TextPaint) {
diff --git a/ui/uikit/core/src/main/java/uikit/widget/BottomSheetLayout.kt b/ui/uikit/core/src/main/java/uikit/widget/BottomSheetLayout.kt
index 722f1f16f..7aa734526 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/BottomSheetLayout.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/BottomSheetLayout.kt
@@ -32,7 +32,7 @@ class BottomSheetLayout @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyle: Int = 0
-) : FrameLayout(context, attrs, defStyle), ValueAnimator.AnimatorUpdateListener {
+) : FrameLayout(context, attrs, defStyle) {
 
     private companion object {
         private const val parentScale = .92f
@@ -86,14 +86,12 @@ class BottomSheetLayout @JvmOverloads constructor(
         }
     }
 
-    private val showAnimation = ValueAnimator.ofFloat(0f, 1f).apply {
+    private val parentAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
         duration = 285
         interpolator = BottomSheetLayout.interpolator
-        addUpdateListener(this@BottomSheetLayout)
-        doOnStart { setLayerType(LAYER_TYPE_HARDWARE, null) }
-        doOnEnd {
-            setLayerType(LAYER_TYPE_NONE, null)
-            doOnAnimationEnd?.invoke()
+        addUpdateListener {
+            val progress = it.animatedValue as Float
+            onAnimationUpdateParent(progress)
         }
     }
 
@@ -129,7 +127,19 @@ class BottomSheetLayout @JvmOverloads constructor(
         doOnLayout {
             behavior.peekHeight = contentView.measuredHeight
             behavior.state = BottomSheetBehavior.STATE_EXPANDED
-            showAnimation.start()
+
+            parentAnimator.start()
+
+            contentView.translationY = measuredHeight.toFloat()
+            contentView.animate()
+                .translationY(0f)
+                .setDuration(285)
+                .setInterpolator(interpolator)
+                .withLayer()
+                .withEndAction {
+                    doOnAnimationEnd?.invoke()
+                }
+                .start()
         }
     }
 
@@ -146,13 +156,6 @@ class BottomSheetLayout @JvmOverloads constructor(
         behavior.state = BottomSheetBehavior.STATE_HIDDEN
     }
 
-    override fun onAnimationUpdate(animation: ValueAnimator) {
-        val value = animation.animatedValue as Float
-        onAnimationUpdateParent(value)
-        val height = measuredHeight
-        contentView.translationY = height * (1 - value)
-    }
-
     private fun onAnimationUpdateParent(progress: Float) {
         if (stackViews.size > 1) {
             return
diff --git a/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt b/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
index 50e611819..bdb9bab2e 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
@@ -240,6 +240,10 @@ open class HeaderView @JvmOverloads constructor(
         closeView.visibility = View.GONE
     }
 
+    fun showCloseIcon() {
+        closeView.visibility = View.VISIBLE
+    }
+
     fun setTitleGravity(newGravity: Int) {
         titleView.updateLayoutParams<LayoutParams> {
             this.gravity = newGravity
diff --git a/ui/uikit/core/src/main/java/uikit/widget/LoadableButton.kt b/ui/uikit/core/src/main/java/uikit/widget/LoadableButton.kt
index 061378c78..78c0b8a7f 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/LoadableButton.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/LoadableButton.kt
@@ -9,6 +9,7 @@ import android.widget.Button
 import android.widget.FrameLayout
 import com.tonapps.uikit.color.iconSecondaryColor
 import uikit.R
+import uikit.UiButtonState
 import uikit.extensions.getDimensionPixelSize
 import uikit.extensions.useAttributes
 
@@ -55,6 +56,15 @@ class LoadableButton @JvmOverloads constructor(
         }
     }
 
+    fun applyUiState(state: UiButtonState) {
+        if (state is UiButtonState.Default) {
+            setDefaultState()
+            setEnabled(state.enabled)
+        } else if (state is UiButtonState.Loading) {
+            setLoadingState()
+        }
+    }
+
     override fun setOnClickListener(l: OnClickListener?) {
         button.setOnClickListener(l)
     }
diff --git a/ui/uikit/core/src/main/java/uikit/widget/LoaderView.kt b/ui/uikit/core/src/main/java/uikit/widget/LoaderView.kt
index 80544f005..678a62215 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/LoaderView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/LoaderView.kt
@@ -11,6 +11,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.RectF
 import android.util.AttributeSet
+import android.util.Log
 import android.view.View
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
@@ -71,7 +72,13 @@ class LoaderView @JvmOverloads constructor(
         this.type = type
         updatePaint()
         stopAnimation()
-        startAnimation()
+        if (type == TYPE_TIMER) {
+            indeterminateRotateOffset = 0f
+            startAngle = -90f
+            invalidate()
+        } else {
+            startAnimation()
+        }
     }
 
     fun setProgressAnimation(progress: Float) {
@@ -148,24 +155,57 @@ class LoaderView @JvmOverloads constructor(
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        if (trackColor != Color.TRANSPARENT) {
-            canvas.drawArc(bounds, 0f, 360f, false, trackPaint)
-        }
         when (type) {
             TYPE_DEFAULT -> drawDefault(canvas)
             TYPE_PROGRESS -> drawProgress(canvas)
+            TYPE_TIMER -> drawTimer(canvas)
         }
     }
 
     private fun drawDefault(canvas: Canvas) {
+        if (trackColor != Color.TRANSPARENT) {
+            canvas.drawArc(bounds, 0f, 360f, false, trackPaint)
+        }
         canvas.drawArc(bounds, startAngle + indeterminateRotateOffset, indeterminateSweep, false, paint)
     }
 
     private fun drawProgress(canvas: Canvas) {
+        if (trackColor != Color.TRANSPARENT) {
+            canvas.drawArc(bounds, 0f, 360f, false, trackPaint)
+        }
         val angle = 360 * progress
         canvas.drawArc(bounds, startAngle + indeterminateRotateOffset, angle, false, paint)
     }
 
+    private fun drawTimer(canvas: Canvas) {
+        if (progress > TIMER_FADE_START) {
+            return
+        }
+        val fadeEnd = TIMER_FADE_START - TIMER_FADE_WINDOW
+        val alphaMul = when {
+            progress >= fadeEnd -> ((TIMER_FADE_START - progress) / TIMER_FADE_WINDOW).coerceIn(0f, 1f)
+            else -> 1f
+        }
+
+        val savedPaintAlpha = paint.alpha
+        val savedTrackAlpha = trackPaint.alpha
+
+        val basePaintAlpha = Color.alpha(color)
+        paint.alpha = (basePaintAlpha * alphaMul).toInt()
+
+        if (trackColor != Color.TRANSPARENT) {
+            val baseTrackAlpha = Color.alpha(trackColor)
+            trackPaint.alpha = (baseTrackAlpha * alphaMul).toInt()
+            canvas.drawArc(bounds, 0f, 360f, false, trackPaint)
+        }
+
+        val angle = 360f * progress.coerceIn(0f, 1f)
+        canvas.drawArc(bounds, -90f, angle, false, paint)
+
+        paint.alpha = savedPaintAlpha
+        trackPaint.alpha = savedTrackAlpha
+    }
+
     private fun cancelAnimator(animator: Animator?) {
         if (animator != null && animator.isRunning) {
             animator.cancel()
@@ -226,7 +266,7 @@ class LoaderView @JvmOverloads constructor(
 
         if (type == TYPE_PROGRESS) {
             startProgressAnimation()
-        } else {
+        } else if (type == TYPE_DEFAULT) {
             startDefaultAnimation()
         }
     }
@@ -297,7 +337,11 @@ class LoaderView @JvmOverloads constructor(
 
     companion object {
         private const val INDETERMINANT_MIN_SWEEP = 15f
+        private const val TIMER_FADE_START = 0.8f
+        private const val TIMER_FADE_WINDOW = 0.008f
+
         const val TYPE_PROGRESS = 1
         const val TYPE_DEFAULT = 2
+        const val TYPE_TIMER = 3
     }
 }
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/widget/SlideActionView.kt b/ui/uikit/core/src/main/java/uikit/widget/SlideActionView.kt
index 976befd92..9f40e3fc7 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/SlideActionView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/SlideActionView.kt
@@ -6,15 +6,20 @@ import android.graphics.Color
 import android.graphics.LinearGradient
 import android.graphics.Matrix
 import android.graphics.Shader
+import android.os.Build
 import android.util.AttributeSet
+import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import android.view.View
 import android.view.animation.LinearInterpolator
 import android.widget.FrameLayout
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.graphics.toColorInt
 import androidx.core.math.MathUtils
 import androidx.customview.widget.ViewDragHelper
+import com.tonapps.uikit.color.backgroundContentColor
+import com.tonapps.uikit.color.iconTertiaryColor
 import com.tonapps.uikit.color.stateList
 import com.tonapps.uikit.color.textTertiaryColor
 import com.tonapps.uikit.icon.UIKitIcon
@@ -23,6 +28,9 @@ import uikit.HapticHelper
 import uikit.extensions.dp
 import uikit.extensions.getDimension
 import uikit.extensions.getDimensionPixelSize
+import uikit.extensions.hapticConfirm
+import uikit.extensions.hapticReject
+import uikit.extensions.isDark
 import uikit.extensions.useAttributes
 
 class SlideActionView @JvmOverloads constructor(
@@ -101,6 +109,7 @@ class SlideActionView @JvmOverloads constructor(
 
     private val textView: GradientTextView
     private val buttonView: AppCompatImageView
+    private val progressView: LoaderView
     private val dragHelper: ViewDragHelper
 
     init {
@@ -110,6 +119,8 @@ class SlideActionView @JvmOverloads constructor(
         textView = findViewById(R.id.text)
         buttonView = findViewById(R.id.button)
 
+        progressView = findViewById(R.id.progress)
+
         dragHelper = ViewDragHelper.create(this, 0.2f, drawCallback)
         dragHelper.setEdgeTrackingEnabled(ViewDragHelper.EDGE_LEFT or ViewDragHelper.EDGE_RIGHT)
 
@@ -118,6 +129,17 @@ class SlideActionView @JvmOverloads constructor(
         }
     }
 
+    fun startReverseProgress() {
+        progressView.setTrackColor(context.iconTertiaryColor)
+        progressView.visibility = VISIBLE
+        progressView.type = LoaderView.TYPE_TIMER
+        progressView.setProgress(0f)
+    }
+
+    fun setReverseProgress(progress: Float) {
+        progressView.setProgress(1f - progress)
+    }
+
     fun setTint(color: Int) {
         buttonView.backgroundTintList = color.stateList
     }
@@ -138,6 +160,7 @@ class SlideActionView @JvmOverloads constructor(
         icon = checkIcon
         doOnDone?.invoke()
         isDone = true
+        hapticConfirm()
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -191,8 +214,8 @@ class SlideActionView @JvmOverloads constructor(
     ) : AppCompatTextView(context, attrs, defStyle), ValueAnimator.AnimatorUpdateListener {
 
         private val gradientWidth = 84f.dp * 2
-        private val color = Color.parseColor("#C2DAFF")
         private val textColor = context.textTertiaryColor
+        private val color = (if (textColor.isDark()) "#C2DAFF" else "#c8d3f7").toColorInt()
         private val gradientColors = intArrayOf(textColor, color, color, textColor)
         private val matrix = Matrix()
 
@@ -204,6 +227,10 @@ class SlideActionView @JvmOverloads constructor(
             addUpdateListener(this@GradientTextView)
         }
 
+        init {
+            setBackgroundResource(R.drawable.bg_content)
+        }
+
         override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
             super.onSizeChanged(w, h, oldw, oldh)
             paint.shader = LinearGradient(0f, 0f, w + gradientWidth, context.getDimension(R.dimen.itemHeight), gradientColors, null, Shader.TileMode.MIRROR)
@@ -221,6 +248,15 @@ class SlideActionView @JvmOverloads constructor(
             invalidate()
         }
 
+        override fun onVisibilityChanged(changedView: View, visibility: Int) {
+            super.onVisibilityChanged(changedView, visibility)
+            if (visibility == VISIBLE) {
+                animator.start()
+            } else {
+                animator.cancel()
+            }
+        }
+
         override fun onAttachedToWindow() {
             super.onAttachedToWindow()
             animator.start()
diff --git a/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt b/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt
index c56d4d26e..6015c6da1 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt
@@ -41,7 +41,12 @@ class SlideBetweenView @JvmOverloads constructor(
     }
 
     fun next(animated: Boolean = true) {
-        getFromToView(currentIndex, currentIndex + 1) { fromView, toView ->
+        val fromIndex = currentIndex
+        val toIndex = currentIndex + 1
+        if (toIndex >= childCount) {
+            return
+        }
+        getFromToView(fromIndex, toIndex) { fromView, toView ->
             if (animated) {
                 toView.visibility = VISIBLE
                 toView.translationX = measuredWidth.toFloat()
@@ -62,7 +67,12 @@ class SlideBetweenView @JvmOverloads constructor(
     }
 
     fun prev(animated: Boolean = true) {
-        getFromToView(currentIndex, currentIndex - 1) { fromView, toView ->
+        val fromIndex = currentIndex
+        val toIndex = currentIndex - 1
+        if (toIndex < 0) {
+            return
+        }
+        getFromToView(fromIndex, toIndex) { fromView, toView ->
             if (animated) {
                 toView.visibility = VISIBLE
                 toView.translationX = -measuredWidth.toFloat()
@@ -82,6 +92,17 @@ class SlideBetweenView @JvmOverloads constructor(
         }
     }
 
+    fun moveToIndex(index: Int, animated: Boolean = true) {
+        if (index < 0 || index >= childCount || index == currentIndex) {
+            return
+        }
+        if (index > currentIndex) {
+            repeat(index - currentIndex) { next(animated) }
+        } else {
+            repeat(currentIndex - index) { prev(animated) }
+        }
+    }
+
     private companion object {
         private const val ANIMATION_DURATION = 220L
         private val INTERPOLATOR = PathInterpolatorCompat.create(0.4f, 0f, 0.2f, 1f)
diff --git a/ui/uikit/core/src/main/java/uikit/widget/item/ItemLineView.kt b/ui/uikit/core/src/main/java/uikit/widget/item/ItemLineView.kt
new file mode 100644
index 000000000..754ed50c7
--- /dev/null
+++ b/ui/uikit/core/src/main/java/uikit/widget/item/ItemLineView.kt
@@ -0,0 +1,52 @@
+package uikit.widget.item
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.core.view.setPadding
+import uikit.R
+import uikit.extensions.dp
+import uikit.extensions.getDimensionPixelSize
+import uikit.extensions.setPaddingHorizontal
+import uikit.extensions.useAttributes
+import uikit.widget.RowLayout
+
+class ItemLineView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0,
+) : RowLayout(context, attrs, defStyle) {
+
+    private val size = context.getDimensionPixelSize(R.dimen.tertiaryHeight)
+
+    private val nameView: AppCompatTextView
+    private val valueView: AppCompatTextView
+
+    var name: CharSequence?
+        get() = nameView.text
+        set(value) {
+            nameView.text = value
+        }
+
+    var value: CharSequence?
+        get() = valueView.text
+        set(value) {
+            valueView.text = value
+        }
+
+    init {
+        inflate(context, R.layout.view_item_line, this)
+        setPaddingHorizontal(16.dp)
+        nameView = findViewById(R.id.line_name)
+        valueView = findViewById(R.id.line_value)
+
+        context.useAttributes(attrs, R.styleable.ItemLineView) {
+            name = it.getString(R.styleable.ItemLineView_android_name)
+            value = it.getString(R.styleable.ItemLineView_android_value)
+        }
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY))
+    }
+}
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/java/uikit/widget/webview/WebViewFixed.kt b/ui/uikit/core/src/main/java/uikit/widget/webview/WebViewFixed.kt
index 99f3c303d..6bd0b10c8 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/webview/WebViewFixed.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/webview/WebViewFixed.kt
@@ -28,6 +28,8 @@ import android.webkit.WebSettings
 import android.webkit.WebStorage
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.net.toUri
 import androidx.webkit.OutcomeReceiverCompat
 import androidx.webkit.PrefetchException
 import androidx.webkit.Profile
@@ -51,18 +53,25 @@ open class WebViewFixed @JvmOverloads constructor(
 ) : WebView(context, attrs, defStyle) {
 
     open class Callback {
-        open fun onScroll(y: Int, x: Int) {  }
-        open fun onElementBlurred() {  }
-        open fun onElementFocused(rect: RectF) { }
-        open fun onPageStarted(url: String, favicon: Bitmap?) { }
-        open fun shouldOverrideUrlLoading(request: WebResourceRequest): Boolean { return false }
-        open fun onPageFinished(url: String) { }
-        open fun onReceivedTitle(title: String) { }
-        open fun onProgressChanged(newProgress: Int) { }
-        open fun onLoadResource(url: String): Boolean { return true }
-        open fun onWindowClose() { }
-        open fun onNewTab(url: String) { }
-        open fun openFilePicker(fileChooserParams: FileChooserParams) { }
+        open fun onScroll(y: Int, x: Int) {}
+        open fun onElementBlurred() {}
+        open fun onElementFocused(rect: RectF) {}
+        open fun onPageStarted(url: String, favicon: Bitmap?) {}
+        open fun shouldOverrideUrlLoading(request: WebResourceRequest): Boolean {
+            return false
+        }
+
+        open fun onPageFinished(url: String) {}
+        open fun onReceivedTitle(title: String) {}
+        open fun onProgressChanged(newProgress: Int) {}
+        open fun onLoadResource(url: String): Boolean {
+            return true
+        }
+
+        open fun onWindowClose() {}
+        open fun onNewTab(url: String) {}
+        open fun openFilePicker(fileChooserParams: FileChooserParams) {}
+        open fun onPermissionRequest(request: PermissionRequest) {}
     }
 
     private var isPageLoaded = false
@@ -102,6 +111,7 @@ open class WebViewFixed @JvmOverloads constructor(
         settings.textSize = WebSettings.TextSize.NORMAL
         settings.setGeolocationEnabled(false)
 
+
         if (WebViewFeature.isFeatureSupported(WebViewFeature.ALGORITHMIC_DARKENING)) {
             WebSettingsCompat.setAlgorithmicDarkeningAllowed(settings, false)
         }
@@ -123,7 +133,9 @@ open class WebViewFixed @JvmOverloads constructor(
                 callbacks.forEach { it.onPageStarted(url, favicon) }
             }
 
-            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
+            override fun shouldOverrideUrlLoading(
+                view: WebView, request: WebResourceRequest
+            ): Boolean {
                 for (callback in callbacks) {
                     if (callback.shouldOverrideUrlLoading(request)) {
                         return true
@@ -135,6 +147,20 @@ open class WebViewFixed @JvmOverloads constructor(
             override fun onPageFinished(view: WebView?, url: String) {
                 super.onPageFinished(view, url)
                 callbacks.forEach { it.onPageFinished(url) }
+
+                val anchor = url.toUri().fragment
+                if (!anchor.isNullOrEmpty()) {
+                    evaluateJavascript(
+                        """
+                        (function() {
+                            var el = document.getElementById('$anchor');
+                            if (el) {
+                                el.scrollIntoView({behavior: 'smooth'});
+                            }
+                        })();
+                        """.trimIndent()
+                    )
+                }
             }
 
             override fun onLoadResource(view: WebView?, url: String) {
@@ -161,16 +187,12 @@ open class WebViewFixed @JvmOverloads constructor(
                 callbacks.forEach { it.onProgressChanged(newProgress) }
             }
 
-            /*override fun onPermissionRequest(request: PermissionRequest) {
-                val resources = request.resources
-                request.grant(resources)
-            }*/
+            override fun onPermissionRequest(request: PermissionRequest) {
+                callbacks.forEach { it.onPermissionRequest(request) }
+            }
 
             override fun onCreateWindow(
-                view: WebView,
-                isDialog: Boolean,
-                isUserGesture: Boolean,
-                resultMsg: Message?
+                view: WebView, isDialog: Boolean, isUserGesture: Boolean, resultMsg: Message?
             ): Boolean {
                 if (isDialog) {
                     return resultMsg?.let { openNewWindow(it) } ?: false
@@ -203,7 +225,6 @@ open class WebViewFixed @JvmOverloads constructor(
     }
 
     fun setFilePickerResult(arrays: Array<Uri>) {
-        Log.d("DAppScreenLog", "setFilePickerResult: ${arrays.joinToString(", ")}")
         filePathCallback?.onReceiveValue(arrays)
         filePathCallback = null
     }
@@ -217,9 +238,7 @@ open class WebViewFixed @JvmOverloads constructor(
     }
 
     private fun getTargetUrl(
-        view: WebView,
-        resultMsg: Message?,
-        callback: (url: String) -> Unit
+        view: WebView, resultMsg: Message?, callback: (url: String) -> Unit
     ) {
         val extra = view.hitTestResult.extra
         if (extra != null) {
@@ -230,9 +249,7 @@ open class WebViewFixed @JvmOverloads constructor(
     }
 
     private fun getTargetUrlHack(
-        view: WebView,
-        resultMsg: Message?,
-        callback: (url: String) -> Unit
+        view: WebView, resultMsg: Message?, callback: (url: String) -> Unit
     ) {
         val newWebView = WebView(view.context).apply {
             settings.apply {
@@ -243,8 +260,7 @@ open class WebViewFixed @JvmOverloads constructor(
             }
             webViewClient = object : WebViewClient() {
                 override fun shouldOverrideUrlLoading(
-                    view: WebView?,
-                    request: WebResourceRequest?
+                    view: WebView?, request: WebResourceRequest?
                 ): Boolean {
                     request?.url?.let {
                         callback(it.toString())
@@ -276,7 +292,8 @@ open class WebViewFixed @JvmOverloads constructor(
         return true
     }
 
-    private class NewWindowDialog(context: Context, profileName: String): Dialog(context, R.style.Widget_Dialog) {
+    private class NewWindowDialog(context: Context, profileName: String) :
+        Dialog(context, R.style.Widget_Dialog) {
 
         val webView = WebViewFixed(context)
 
@@ -334,15 +351,8 @@ open class WebViewFixed @JvmOverloads constructor(
     }
 
     suspend fun getInputBottom(): Float = suspendCancellableCoroutine { continuation ->
-        val jsCode = "(function() {" +
-                "var focusedElement = document.activeElement;" +
-                "if (focusedElement && (focusedElement.tagName === 'INPUT' || focusedElement.tagName === 'TEXTAREA')) {" +
-                "   var rect = focusedElement.getBoundingClientRect();" +
-                "   return rect.bottom;" +
-                "} else {" +
-                "   return -1;" +
-                "}" +
-                "})()"
+        val jsCode =
+            "(function() {" + "var focusedElement = document.activeElement;" + "if (focusedElement && (focusedElement.tagName === 'INPUT' || focusedElement.tagName === 'TEXTAREA')) {" + "   var rect = focusedElement.getBoundingClientRect();" + "   return rect.bottom;" + "} else {" + "   return -1;" + "}" + "})()"
         evaluateJavascript(jsCode) { value ->
             val elementBottom = value.toFloatOrNull() ?: -1f
             continuation.resume(elementBottom)
@@ -354,14 +364,16 @@ open class WebViewFixed @JvmOverloads constructor(
         super.clearHistory()
         try {
             (this.parent as ViewGroup).removeView(this)
-        } catch (ignored: Throwable) { }
+        } catch (ignored: Throwable) {
+        }
     }
 
     override fun destroy() {
         reset()
         try {
             removeAllViews()
-        } catch (ignored: Throwable) { }
+        } catch (ignored: Throwable) {
+        }
         super.destroy()
     }
 
@@ -425,7 +437,12 @@ open class WebViewFixed @JvmOverloads constructor(
         @JavascriptInterface
         fun onElementFocused(value: String) {
             val json = JSONObject(value)
-            val rect = RectF(json.getDouble("left").toFloat(), json.getDouble("top").toFloat(), json.getDouble("right").toFloat(), json.getDouble("bottom").toFloat())
+            val rect = RectF(
+                json.getDouble("left").toFloat(),
+                json.getDouble("top").toFloat(),
+                json.getDouble("right").toFloat(),
+                json.getDouble("bottom").toFloat()
+            )
             this@WebViewFixed.onElementFocused(rect)
         }
     }
diff --git a/ui/uikit/core/src/main/res/drawable/bg_content_bottom.xml b/ui/uikit/core/src/main/res/drawable/bg_content_bottom.xml
new file mode 100644
index 000000000..efd63e63b
--- /dev/null
+++ b/ui/uikit/core/src/main/res/drawable/bg_content_bottom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?attr/backgroundContentColor" />
+
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="@dimen/offsetMedium"
+        android:bottomRightRadius="@dimen/offsetMedium" />
+</shape>
diff --git a/ui/uikit/core/src/main/res/drawable/bg_content_error.xml b/ui/uikit/core/src/main/res/drawable/bg_content_error.xml
new file mode 100644
index 000000000..0fe90ef66
--- /dev/null
+++ b/ui/uikit/core/src/main/res/drawable/bg_content_error.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/backgroundContentColor"/>
+    <corners android:radius="@dimen/offsetMedium"/>
+    <stroke
+        android:width="1.5dp"
+        android:color="?attr/accentRedColor"/>
+</shape>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/drawable/bg_content_top.xml b/ui/uikit/core/src/main/res/drawable/bg_content_top.xml
new file mode 100644
index 000000000..ecb65f52b
--- /dev/null
+++ b/ui/uikit/core/src/main/res/drawable/bg_content_top.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?attr/backgroundContentColor" />
+
+    <corners
+        android:topLeftRadius="@dimen/offsetMedium"
+        android:topRightRadius="@dimen/offsetMedium"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp" />
+</shape>
diff --git a/ui/uikit/core/src/main/res/drawable/bg_field.xml b/ui/uikit/core/src/main/res/drawable/bg_field.xml
new file mode 100644
index 000000000..6d62478ac
--- /dev/null
+++ b/ui/uikit/core/src/main/res/drawable/bg_field.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/fieldBackgroundColor"/>
+    <corners android:radius="@dimen/offsetMedium"/>
+</shape>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/drawable/bg_field_focused.xml b/ui/uikit/core/src/main/res/drawable/bg_field_focused.xml
new file mode 100644
index 000000000..7043854bc
--- /dev/null
+++ b/ui/uikit/core/src/main/res/drawable/bg_field_focused.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/fieldBackgroundColor"/>
+    <corners android:radius="@dimen/offsetMedium"/>
+    <stroke
+        android:width="1.5dp"
+        android:color="?attr/accentBlueColor"/>
+</shape>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/layout/fragment_list.xml b/ui/uikit/core/src/main/res/layout/fragment_list.xml
index 49dcbac92..79ece4ada 100644
--- a/ui/uikit/core/src/main/res/layout/fragment_list.xml
+++ b/ui/uikit/core/src/main/res/layout/fragment_list.xml
@@ -22,4 +22,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </FrameLayout>
+
+    <Button
+        style="@style/Widget.App.Button"
+        android:id="@+id/action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_margin="@dimen/offsetMedium"
+        android:textAppearance="@style/TextAppearance.Label1"
+        android:visibility="gone"/>
 </FrameLayout>
diff --git a/ui/uikit/core/src/main/res/layout/view_item_line.xml b/ui/uikit/core/src/main/res/layout/view_item_line.xml
new file mode 100644
index 000000000..aaac7cf08
--- /dev/null
+++ b/ui/uikit/core/src/main/res/layout/view_item_line.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/line_name"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:textAppearance="@style/TextAppearance.Body2"
+        android:textColor="?attr/textSecondaryColor"
+        android:layout_weight="1"/>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/line_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/textPrimaryColor"
+        android:textAppearance="@style/TextAppearance.Body2"
+        android:layout_gravity="center"/>
+</merge>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/layout/view_slide_action.xml b/ui/uikit/core/src/main/res/layout/view_slide_action.xml
index 2433202e4..afccb8820 100644
--- a/ui/uikit/core/src/main/res/layout/view_slide_action.xml
+++ b/ui/uikit/core/src/main/res/layout/view_slide_action.xml
@@ -9,6 +9,14 @@
         android:textAppearance="@style/TextAppearance.Label1"
         android:textColor="?attr/textTertiaryColor"/>
 
+    <uikit.widget.LoaderView
+        android:id="@+id/progress"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginEnd="16dp"
+        android:visibility="gone"/>
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/button"
         android:layout_width="76dp"
diff --git a/ui/uikit/core/src/main/res/values/styleable.xml b/ui/uikit/core/src/main/res/values/styleable.xml
index 215887929..d731a2a3c 100644
--- a/ui/uikit/core/src/main/res/values/styleable.xml
+++ b/ui/uikit/core/src/main/res/values/styleable.xml
@@ -81,6 +81,11 @@
         <attr name="position"/>
     </declare-styleable>
 
+    <declare-styleable name="ItemLineView">
+        <attr name="android:name" format="string|reference"/>
+        <attr name="android:value" format="string|reference"/>
+    </declare-styleable>
+
     <declare-styleable name="SearchInput">
         <attr name="android:text" format="string|reference"/>
         <attr name="android:hint" format="string|reference"/>
diff --git a/ui/uikit/core/src/main/res/values/styles.xml b/ui/uikit/core/src/main/res/values/styles.xml
index ffdd577a6..85b0632f4 100644
--- a/ui/uikit/core/src/main/res/values/styles.xml
+++ b/ui/uikit/core/src/main/res/values/styles.xml
@@ -61,6 +61,7 @@
     <style name="Widget.App.Button.Small" parent="Base.Widget.App.Button">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">@dimen/tertiaryHeight</item>
+        <item name="android:minWidth">@dimen/tertiaryHeight</item>
         <item name="android:minHeight">@dimen/tertiaryHeight</item>
         <item name="android:background">@drawable/bg_small_button_primary</item>
         <item name="android:textColor">@color/button_primary_foreground_selector</item>
diff --git a/ui/uikit/icon/build.gradle.kts b/ui/uikit/icon/build.gradle.kts
index cff81237b..874c54058 100644
--- a/ui/uikit/icon/build.gradle.kts
+++ b/ui/uikit/icon/build.gradle.kts
@@ -15,5 +15,5 @@ android {
 }
 
 dependencies {
-    implementation(project(Dependence.UIKit.color))
+    implementation(project(ProjectModules.UIKit.color))
 }
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_arrow_down_16.xml b/ui/uikit/icon/src/main/res/drawable/ic_arrow_down_16.xml
new file mode 100644
index 000000000..58ffcd9fa
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_arrow_down_16.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8.75,2.75C8.75,2.336 8.414,2 8,2C7.586,2 7.25,2.336 7.25,2.75V11.439L4.53,8.72C4.237,8.427 3.763,8.427 3.47,8.72C3.177,9.013 3.177,9.487 3.47,9.78L7.47,13.78C7.763,14.073 8.237,14.073 8.53,13.78L12.53,9.78C12.823,9.487 12.823,9.013 12.53,8.72C12.237,8.427 11.763,8.427 11.47,8.72L8.75,11.439V2.75Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/ui/uikit/list/build.gradle.kts b/ui/uikit/list/build.gradle.kts
index 2cb092259..fbd0c56b0 100644
--- a/ui/uikit/list/build.gradle.kts
+++ b/ui/uikit/list/build.gradle.kts
@@ -15,6 +15,6 @@ android {
 }
 
 dependencies {
-    implementation(Dependence.AndroidX.recyclerView)
-    implementation(Dependence.AndroidX.lifecycle)
+    implementation(libs.androidX.recyclerView)
+    implementation(libs.androidX.lifecycle)
 }
diff --git a/ui/uikit/list/src/main/java/com/tonapps/uikit/list/ListCell.kt b/ui/uikit/list/src/main/java/com/tonapps/uikit/list/ListCell.kt
index f9b306add..4ec9aebf1 100644
--- a/ui/uikit/list/src/main/java/com/tonapps/uikit/list/ListCell.kt
+++ b/ui/uikit/list/src/main/java/com/tonapps/uikit/list/ListCell.kt
@@ -3,6 +3,7 @@ package com.tonapps.uikit.list
 interface ListCell {
 
     companion object {
+
         fun getPosition(size: Int, index: Int): Position {
             if (1 >= size) {
                 return Position.SINGLE