diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1ad295e73..733bcc07d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -27,6 +27,7 @@
             <option value="$PROJECT_DIR$/apps/wallet/data" />
             <option value="$PROJECT_DIR$/apps/wallet/data/account" />
             <option value="$PROJECT_DIR$/apps/wallet/data/backup" />
+            <option value="$PROJECT_DIR$/apps/wallet/data/battery" />
             <option value="$PROJECT_DIR$/apps/wallet/data/browser" />
             <option value="$PROJECT_DIR$/apps/wallet/data/collectibles" />
             <option value="$PROJECT_DIR$/apps/wallet/data/core" />
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 625df56af..bfc875094 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,6 +3,7 @@ package com.tonapps.wallet.api
 import android.content.Context
 import android.util.ArrayMap
 import android.util.Log
+import com.squareup.moshi.JsonAdapter
 import com.tonapps.blockchain.ton.extensions.EmptyPrivateKeyEd25519
 import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.isValidTonAddress
@@ -17,6 +18,7 @@ import com.tonapps.network.interceptor.AuthorizationInterceptor
 import com.tonapps.network.post
 import com.tonapps.network.postJSON
 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.BalanceEntity
 import com.tonapps.wallet.api.entity.ChartEntity
@@ -24,6 +26,12 @@ import com.tonapps.wallet.api.entity.ConfigEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.api.internal.ConfigRepository
 import com.tonapps.wallet.api.internal.InternalApi
+import io.batteryapi.apis.BatteryApi
+import io.batteryapi.apis.BatteryApi.UnitsGetBalance
+import io.batteryapi.models.Balance
+import io.batteryapi.models.Config
+import io.batteryapi.models.RechargeMethods
+import io.tonapi.infrastructure.Serializer
 import io.tonapi.models.Account
 import io.tonapi.models.AccountAddress
 import io.tonapi.models.AccountEvent
@@ -67,6 +75,10 @@ class API(
         )
     }
 
+    private val batteryHttpClient: OkHttpClient by lazy {
+        createBatteryAPIHttpClient(context)
+    }
+
     private val internalApi = InternalApi(context, defaultHttpClient)
     private val configRepository = ConfigRepository(context, scope, internalApi)
 
@@ -88,6 +100,14 @@ class API(
         Provider(config.tonapiMainnetHost, config.tonapiTestnetHost, tonAPIHttpClient)
     }
 
+    private val batteryApi by lazy {
+        SourceAPI(BatteryApi(config.batteryHost, batteryHttpClient), BatteryApi(config.batteryTestnetHost, batteryHttpClient))
+    }
+
+    private val emulationJSONAdapter: JsonAdapter<MessageConsequences> by lazy {
+        Serializer.moshi.adapter(MessageConsequences::class.java)
+    }
+
     fun accounts(testnet: Boolean) = provider.accounts.get(testnet)
 
     fun jettons(testnet: Boolean) = provider.jettons.get(testnet)
@@ -108,11 +128,29 @@ class API(
 
     fun rates() = provider.rates.get(false)
 
-    fun getAlertNotifications() = withRetry {
+    fun battery(testnet: Boolean) = batteryApi.get(testnet)
+
+    suspend fun getBatteryConfig(testnet: Boolean): Config? {
+        return withRetry { battery(testnet).getConfig() }
+    }
+
+    suspend fun getBatteryRechargeMethods(testnet: Boolean): RechargeMethods? {
+        return withRetry { battery(testnet).getRechargeMethods(false) }
+    }
+
+    suspend fun getBatteryBalance(
+        tonProofToken: String,
+        testnet: Boolean,
+        units: UnitsGetBalance = UnitsGetBalance.ton
+    ): Balance? {
+        return withRetry { battery(testnet).getBalance(tonProofToken, units) }
+    }
+
+    suspend fun getAlertNotifications() = withRetry {
         internalApi.getNotifications()
     } ?: emptyList()
 
-    private fun isOkStatus(testnet: Boolean): Boolean {
+    suspend fun isOkStatus(testnet: Boolean): Boolean {
         try {
             val status = withRetry {
                 provider.blockchain.get(testnet).status()
@@ -165,7 +203,6 @@ class API(
         return listOf(accountEvent)
     }
 
-
     fun getTokenEvents(
         tokenAddress: String,
         accountId: String,
@@ -355,6 +392,36 @@ class API(
         }
     }
 
+    suspend fun emulateWithBattery(
+        tonProofToken: String,
+        cell: Cell,
+        testnet: Boolean
+    ) = emulateWithBattery(tonProofToken, cell.base64(), testnet)
+
+    suspend fun emulateWithBattery(
+        tonProofToken: String,
+        boc: String,
+        testnet: Boolean
+    ): Pair<MessageConsequences, Boolean>? {
+        val host = if (testnet) config.batteryTestnetHost else config.batteryHost
+        val url = "$host/wallet/emulate"
+        val data = "{\"boc\":\"$boc\"}"
+
+        val response = withRetry {
+            tonAPIHttpClient.postJSON(url, data, ArrayMap<String, String>().apply {
+                set("X-TonConnect-Auth", tonProofToken)
+            })
+        } ?: return null
+
+        val supportedByBattery = response.headers["supported-by-battery"] == "true"
+        val allowedByBattery = response.headers["allowed-by-battery"] == "true"
+        val withBattery = supportedByBattery && allowedByBattery
+
+        val string = response.body?.string() ?: return null
+        val consequences = emulationJSONAdapter.fromJson(string) ?: return null
+        return Pair(consequences, withBattery)
+    }
+
     suspend fun emulate(
         boc: String,
         testnet: Boolean,
@@ -380,6 +447,29 @@ class API(
         return emulate(cell.base64(), testnet, address, balance)
     }
 
+    suspend fun sendToBlockchainWithBattery(
+        boc: Cell,
+        tonProofToken: String,
+        testnet: Boolean,
+    ) = sendToBlockchainWithBattery(boc.base64(), tonProofToken, testnet)
+
+    suspend fun sendToBlockchainWithBattery(
+        boc: String,
+        tonProofToken: String,
+        testnet: Boolean,
+    ): Boolean = withContext(Dispatchers.IO) {
+        if (!isOkStatus(testnet)) {
+            return@withContext false
+        }
+
+        val request = io.batteryapi.models.EmulateMessageToWalletRequest(boc)
+
+        withRetry {
+            battery(testnet).sendMessage(tonProofToken, request)
+            true
+        } ?: false
+    }
+
     suspend fun sendToBlockchain(
         boc: String,
         testnet: Boolean
@@ -387,6 +477,7 @@ class API(
         if (!isOkStatus(testnet)) {
             return@withContext false
         }
+
         val request = SendBlockchainMessageRequest(boc)
         withRetry {
             blockchain(testnet).sendBlockchainMessage(request)
@@ -649,5 +740,13 @@ class API(
                     )
                 )).build()
         }
+
+        private fun createBatteryAPIHttpClient(
+            context: Context,
+        ): OkHttpClient {
+            return baseOkHttpClientBuilder()
+                 .addInterceptor(AcceptLanguageInterceptor(context.locale))
+                .build()
+        }
     }
 }
\ 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 881c84f56..b66069790 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,5 +1,6 @@
 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
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 0c983979a..178040632 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
@@ -1,7 +1,6 @@
 package com.tonapps.wallet.api.entity
 
 import android.os.Parcelable
-import android.util.Log
 import com.tonapps.icu.Coins
 import io.tonapi.models.JettonBalance
 import io.tonapi.models.TokenRates
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 05c012f58..48392cd19 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
@@ -26,12 +26,29 @@ data class ConfigEntity(
     val faqUrl: String,
     val aptabaseEndpoint: String,
     val aptabaseAppKey: String,
-    val scamEndpoint: String
+    val scamEndpoint: String,
+    val batteryHost: String,
+    val batteryTestnetHost: String,
+    val batteryBeta: Boolean,
+    val batteryDisabled: Boolean,
+    val batterySendDisabled: Boolean,
+    val batteryMeanFees: String,
+    val batteryMeanPriceNft: String,
+    val batteryMeanPriceSwap: String,
+    val batteryMeanPriceJetton: String,
+    val disableBatteryCryptoRecharge: Boolean,
+    val batteryReservedAmount: String,
+    val batteryMaxInputAmount: String,
+    val batteryRefundEndpoint: String,
+    val batteryPromoDisabled: Boolean,
 ): Parcelable {
 
     val swapUri: Uri
         get() = Uri.parse(stonfiUrl)
 
+    val isBatteryDisabled: Boolean
+        get() = batteryDisabled || batterySendDisabled
+
     constructor(json: JSONObject, debug: Boolean) : this(
         supportLink = json.getString("supportLink"),
         nftExplorer = json.getString("NFTOnExplorerUrl"),
@@ -55,10 +72,22 @@ data class ConfigEntity(
         faqUrl = json.getString("faq_url"),
         aptabaseEndpoint = json.getString("aptabaseEndpoint"),
         aptabaseAppKey = json.getString("aptabaseAppKey"),
-        scamEndpoint = json.optString("scamEndpoint", "https://scam.tonkeeper.com")
-    ) {
-        Log.d("ConfigLog", "ConfigEntity: $json")
-    }
+        scamEndpoint = json.optString("scamEndpoint", "https://scam.tonkeeper.com"),
+        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"),
+        disableBatteryCryptoRecharge = json.optBoolean("disable_battery_crypto_recharge_module", false),
+        batteryMeanPriceNft = json.optString("batteryMeanPrice_nft", "0.03"),
+        batteryMeanPriceSwap = json.optString("batteryMeanPrice_swap", "0.22"),
+        batteryMeanPriceJetton = json.optString("batteryMeanPrice_jetton", "0.06"),
+        batteryReservedAmount = json.optString("batteryReservedAmount", "0.3"),
+        batteryMaxInputAmount = json.optString("batteryMaxInputAmount", "3"),
+        batteryRefundEndpoint = json.optString("batteryRefundEndpoint", "https://battery-refund-app.vercel.app"),
+        batteryPromoDisabled = json.optBoolean("disable_battery_promo_module", true),
+    )
 
     constructor() : this(
         supportLink = "mailto:support@tonkeeper.com",
@@ -80,6 +109,20 @@ data class ConfigEntity(
         aptabaseEndpoint = "https://anonymous-analytics.tonkeeper.com",
         aptabaseAppKey = "A-SH-4314447490",
         scamEndpoint = "https://scam.tonkeeper.com",
+        batteryHost = "https://battery.tonkeeper.com",
+        batteryTestnetHost = "https://testnet-battery.tonkeeper.com",
+        batteryBeta = true,
+        batteryDisabled = false,
+        batterySendDisabled = false,
+        batteryMeanFees = "0.0055",
+        disableBatteryCryptoRecharge = false,
+        batteryMeanPriceNft = "0.03",
+        batteryMeanPriceSwap = "0.22",
+        batteryMeanPriceJetton = "0.06",
+        batteryReservedAmount = "0.3",
+        batteryMaxInputAmount = "3",
+        batteryRefundEndpoint = "https://battery-refund-app.vercel.app",
+        batteryPromoDisabled = false,
     )
 
     companion object {
diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt
index 28e5fdb82..f3f8ba2b7 100644
--- a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt
+++ b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/AccountRepository.kt
@@ -1,7 +1,6 @@
 package com.tonapps.wallet.data.account
 
 import android.content.Context
-import android.util.Log
 import com.tonapps.blockchain.ton.contract.BaseWalletContract
 import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.contract.walletVersion
@@ -9,7 +8,6 @@ import com.tonapps.blockchain.ton.extensions.EmptyPrivateKeyEd25519
 import com.tonapps.blockchain.ton.extensions.base64
 import com.tonapps.blockchain.ton.extensions.hex
 import com.tonapps.blockchain.ton.extensions.toAccountId
-import com.tonapps.extensions.isMainVersion
 import com.tonapps.ledger.ton.LedgerAccount
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.MessageBodyEntity
@@ -37,14 +35,10 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.parcelize.RawValue
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import org.ton.api.pk.PrivateKeyEd25519
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.cell.Cell
 import org.ton.contract.wallet.WalletTransfer
-import org.ton.mnemonic.Mnemonic
 import java.util.UUID
 
 class AccountRepository(
@@ -427,9 +421,10 @@ class AccountRepository(
         wallet: WalletEntity,
         seqno: Int,
         validUntil: Long,
-        transfers: List<WalletTransfer>
+        transfers: List<WalletTransfer>,
+        internalMessage: Boolean = false,
     ): MessageBodyEntity {
-        val body = wallet.createBody(seqno, validUntil, transfers)
+        val body = wallet.createBody(seqno, validUntil, transfers, internalMessage)
         return MessageBodyEntity(seqno, body, validUntil)
     }
 
@@ -438,9 +433,10 @@ class AccountRepository(
         seqno: Int,
         privateKeyEd25519: PrivateKeyEd25519,
         validUntil: Long,
-        transfers: List<WalletTransfer>
+        transfers: List<WalletTransfer>,
+        internalMessage: Boolean = false,
     ): Cell {
-        val data = messageBody(wallet, seqno, validUntil, transfers)
+        val data = messageBody(wallet, seqno, validUntil, transfers, internalMessage)
         return wallet.sign(privateKeyEd25519, data.seqno, data.body)
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/entities/WalletEntity.kt b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/entities/WalletEntity.kt
index c3dfab117..35a7072ba 100644
--- a/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/entities/WalletEntity.kt
+++ b/apps/wallet/data/account/src/main/java/com/tonapps/wallet/data/account/entities/WalletEntity.kt
@@ -4,6 +4,7 @@ import android.os.Parcelable
 import android.util.Log
 import com.tonapps.blockchain.ton.TonNetwork
 import com.tonapps.blockchain.ton.contract.BaseWalletContract
+import com.tonapps.blockchain.ton.contract.WalletFeature
 import com.tonapps.blockchain.ton.contract.WalletVersion
 import com.tonapps.blockchain.ton.extensions.toAccountId
 import com.tonapps.blockchain.ton.extensions.toRawAddress
@@ -32,7 +33,7 @@ data class WalletEntity(
     data class Ledger(
         val deviceId: String,
         val accountIndex: Int
-    ): Parcelable
+    ) : Parcelable
 
     val contract: BaseWalletContract by lazy {
         val network = if (testnet) TonNetwork.TESTNET.value else TonNetwork.MAINNET.value
@@ -69,15 +70,21 @@ data class WalletEntity(
         return address.toRawAddress().equals(accountId, ignoreCase = true)
     }
 
+    fun isSupportedFeature(feature: WalletFeature): Boolean {
+        return contract.isSupportedFeature(feature)
+    }
+
     fun createBody(
         seqno: Int,
         validUntil: Long,
-        gifts: List<WalletTransfer>
+        gifts: List<WalletTransfer>,
+        internalMessage: Boolean = false,
     ): Cell {
         return contract.createTransferUnsignedBody(
             validUntil = validUntil,
             seqno = seqno,
-            gifts = gifts.toTypedArray()
+            gifts = gifts.toTypedArray(),
+            internalMessage = internalMessage,
         )
     }
 
diff --git a/apps/wallet/data/battery/.gitignore b/apps/wallet/data/battery/.gitignore
new file mode 100644
index 000000000..42afabfd2
--- /dev/null
+++ b/apps/wallet/data/battery/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/apps/wallet/data/battery/build.gradle.kts b/apps/wallet/data/battery/build.gradle.kts
new file mode 100644
index 000000000..c79380c1d
--- /dev/null
+++ b/apps/wallet/data/battery/build.gradle.kts
@@ -0,0 +1,40 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = Build.namespacePrefix("wallet.data.battery")
+    compileSdk = Build.compileSdkVersion
+
+    defaultConfig {
+        minSdk = Build.minSdkVersion
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(Dependence.KotlinX.coroutines)
+    implementation(Dependence.Koin.core)
+    implementation(Dependence.Squareup.moshi)
+    implementation(Dependence.Squareup.moshiAdapters)
+    implementation(Dependence.Squareup.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))
+}
diff --git a/apps/wallet/data/battery/consumer-rules.pro b/apps/wallet/data/battery/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/wallet/data/battery/proguard-rules.pro b/apps/wallet/data/battery/proguard-rules.pro
new file mode 100644
index 000000000..481bb4348
--- /dev/null
+++ b/apps/wallet/data/battery/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/AndroidManifest.xml b/apps/wallet/data/battery/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..227314eeb
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest />
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryMapper.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryMapper.kt
new file mode 100644
index 000000000..da64912b3
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryMapper.kt
@@ -0,0 +1,34 @@
+package com.tonapps.wallet.data.battery
+
+import com.tonapps.icu.Coins
+import com.tonapps.wallet.data.battery.entity.RechargeMethodEntity
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+object BatteryMapper {
+
+    fun convertToCharges(
+        balance: Coins,
+        meanFees: String
+    ): Int {
+        val meanFeesBigDecimal = BigDecimal(meanFees)
+        return balance.value.divide(meanFeesBigDecimal, 0, RoundingMode.UP).toInt()
+    }
+
+    fun calculateChargesAmount(
+        transactionCost: String,
+        meanFees: String
+    ): Int {
+        val meanFeesBigDecimal = BigDecimal(meanFees)
+        val transactionCostBigDecimal = BigDecimal(transactionCost)
+
+        return transactionCostBigDecimal.divide(meanFeesBigDecimal, 0, RoundingMode.HALF_UP)
+            .toInt()
+    }
+
+    fun calculateCryptoCharges(method: RechargeMethodEntity, meanFees: String, amount: Coins): BigDecimal {
+        val meanFeesBigDecimal = BigDecimal(meanFees)
+        val rateBigDecimal = BigDecimal(method.rate)
+        return rateBigDecimal.divide(meanFeesBigDecimal, 0, RoundingMode.HALF_UP).multiply(amount.value)
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryRepository.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryRepository.kt
new file mode 100644
index 000000000..5b13b2a9c
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/BatteryRepository.kt
@@ -0,0 +1,125 @@
+package com.tonapps.wallet.data.battery
+
+import android.content.Context
+import androidx.collection.ArrayMap
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.extensions.filterList
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.battery.entity.BatteryConfigEntity
+import com.tonapps.wallet.data.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.battery.source.LocalDataSource
+import com.tonapps.wallet.data.battery.source.RemoteDataSource
+import io.tonapi.models.MessageConsequences
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.cancellable
+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.launch
+import kotlinx.coroutines.withContext
+import org.ton.api.pub.PublicKeyEd25519
+import org.ton.cell.Cell
+
+class BatteryRepository(
+    context: Context,
+    private val api: API,
+    scope: CoroutineScope,
+) {
+    private val localDataSource = LocalDataSource(context)
+    private val remoteDataSource = RemoteDataSource(api)
+
+    private val _balanceUpdatedFlow = MutableEffectFlow<Unit>()
+    val balanceUpdatedFlow = _balanceUpdatedFlow.asSharedFlow()
+
+    init {
+        _balanceUpdatedFlow.tryEmit(Unit)
+        scope.launch(Dispatchers.IO) {
+            getConfig(false, ignoreCache = true)
+        }
+    }
+
+    suspend fun getConfig(
+        testnet: Boolean,
+        ignoreCache: Boolean = false
+    ): BatteryConfigEntity = withContext(Dispatchers.IO) {
+        if (ignoreCache) {
+            fetchConfig(testnet)
+        } else {
+            localDataSource.getConfig(testnet) ?: fetchConfig(testnet)
+        }
+    }
+
+    private suspend fun fetchConfig(testnet: Boolean): BatteryConfigEntity {
+        val config = remoteDataSource.fetchConfig(testnet) ?: return BatteryConfigEntity.Empty
+        localDataSource.setConfig(testnet, config)
+        return config
+    }
+
+    suspend fun getBalance(
+        tonProofToken: String,
+        publicKey: PublicKeyEd25519,
+        testnet: Boolean,
+        ignoreCache: Boolean = false,
+    ): BatteryBalanceEntity = withContext(Dispatchers.IO) {
+        val balance = if (ignoreCache) {
+            fetchBalance(publicKey, tonProofToken, testnet)
+        } else {
+            localDataSource.getBalance(publicKey, testnet) ?: fetchBalance(publicKey, tonProofToken, testnet)
+        }
+        balance
+    }
+
+    private suspend fun fetchBalance(
+        publicKey: PublicKeyEd25519,
+        tonProofToken: String,
+        testnet: Boolean
+    ): BatteryBalanceEntity {
+        val balance = remoteDataSource.fetchBalance(tonProofToken, testnet) ?: return BatteryBalanceEntity.Empty
+        localDataSource.setBalance(publicKey, testnet, balance)
+        _balanceUpdatedFlow.emit(Unit)
+        return balance
+    }
+
+    suspend fun emulate(
+        tonProofToken: String,
+        publicKey: PublicKeyEd25519,
+        testnet: Boolean,
+        boc: Cell,
+        forceRelayer: Boolean = false
+    ): Pair<MessageConsequences, Boolean>? = withContext(Dispatchers.IO) {
+
+        val balance = getBalance(
+            tonProofToken = tonProofToken,
+            publicKey = publicKey,
+            testnet = testnet
+        ).balance
+
+        if (!forceRelayer && !balance.isPositive) {
+            throw IllegalStateException("Zero balance")
+        }
+
+        api.emulateWithBattery(tonProofToken, boc, testnet)
+    }
+
+    suspend fun getAppliedPromo(
+        testnet: Boolean,
+    ): String? = withContext(Dispatchers.IO) {
+        localDataSource.getAppliedPromo(testnet)
+    }
+
+    suspend fun setAppliedPromo(
+        testnet: Boolean,
+        promo: String,
+    ) = withContext(Dispatchers.IO) {
+        localDataSource.setAppliedPromo(testnet, promo)
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/Module.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/Module.kt
new file mode 100644
index 000000000..21bd0c1af
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/Module.kt
@@ -0,0 +1,7 @@
+package com.tonapps.wallet.data.battery
+
+import org.koin.dsl.module
+
+val batteryModule = module {
+    single { BatteryRepository(get(), get(), get()) }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryBalanceEntity.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryBalanceEntity.kt
new file mode 100644
index 000000000..83ed52c71
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryBalanceEntity.kt
@@ -0,0 +1,19 @@
+package com.tonapps.wallet.data.battery.entity
+
+import android.os.Parcelable
+import com.tonapps.icu.Coins
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class BatteryBalanceEntity(
+    val balance: Coins,
+    val reservedBalance: Coins,
+) : Parcelable {
+
+    companion object {
+        val Empty = BatteryBalanceEntity(
+            balance = Coins.ZERO,
+            reservedBalance = Coins.ZERO
+        )
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryConfigEntity.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryConfigEntity.kt
new file mode 100644
index 000000000..d40b23c18
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/BatteryConfigEntity.kt
@@ -0,0 +1,27 @@
+package com.tonapps.wallet.data.battery.entity
+
+import android.os.Parcelable
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import org.ton.block.AddrStd
+
+@Parcelize
+data class BatteryConfigEntity(
+    val excessesAccount: String?,
+    val fundReceiver: String?,
+    val rechargeMethods: List<RechargeMethodEntity>,
+) : Parcelable {
+
+    @IgnoredOnParcel
+    val excessesAddress: AddrStd? by lazy {
+        excessesAccount?.let { AddrStd(it) }
+    }
+
+    companion object {
+        val Empty = BatteryConfigEntity(
+            excessesAccount = null,
+            fundReceiver = null,
+            rechargeMethods = emptyList()
+        )
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodEntity.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodEntity.kt
new file mode 100644
index 000000000..6ceb30dcb
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodEntity.kt
@@ -0,0 +1,51 @@
+package com.tonapps.wallet.data.battery.entity
+
+import android.os.Parcelable
+import com.tonapps.icu.Coins
+import io.batteryapi.models.RechargeMethodsMethodsInner
+import kotlinx.parcelize.Parcelize
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+@Parcelize
+data class RechargeMethodEntity(
+    val type: RechargeMethodType,
+    val rate: String,
+    val symbol: String,
+    val decimals: Int,
+    val supportGasless: Boolean,
+    val supportRecharge: Boolean,
+    val image: String? = null,
+    val jettonMaster: String? = null,
+    val minBootstrapValue: String? = null
+) : Parcelable {
+
+    private companion object {
+
+        private fun RechargeMethodsMethodsInner.Type.toRechargeMethodType(): RechargeMethodType {
+            return when (this) {
+                RechargeMethodsMethodsInner.Type.jetton -> RechargeMethodType.JETTON
+                RechargeMethodsMethodsInner.Type.ton -> RechargeMethodType.TON
+            }
+        }
+    }
+
+    constructor(method: RechargeMethodsMethodsInner) : this(
+        type = method.type.toRechargeMethodType(),
+        rate = method.rate,
+        symbol = method.symbol,
+        decimals = method.decimals,
+        supportGasless = method.supportGasless,
+        supportRecharge = method.supportRecharge,
+        image = method.image,
+        jettonMaster = method.jettonMaster,
+        minBootstrapValue = method.minBootstrapValue
+    )
+
+
+    fun fromTon(amount: BigDecimal): Coins {
+        return Coins.of(amount.divide(rate.toBigDecimal(), decimals, RoundingMode.HALF_UP))
+    }
+
+    fun fromTon(amount: String) = fromTon(amount.toBigDecimal())
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodType.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodType.kt
new file mode 100644
index 000000000..b828130b0
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/entity/RechargeMethodType.kt
@@ -0,0 +1,6 @@
+package com.tonapps.wallet.data.battery.entity
+
+enum class RechargeMethodType {
+    TON,
+    JETTON,
+}
\ No newline at end of file
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/LocalDataSource.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/LocalDataSource.kt
new file mode 100644
index 000000000..f0a3c2698
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/LocalDataSource.kt
@@ -0,0 +1,65 @@
+package com.tonapps.wallet.data.battery.source
+
+import android.content.Context
+import androidx.core.content.edit
+import com.tonapps.blockchain.ton.extensions.hex
+import com.tonapps.security.Security
+import com.tonapps.wallet.data.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.battery.entity.BatteryConfigEntity
+import com.tonapps.wallet.data.core.BlobDataSource
+import org.ton.api.pub.PublicKeyEd25519
+
+internal class LocalDataSource(
+    context: Context
+) {
+
+    companion object {
+        private const val NAME = "battery"
+        private const val KEY_ALIAS = "_com_tonapps_battery_master_key_"
+    }
+
+    private val balance = BlobDataSource.simple<BatteryBalanceEntity>(context, "battery_balance")
+    private val configStore = BlobDataSource.simple<BatteryConfigEntity>(context, "battery_config")
+
+    private val encryptedPrefs = Security.pref(context, KEY_ALIAS, NAME)
+
+    fun setConfig(testnet: Boolean, entity: BatteryConfigEntity) {
+        configStore.setCache(configCacheKey(testnet), entity)
+    }
+
+    fun getConfig(testnet: Boolean): BatteryConfigEntity? {
+        return configStore.getCache(configCacheKey(testnet))
+    }
+
+    private fun configCacheKey(testnet: Boolean): String {
+        return if (testnet) "testnet" else "mainnet"
+    }
+
+    fun setBalance(publicKey: PublicKeyEd25519, testnet: Boolean, entity: BatteryBalanceEntity) {
+        balance.setCache(balanceCacheKey(publicKey, testnet), entity)
+    }
+
+    fun getBalance(publicKey: PublicKeyEd25519, testnet: Boolean): BatteryBalanceEntity? {
+        return balance.getCache(balanceCacheKey(publicKey, testnet))
+    }
+
+    private fun balanceCacheKey(publicKey: PublicKeyEd25519, testnet: Boolean): String {
+        val prefix = if (testnet) "testnet" else "mainnet"
+        return "$prefix:${publicKey.hex()}"
+    }
+
+    fun getAppliedPromo(testnet: Boolean): String? {
+        return encryptedPrefs.getString(promoKey(testnet), null)
+    }
+
+    fun setAppliedPromo(testnet: Boolean, promo: String) {
+        encryptedPrefs.edit {
+            putString(promoKey(testnet), promo)
+        }
+    }
+
+    private fun promoKey(testnet: Boolean): String {
+        return "promo_${if (testnet) "testnet" else "mainnet"}"
+    }
+}
+
diff --git a/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/RemoteDataSource.kt b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/RemoteDataSource.kt
new file mode 100644
index 000000000..1f384a678
--- /dev/null
+++ b/apps/wallet/data/battery/src/main/java/com/tonapps/wallet/data/battery/source/RemoteDataSource.kt
@@ -0,0 +1,44 @@
+package com.tonapps.wallet.data.battery.source
+
+import com.tonapps.icu.Coins
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.data.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.battery.entity.BatteryConfigEntity
+import com.tonapps.wallet.data.battery.entity.RechargeMethodEntity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
+
+internal class RemoteDataSource(
+    private val api: API
+) {
+
+    suspend fun fetchBalance(
+        tonProofToken: String,
+        testnet: Boolean
+    ): BatteryBalanceEntity? = withContext(Dispatchers.IO) {
+        val response = api.getBatteryBalance(tonProofToken, testnet) ?: return@withContext null
+
+        BatteryBalanceEntity(
+            balance = Coins.of(response.balance.toBigDecimal(), 20),
+            reservedBalance = Coins.of(response.reserved.toBigDecimal(), 20)
+        )
+    }
+
+    suspend fun fetchConfig(
+        testnet: Boolean
+    ): BatteryConfigEntity? = withContext(Dispatchers.IO) {
+        val configDeferred = async { api.getBatteryConfig(testnet) }
+        val rechargeMethodsDeferred = async { api.getBatteryRechargeMethods(testnet) }
+
+        val config = configDeferred.await() ?: return@withContext null
+        val rechargeMethods = rechargeMethodsDeferred.await() ?: return@withContext null
+
+        BatteryConfigEntity(
+            excessesAccount = config.excessAccount,
+            fundReceiver = config.fundReceiver,
+            rechargeMethods = rechargeMethods.methods.map(::RechargeMethodEntity)
+        )
+    }
+
+}
\ No newline at end of file
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 5a31185e9..0a13e9a5b 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
@@ -1,9 +1,12 @@
 package com.tonapps.wallet.data.core
 
 import android.content.Context
+import android.os.Parcelable
 import android.util.Log
 import com.tonapps.extensions.cacheFolder
 import com.tonapps.extensions.file
+import com.tonapps.extensions.toByteArray
+import com.tonapps.extensions.toParcel
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.ConcurrentHashMap
@@ -15,6 +18,19 @@ abstract class BlobDataSource<D>(
     private val timeout: Long = TimeUnit.DAYS.toMillis(90)
 ) {
 
+    companion object {
+
+        inline fun <reified T: Parcelable> simple(
+            context: Context,
+            path: String
+        ): BlobDataSource<T> {
+            return object : BlobDataSource<T>(context, path) {
+                override fun onMarshall(data: T) = data.toByteArray()
+                override fun onUnmarshall(bytes: ByteArray) = bytes.toParcel<T>()
+            }
+        }
+    }
+
     private val diskFolder = context.cacheFolder(path)
 
     fun getCache(key: String): D? {
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 443a5aa16..eaf20336d 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
@@ -8,10 +8,14 @@ import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 import org.ton.block.AddrStd
 import org.ton.block.Coins
+import org.ton.block.MsgAddressInt
 import org.ton.block.StateInit
 import org.ton.cell.Cell
+import org.ton.cell.CellBuilder
 import org.ton.contract.wallet.WalletTransfer
 import org.ton.contract.wallet.WalletTransferBuilder
+import org.ton.tlb.loadTlb
+import org.ton.tlb.storeTlb
 
 @Parcelize
 data class RawMessageEntity(
@@ -33,14 +37,46 @@ data class RawMessageEntity(
     val payload: Cell
         get() = payloadValue.safeParseCell() ?: Cell()
 
-    val walletTransfer: WalletTransfer by lazy {
+    fun getWalletTransfer(excessesAddress: AddrStd? = null): WalletTransfer {
         val builder = WalletTransferBuilder()
         builder.stateInit = stateInit
         builder.destination = address
-        builder.body = payload
+        builder.body = if (excessesAddress != null) rebuildBodyWithCustomExcessesAccount(payload, excessesAddress) else payload
         // builder.bounceable = address.isBounceable()
         builder.coins = coins
-        builder.build()
+        return builder.build()
+    }
+
+    private fun rebuildBodyWithCustomExcessesAccount(body: Cell, excessesAddress: AddrStd): Cell {
+        val slice = body.beginParse()
+        val opCode = slice.loadUInt32()
+        var builder = CellBuilder.beginCell()
+        return when (opCode.toInt()) {
+            // stonfi swap
+            0x25938561 -> {
+                builder
+                    .storeUInt(0x25938561, 32)
+                    .storeTlb(MsgAddressInt, slice.loadTlb(AddrStd.tlbCodec()))
+                    .storeTlb(Coins, slice.loadTlb(Coins.tlbCodec()))
+                    .storeTlb(MsgAddressInt, slice.loadTlb(AddrStd.tlbCodec()))
+
+                if (slice.loadBit()) {
+                    slice.loadTlb(AddrStd.tlbCodec())
+                }
+                slice.endParse()
+
+                builder
+                    .storeBit(true)
+                    .storeTlb(MsgAddressInt, excessesAddress)
+
+                builder.endCell()
+            }
+            // nft transfer
+            0x5fcc3d14 -> body
+            // jetton transfer
+            0xf8a7ea5 -> body
+            else -> body
+        }
     }
 
     constructor(json: JSONObject) : this(
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 f006b8535..4d3da0ec6 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
@@ -21,7 +21,7 @@ data class SignRequestEntity(
     val from: AddrStd?
         get() = fromValue?.let { AddrStd.parse(it) }
 
-    val transfers = messages.map { it.walletTransfer }
+    val transfers = messages.map { it.getWalletTransfer() }
 
     constructor(json: JSONObject) : this(
         fromValue = parseFrom(json),
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/BatteryTransaction.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/BatteryTransaction.kt
new file mode 100644
index 000000000..64c42f2e0
--- /dev/null
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/BatteryTransaction.kt
@@ -0,0 +1,23 @@
+package com.tonapps.wallet.data.settings
+
+@JvmInline
+value class BatteryTransaction(val code: Int) {
+
+    companion object {
+        val SWAP = BatteryTransaction(0)
+        val JETTON = BatteryTransaction(1)
+        val NFT = BatteryTransaction(2)
+
+        val entries = arrayOf(SWAP, JETTON, NFT)
+
+        fun Array<BatteryTransaction>.toIntArray(): IntArray {
+            return map { it.code }.toIntArray()
+        }
+
+        fun List<BatteryTransaction>.toIntArray(): IntArray {
+            return map { it.code }.toIntArray()
+        }
+
+    }
+
+}
\ No newline at end of file
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 ded651212..2ad0cbc54 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
@@ -52,6 +52,7 @@ class SettingsRepository(
         private const val INSTALL_ID_KEY = "install_id"
         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 val _currencyFlow = MutableEffectFlow<WalletCurrency>()
@@ -199,6 +200,14 @@ class SettingsRepository(
             }
         }
 
+    var batteryViewed: Boolean = prefs.getBoolean(BATTERY_VIEWED_KEY, false)
+        set(value) {
+            if (value != field) {
+                prefs.edit().putBoolean(BATTERY_VIEWED_KEY, value).apply()
+                field = value
+            }
+        }
+
     fun getSpamStateTransaction(walletId: String, id: String) = walletPrefsFolder.getSpamStateTransaction(walletId, id)
 
     fun isSpamTransaction(walletId: String, id: String) = getSpamStateTransaction(walletId, id) == SpamTransactionState.SPAM
@@ -233,6 +242,31 @@ class SettingsRepository(
         rnLegacy.setSetupLastBackupAt(walletId, date)
     }
 
+    fun getBatteryTxEnabled(accountId: String) = walletPrefsFolder.getBatteryTxEnabled(accountId)
+
+    fun setBatteryTxEnabled(accountId: String, types: Array<BatteryTransaction>) {
+        walletPrefsFolder.setBatteryTxEnabled(accountId, types)
+    }
+
+    fun batteryEnableTx(
+        accountId: String,
+        type: BatteryTransaction,
+        enable: Boolean
+    ): Array<BatteryTransaction> {
+        val types = getBatteryTxEnabled(accountId).toMutableSet()
+        if (enable && !types.contains(type)) {
+            types.add(type)
+        } else if (!enable && !types.remove(type)) {
+            return types.toTypedArray()
+        }
+        setBatteryTxEnabled(accountId, types.toTypedArray())
+        return types.toTypedArray()
+    }
+
+    fun batteryIsEnabledTx(accountId: String, type: BatteryTransaction): Boolean {
+        return getBatteryTxEnabled(accountId).contains(type)
+    }
+
     fun getLocale(): Locale {
         if (language.code == Language.DEFAULT) {
             return context.locale
diff --git a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
index fc71e2712..a5eec3e68 100644
--- a/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
+++ b/apps/wallet/data/settings/src/main/java/com/tonapps/wallet/data/settings/folder/BaseSettingsFolder.kt
@@ -5,6 +5,8 @@ import android.content.SharedPreferences
 import android.util.Log
 import com.tonapps.extensions.MutableEffectFlow
 import com.tonapps.extensions.getByteArray
+import com.tonapps.extensions.getIntArray
+import com.tonapps.extensions.putIntArray
 import com.tonapps.extensions.state
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
@@ -43,6 +45,15 @@ internal abstract class BaseSettingsFolder(
 
     fun getLong(key: String, defValue: Long = 0) = prefs.getLong(key, defValue)
 
+    fun getIntArray(key: String, def: IntArray? = null) = prefs.getIntArray(key) ?: def
+
+    fun putIntArray(key: String, value: IntArray, notify: Boolean = true) {
+        prefs.putIntArray(key, value)
+        if (notify) {
+            notifyChanged()
+        }
+    }
+
     fun putLong(key: String, value: Long, notify: Boolean = true) {
         prefs.edit().putLong(key, value).apply()
         if (notify) {
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 a25968979..9786bac7f 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
@@ -3,6 +3,8 @@ package com.tonapps.wallet.data.settings.folder
 import android.content.Context
 import android.os.SystemClock
 import android.util.Log
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.settings.BatteryTransaction.Companion.toIntArray
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.settings.SpamTransactionState
 import com.tonapps.wallet.data.settings.entities.WalletPrefsEntity
@@ -18,6 +20,18 @@ internal class WalletPrefsFolder(context: Context, scope: CoroutineScope): BaseS
         private const val LAST_UPDATED_PREFIX = "last_updated_"
         private const val TELEGRAM_CHANNEL_PREFIX = "telegram_channel_"
         private const val SPAM_STATE_TRANSACTION_PREFIX = "spam_state_transaction_"
+        private const val BATTERY_TX_ENABLED_PREFIX = "batter_tx_enabled_"
+    }
+
+    fun getBatteryTxEnabled(accountId: String): Array<BatteryTransaction> {
+        val key = keyBatteryTxEnabled(accountId)
+        val value = getIntArray(key, BatteryTransaction.entries.toIntArray()) ?: return emptyArray()
+        return value.map { BatteryTransaction(it) }.toTypedArray()
+    }
+
+    fun setBatteryTxEnabled(accountId: String, types: Array<BatteryTransaction>) {
+        val key = keyBatteryTxEnabled(accountId)
+        putIntArray(key, types.distinct().toIntArray())
     }
 
     fun getSpamStateTransaction(
@@ -94,6 +108,10 @@ internal class WalletPrefsFolder(context: Context, scope: CoroutineScope): BaseS
         }
     }
 
+    private fun keyBatteryTxEnabled(accountId: String): String {
+        return key(BATTERY_TX_ENABLED_PREFIX, accountId)
+    }
+
     private fun keySpamStateTransaction(walletId: String, id: String): String {
         val key = key(SPAM_STATE_TRANSACTION_PREFIX, walletId)
         return "$key$id"
diff --git a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingRepository.kt b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingRepository.kt
index 61d384b99..86217deff 100644
--- a/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingRepository.kt
+++ b/apps/wallet/data/staking/src/main/java/com/tonapps/wallet/data/staking/StakingRepository.kt
@@ -37,5 +37,4 @@ class StakingRepository(context: Context, api: API) {
         }
         return "${accountId}_testnet_2"
     }
-
 }
\ 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 9cf087991..198a52037 100644
--- a/apps/wallet/instance/app/build.gradle.kts
+++ b/apps/wallet/instance/app/build.gradle.kts
@@ -50,6 +50,7 @@ dependencies {
     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.UIKit.core))
 
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 82ac96055..b3667282d 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
@@ -19,6 +19,7 @@ import com.tonapps.wallet.data.token.tokenModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import com.tonapps.wallet.data.backup.backupModule
+import com.tonapps.wallet.data.battery.batteryModule
 import com.tonapps.wallet.data.browser.browserModule
 import com.tonapps.wallet.data.collectibles.collectiblesModule
 import com.tonapps.wallet.data.core.Theme
@@ -49,7 +50,7 @@ class App: Application(), CameraXConfig.Provider, KoinComponent {
 
         startKoin {
             androidContext(this@App)
-            modules(koinModel, purchaseModule, stakingModule, passcodeModule, rnLegacyModule, backupModule, dataModule, browserModule, pushModule, tonConnectModule, apiModule, accountModule, ratesModule, tokenModule, eventsModule, collectiblesModule)
+            modules(koinModel, purchaseModule, batteryModule, stakingModule, passcodeModule, rnLegacyModule, backupModule, dataModule, browserModule, pushModule, tonConnectModule, apiModule, accountModule, ratesModule, tokenModule, eventsModule, collectiblesModule)
         }
 
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
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 113aff793..18cd5ac80 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
@@ -111,10 +111,7 @@ val JettonSwapAction.ton: Long
 fun AccountAddress.getNameOrAddress(testnet: Boolean): String {
     if (!name.isNullOrBlank()) {
         val accountName = name!!.ifPunycodeToUnicode()
-        if (accountName.endsWith(".ton")) {
-            return accountName.short6
-        }
-        return accountName.max12
+        return accountName
     }
     return address.toUserFriendly(
         wallet = isWallet,
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
new file mode 100644
index 000000000..e0a5c9b02
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/billing/BillingManager.kt
@@ -0,0 +1,21 @@
+package com.tonapps.tonkeeper.billing
+
+import com.android.billingclient.api.Purchase
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+
+class BillingManager {
+
+    // Example
+    private val _purchasesFlow = MutableSharedFlow<List<Purchase>>()
+    val purchasesFlow = _purchasesFlow.asSharedFlow()
+
+    private val purchasesUpdatedListener = { purchases: List<Purchase> ->
+        // _purchasesFlow.value = purchases
+    }
+
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt
index dddfdafb1..fe1c01f93 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt
@@ -75,7 +75,8 @@ data class TransferEntity(
         } else if (!commentEncrypted) {
             return MessageData.text(comment).body
         } else {
-            privateKey ?: throw IllegalArgumentException("Private key required for encrypted comment")
+            privateKey
+                ?: throw IllegalArgumentException("Private key required for encrypted comment")
 
             val publicKey = privateKey.publicKey()
             return CommentEncryption.encryptComment(
@@ -88,10 +89,13 @@ data class TransferEntity(
         }
     }
 
-    private fun getWalletTransfer(privateKey: PrivateKeyEd25519?): WalletTransfer {
+    private fun getWalletTransfer(
+        privateKey: PrivateKeyEd25519?,
+        excessesAddress: AddrStd
+    ): WalletTransfer {
         val builder = WalletTransferBuilder()
         builder.bounceable = bounceable
-        builder.body = body(privateKey)
+        builder.body = body(privateKey, excessesAddress)
         builder.sendMode = sendMode
         if (isNft) {
             builder.coins = coins
@@ -107,15 +111,23 @@ data class TransferEntity(
         return builder.build()
     }
 
-    private fun getGifts(privateKey: PrivateKeyEd25519?): Array<WalletTransfer> {
-        return arrayOf(getWalletTransfer(privateKey))
+    private fun getGifts(
+        privateKey: PrivateKeyEd25519?,
+        excessesAddress: AddrStd
+    ): Array<WalletTransfer> {
+        return arrayOf(getWalletTransfer(privateKey, excessesAddress))
     }
 
-    fun getUnsignedBody(privateKey: PrivateKeyEd25519? = null): Cell {
+    fun getUnsignedBody(
+        privateKey: PrivateKeyEd25519? = null,
+        internalMessage: Boolean = false,
+        excessesAddress: AddrStd? = null
+    ): Cell {
         return contract.createTransferUnsignedBody(
             validUntil = validUntil,
             seqno = seqno,
-            gifts = getGifts(privateKey)
+            gifts = getGifts(privateKey, excessesAddress = excessesAddress ?: contract.address),
+            internalMessage = internalMessage ?: false,
         )
     }
 
@@ -185,40 +197,48 @@ data class TransferEntity(
         return contract.createTransferMessageCell(contract.address, seqno, signedBody)
     }
 
-    private fun body(privateKey: PrivateKeyEd25519?): Cell? {
+    private fun body(privateKey: PrivateKeyEd25519?, excessesAddress: AddrStd): Cell? {
         if (isNft) {
-            return nftBody(privateKey)
+            return nftBody(privateKey, excessesAddress)
         } else if (!isTon) {
-            return jettonBody(privateKey)
+            return jettonBody(privateKey, excessesAddress)
         }
         return getCommentForwardPayload(privateKey)
     }
 
-    private fun jettonBody(privateKey: PrivateKeyEd25519?): Cell {
+    private fun jettonBody(privateKey: PrivateKeyEd25519?, excessesAddress: AddrStd): Cell {
         return TonTransferHelper.jetton(
             coins = coins,
             toAddress = destination,
-            responseAddress = contract.address,
+            responseAddress = excessesAddress,
             queryId = queryId,
             body = getCommentForwardPayload(privateKey),
         )
     }
 
-    private fun nftBody(privateKey: PrivateKeyEd25519?): Cell {
+    private fun nftBody(privateKey: PrivateKeyEd25519?, excessesAddress: AddrStd): Cell {
         return TonTransferHelper.nft(
             newOwnerAddress = destination,
-            excessesAddress = contract.address,
+            excessesAddress = excessesAddress,
             queryId = queryId,
             body = getCommentForwardPayload(privateKey),
         )
     }
 
-    fun toSignedMessage(privateKeyEd25519: PrivateKeyEd25519): Cell {
+    fun toSignedMessage(
+        privateKeyEd25519: PrivateKeyEd25519,
+        isBattery: Boolean,
+        excessesAddress: AddrStd? = null
+    ): Cell {
         return contract.createTransferMessageCell(
             address = contract.address,
             privateKey = privateKeyEd25519,
             seqno = seqno,
-            unsignedBody = getUnsignedBody(privateKeyEd25519),
+            unsignedBody = getUnsignedBody(
+                privateKeyEd25519,
+                internalMessage = isBattery,
+                excessesAddress = excessesAddress,
+            ),
         )
     }
 
@@ -264,8 +284,10 @@ data class TransferEntity(
 
         fun build(): TransferEntity {
             val token = token ?: throw IllegalArgumentException("Token is not set")
-            val destination = destination ?: throw IllegalArgumentException("Destination is not set")
-            val destinationPK = destinationPK ?: throw IllegalArgumentException("DestinationPK is not set")
+            val destination =
+                destination ?: throw IllegalArgumentException("Destination is not set")
+            val destinationPK =
+                destinationPK ?: throw IllegalArgumentException("DestinationPK is not set")
             val amount = amount ?: throw IllegalArgumentException("Amount is not set")
             val seqno = seqno ?: throw IllegalArgumentException("Seqno is not set")
             val validUntil = validUntil ?: throw IllegalArgumentException("ValidUntil is not set")
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 001650c9e..4f8d2b653 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
@@ -19,4 +19,5 @@ enum class ActionType {
     JettonBurn,
     UnSubscribe,
     Subscribe,
+    Fee,
 }
\ 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 51f708747..9b944750b 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
@@ -22,6 +22,7 @@ val ActionType.iconRes: Int
         ActionType.JettonBurn -> R.drawable.ic_fire_28
         ActionType.UnSubscribe -> R.drawable.ic_xmark_28
         ActionType.Subscribe -> R.drawable.ic_bell_28
+        ActionType.Fee -> R.drawable.ic_ton_28
     }
 
 
@@ -43,6 +44,7 @@ val ActionType.nameRes: Int
         ActionType.JettonBurn -> Localization.burned
         ActionType.UnSubscribe -> Localization.unsubscribed
         ActionType.Subscribe -> Localization.subscribed
+        ActionType.Fee -> Localization.network_fee
     }
 
 val Action.recipient: AccountAddress?
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 6b9b684c4..f0b09e315 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
@@ -177,15 +177,35 @@ class HistoryHelper(
         wallet: WalletEntity,
         response: MessageConsequences,
         rates: RatesEntity,
+        isBattery: Boolean = false,
     ): Details {
-        val items = mapping(wallet, response.event, true)
+        val items = mapping(wallet, response.event, true, positionExtra = 1).toMutableList()
+
         val fee = Coins.of(response.totalFees)
         val feeFormat = CurrencyFormatter.format("TON", fee)
         val feeFiat = rates.convert("TON", fee)
         val feeFiatFormat = CurrencyFormatter.formatFiat(rates.currency.code, feeFiat)
+
+        items.add(
+            HistoryItem.Event(
+                index = items.lastIndex + 1,
+                position = ListCell.Position.LAST,
+                txId = "fee",
+                iconURL = "",
+                action = ActionType.Fee,
+                title = "",
+                subtitle = if (isBattery) context.getString(Localization.will_be_paid_with_battery) else "",
+                value = feeFormat,
+                date = feeFiatFormat.toString(),
+                isOut = true,
+                failed = false,
+                isScam = false,
+            )
+        )
+
         return Details(
             accountId = wallet.accountId,
-            items = items,
+            items = items.toList(),
             fee = fee,
             feeFormat = feeFormat,
             feeFiat = feeFiat,
@@ -218,9 +238,10 @@ class HistoryHelper(
         wallet: WalletEntity,
         event: AccountEvent,
         removeDate: Boolean = false,
-        hiddenBalances: Boolean = false
+        hiddenBalances: Boolean = false,
+        positionExtra: Int = 0,
     ): List<HistoryItem> {
-        return mapping(wallet, listOf(event), removeDate, hiddenBalances)
+        return mapping(wallet, listOf(event), removeDate, hiddenBalances, positionExtra)
     }
 
     suspend fun getEvent(
@@ -237,7 +258,8 @@ class HistoryHelper(
         wallet: WalletEntity,
         events: List<AccountEvent>,
         removeDate: Boolean = false,
-        hiddenBalances: Boolean = false
+        hiddenBalances: Boolean = false,
+        positionExtra: Int = 0,
     ): List<HistoryItem> = withContext(Dispatchers.IO) {
         val items = mutableListOf<HistoryItem>()
 
@@ -266,7 +288,7 @@ class HistoryHelper(
                 )
                 chunkItems.add(item.copy(
                     pending = pending,
-                    position = ListCell.getPosition(actions.size, actionIndex),
+                    position = ListCell.getPosition(actions.size + positionExtra, actionIndex),
                     fee = CurrencyFormatter.format(TokenEntity.TON.symbol, fee, TokenEntity.TON.decimals),
                     feeInCurrency = CurrencyFormatter.formatFiat(currency.code, feeInCurrency),
                     lt = event.lt,
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 ea31e5b44..1050fbd0c 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
@@ -1,6 +1,9 @@
 package com.tonapps.tonkeeper.koin
 
 import android.content.Context
+import androidx.annotation.MainThread
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.wallet.api.API
@@ -10,6 +13,7 @@ import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.data.rn.RNLegacy
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.tonconnect.TonConnectRepository
+import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koin.core.Koin
 import org.koin.core.component.KoinComponent
 import org.koin.core.definition.Definition
@@ -22,6 +26,11 @@ inline fun <reified T: RecyclerView.Adapter<*>> Module.uiAdapter(
     return single(definition = definition)
 }
 
+@MainThread
+inline fun <reified T : ViewModel> Fragment.parentFragmentViewModel(): Lazy<T> {
+    return lazy { requireParentFragment().getViewModel() }
+}
+
 val Context.koin: Koin?
     get() = (applicationContext as? KoinComponent)?.getKoin()
 
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 930315a8b..cc4274d00 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
@@ -1,6 +1,7 @@
 package com.tonapps.tonkeeper.koin
 
 import com.tonapps.network.NetworkMonitor
+import com.tonapps.tonkeeper.billing.BillingManager
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.ui.screen.main.MainViewModel
 import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
@@ -10,6 +11,10 @@ import com.tonapps.tonkeeper.ui.screen.action.ActionViewModel
 import com.tonapps.tonkeeper.ui.screen.add.imprt.ImportWalletViewModel
 import com.tonapps.tonkeeper.ui.screen.backup.main.BackupViewModel
 import com.tonapps.tonkeeper.ui.screen.backup.check.BackupCheckViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.BatteryRechargeViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.refill.BatteryRefillViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.settings.BatterySettingsViewModel
 import com.tonapps.tonkeeper.ui.screen.browser.connected.BrowserConnectedViewModel
 import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppViewModel
 import com.tonapps.tonkeeper.ui.screen.browser.explore.BrowserExploreViewModel
@@ -53,6 +58,7 @@ import kotlinx.coroutines.SupervisorJob
 import org.koin.android.ext.koin.androidApplication
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val koinModel = module {
@@ -60,8 +66,9 @@ val koinModel = module {
     single(createdAtStart = true) { CoroutineScope(Dispatchers.IO + SupervisorJob()) }
     single { SettingsRepository(get(), get(), get()) }
     single { NetworkMonitor(get(), get()) }
-    single { SignManager(get(), get(), get(), get(), get()) }
+    single { SignManager(get(), get(), get(), get(), get(), get()) }
     single { HistoryHelper(get(), get(), get(), get(), get(), get(), get()) }
+    singleOf(::BillingManager)
 
     factory { (viewModel: com.tonapps.tonkeeper.ui.base.BaseWalletVM) ->
         // TODO
@@ -75,7 +82,7 @@ val koinModel = module {
     viewModel { MainViewModel(androidApplication(), get(), get()) }
     viewModel { RootViewModel(androidApplication(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { PickerViewModel(androidApplication(), get(), get()) }
-    viewModel { WalletViewModel(androidApplication(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { WalletViewModel(androidApplication(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { CurrencyViewModel(androidApplication(), get()) }
     viewModel { SettingsViewModel(androidApplication(), get(), get(), get(), get(), get(), get()) }
     viewModel { EditNameViewModel(androidApplication(), get()) }
@@ -85,7 +92,7 @@ val koinModel = module {
     viewModel { EventsViewModel(androidApplication(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { parameters -> TCAuthViewModel(androidApplication(), request = parameters.get(), get(), get(), get()) }
     viewModel { CollectiblesViewModel(androidApplication(), get(), get(), get(), get()) }
-    viewModel { parameters -> ActionViewModel(androidApplication(), args = parameters.get(), get(), get(), get()) }
+    viewModel { parameters -> ActionViewModel(androidApplication(), args = parameters.get(), get(), get(), get(), get()) }
     viewModel { BrowserExploreViewModel(androidApplication(), get(), get(), get(), get()) }
     viewModel { BrowserConnectedViewModel(androidApplication(), get(), get(), get()) }
     viewModel { BrowserMainViewModel(androidApplication(), get()) }
@@ -97,7 +104,7 @@ val koinModel = module {
     viewModel { BackupViewModel(androidApplication(), get(), get(), get(), get()) }
     viewModel { BackupCheckViewModel(androidApplication(), get(), get()) }
     viewModel { TokensManageViewModel(androidApplication(), get(), get(), get()) }
-    viewModel { parameters -> SendViewModel(androidApplication(), nftAddress = parameters.get(), get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { parameters -> SendViewModel(androidApplication(), nftAddress = parameters.get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     viewModel { TokenPickerViewModel(androidApplication(), get(), get(), get()) }
     viewModel { CountryPickerViewModel(androidApplication(), get(), get()) }
     viewModel { parameters -> StakingViewModel(androidApplication(), address = parameters.get(), get(), get(), get(), get(), get(), get(), get()) }
@@ -110,4 +117,8 @@ val koinModel = module {
     viewModel { SendContactsViewModel(androidApplication(), get(), get(), get()) }
     viewModel { NotificationsEnableViewModel(get(), get()) }
     viewModel { ImportWalletViewModel(androidApplication(), get()) }
+    viewModel { BatteryViewModel(androidApplication()) }
+    viewModel { BatterySettingsViewModel(androidApplication(), get(), get(), get(), get()) }
+    viewModel { BatteryRefillViewModel(androidApplication(), get(), get(), get(), get(), get(), get()) }
+    viewModel { parameters -> BatteryRechargeViewModel(androidApplication(), args = parameters.get(), get(), get(), get(), get(), get(), get()) }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/sign/SignManager.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/sign/SignManager.kt
index 159840112..a2fcf1e8b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/sign/SignManager.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/sign/SignManager.kt
@@ -11,9 +11,11 @@ import com.tonapps.tonkeeper.ui.screen.action.ActionScreen
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.WalletCurrency
 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.localization.Localization
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -26,7 +28,8 @@ class SignManager(
     private val settingsRepository: SettingsRepository,
     private val accountRepository: AccountRepository,
     private val api: API,
-    private val historyHelper: HistoryHelper
+    private val historyHelper: HistoryHelper,
+    private val batteryRepository: BatteryRepository,
 ) {
 
     suspend fun action(
@@ -34,9 +37,19 @@ class SignManager(
         wallet: WalletEntity,
         request: SignRequestEntity,
         canceller: CancellationSignal = CancellationSignal(),
+        batteryTxType: BatteryTransaction? = null,
+        forceRelayer: Boolean = false,
     ): String {
         navigation.toastLoading(true)
-        val details = emulate(request, wallet)
+        var isBattery = batteryTxType != null && settingsRepository.batteryIsEnabledTx(wallet.accountId, batteryTxType)
+        val details: HistoryHelper.Details?
+        if (isBattery || forceRelayer) {
+            val result = emulateBattery(request, wallet, forceRelayer = forceRelayer)
+            details = result.first
+            isBattery = result.second
+        } else {
+            details = emulate(request, wallet)
+        }
         navigation.toastLoading(false)
 
         if (details == null) {
@@ -44,10 +57,18 @@ class SignManager(
             throw IllegalArgumentException("Failed to emulate")
         }
 
-        val boc = getBoc(navigation, wallet, request, details, canceller) ?: throw IllegalArgumentException("Failed boc")
+        val boc = getBoc(navigation, wallet, request, details, canceller, isBattery) ?: throw IllegalArgumentException("Failed boc")
         AnalyticsHelper.trackEvent("send_transaction")
-        if (api.sendToBlockchain(boc, wallet.testnet)) {
+        val success = if (isBattery) {
+            val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: throw IllegalStateException("Can't find TonProof token")
+            api.sendToBlockchainWithBattery(boc, tonProofToken, wallet.testnet)
+        } else {
+            api.sendToBlockchain(boc, wallet.testnet)
+        }
+        if (success) {
             AnalyticsHelper.trackEvent("send_success")
+        } else {
+            throw Exception("Failed to send transaction")
         }
         return boc
     }
@@ -57,7 +78,8 @@ class SignManager(
         wallet: WalletEntity,
         request: SignRequestEntity,
         details: HistoryHelper.Details,
-        canceller: CancellationSignal
+        canceller: CancellationSignal,
+        isBattery: Boolean,
     ) = suspendCancellableCoroutine { continuation ->
         continuation.invokeOnCancellation { canceller.cancel() }
 
@@ -67,7 +89,7 @@ class SignManager(
                 continuation.resume(ActionScreen.parseResult(bundle))
             }
         }
-        navigation.add(ActionScreen.newInstance(details, wallet.id, request, requestKey))
+        navigation.add(ActionScreen.newInstance(details, wallet.id, request, requestKey, isBattery))
     }
 
     private suspend fun emulate(
@@ -98,4 +120,36 @@ class SignManager(
             null
         }
     }
+
+    private suspend fun emulateBattery(
+        request: SignRequestEntity,
+        wallet: WalletEntity,
+        currency: WalletCurrency = settingsRepository.currency,
+        forceRelayer: Boolean,
+    ): Pair<HistoryHelper.Details?, Boolean> {
+        return try {
+            if (api.config.isBatteryDisabled) {
+                throw IllegalStateException("Battery is disabled")
+            }
+
+            val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: throw IllegalStateException("Can't find TonProof token")
+
+            val rates = ratesRepository.getRates(currency, "TON")
+            val seqno = accountRepository.getSeqno(wallet)
+            val cell = accountRepository.createSignedMessage(wallet, seqno, EmptyPrivateKeyEd25519, request.validUntil, request.transfers, internalMessage = true)
+
+            val (consequences, withBattery) = batteryRepository.emulate(
+                tonProofToken = tonProofToken,
+                publicKey = wallet.publicKey,
+                testnet = wallet.testnet,
+                boc = cell,
+                forceRelayer = forceRelayer,
+            ) ?: throw IllegalStateException("Failed to emulate battery")
+
+            val details = historyHelper.create(wallet, consequences, rates, isBattery = true)
+            Pair(details, withBattery)
+        } catch (e: Throwable) {
+            Pair(emulate(request, wallet, currency), false)
+        }
+    }
 }
\ 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 b626b7dca..24baf3b4c 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
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.FrameLayout
 import androidx.annotation.DrawableRes
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.tonapps.uikit.icon.UIKitIcon
@@ -18,7 +19,7 @@ import uikit.widget.SimpleRecyclerView
 abstract class BaseListWalletScreen: BaseWalletScreen(R.layout.fragment_list) {
 
     private lateinit var headerContainer: FrameLayout
-    private lateinit var headerView: HeaderView
+    protected lateinit var headerView: HeaderView
     private lateinit var listView: SimpleRecyclerView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -33,6 +34,8 @@ abstract class BaseListWalletScreen: BaseWalletScreen(R.layout.fragment_list) {
             headerView.setIgnoreSystemOffset()
             headerView.setAction(UIKitIcon.ic_close_16)
             headerView.doOnActionClick = { finish() }
+        } else if (parentFragment != null) {
+            headerView.setIgnoreSystemOffset()
         }
 
         listView = view.findViewById(R.id.list)
@@ -40,6 +43,10 @@ abstract class BaseListWalletScreen: BaseWalletScreen(R.layout.fragment_list) {
         collectFlow(listView.topScrolled, headerView::setDivider)
     }
 
+    fun hideHeaderContainer() {
+        headerContainer.visibility = View.GONE
+    }
+
     fun addViewHeader(view: View, params: FrameLayout.LayoutParams? = null) {
         headerContainer.addView(view, params)
     }
@@ -74,6 +81,15 @@ abstract class BaseListWalletScreen: BaseWalletScreen(R.layout.fragment_list) {
         listView.setPadding(left, top, right, bottom)
     }
 
+    fun updateListPadding(
+        left: Int = listView.paddingLeft,
+        top: Int = listView.paddingTop,
+        right: Int = listView.paddingRight,
+        bottom: Int = listView.paddingBottom
+    ) {
+        listView.updatePadding(left, top, right, bottom)
+    }
+
     fun setActionIcon(@DrawableRes resId: Int, onClick: (view: View) -> Unit) {
         headerView.setAction(resId)
         headerView.doOnActionClick = onClick
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionArgs.kt
index f644f813c..64c85d86b 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionArgs.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionArgs.kt
@@ -6,44 +6,36 @@ import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import uikit.base.BaseArgs
 
 data class ActionArgs(
-    val accountId: String,
     val walletId: String,
     val request: SignRequestEntity,
     val historyItems: List<HistoryItem>,
-    val feeFormat: CharSequence,
-    val feeFiatFormat: CharSequence,
     val resultKey: String,
+    val isBattery: Boolean,
 ): BaseArgs() {
 
     private companion object {
-        private const val ARG_ACCOUNT_ID = "account_id"
         private const val ARG_WALLET_ID = "wallet_id"
         private const val ARG_HISTORY_ITEMS = "history_items"
-        private const val ARG_FEE_FORMAT = "fee_format"
-        private const val ARG_FEE_FIAT_FORMAT = "fee_fiat_format"
         private const val ARG_RESULT_KEY = "result_key"
         private const val ARG_REQUEST = "request"
+        private const val ARG_IS_BATTERY = "is_battery"
     }
 
     constructor(bundle: Bundle) : this(
-        accountId = bundle.getString(ARG_ACCOUNT_ID)!!,
         walletId = bundle.getString(ARG_WALLET_ID)!!,
         request = bundle.getParcelable(ARG_REQUEST)!!,
         historyItems = bundle.getParcelableArrayList(ARG_HISTORY_ITEMS)!!,
-        feeFormat = bundle.getCharSequence(ARG_FEE_FORMAT)!!,
-        feeFiatFormat = bundle.getCharSequence(ARG_FEE_FIAT_FORMAT)!!,
-        resultKey = bundle.getString(ARG_RESULT_KEY)!!
+        resultKey = bundle.getString(ARG_RESULT_KEY)!!,
+        isBattery = bundle.getBoolean(ARG_IS_BATTERY)
     )
 
     override fun toBundle(): Bundle {
         val bundle = Bundle()
-        bundle.putString(ARG_ACCOUNT_ID, accountId)
         bundle.putString(ARG_WALLET_ID, walletId)
         bundle.putParcelable(ARG_REQUEST, request)
         bundle.putParcelableArrayList(ARG_HISTORY_ITEMS, ArrayList(historyItems))
-        bundle.putCharSequence(ARG_FEE_FORMAT, feeFormat)
-        bundle.putCharSequence(ARG_FEE_FIAT_FORMAT, feeFiatFormat)
         bundle.putString(ARG_RESULT_KEY, resultKey)
+        bundle.putBoolean(ARG_IS_BATTERY, isBattery)
         return bundle
     }
 }
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionScreen.kt
index 926d429d6..606a7f53d 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionScreen.kt
@@ -7,7 +7,6 @@ import android.widget.Button
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
 import com.tonapps.tonkeeper.core.history.HistoryHelper
 import com.tonapps.tonkeeper.core.history.list.HistoryAdapter
 import com.tonapps.tonkeeper.core.history.list.item.HistoryItem
@@ -43,7 +42,9 @@ class ActionScreen: BaseWalletScreen(R.layout.fragment_action), BaseFragment.Mod
     private lateinit var walletView: AppCompatTextView
     private lateinit var closeView: View
     private lateinit var actionsView: SimpleRecyclerView
-    private lateinit var feeView: AppCompatTextView
+    private lateinit var buttonsView: View
+    private lateinit var confirmButton: Button
+    private lateinit var cancelButton: Button
     private lateinit var processView: ProcessTaskView
     private lateinit var slideView: SlideActionView
 
@@ -59,15 +60,6 @@ class ActionScreen: BaseWalletScreen(R.layout.fragment_action), BaseFragment.Mod
 
         adapter.submitList(args.historyItems)
 
-        feeView = view.findViewById(R.id.fee)
-
-        val builder = SpannableStringBuilder("≈ ")
-        builder.append(args.feeFormat.withCustomSymbol(requireContext()))
-        builder.append(" · ")
-        builder.append(args.feeFiatFormat.withCustomSymbol(requireContext()))
-
-        feeView.text = builder
-
         processView = view.findViewById(R.id.process)
 
         slideView = view.findViewById(R.id.slide)
@@ -128,27 +120,24 @@ class ActionScreen: BaseWalletScreen(R.layout.fragment_action), BaseFragment.Mod
             details: HistoryHelper.Details,
             walletId: String,
             request: SignRequestEntity,
-            requestKey: String
+            requestKey: String,
+            isBattery: Boolean = false,
         ) = newInstance(
-            accountId = details.accountId,
             walletId = walletId,
             request = request,
             historyItems = details.items,
-            feeFormat = details.feeFormat,
-            feeFiatFormat = details.feeFiatFormat,
-            requestKey = requestKey
+            requestKey = requestKey,
+            isBattery = isBattery,
         )
 
         fun newInstance(
-            accountId: String,
             walletId: String,
             request: SignRequestEntity,
             historyItems: List<HistoryItem>,
-            feeFormat: CharSequence,
-            feeFiatFormat: CharSequence,
-            requestKey: String
+            requestKey: String,
+            isBattery: Boolean = false,
         ): ActionScreen {
-            val args = ActionArgs(accountId, walletId, request, historyItems, feeFormat, feeFiatFormat, requestKey)
+            val args = ActionArgs(walletId, request, historyItems, requestKey, isBattery)
             val screen = ActionScreen()
             screen.setArgs(args)
             return screen
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionViewModel.kt
index 82b23a7f9..c5ab8c150 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionViewModel.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/action/ActionViewModel.kt
@@ -13,6 +13,7 @@ import com.tonapps.tonkeeper.ui.screen.send.main.SendException
 import com.tonapps.wallet.api.API
 import com.tonapps.wallet.data.account.entities.WalletEntity
 import com.tonapps.wallet.data.account.AccountRepository
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.localization.Localization
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -23,6 +24,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
+import org.ton.contract.wallet.WalletTransfer
 
 class ActionViewModel(
     app: Application,
@@ -30,6 +32,7 @@ class ActionViewModel(
     private val accountRepository: AccountRepository,
     private val passcodeManager: PasscodeManager,
     private val api: API,
+    private val batteryRepository: BatteryRepository,
 ) : BaseWalletVM(app) {
 
     private val _walletFlow = MutableStateFlow<WalletEntity?>(null)
@@ -69,9 +72,11 @@ class ActionViewModel(
                 transactions.forEachIndexed { index, transaction ->
                     Log.d("ActionViewModel", "Signing transaction $transaction")
                     val isLast = index == transactions.size - 1
-                    val signedBody = context.signLedgerTransaction(transaction, wallet.id) ?: throw SendException.Cancelled()
+                    val signedBody = context.signLedgerTransaction(transaction, wallet.id)
+                        ?: throw SendException.Cancelled()
                     val contract = wallet.contract
-                    val message = contract.createTransferMessageCell(contract.address, seqno, signedBody)
+                    val message =
+                        contract.createTransferMessageCell(contract.address, seqno, signedBody)
                     boc = message.base64()
                     if (!isLast) {
                         Log.d("ActionViewModel", "Sending transaction to blockchain")
@@ -86,12 +91,19 @@ class ActionViewModel(
                 boc!!
             } else {
                 val secretKey = accountRepository.getPrivateKey(wallet.id)
+                val excessesAddress = if (args.isBattery) {
+                    batteryRepository.getConfig(wallet.testnet).excessesAddress
+                } else null
+
+                val transfers = request.messages.map { it.getWalletTransfer(excessesAddress) }
+
                 val message = accountRepository.createSignedMessage(
                     wallet,
                     seqno,
                     secretKey,
                     request.validUntil,
-                    request.transfers
+                    transfers,
+                    internalMessage = args.isBattery
                 )
                 message.base64()
             }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryRoute.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryRoute.kt
new file mode 100644
index 000000000..bce7d6bf5
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryRoute.kt
@@ -0,0 +1,6 @@
+package com.tonapps.tonkeeper.ui.screen.battery
+
+sealed class BatteryRoute {
+    data object Refill: BatteryRoute()
+    data object Settings: BatteryRoute()
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..ad55f1214
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryScreen.kt
@@ -0,0 +1,88 @@
+package com.tonapps.tonkeeper.ui.screen.battery
+
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.fragment.app.FragmentManager
+import com.tonapps.tonkeeper.ui.base.BaseWalletScreen
+import com.tonapps.tonkeeper.ui.screen.battery.refill.BatteryRefillScreen
+import com.tonapps.tonkeeper.ui.screen.battery.settings.BatterySettingsScreen
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.icon.UIKitIcon
+import kotlinx.coroutines.flow.map
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.commitChildAsSlide
+import uikit.widget.HeaderView
+
+class BatteryScreen : BaseWalletScreen(R.layout.fragment_battery), BaseFragment.BottomSheet {
+
+    private val initialPromo: String? by lazy { requireArguments().getString(ARG_PROMO) }
+
+    override val viewModel: BatteryViewModel by viewModel()
+
+    private val backStackListener = FragmentManager.OnBackStackChangedListener {
+        updateBackVisibility()
+    }
+
+    private lateinit var headerView: HeaderView
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        headerView = view.findViewById(R.id.header)
+        headerView.doOnActionClick = { finish() }
+        headerView.doOnCloseClick = { childFragmentManager.popBackStack() }
+        headerView.setBackgroundResource(uikit.R.drawable.bg_page_gradient)
+
+        childFragmentManager.addOnBackStackChangedListener(backStackListener)
+        collectFlow(viewModel.routeFlow.map { route ->
+            when(route) {
+                BatteryRoute.Refill -> BatteryRefillScreen.newInstance(initialPromo)
+                BatteryRoute.Settings -> BatterySettingsScreen.newInstance()
+            }
+        }, ::setChildFragment)
+
+        collectFlow(viewModel.titleFlow) {
+            headerView.title = it
+        }
+    }
+
+    private fun setChildFragment(fragment: BaseFragment) {
+        childFragmentManager.commitChildAsSlide {
+            replace(R.id.fragment_battery_container, fragment, fragment.toString())
+            addToBackStack(fragment.toString())
+        }
+    }
+
+    private fun updateBackVisibility() {
+        val hasBackStack = childFragmentManager.backStackEntryCount > 1
+        headerView.setIcon(if (hasBackStack) UIKitIcon.ic_chevron_left_16 else 0)
+    }
+
+    override fun onBackPressed(): Boolean {
+        if (childFragmentManager.backStackEntryCount > 1) {
+            childFragmentManager.popBackStack()
+            return false
+        }
+        return super.onBackPressed()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        childFragmentManager.removeOnBackStackChangedListener(backStackListener)
+    }
+
+    companion object {
+        private const val ARG_PROMO = "promo"
+
+        fun newInstance(promo: String? = null): BatteryScreen {
+            val fragment = BatteryScreen()
+            fragment.arguments = Bundle().apply {
+                putString(ARG_PROMO, promo)
+            }
+
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryViewModel.kt
new file mode 100644
index 000000000..c16da5fd4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/BatteryViewModel.kt
@@ -0,0 +1,46 @@
+package com.tonapps.tonkeeper.ui.screen.battery
+
+import android.app.Application
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.wallet.api.API
+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.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+
+class BatteryViewModel(
+    app: Application
+) : BaseWalletVM(app) {
+
+    private val _routeFlow = MutableEffectFlow<BatteryRoute>() // with "_" writable only inside
+    val routeFlow = _routeFlow.asSharedFlow().filterNotNull() // without "_" read-only for outside
+
+    private val _titleFlow = MutableStateFlow<CharSequence?>(null)
+    val titleFlow = _titleFlow.asStateFlow()
+
+    init {
+        routeToRefill()
+    }
+
+    fun routeToSettings() {
+        _routeFlow.tryEmit(BatteryRoute.Settings)
+    }
+
+    private fun routeToRefill() {
+        _routeFlow.tryEmit(BatteryRoute.Refill)
+    }
+
+    fun setTitle(title: CharSequence?) {
+        _titleFlow.value = title
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeScreen.kt
new file mode 100644
index 000000000..d5931e6fd
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeScreen.kt
@@ -0,0 +1,158 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge
+
+import android.os.Bundle
+import android.util.Log
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup.inflate
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.appcompat.widget.LinearLayoutCompat
+import androidx.lifecycle.lifecycleScope
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.extensions.showToast
+import com.tonapps.tonkeeper.extensions.toast
+import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.BatteryRechargeEvent
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Adapter
+import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
+import com.tonapps.tonkeeper.ui.screen.send.contacts.SendContactsScreen
+import com.tonapps.tonkeeper.ui.screen.send.main.SendContact
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import com.tonapps.wallet.localization.Localization
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import uikit.base.BaseFragment
+import uikit.extensions.collectFlow
+import uikit.extensions.hideKeyboard
+import uikit.widget.FrescoView
+import uikit.widget.InputView
+import java.util.UUID
+
+class BatteryRechargeScreen : BaseListWalletScreen(), BaseFragment.BottomSheet {
+
+    private val args: RechargeArgs by lazy { RechargeArgs(requireArguments()) }
+    private val contractsRequestKey: String by lazy { "contacts_${UUID.randomUUID()}" }
+
+    private val rootViewModel: RootViewModel by activityViewModel()
+
+    override val viewModel: BatteryRechargeViewModel by viewModel { parametersOf(args) }
+
+    private val adapter = Adapter(
+        onAddressChange = { viewModel.updateAddress(it) },
+        openAddressBook = ::openAddressBook,
+        onAmountChange = { viewModel.updateAmount(it) },
+        onPackSelect = { viewModel.setSelectedPack(it) },
+        onCustomAmountSelect = { viewModel.onCustomAmountSelect() },
+        onContinue = ::onContinue,
+        onSubmitPromo = { viewModel.applyPromo(it) }
+    )
+
+    private lateinit var tokenIconView: FrescoView
+    private lateinit var tokenTitleView: AppCompatTextView
+
+    private val addressInput: InputView?
+        get() = findListItemView(0)?.findViewById<InputView>(R.id.address)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(viewModel.uiItemsFlow, adapter::submitList)
+
+        navigation?.setFragmentResultListener(contractsRequestKey) { bundle ->
+            val contact = bundle.getParcelableCompat<SendContact>("contact")
+                ?: return@setFragmentResultListener
+            addressInput?.text = contact.address
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setAdapter(adapter)
+
+        val rightContentView = inflate(context, R.layout.view_battery_recharge_token, null)
+        tokenIconView = rightContentView.findViewById(R.id.token_icon)
+        tokenTitleView = rightContentView.findViewById(R.id.token_title)
+        rightContentView.findViewById<LinearLayoutCompat>(R.id.token)
+            .setOnClickListener { openTokenSelector() }
+
+        headerView.setRightContent(rightContentView)
+        headerView.hideIcon()
+        headerView.setTitleGravity(Gravity.START)
+        headerView.title = when (args.isGift) {
+            true -> getString(Localization.battery_gift_title)
+            false -> getString(Localization.battery_recharge_title)
+        }
+        collectFlow(viewModel.tokenFlow) { token ->
+            tokenTitleView.text = token.symbol
+            tokenIconView.setImageURI(token.imageUri, this)
+        }
+        collectFlow(viewModel.eventFlow, ::onEvent)
+    }
+
+    private fun onContinue() {
+        requireContext().hideKeyboard()
+        viewModel.onContinue()
+    }
+
+    private fun openAddressBook() {
+        navigation?.add(SendContactsScreen.newInstance(contractsRequestKey))
+        getCurrentFocus()?.hideKeyboard()
+    }
+
+    private fun openTokenSelector() {
+        Log.d("BatteryRechargeScreen", "openTokenSelector")
+    }
+
+    private fun showError(message: String? = null) {
+        navigation?.toast(message ?: getString(Localization.sending_error))
+    }
+
+    private fun onSuccess() {
+        requireContext().showToast(Localization.battery_please_wait)
+        navigation?.openURL("tonkeeper://activity")
+        finish()
+    }
+
+    private fun sing(
+        request: SignRequestEntity
+    ) {
+        lifecycleScope.launch {
+            try {
+                rootViewModel.requestSign(requireContext(), request, forceRelayer = true)
+                onSuccess()
+            } catch (_: Exception) {}
+        }
+    }
+
+    private fun onEvent(event: BatteryRechargeEvent) {
+        when (event) {
+            is BatteryRechargeEvent.Sign -> sing(event.request)
+            is BatteryRechargeEvent.Error -> showError()
+            is BatteryRechargeEvent.MaxAmountError -> {
+                val message = requireContext().getString(
+                    Localization.battery_max_input_amount,
+                    CurrencyFormatter.format(currency = event.currency, value = event.maxAmount)
+                )
+                showError(message)
+            }
+        }
+    }
+
+    companion object {
+
+        fun newInstance(
+            token: AccountTokenEntity? = null, isGift: Boolean = false
+        ): BatteryRechargeScreen {
+            val args = RechargeArgs(token, isGift)
+            val fragment = BatteryRechargeScreen()
+            fragment.setArgs(args)
+            return fragment
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..252b355a3
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/BatteryRechargeViewModel.kt
@@ -0,0 +1,466 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge
+
+import android.app.Application
+import android.util.Log
+import androidx.lifecycle.viewModelScope
+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.toAccountId
+import com.tonapps.blockchain.ton.tlb.JettonTransfer
+import com.tonapps.extensions.MutableEffectFlow
+import com.tonapps.extensions.state
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.core.entities.TransferEntity
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.BatteryRechargeEvent
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.RechargePackEntity
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.RechargePackType
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeper.ui.screen.battery.refill.entity.PromoState
+import com.tonapps.tonkeeper.ui.screen.send.main.state.SendDestination
+import com.tonapps.uikit.list.ListCell
+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.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.battery.entity.BatteryConfigEntity
+import com.tonapps.wallet.data.battery.entity.RechargeMethodEntity
+import com.tonapps.wallet.data.battery.entity.RechargeMethodType
+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.SettingsRepository
+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.FlowPreview
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.withContext
+import org.ton.block.AddrStd
+import uikit.extensions.collectFlow
+import java.math.BigDecimal
+
+class BatteryRechargeViewModel(
+    app: Application,
+    private val args: RechargeArgs,
+    private val accountRepository: AccountRepository,
+    private val batteryRepository: BatteryRepository,
+    private val tokenRepository: TokenRepository,
+    private val settingsRepository: SettingsRepository,
+    private val ratesRepository: RatesRepository,
+    private val api: API,
+) : BaseWalletVM(app) {
+
+    private val _tokenFlow = MutableStateFlow<AccountTokenEntity?>(null)
+    val tokenFlow = _tokenFlow.asStateFlow().filterNotNull()
+
+    private val promoStateFlow = MutableStateFlow<PromoState>(PromoState.Default)
+
+    private val _amountFlow = MutableStateFlow(0.0)
+    private val amountFlow = _amountFlow.map { Coins.of(it) }
+
+    private val _addressFlow = MutableStateFlow("")
+
+    @OptIn(FlowPreview::class)
+    private val addressDebounceFlow = _addressFlow.debounce { if (it.isEmpty()) 0 else 600 }
+
+    private val _destinationLoadingFlow = MutableStateFlow(false)
+
+    private val destinationFlow = combine(
+        accountRepository.selectedWalletFlow, addressDebounceFlow
+    ) { wallet, address ->
+        if (address.isEmpty()) {
+            return@combine SendDestination.Empty
+        }
+        _destinationLoadingFlow.tryEmit(true)
+        val destination = getDestinationAccount(address, wallet.testnet)
+        _destinationLoadingFlow.tryEmit(false)
+        destination
+    }.flowOn(Dispatchers.IO).state(viewModelScope)
+
+    private val _eventFlow = MutableEffectFlow<BatteryRechargeEvent>()
+    val eventFlow = _eventFlow.asSharedFlow().filterNotNull()
+
+    private val _selectedPackTypeFlow = MutableStateFlow<RechargePackType?>(null)
+    private val _customAmountFlow = MutableStateFlow(false)
+
+    private val selectedFlow = combine(
+        _selectedPackTypeFlow,
+        _customAmountFlow,
+    ) { selectedPackType, customAmount ->
+        selectedPackType to customAmount
+    }
+
+    private val stateFlow = combine(
+        accountRepository.selectedWalletFlow, tokenFlow, promoStateFlow
+    ) { wallet, token, promoState ->
+        Triple(wallet, token, promoState)
+    }
+
+    val uiItemsFlow = combine(
+        stateFlow,
+        amountFlow,
+        selectedFlow,
+        _destinationLoadingFlow,
+        destinationFlow,
+    ) { state, amount, selected, destinationLoading, destination ->
+        val uiItems = mutableListOf<Item>()
+
+        val wallet = state.first
+        val token = state.second
+        val promoState = state.third
+        val selectedPackType = selected.first
+        val customAmount = selected.second
+
+        val batteryBalance = getBatteryBalance(wallet)
+        val ton = tokenRepository.get(settingsRepository.currency, wallet.accountId, wallet.testnet)
+            ?.find { it.isTon } ?: return@combine emptyList()
+        val hasEnoughTonBalance = ton.balance.value >= Coins.of(0.1)
+        val hasBatteryBalance = batteryBalance.balance > Coins.ZERO
+        val rechargeMethod = getRechargeMethod(wallet, token)
+        val shouldMinusReservedAmount = batteryBalance.reservedBalance == Coins.ZERO || args.isGift
+
+        val batteryReservedAmount = rechargeMethod.fromTon(api.config.batteryReservedAmount)
+
+        if (args.isGift) {
+            uiItems.add(
+                Item.Address(
+                    loading = destinationLoading,
+                    error = destination is SendDestination.NotFound
+                )
+            )
+            uiItems.add(Item.Space)
+        }
+
+        val packs = getPacks(
+            rechargeMethod,
+            token,
+            hasEnoughTonBalance || hasBatteryBalance,
+            shouldMinusReservedAmount
+        )
+
+        uiItems.addAll(uiItemsPacks(packs, selectedPackType, customAmount))
+
+        if (!api.config.batteryPromoDisabled) {
+            uiItems.add(Item.Space)
+            uiItems.add(Item.Promo(promoState))
+        }
+
+        val remainingBalance = token.balance.value - amount
+        val minAmount: Coins = when {
+            !hasBatteryBalance && !hasEnoughTonBalance && rechargeMethod.minBootstrapValue != null -> {
+                Coins.of(rechargeMethod.minBootstrapValue!!)
+            }
+
+            shouldMinusReservedAmount -> batteryReservedAmount
+            else -> Coins.ZERO
+        }
+        val isLessThanMin = amount > Coins.ZERO && amount < minAmount
+
+        if (customAmount) {
+            val charges = BatteryMapper.calculateCryptoCharges(
+                getRechargeMethod(wallet, token), api.config.batteryMeanFees, amount
+            )
+            uiItems.add(Item.Space)
+            uiItems.add(
+                Item.Amount(
+                    symbol = token.symbol,
+                    formattedRemaining = CurrencyFormatter.format(
+                        currency = token.symbol, value = remainingBalance
+                    ),
+                    isInsufficientBalance = remainingBalance.isNegative,
+                    isLessThanMin = isLessThanMin,
+                    formattedCharges = CurrencyFormatter.format(value = charges)
+                )
+            )
+        }
+
+        val isValidGiftAddress = if (args.isGift) {
+            destination is SendDestination.Account
+        } else {
+            true
+        }
+
+        val isValidAmount = if (customAmount) {
+            amount.isPositive && !isLessThanMin && !remainingBalance.isNegative
+        } else {
+            selectedPackType != null
+        }
+
+        uiItems.add(Item.Space)
+        uiItems.add(Item.Button(isValidGiftAddress && isValidAmount))
+
+        uiItems.toList()
+    }
+
+    init {
+        accountRepository.selectedWalletFlow.take(1).map { wallet ->
+            val appliedPromo = batteryRepository.getAppliedPromo(wallet.testnet)
+
+            if (appliedPromo.isNullOrBlank()) {
+                promoStateFlow.tryEmit(PromoState.Default)
+            } else {
+                promoStateFlow.tryEmit(PromoState.Applied(appliedPromo))
+            }
+
+            if (args.token == null) {
+                val batteryConfig = getBatteryConfig(wallet)
+                val supportedTokens = getSupportedTokens(wallet, batteryConfig.rechargeMethods)
+                _tokenFlow.tryEmit(supportedTokens.first())
+            } else {
+                _tokenFlow.tryEmit(args.token)
+            }
+        }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
+    }
+
+    fun setToken(token: AccountTokenEntity) {
+        _tokenFlow.tryEmit(token)
+    }
+
+    fun updateAddress(address: String) {
+        _addressFlow.tryEmit(address)
+    }
+
+    fun updateAmount(amount: Double) {
+        _amountFlow.value = amount
+    }
+
+    fun setSelectedPack(packType: RechargePackType) {
+        _selectedPackTypeFlow.tryEmit(packType)
+        _customAmountFlow.tryEmit(false)
+    }
+
+    fun onCustomAmountSelect() {
+        _customAmountFlow.tryEmit(true)
+        _selectedPackTypeFlow.tryEmit(null)
+    }
+
+    fun onContinue() = combine(stateFlow, destinationFlow) { state, destination ->
+        val wallet = state.first
+        val token = state.second
+        val rechargeMethod = getRechargeMethod(wallet, token)
+        val config = getBatteryConfig(wallet)
+        val batteryMaxInputAmount = rechargeMethod.fromTon(api.config.batteryMaxInputAmount)
+
+        val amount = _selectedPackTypeFlow.value?.let { packType ->
+            Coins.of(RechargePackEntity.getTonAmount(api.config.batteryMeanFees, packType))
+        } ?: Coins.of(_amountFlow.value)
+
+        if (amount > batteryMaxInputAmount) {
+            _eventFlow.tryEmit(
+                BatteryRechargeEvent.MaxAmountError(
+                    currency = token.symbol,
+                    maxAmount = batteryMaxInputAmount
+                )
+            )
+            return@combine
+        }
+
+        val fundReceiver = config.fundReceiver ?: return@combine
+        val recipientAddress = if (destination is SendDestination.Account) {
+            destination.address
+        } else null
+        val payload = wallet.contract.createBatteryBody(
+            recipientAddress,
+            appliedPromo = batteryRepository.getAppliedPromo(wallet.testnet)
+        )
+        val validUntil = accountRepository.getValidUntil(wallet.testnet)
+        val network = when (wallet.testnet) {
+            true -> TonNetwork.TESTNET
+            false -> TonNetwork.MAINNET
+        }
+
+        if (token.isTon) {
+            val request = SignRequestEntity(
+                fromValue = wallet.contract.address.toAccountId(),
+                validUntil = validUntil,
+                messages = listOf(
+                    RawMessageEntity(
+                        addressValue = fundReceiver,
+                        amount = amount.toLong(),
+                        stateInitValue = null,
+                        payloadValue = payload.base64()
+                    )
+                ),
+                network = network,
+            )
+            _eventFlow.tryEmit(BatteryRechargeEvent.Sign(request))
+        } else {
+            val queryId = TransferEntity.newWalletQueryId()
+            val jettonPayload = TonTransferHelper.jetton(
+                coins = org.ton.block.Coins.ofNano(amount.toLong()),
+                toAddress = AddrStd.parse(fundReceiver),
+                responseAddress = wallet.contract.address,
+                queryId = queryId,
+                body = payload,
+            )
+            val request = SignRequestEntity(
+                fromValue = wallet.contract.address.toAccountId(),
+                validUntil = validUntil,
+                messages = listOf(
+                    RawMessageEntity(
+                        addressValue = token.balance.walletAddress,
+                        amount = Coins.of(0.1).toLong(),
+                        stateInitValue = null,
+                        payloadValue = jettonPayload.base64()
+                    )
+                ),
+                network = network,
+            )
+            _eventFlow.tryEmit(BatteryRechargeEvent.Sign(request))
+        }
+    }.catch {
+        _eventFlow.tryEmit(BatteryRechargeEvent.Error)
+    }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
+
+    private fun uiItemsPacks(
+        packs: List<RechargePackEntity>,
+        selectedPackType: RechargePackType?,
+        isCustomAmount: Boolean
+    ): List<Item> {
+        val uiItems = mutableListOf<Item>()
+        for ((index, pack) in packs.withIndex()) {
+            val position = ListCell.getPosition(packs.size + 1, index)
+            uiItems.add(
+                Item.RechargePack(
+                    position = position,
+                    packType = pack.type,
+                    charges = pack.charges,
+                    formattedAmount = pack.formattedAmount,
+                    formattedFiatAmount = pack.formattedFiatAmount,
+                    batteryLevel = pack.batteryLevel,
+                    isEnabled = pack.isEnabled,
+                    selected = pack.type == selectedPackType,
+                    transactions = pack.transactions,
+                )
+            )
+        }
+        uiItems.add(Item.CustomAmount(position = ListCell.Position.LAST, selected = isCustomAmount))
+        return uiItems.toList()
+    }
+
+    private suspend fun getBatteryConfig(
+        wallet: WalletEntity
+    ): BatteryConfigEntity {
+        return batteryRepository.getConfig(wallet.testnet)
+    }
+
+    private suspend fun getBatteryBalance(
+        wallet: WalletEntity
+    ): BatteryBalanceEntity {
+        val tonProofToken =
+            accountRepository.requestTonProofToken(wallet) ?: return BatteryBalanceEntity.Empty
+        return batteryRepository.getBalance(
+            tonProofToken = tonProofToken, publicKey = wallet.publicKey, testnet = wallet.testnet
+        )
+    }
+
+    private suspend fun getTokens(wallet: WalletEntity): List<AccountTokenEntity> {
+        return tokenRepository.get(
+            currency = settingsRepository.currency,
+            accountId = wallet.accountId,
+            testnet = wallet.testnet
+        ) ?: emptyList()
+    }
+
+    private suspend fun getSupportedTokens(
+        wallet: WalletEntity, rechargeMethods: List<RechargeMethodEntity>
+    ): List<AccountTokenEntity> {
+        val tokens = getTokens(wallet)
+        val supportTokenAddress = rechargeMethods.filter { it.supportRecharge }.mapNotNull {
+            if (it.type == RechargeMethodType.TON) {
+                TokenEntity.TON.address
+            } else {
+                it.jettonMaster
+            }
+        }
+        return tokens.filter { token ->
+            supportTokenAddress.contains(token.address)
+        }.sortedBy { it.fiat }.reversed()
+    }
+
+    private suspend fun getRechargeMethod(
+        wallet: WalletEntity, token: AccountTokenEntity
+    ): RechargeMethodEntity {
+        val rechargeMethods = getBatteryConfig(wallet).rechargeMethods
+        return rechargeMethods.first {
+            if (it.type == RechargeMethodType.TON) {
+                token.isTon
+            } else {
+                it.jettonMaster == token.address
+            }
+        }
+    }
+
+    private fun getPacks(
+        rechargeMethod: RechargeMethodEntity,
+        token: AccountTokenEntity,
+        willBePaidManually: Boolean,
+        shouldMinusReservedAmount: Boolean
+    ): List<RechargePackEntity> {
+        val fiatRate = ratesRepository.getRates(settingsRepository.currency, token.address)
+            .getRate(token.address)
+        val config = api.config
+
+        return arrayOf(
+            RechargePackType.LARGE, RechargePackType.MEDIUM, RechargePackType.SMALL
+        ).map { type ->
+            RechargePackEntity(
+                type = type,
+                rechargeMethod = rechargeMethod,
+                fiatRate = fiatRate,
+                token = token,
+                config = config,
+                shouldMinusReservedAmount = shouldMinusReservedAmount,
+                willBePaidManually = willBePaidManually,
+                currency = settingsRepository.currency,
+            )
+        }
+    }
+
+    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) }
+
+        val account = accountDeferred.await() ?: return@withContext SendDestination.NotFound
+        val publicKey = publicKeyDeferred.await()
+
+        SendDestination.Account(address, publicKey, account)
+    }
+
+    fun applyPromo(promo: String) = accountRepository.selectedWalletFlow.take(1).map { wallet ->
+        if (promo.isEmpty()) {
+            promoStateFlow.tryEmit(PromoState.Default)
+            return@map
+        }
+        promoStateFlow.tryEmit(PromoState.Loading())
+        try {
+            api.battery(wallet.testnet).verifyPurchasePromo(promo)
+            batteryRepository.setAppliedPromo(wallet.testnet, promo)
+            promoStateFlow.tryEmit(PromoState.Applied(promo))
+        } catch (_: Exception) {
+            promoStateFlow.tryEmit(PromoState.Error)
+        }
+    }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/RechargeArgs.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/RechargeArgs.kt
new file mode 100644
index 000000000..b97bb2393
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/RechargeArgs.kt
@@ -0,0 +1,29 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge
+
+import android.os.Bundle
+import com.tonapps.extensions.getParcelableCompat
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import uikit.base.BaseArgs
+
+data class RechargeArgs(
+    val token: AccountTokenEntity?,
+    val isGift: Boolean
+) : BaseArgs() {
+
+    private companion object {
+        private const val ARG_TOKEN = "token"
+        private const val ARG_IS_GIFT = "is_gift"
+    }
+
+    constructor(bundle: Bundle) : this(
+        token = bundle.getParcelableCompat(ARG_TOKEN),
+        isGift = bundle.getBoolean(ARG_IS_GIFT)
+    )
+
+    override fun toBundle(): Bundle {
+        val bundle = Bundle()
+        bundle.putParcelable(ARG_TOKEN, token)
+        bundle.putBoolean(ARG_IS_GIFT, isGift)
+        return bundle
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/BatteryRechargeEvent.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/BatteryRechargeEvent.kt
new file mode 100644
index 000000000..9866c9a20
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/BatteryRechargeEvent.kt
@@ -0,0 +1,11 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.entity
+
+import androidx.annotation.StringRes
+import com.tonapps.icu.Coins
+import com.tonapps.wallet.data.core.entity.SignRequestEntity
+
+sealed class BatteryRechargeEvent {
+    data class Sign(val request: SignRequestEntity) : BatteryRechargeEvent()
+    data object Error : BatteryRechargeEvent()
+    data class MaxAmountError(val maxAmount: Coins, val currency: String) : BatteryRechargeEvent()
+}
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackEntity.kt
new file mode 100644
index 000000000..0557b408a
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackEntity.kt
@@ -0,0 +1,109 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.entity
+
+import com.tonapps.icu.Coins
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.wallet.api.entity.ConfigEntity
+import com.tonapps.wallet.data.battery.BatteryMapper
+import com.tonapps.wallet.data.battery.entity.RechargeMethodEntity
+import com.tonapps.wallet.data.core.WalletCurrency
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+data class RechargePackEntity(
+    val type: RechargePackType,
+    private val rechargeMethod: RechargeMethodEntity,
+    private val fiatRate: Coins,
+    private val token: AccountTokenEntity,
+    private val config: ConfigEntity,
+    private val willBePaidManually: Boolean,
+    private val shouldMinusReservedAmount: Boolean,
+    private val currency: WalletCurrency,
+) {
+    private val rate: BigDecimal
+        get() = rechargeMethod.rate.toBigDecimal()
+
+    private val meansFee: BigDecimal
+        get() = config.batteryMeanFees.toBigDecimal()
+
+    private val tonAmount: BigDecimal
+        get() = getTonAmount(meansFee, type)
+
+    private val amountInToken: BigDecimal
+        get() = rechargeMethod.fromTon(tonAmount).value
+
+    private val reservedAmount: BigDecimal
+        get() = rechargeMethod.fromTon(config.batteryReservedAmount).value
+
+    val formattedAmount: CharSequence
+        get() = CurrencyFormatter.formatFiat(
+            currency = rechargeMethod.symbol,
+            value = amountInToken,
+        )
+
+    val formattedFiatAmount: CharSequence
+        get() = CurrencyFormatter.formatFiat(
+            currency = currency.code,
+            value = amountInToken.multiply(fiatRate.value)
+        )
+
+    val charges: Int
+        get() = amountInToken.minus(
+            if (shouldMinusReservedAmount) {
+                reservedAmount
+            } else {
+                BigDecimal.valueOf(0)
+            }
+        ).multiply(rate).divide(meansFee, 0, RoundingMode.HALF_UP).toInt()
+
+    val batteryLevel: Float
+        get() = when (type) {
+            RechargePackType.LARGE -> 1f
+            RechargePackType.MEDIUM -> 0.5f
+            RechargePackType.SMALL -> 0.25f
+        }
+
+    val transactions: Map<BatteryTransaction, Int>
+        get() = mapOf(
+            BatteryTransaction.SWAP to charges / BatteryMapper.calculateChargesAmount(
+                config.batteryMeanPriceSwap,
+                config.batteryMeanFees
+            ),
+            BatteryTransaction.NFT to charges / BatteryMapper.calculateChargesAmount(
+                config.batteryMeanPriceNft,
+                config.batteryMeanFees
+            ),
+            BatteryTransaction.JETTON to charges / BatteryMapper.calculateChargesAmount(
+                config.batteryMeanPriceJetton,
+                config.batteryMeanFees
+            )
+        )
+
+    private val isAvailableToBuy: Boolean
+        get() = willBePaidManually || rechargeMethod.minBootstrapValue?.let { amountInToken >= it.toBigDecimal() } ?: false
+
+    private val isEnoughBalance: Boolean
+        get() = token.balance.value.value >= amountInToken
+
+    val isEnabled: Boolean
+        get() = isAvailableToBuy && isEnoughBalance
+
+
+    companion object {
+
+        fun getTonAmount(meansFee: BigDecimal, type: RechargePackType): BigDecimal {
+            return when (type) {
+                RechargePackType.LARGE -> meansFee.multiply(BigDecimal.valueOf(400))
+                RechargePackType.MEDIUM -> meansFee.multiply(BigDecimal.valueOf(250))
+                RechargePackType.SMALL -> meansFee.multiply(BigDecimal.valueOf(150))
+            }
+        }
+
+        fun getTonAmount(meansFee: String, type: RechargePackType): BigDecimal {
+            val meansFeeBigDecimal = BigDecimal(meansFee)
+            return getTonAmount(meansFeeBigDecimal, type)
+        }
+    }
+
+}
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackType.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackType.kt
new file mode 100644
index 000000000..13ff507ba
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/entity/RechargePackType.kt
@@ -0,0 +1,7 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.entity
+
+enum class RechargePackType {
+    LARGE,
+    MEDIUM,
+    SMALL
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/Adapter.kt
new file mode 100644
index 000000000..072c86dca
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/Adapter.kt
@@ -0,0 +1,43 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.RechargePackType
+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.recharge.list.holder.ButtonHolder
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.CustomAmountHolder
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.PromoHolder
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.RechargePackHolder
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder.SpaceHolder
+import com.tonapps.uikit.list.BaseListAdapter
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.uikit.list.BaseListItem
+
+class Adapter(
+    private val onAddressChange: (String) -> Unit,
+    private val openAddressBook: () -> Unit,
+    private val onAmountChange: (Double) -> Unit,
+    private val onPackSelect: (RechargePackType) -> Unit,
+    private val onCustomAmountSelect: () -> Unit,
+    private val onContinue: () -> Unit,
+    private val onSubmitPromo: (String) -> Unit,
+): BaseListAdapter() {
+    override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
+        return when(viewType) {
+            Item.TYPE_RECHARGE_PACK -> RechargePackHolder(parent, onPackSelect)
+            Item.TYPE_CUSTOM_AMOUNT -> CustomAmountHolder(parent, onCustomAmountSelect)
+            Item.TYPE_SPACE -> SpaceHolder(parent)
+            Item.TYPE_AMOUNT -> AmountHolder(parent, onAmountChange)
+            Item.TYPE_ADDRESS -> AddressHolder(parent, onAddressChange, openAddressBook)
+            Item.TYPE_BUTTON -> ButtonHolder(parent, onContinue)
+            Item.TYPE_PROMO -> PromoHolder(parent, onSubmitPromo)
+            else -> throw IllegalArgumentException("Unknown view type: $viewType")
+        }
+    }
+
+    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/battery/recharge/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/Item.kt
new file mode 100644
index 000000000..6d4aa616d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/Item.kt
@@ -0,0 +1,70 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list
+
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.RechargePackType
+import com.tonapps.tonkeeper.ui.screen.battery.refill.entity.PromoState
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.settings.BatteryTransaction
+
+sealed class Item(type: Int) : BaseListItem(type) {
+
+    companion object {
+        const val TYPE_RECHARGE_PACK = 0
+        const val TYPE_CUSTOM_AMOUNT = 1
+        const val TYPE_SPACE = 2
+        const val TYPE_AMOUNT = 3
+        const val TYPE_ADDRESS = 4
+        const val TYPE_BUTTON = 5
+        const val TYPE_PROMO = 6
+    }
+
+    data class RechargePack(
+        val position: ListCell.Position,
+        val packType: RechargePackType,
+        val charges: Int,
+        val formattedAmount: CharSequence,
+        val formattedFiatAmount: CharSequence,
+        val batteryLevel: Float,
+        val isEnabled: Boolean,
+        val selected: Boolean,
+        val transactions: Map<BatteryTransaction, Int>
+    ) : Item(TYPE_RECHARGE_PACK)
+
+    data class CustomAmount(
+        val position: ListCell.Position,
+        val selected: Boolean,
+    ) : Item(TYPE_CUSTOM_AMOUNT)
+
+    data class Amount(
+        val symbol: String,
+        val formattedRemaining: CharSequence,
+        val isInsufficientBalance: Boolean,
+        val isLessThanMin: Boolean,
+        val formattedCharges: CharSequence,
+    ) : Item(TYPE_AMOUNT)
+
+    data class Address(
+        val loading: Boolean,
+        val error: Boolean
+    ) : Item(TYPE_ADDRESS)
+
+    data class Button(
+        val isEnabled: Boolean,
+    ) : Item(TYPE_BUTTON)
+
+    data class Promo(
+        val promoState: PromoState,
+    ) : Item(TYPE_PROMO) {
+
+        val appliedPromo: String
+            get() = (promoState as? PromoState.Applied)?.appliedPromo ?: ""
+
+        val isLoading: Boolean
+            get() = promoState is PromoState.Loading
+
+        val isError: Boolean
+            get() = promoState is PromoState.Error
+    }
+
+    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/recharge/list/holder/AddressHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/AddressHolder.kt
new file mode 100644
index 000000000..68fcbd15d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/AddressHolder.kt
@@ -0,0 +1,41 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.extensions.clipboardText
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeperx.R
+import uikit.widget.InputView
+import uikit.widget.RowLayout
+
+class AddressHolder(
+    parent: ViewGroup,
+    private val onTextChange: (String) -> Unit,
+    private val openAddressBook: () -> Unit,
+) : Holder<Item.Address>(parent, R.layout.fragment_recharge_address) {
+
+    private val inputView = itemView.findViewById<InputView>(R.id.address)
+    private val addressActionsView = itemView.findViewById<RowLayout>(R.id.address_actions)
+    private val pasteView = itemView.findViewById<AppCompatTextView>(R.id.paste)
+    private val addressBookView = itemView.findViewById<AppCompatImageView>(R.id.address_book)
+
+    override fun onBind(item: Item.Address) {
+        inputView.doOnTextChange = { text ->
+            onTextChange(text)
+            inputView.loading = text.isNotBlank()
+            addressActionsView.visibility = if (text.isBlank()) View.VISIBLE else View.GONE
+        }
+        inputView.loading = item.loading
+        inputView.error = item.error
+
+        addressBookView.setOnClickListener {
+            openAddressBook()
+        }
+
+        pasteView.setOnClickListener {
+            inputView.text = context.clipboardText()
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/AmountHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/AmountHolder.kt
new file mode 100644
index 000000000..67ae66081
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/AmountHolder.kt
@@ -0,0 +1,46 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.component.coin.CoinEditText
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentRedColor
+import com.tonapps.uikit.color.textSecondaryColor
+import com.tonapps.wallet.localization.Localization
+
+class AmountHolder(
+    parent: ViewGroup,
+    private val onValueChange: (Double) -> Unit
+) : Holder<Item.Amount>(parent, R.layout.fragment_recharge_amount) {
+
+    private val amountView = itemView.findViewById<CoinEditText>(R.id.amount)
+    private val currencyView = itemView.findViewById<AppCompatTextView>(R.id.currency)
+    private val availableView = itemView.findViewById<AppCompatTextView>(R.id.available)
+
+    override fun onBind(item: Item.Amount) {
+        amountView.doOnValueChange = onValueChange
+        amountView.suffix = item.symbol
+        currencyView.text = item.formattedCharges
+        applyAvailable(item.formattedRemaining, item.isInsufficientBalance, item.isLessThanMin)
+    }
+
+
+    private fun applyAvailable(
+        formattedRemaining: CharSequence,
+        isInsufficientBalance: Boolean,
+        isLessThanMin: Boolean
+    ) {
+        if (isInsufficientBalance) {
+            availableView.setText(Localization.insufficient_balance)
+            availableView.setTextColor(context.accentRedColor)
+        } else if (isLessThanMin) {
+            availableView.text = getString(Localization.insufficient_balance)
+            availableView.setTextColor(context.textSecondaryColor)
+        } else {
+            availableView.text =
+                context.getString(Localization.remaining_balance, formattedRemaining)
+            availableView.setTextColor(context.textSecondaryColor)
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/ButtonHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/ButtonHolder.kt
new file mode 100644
index 000000000..5bc793797
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/ButtonHolder.kt
@@ -0,0 +1,21 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.ViewGroup
+import android.widget.Button
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeperx.R
+
+class ButtonHolder(
+    parent: ViewGroup,
+    private val onContinue: () -> Unit,
+) : Holder<Item.Button>(parent, R.layout.fragment_recharge_button) {
+
+    private val buttonView = itemView.findViewById<Button>(R.id.button)
+
+    override fun onBind(item: Item.Button) {
+        buttonView.setOnClickListener {
+            onContinue()
+        }
+        buttonView.isEnabled = item.isEnabled
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/CustomAmountHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/CustomAmountHolder.kt
new file mode 100644
index 000000000..761db2ebb
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/CustomAmountHolder.kt
@@ -0,0 +1,27 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.widget.RadioView
+
+class CustomAmountHolder(
+    parent: ViewGroup,
+    private val onCustomAmountSelect: () -> Unit,
+): Holder<Item.CustomAmount>(parent, R.layout.view_cell_recharge_pack) {
+
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+    private val radioView = itemView.findViewById<RadioView>(R.id.radio)
+
+    override fun onBind(item: Item.CustomAmount) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener { onCustomAmountSelect() }
+        titleView.text = getString(Localization.battery_other_title)
+        subtitleView.text = getString(Localization.battery_other_subtitle)
+        radioView.checked = item.selected
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/Holder.kt
new file mode 100644
index 000000000..2efec66b4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/Holder.kt
@@ -0,0 +1,15 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.uikit.list.BaseListHolder
+import uikit.navigation.Navigation
+
+abstract class Holder<I: Item>(
+    parent: ViewGroup,
+    @LayoutRes resId: Int,
+): BaseListHolder<I>(parent, resId) {
+
+    val navigation = Navigation.from(context)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/PromoHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/PromoHolder.kt
new file mode 100644
index 000000000..51e744419
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/PromoHolder.kt
@@ -0,0 +1,49 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.extensions.clipboardText
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeperx.R
+import uikit.widget.InputView
+import uikit.widget.RowLayout
+
+class PromoHolder(
+    parent: ViewGroup,
+    private val onSubmitPromo: (String) -> Unit,
+): Holder<Item.Promo>(parent, R.layout.fragment_battery_promo) {
+
+    private val inputView = itemView.findViewById<InputView>(R.id.promo_input)
+    private val actionsView = itemView.findViewById<RowLayout>(R.id.actions)
+    private val pasteView = itemView.findViewById<AppCompatTextView>(R.id.paste)
+
+    override fun onBind(item: Item.Promo) {
+        inputView.singleLine = true
+        inputView.doOnTextChange = { text ->
+            inputView.error = false
+            inputView.success = item.appliedPromo.isNotBlank() && text == item.appliedPromo
+            actionsView.visibility = if (text.isBlank()) View.VISIBLE else View.GONE
+        }
+        inputView.loading = item.isLoading
+        inputView.error = item.isError
+        inputView.success = item.appliedPromo.isNotBlank()
+
+        if (inputView.isEmpty && !inputView.isFocused) {
+            inputView.text = item.appliedPromo
+        }
+
+        inputView.setOnDoneActionListener {
+            inputView.hideKeyboard()
+            if (inputView.text.isNotBlank() && inputView.text != item.appliedPromo && !item.isLoading) {
+                onSubmitPromo(inputView.text)
+            }
+        }
+
+        pasteView.setOnClickListener {
+            inputView.text = context.clipboardText()
+            inputView.hideKeyboard()
+            onSubmitPromo(inputView.text)
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/RechargePackHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/RechargePackHolder.kt
new file mode 100644
index 000000000..ff1f7c200
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/RechargePackHolder.kt
@@ -0,0 +1,80 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.entity.RechargePackType
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.list.Item
+import com.tonapps.tonkeeper.view.BatteryView
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.icon.UIKitIcon
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.localization.Plurals
+import uikit.extensions.drawable
+import uikit.extensions.setRightDrawable
+import uikit.extensions.getDrawable
+import uikit.widget.RadioView
+
+class RechargePackHolder(
+    parent: ViewGroup,
+    private val onPackSelect: (RechargePackType) -> Unit,
+) : Holder<Item.RechargePack>(parent, R.layout.view_cell_recharge_pack) {
+
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+    private val detailsView = itemView.findViewById<AppCompatTextView>(R.id.details)
+    private val batteryView = itemView.findViewById<BatteryView>(R.id.battery)
+    private val radioView = itemView.findViewById<RadioView>(R.id.radio)
+
+    override fun onBind(item: Item.RechargePack) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener { onPackSelect(item.packType) }
+        itemView.isEnabled = item.isEnabled
+
+        titleView.text = context.resources.getQuantityString(
+            Plurals.battery_current_charges, item.charges, item.charges
+        )
+        titleView.setRightDrawable(itemView.getDrawable(UIKitIcon.ic_information_circle_16))
+        titleView.setOnClickListener {
+            detailsView.visibility = if (detailsView.visibility == View.VISIBLE) {
+                View.GONE
+            } else {
+                View.VISIBLE
+            }
+        }
+
+        subtitleView.text = createSubtitle(item.formattedAmount, item.formattedFiatAmount)
+
+        detailsView.text = createDetails(item.transactions)
+
+        batteryView.setBatteryLevel(item.batteryLevel)
+
+        radioView.checked = item.selected
+        radioView.isEnabled = item.isEnabled
+
+
+    }
+
+    private fun createDetails(transactions: Map<BatteryTransaction, Int>): String {
+        val builder = StringBuilder()
+        transactions.forEach { (transaction, count) ->
+            val titleRes = when (transaction) {
+                BatteryTransaction.NFT -> Plurals.battery_nft
+                BatteryTransaction.SWAP -> Plurals.battery_swap
+                BatteryTransaction.JETTON -> Plurals.battery_jetton
+                else -> throw IllegalArgumentException("Unsupported transaction type: $transaction")
+            }
+            builder.append(context.resources.getQuantityString(titleRes, count, count))
+            builder.append("\n")
+        }
+        return builder.toString()
+    }
+
+    private fun createSubtitle(tokenAmount: CharSequence, fiatAmount: CharSequence): String {
+        val builder = StringBuilder()
+        builder.append(tokenAmount)
+        builder.append(" · ")
+        builder.append(fiatAmount)
+        return builder.toString()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/SpaceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/SpaceHolder.kt
new file mode 100644
index 000000000..e41b88d2b
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/recharge/list/holder/SpaceHolder.kt
@@ -0,0 +1,9 @@
+package com.tonapps.tonkeeper.ui.screen.battery.recharge.list.holder
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.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/battery/refill/BatteryRefillScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillScreen.kt
new file mode 100644
index 000000000..4cfcd0f29
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillScreen.kt
@@ -0,0 +1,58 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill
+
+import android.os.Bundle
+import android.view.View
+import com.tonapps.tonkeeper.koin.parentFragmentViewModel
+import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Adapter
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import uikit.R
+import uikit.extensions.collectFlow
+import uikit.extensions.getDimensionPixelSize
+
+class BatteryRefillScreen : BaseListWalletScreen() {
+
+    private val initialPromo: String? by lazy { requireArguments().getString(ARG_PROMO) }
+
+    override val viewModel: BatteryRefillViewModel by viewModel { parametersOf(initialPromo) }
+
+    private val parentViewModel: BatteryViewModel by parentFragmentViewModel()
+
+    private val adapter = Adapter(
+        openSettings = { parentViewModel.routeToSettings() },
+        onSubmitPromo = { viewModel.applyPromo(it) }
+    )
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        parentViewModel.setTitle(null)
+        collectFlow(viewModel.uiItemsFlow, adapter::submitList)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        hideHeaderContainer()
+        setAdapter(adapter)
+        updateListPadding(top = requireContext().getDimensionPixelSize(R.dimen.barHeight))
+        if (initialPromo != null) {
+            viewModel.applyPromo(initialPromo!!, true)
+        }
+    }
+
+    companion object {
+        private const val ARG_PROMO = "promo"
+
+        fun newInstance() = BatteryRefillScreen()
+
+        fun newInstance(promo: String?): BatteryRefillScreen {
+            val fragment = BatteryRefillScreen()
+            fragment.arguments = Bundle().apply {
+                putString(ARG_PROMO, promo)
+            }
+
+            return fragment
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..b429192d8
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/BatteryRefillViewModel.kt
@@ -0,0 +1,200 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill
+
+import android.app.Application
+import androidx.lifecycle.viewModelScope
+import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.billing.BillingManager
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.battery.refill.entity.PromoState
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.entity.ConfigEntity
+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.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.battery.entity.BatteryConfigEntity
+import com.tonapps.wallet.data.battery.entity.RechargeMethodEntity
+import com.tonapps.wallet.data.battery.entity.RechargeMethodType
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.data.token.TokenRepository
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
+import uikit.extensions.collectFlow
+import java.net.URLEncoder
+
+class BatteryRefillViewModel(
+    app: Application,
+    private val api: API,
+    private val accountRepository: AccountRepository,
+    private val batteryRepository: BatteryRepository,
+    private val tokenRepository: TokenRepository,
+    private val settingsRepository: SettingsRepository,
+    private val billingManager: BillingManager,
+) : BaseWalletVM(app) {
+
+    private val promoStateFlow = MutableStateFlow<PromoState>(PromoState.Default)
+
+    val uiItemsFlow = combine(
+        accountRepository.selectedWalletFlow,
+        promoStateFlow,
+        settingsRepository.walletPrefsChangedFlow,
+        batteryRepository.balanceUpdatedFlow,
+    ) { wallet, promoState, _, _ ->
+        val batteryBalance = getBatteryBalance(wallet)
+
+        val uiItems = mutableListOf<Item>()
+        uiItems.add(uiItemBattery(batteryBalance, api.config))
+        uiItems.add(Item.Space)
+
+        if (!api.config.batteryPromoDisabled) {
+            uiItems.add(Item.Promo(promoState))
+            uiItems.add(Item.Space)
+        }
+
+        if (batteryBalance.balance.isPositive) {
+            uiItems.add(Item.Settings(settingsRepository.getBatteryTxEnabled(wallet.accountId)))
+            uiItems.add(Item.Space)
+        }
+
+        if (!api.config.disableBatteryCryptoRecharge) {
+            uiItems.addAll(uiItemsRechargeMethods(wallet))
+        }
+
+        val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: ""
+
+        uiItems.add(Item.Space)
+        uiItems.add(
+            Item.Refund(
+                refundUrl = "${api.config.batteryRefundEndpoint}?token=${
+                    URLEncoder.encode(
+                        tonProofToken,
+                        "UTF-8"
+                    )
+                }&testnet=${wallet.testnet}"
+            )
+        )
+
+        uiItems.toList()
+    }.flowOn(Dispatchers.IO)
+
+    init {
+        accountRepository.selectedWalletFlow.take(1).map { wallet ->
+            val appliedPromo = batteryRepository.getAppliedPromo(wallet.testnet)
+
+            if (appliedPromo.isNullOrBlank()) {
+                promoStateFlow.tryEmit(PromoState.Default)
+            } else {
+                promoStateFlow.tryEmit(PromoState.Applied(appliedPromo))
+            }
+        }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
+    }
+
+    private fun uiItemBattery(
+        balance: BatteryBalanceEntity,
+        config: ConfigEntity,
+    ): Item.Battery {
+        val charges = BatteryMapper.convertToCharges(balance.balance, api.config.batteryMeanFees)
+        val formattedChanges = CurrencyFormatter.format(value = charges.toBigDecimal())
+
+        return Item.Battery(
+            balance = balance.balance.value.toFloat(),
+            beta = config.batteryBeta,
+            changes = charges,
+            formattedChanges = formattedChanges
+        )
+    }
+
+    private suspend fun uiItemsRechargeMethods(
+        wallet: WalletEntity,
+    ): List<Item> {
+        val batteryConfig = getBatteryConfig(wallet)
+        val supportedTokens = getSupportedTokens(wallet, batteryConfig.rechargeMethods)
+
+        val uiItems = mutableListOf<Item>()
+        for ((index, supportToken) in supportedTokens.withIndex()) {
+            val position = ListCell.getPosition(supportedTokens.size + 1, index)
+            uiItems.add(
+                Item.RechargeMethod(
+                    position = position,
+                    token = supportToken
+                )
+            )
+        }
+        uiItems.add(Item.Gift(position = ListCell.Position.LAST))
+        return uiItems.toList()
+    }
+
+    private suspend fun getBatteryConfig(
+        wallet: WalletEntity
+    ): BatteryConfigEntity {
+        return batteryRepository.getConfig(wallet.testnet)
+    }
+
+    private suspend fun getBatteryBalance(
+        wallet: WalletEntity
+    ): BatteryBalanceEntity {
+        val tonProofToken =
+            accountRepository.requestTonProofToken(wallet) ?: return BatteryBalanceEntity.Empty
+        return batteryRepository.getBalance(
+            tonProofToken = tonProofToken,
+            publicKey = wallet.publicKey,
+            testnet = wallet.testnet
+        )
+    }
+
+    private suspend fun getTokens(wallet: WalletEntity): List<AccountTokenEntity> {
+        return tokenRepository.get(
+            currency = settingsRepository.currency,
+            accountId = wallet.accountId,
+            testnet = wallet.testnet
+        ) ?: emptyList()
+    }
+
+    private suspend fun getSupportedTokens(
+        wallet: WalletEntity,
+        rechargeMethods: List<RechargeMethodEntity>
+    ): List<AccountTokenEntity> {
+        val tokens = getTokens(wallet)
+        val supportTokenAddress = rechargeMethods.filter { it.supportRecharge }.mapNotNull {
+            if (it.type == RechargeMethodType.TON) {
+                TokenEntity.TON.address
+            } else {
+                it.jettonMaster
+            }
+        }
+        return tokens.filter { token ->
+            supportTokenAddress.contains(token.address)
+        }.sortedBy { it.fiat }.reversed()
+    }
+
+    fun applyPromo(promo: String, isInitial: Boolean = false) =
+        accountRepository.selectedWalletFlow.take(1).map { wallet ->
+            if (promo.isEmpty()) {
+                promoStateFlow.tryEmit(PromoState.Default)
+                return@map
+            }
+            val initialPromo = if (isInitial) promo else null
+            promoStateFlow.tryEmit(PromoState.Loading(initialPromo = initialPromo))
+            try {
+                if (isInitial) {
+                    delay(2000)
+                }
+                api.battery(wallet.testnet).verifyPurchasePromo(promo)
+                batteryRepository.setAppliedPromo(wallet.testnet, promo)
+                promoStateFlow.tryEmit(PromoState.Applied(promo))
+            } catch (_: Exception) {
+                promoStateFlow.tryEmit(PromoState.Error)
+            }
+        }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/entity/PromoState.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/entity/PromoState.kt
new file mode 100644
index 000000000..fc10cf5dc
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/entity/PromoState.kt
@@ -0,0 +1,12 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.entity
+
+sealed class PromoState {
+    data object Default : PromoState()
+    data object Error : PromoState()
+    data class Loading(
+        val initialPromo: String? = null
+    ) : PromoState()
+    data class Applied(
+        val appliedPromo: String
+    ) : PromoState()
+}
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
new file mode 100644
index 000000000..2b8bb8263
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Adapter.kt
@@ -0,0 +1,37 @@
+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.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.PromoHolder
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.RechargeMethodHolder
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.RefundHolder
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.SettingsHolder
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder.SpaceHolder
+import com.tonapps.uikit.list.BaseListAdapter
+import com.tonapps.uikit.list.BaseListHolder
+import com.tonapps.uikit.list.BaseListItem
+
+class Adapter(
+    private val openSettings: () -> Unit,
+    private val onSubmitPromo: (String) -> Unit,
+): BaseListAdapter() {
+    override fun createHolder(parent: ViewGroup, viewType: Int): BaseListHolder<out BaseListItem> {
+        return when(viewType) {
+            Item.TYPE_BATTERY -> BatteryHolder(parent, openSettings)
+            Item.TYPE_SPACE -> SpaceHolder(parent)
+            Item.TYPE_RECHARGE_METHOD -> RechargeMethodHolder(parent)
+            Item.TYPE_GIFT -> GiftHolder(parent)
+            Item.TYPE_SETTINGS -> SettingsHolder(parent, openSettings)
+            Item.TYPE_REFUND -> RefundHolder(parent)
+            Item.TYPE_PROMO -> PromoHolder(parent, onSubmitPromo)
+            else -> throw IllegalArgumentException("Unknown view type: $viewType")
+        }
+    }
+
+    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/battery/refill/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
new file mode 100644
index 000000000..7d8262181
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/Item.kt
@@ -0,0 +1,72 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list
+
+import android.net.Uri
+import com.tonapps.tonkeeper.ui.screen.battery.refill.entity.PromoState
+import com.tonapps.uikit.list.BaseListItem
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.api.entity.TokenEntity
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.token.entities.AccountTokenEntity
+
+sealed class Item(type: Int) : BaseListItem(type) {
+
+    companion object {
+        const val TYPE_BATTERY = 0
+        const val TYPE_SPACE = 1
+        const val TYPE_RECHARGE_METHOD = 2
+        const val TYPE_GIFT = 3
+        const val TYPE_SETTINGS = 4
+        const val TYPE_REFUND = 5
+        const val TYPE_PROMO = 6
+    }
+
+    data class Battery(
+        val balance: Float,
+        val beta: Boolean,
+        val changes: Int,
+        val formattedChanges: CharSequence,
+    ) : Item(TYPE_BATTERY)
+
+    data class RechargeMethod(
+        val position: ListCell.Position,
+        val token: AccountTokenEntity
+    ) : Item(TYPE_RECHARGE_METHOD) {
+
+        val symbol: String
+            get() = token.symbol
+
+        val imageUri: Uri
+            get() = token.imageUri
+    }
+
+    data class Gift(
+        val position: ListCell.Position,
+    ) : Item(TYPE_GIFT)
+
+    data class Refund(
+        val refundUrl: String,
+    ) : Item(TYPE_REFUND)
+
+    data class Promo(
+        val promoState: PromoState,
+    ) : Item(TYPE_PROMO) {
+
+        val appliedPromo: String
+            get() = (promoState as? PromoState.Applied)?.appliedPromo ?: ""
+
+        val isLoading: Boolean
+            get() = promoState is PromoState.Loading
+
+        val isError: Boolean
+            get() = promoState is PromoState.Error
+
+        val initialPromo: String?
+            get() = (promoState as? PromoState.Loading)?.initialPromo
+    }
+
+    data class Settings(
+        val supportedTransactions: Array<BatteryTransaction>,
+    ) : Item(TYPE_SETTINGS)
+
+    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/BatteryHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/BatteryHolder.kt
new file mode 100644
index 000000000..af4d7b1c4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/BatteryHolder.kt
@@ -0,0 +1,58 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.method.LinkMovementMethod
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeper.view.BatteryView
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.accentBlueColor
+import com.tonapps.uikit.color.accentOrangeColor
+import com.tonapps.uikit.color.stateList
+import com.tonapps.uikit.color.textAccentColor
+import com.tonapps.wallet.localization.Localization
+import com.tonapps.wallet.localization.Plurals
+import uikit.extensions.withAlpha
+import uikit.span.ClickableSpanCompat
+
+class BatteryHolder(
+    parent: ViewGroup,
+    private val openSettings: () -> Unit
+): Holder<Item.Battery>(parent, R.layout.view_battery_icon) {
+
+    private val batteryView = itemView.findViewById<BatteryView>(R.id.battery_view)
+    private val betaView = itemView.findViewById<AppCompatTextView>(R.id.beta)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.battery_subtitle)
+
+    init {
+        subtitleView.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    override fun onBind(item: Item.Battery) {
+        batteryView.setBatteryLevel(item.balance)
+        if (item.beta) {
+            val color = context.accentOrangeColor
+            betaView.setTextColor(color)
+            betaView.backgroundTintList = color.withAlpha(.16f).stateList
+            betaView.visibility = View.VISIBLE
+        }
+
+        if (item.balance > 0) {
+            subtitleView.text = context.resources.getQuantityString(Plurals.battery_current_charges, item.changes, item.formattedChanges)
+        } else {
+            val subtitleText = context.getString(Localization.battery_refill_subtitle)
+            val clickText = context.getString(Localization.battery_supported_transaction)
+            val text = "$subtitleText $clickText"
+
+            val spannableString = SpannableStringBuilder(text)
+            spannableString.setSpan(ClickableSpanCompat(context.textAccentColor) {
+                openSettings()
+            }, subtitleText.length + 1, text.length, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+            subtitleView.text = spannableString
+        }
+    }
+}
\ 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/GiftHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/GiftHolder.kt
new file mode 100644
index 000000000..2770b46ea
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/GiftHolder.kt
@@ -0,0 +1,30 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.backup.main.BackupScreen
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.BatteryRechargeScreen
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+
+class GiftHolder(
+    parent: ViewGroup,
+): Holder<Item.Gift>(parent, R.layout.view_cell_recharge_method) {
+
+    private val giftImageView = itemView.findViewById<AppCompatImageView>(R.id.gift_icon)
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+
+    override fun onBind(item: Item.Gift) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener { navigation?.add(BatteryRechargeScreen.newInstance(isGift = true)) }
+        giftImageView.visibility = View.VISIBLE
+        titleView.text = context.getString(Localization.battery_refill_gift)
+        subtitleView.text = context.getString(Localization.battery_refill_gift_subtitle)
+        subtitleView.visibility = View.VISIBLE
+    }
+}
\ 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/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/Holder.kt
new file mode 100644
index 000000000..18ef03dcb
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/Holder.kt
@@ -0,0 +1,15 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.uikit.list.BaseListHolder
+import uikit.navigation.Navigation
+
+abstract class Holder<I: Item>(
+    parent: ViewGroup,
+    @LayoutRes resId: Int,
+): BaseListHolder<I>(parent, resId) {
+
+    val navigation = Navigation.from(context)
+}
\ 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/PromoHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/PromoHolder.kt
new file mode 100644
index 000000000..37240589c
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/PromoHolder.kt
@@ -0,0 +1,53 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.extensions.clipboardText
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeperx.R
+import uikit.widget.InputView
+import uikit.widget.RowLayout
+
+class PromoHolder(
+    parent: ViewGroup,
+    private val onSubmitPromo: (String) -> Unit,
+): Holder<Item.Promo>(parent, R.layout.fragment_battery_promo) {
+
+    private val inputView = itemView.findViewById<InputView>(R.id.promo_input)
+    private val actionsView = itemView.findViewById<RowLayout>(R.id.actions)
+    private val pasteView = itemView.findViewById<AppCompatTextView>(R.id.paste)
+
+    override fun onBind(item: Item.Promo) {
+        inputView.singleLine = true
+        inputView.doOnTextChange = { text ->
+            inputView.error = false
+            inputView.success = item.appliedPromo.isNotBlank() && text == item.appliedPromo
+            actionsView.visibility = if (text.isBlank()) View.VISIBLE else View.GONE
+        }
+        inputView.loading = item.isLoading
+        inputView.error = item.isError
+        inputView.success = item.appliedPromo.isNotBlank()
+
+        if (item.initialPromo != null) {
+            inputView.text = item.initialPromo!!
+        }
+
+        if (inputView.isEmpty && !inputView.isFocused) {
+            inputView.text = item.appliedPromo
+        }
+
+        inputView.setOnDoneActionListener {
+            inputView.hideKeyboard()
+            if (inputView.text.isNotBlank() && inputView.text != item.appliedPromo && !item.isLoading) {
+                onSubmitPromo(inputView.text)
+            }
+        }
+
+        pasteView.setOnClickListener {
+            inputView.text = context.clipboardText()
+            inputView.hideKeyboard()
+            onSubmitPromo(inputView.text)
+        }
+    }
+}
\ 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/RechargeMethodHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/RechargeMethodHolder.kt
new file mode 100644
index 000000000..c32bcd12a
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/RechargeMethodHolder.kt
@@ -0,0 +1,27 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.recharge.BatteryRechargeScreen
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+import uikit.widget.FrescoView
+
+class RechargeMethodHolder(
+    parent: ViewGroup,
+): Holder<Item.RechargeMethod>(parent, R.layout.view_cell_recharge_method) {
+
+    private val frescoView = itemView.findViewById<FrescoView>(R.id.icon)
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+
+    override fun onBind(item: Item.RechargeMethod) {
+        itemView.background = item.position.drawable(context)
+        itemView.setOnClickListener { navigation?.add(BatteryRechargeScreen.newInstance(item.token)) }
+        frescoView.setImageURI(item.imageUri, this)
+        frescoView.visibility = View.VISIBLE
+        titleView.text = context.getString(Localization.battery_refill_crypto, item.symbol)
+    }
+}
\ 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/RefundHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/RefundHolder.kt
new file mode 100644
index 000000000..c4882e433
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/RefundHolder.kt
@@ -0,0 +1,34 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeper.ui.screen.browser.dapp.DAppScreen
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.activity
+import uikit.extensions.drawable
+
+class RefundHolder(
+    parent: ViewGroup,
+): Holder<Item.Refund>(parent, R.layout.view_cell_recharge_method) {
+
+    private val refundImageView = itemView.findViewById<AppCompatImageView>(R.id.refund_icon)
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+
+    override fun onBind(item: Item.Refund) {
+        itemView.background = ListCell.Position.SINGLE.drawable(context)
+        itemView.setOnClickListener {
+            context.activity?.onBackPressed()
+            navigation?.add(DAppScreen.newInstance(url = item.refundUrl))
+        }
+        refundImageView.visibility = View.VISIBLE
+        titleView.text = context.getString(Localization.battery_refund_title)
+        subtitleView.text = context.getString(Localization.battery_refund_subtitle)
+        subtitleView.visibility = View.VISIBLE
+    }
+}
\ 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/SettingsHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/SettingsHolder.kt
new file mode 100644
index 000000000..d619daf55
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/SettingsHolder.kt
@@ -0,0 +1,49 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.ui.screen.battery.refill.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.localization.Localization
+import uikit.extensions.drawable
+
+class SettingsHolder(
+    parent: ViewGroup,
+    private val openSettings: () -> Unit
+): Holder<Item.Settings>(parent, R.layout.view_battery_settings) {
+
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+
+    override fun onBind(item: Item.Settings) {
+        itemView.background = ListCell.Position.SINGLE.drawable(context)
+        itemView.setOnClickListener { openSettings() }
+        if (item.supportedTransactions.isEmpty()) {
+            subtitleView.visibility = View.GONE
+        } else {
+            subtitleView.visibility = View.VISIBLE
+            subtitleView.text = context.getString(
+                Localization.battery_will_be_paid,
+                getSupportedTransactionText(item.supportedTransactions)
+            )
+        }
+    }
+
+    private fun getSupportedTransactionText(supportedTransactions: Array<BatteryTransaction>): String {
+        return supportedTransactions.joinToString(", ") {
+            context.getString(supportedTransactionMap[it]!!)
+        }
+    }
+
+    companion object {
+
+        private val supportedTransactionMap = mapOf(
+            BatteryTransaction.NFT to Localization.battery_nft,
+            BatteryTransaction.SWAP to Localization.battery_swap,
+            BatteryTransaction.JETTON to Localization.battery_jetton,
+        )
+    }
+
+}
\ 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/SpaceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/SpaceHolder.kt
new file mode 100644
index 000000000..27e64e272
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/refill/list/holder/SpaceHolder.kt
@@ -0,0 +1,9 @@
+package com.tonapps.tonkeeper.ui.screen.battery.refill.list.holder
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.battery.refill.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/battery/settings/BatterySettingsScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/BatterySettingsScreen.kt
new file mode 100644
index 000000000..2745b2bee
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/BatterySettingsScreen.kt
@@ -0,0 +1,50 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings
+
+import android.os.Bundle
+import android.view.View
+import com.tonapps.tonkeeper.koin.parentFragmentViewModel
+import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryViewModel
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.Adapter
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.Item
+import com.tonapps.wallet.localization.Localization
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import uikit.R
+import uikit.extensions.collectFlow
+import uikit.extensions.dp
+import uikit.extensions.getDimensionPixelSize
+
+class BatterySettingsScreen: BaseListWalletScreen() {
+
+    override val viewModel: BatterySettingsViewModel by viewModel()
+
+    private val parentViewModel: BatteryViewModel by parentFragmentViewModel()
+
+    private val adapter = Adapter()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        collectFlow(viewModel.uiItemsFlow) { uiItems ->
+            val showTitle = !uiItems.contains(Item.SettingsHeader)
+            parentViewModel.setTitle(if (showTitle) getString(Localization.transactions) else null)
+            adapter.submitList(uiItems)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        hideHeaderContainer()
+        setAdapter(adapter)
+        updateListPadding(top = requireContext().getDimensionPixelSize(R.dimen.barHeight))
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        parentViewModel.setTitle(null)
+    }
+
+    companion object {
+
+        fun newInstance() = BatterySettingsScreen()
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/BatterySettingsViewModel.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/BatterySettingsViewModel.kt
new file mode 100644
index 000000000..f47a0afb7
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/BatterySettingsViewModel.kt
@@ -0,0 +1,84 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings
+
+import android.app.Application
+import com.tonapps.tonkeeper.ui.base.BaseWalletVM
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.Item
+import com.tonapps.uikit.list.ListCell
+import com.tonapps.wallet.api.API
+import com.tonapps.wallet.api.entity.ConfigEntity
+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.battery.entity.BatteryBalanceEntity
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.settings.SettingsRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+
+class BatterySettingsViewModel(
+    app: Application,
+    private val accountRepository: AccountRepository,
+    private val settingsRepository: SettingsRepository,
+    private val batteryRepository: BatteryRepository,
+    private val api: API,
+): BaseWalletVM(app) {
+
+    val uiItemsFlow = combine(
+        accountRepository.selectedWalletFlow,
+        batteryRepository.balanceUpdatedFlow
+    ) { wallet, _ ->
+        val config = api.config
+        val batteryBalance = getBatteryBalance(wallet)
+        val hasBalance = batteryBalance.balance.isPositive
+
+        val uiItems = mutableListOf<Item>()
+        if (hasBalance) {
+            uiItems.add(Item.SettingsHeader)
+        }
+
+        val types = BatteryTransaction.entries
+        for ((index, type) in types.withIndex()) {
+            val position = ListCell.getPosition(types.size, index)
+            val meanPrice = getTransactionMeanPrice(config, type)
+            val charges = BatteryMapper.calculateChargesAmount(meanPrice, config.batteryMeanFees)
+            val enabled = settingsRepository.batteryIsEnabledTx(wallet.accountId, type)
+            val item = Item.SupportedTransaction(
+                wallet = wallet,
+                position = position,
+                supportedTransaction = type,
+                enabled = enabled,
+                showToggle = hasBalance,
+                changes = charges,
+            )
+            uiItems.add(item)
+        }
+
+        uiItems.toList()
+    }.flowOn(Dispatchers.IO)
+
+    private suspend fun getBatteryBalance(
+        wallet: WalletEntity
+    ): BatteryBalanceEntity {
+        val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: return BatteryBalanceEntity.Empty
+        return batteryRepository.getBalance(
+            tonProofToken = tonProofToken,
+            publicKey = wallet.publicKey,
+            testnet = wallet.testnet
+        )
+    }
+
+    private fun getTransactionMeanPrice(
+        config: ConfigEntity,
+        transaction: BatteryTransaction
+    ): String {
+        return when (transaction) {
+            BatteryTransaction.NFT -> config.batteryMeanPriceNft
+            BatteryTransaction.SWAP -> config.batteryMeanPriceSwap
+            BatteryTransaction.JETTON -> config.batteryMeanPriceJetton
+            else -> "0"
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/Adapter.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/Adapter.kt
new file mode 100644
index 000000000..34d480ad2
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/Adapter.kt
@@ -0,0 +1,25 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings.list
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.holder.SettingsHeaderHolder
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.holder.SupportedTransactionHolder
+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 when(viewType) {
+            Item.TYPE_SETTINGS_HEADER -> SettingsHeaderHolder(parent)
+            Item.TYPE_SUPPORTED_TRANSACTION -> SupportedTransactionHolder(parent)
+            else -> throw IllegalArgumentException("Unknown view type: $viewType")
+        }
+    }
+
+    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/battery/settings/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/Item.kt
new file mode 100644
index 000000000..ef6124d9d
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/Item.kt
@@ -0,0 +1,45 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings.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.settings.BatteryTransaction
+import com.tonapps.wallet.localization.Localization
+
+sealed class Item(type: Int) : BaseListItem(type) {
+
+    companion object {
+        const val TYPE_SETTINGS_HEADER = 1
+        const val TYPE_SUPPORTED_TRANSACTION = 2
+    }
+
+    data class SupportedTransaction(
+        val wallet: WalletEntity,
+        val position: ListCell.Position,
+        val supportedTransaction: BatteryTransaction,
+        val enabled: Boolean,
+        val changes: Int,
+        val showToggle: Boolean
+    ) : Item(TYPE_SUPPORTED_TRANSACTION) {
+
+        val accountId: String
+            get() = wallet.accountId
+
+        val titleRes: Int
+            get() = when(supportedTransaction) {
+                BatteryTransaction.NFT -> Localization.battery_nft
+                BatteryTransaction.SWAP -> Localization.battery_swap
+                BatteryTransaction.JETTON -> Localization.battery_jetton
+                else -> throw IllegalArgumentException("Unsupported transaction type: $supportedTransaction")
+            }
+
+        val typeTitleRes: Int
+            get() = when(supportedTransaction) {
+                BatteryTransaction.NFT, BatteryTransaction.JETTON -> Localization.battery_transfer_single
+                BatteryTransaction.SWAP -> Localization.battery_swap_single
+                else -> throw IllegalArgumentException("Unsupported transaction type: $supportedTransaction")
+            }
+    }
+
+    data object SettingsHeader: Item(TYPE_SETTINGS_HEADER)
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/Holder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/Holder.kt
new file mode 100644
index 000000000..f1926a4ba
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/Holder.kt
@@ -0,0 +1,11 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings.list.holder
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import com.tonapps.tonkeeper.ui.screen.battery.settings.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/battery/settings/list/holder/SettingsHeaderHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/SettingsHeaderHolder.kt
new file mode 100644
index 000000000..2094064ce
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/SettingsHeaderHolder.kt
@@ -0,0 +1,12 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings.list.holder
+
+import android.view.ViewGroup
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.Item
+import com.tonapps.tonkeeperx.R
+
+class SettingsHeaderHolder(
+    parent: ViewGroup
+): Holder<Item.SettingsHeader>(parent, R.layout.view_battery_settings_header) {
+
+    override fun onBind(item: Item.SettingsHeader) {}
+}
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/SupportedTransactionHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/SupportedTransactionHolder.kt
new file mode 100644
index 000000000..584d6f8db
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/battery/settings/list/holder/SupportedTransactionHolder.kt
@@ -0,0 +1,62 @@
+package com.tonapps.tonkeeper.ui.screen.battery.settings.list.holder
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.tonapps.tonkeeper.extensions.capitalized
+import com.tonapps.tonkeeper.koin.settingsRepository
+import com.tonapps.tonkeeper.ui.screen.battery.settings.list.Item
+import com.tonapps.tonkeeperx.R
+import com.tonapps.wallet.data.settings.BatteryTransaction
+import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.localization.Localization
+import com.tonapps.wallet.localization.Plurals
+import uikit.extensions.drawable
+import uikit.widget.SwitchView
+
+class SupportedTransactionHolder(
+    parent: ViewGroup
+): Holder<Item.SupportedTransaction>(parent, R.layout.view_battery_settings) {
+
+    private val settingsRepository: SettingsRepository?
+        get() = context.settingsRepository
+
+    private val chevronView = itemView.findViewById<AppCompatImageView>(R.id.chevron)
+    private val switchView = findViewById<SwitchView>(R.id.enabled)
+    private val titleView = itemView.findViewById<AppCompatTextView>(R.id.title)
+    private val subtitleView = itemView.findViewById<AppCompatTextView>(R.id.subtitle)
+
+    init {
+        chevronView.visibility = View.GONE
+    }
+
+    override fun onBind(item: Item.SupportedTransaction) {
+        itemView.background = item.position.drawable(context)
+        if (item.showToggle) {
+            itemView.setOnClickListener { switchView.toggle(true) }
+            switchView.setChecked(item.enabled, false)
+            switchView.visibility = View.VISIBLE
+            switchView.doCheckedChanged = { checked, byUser ->
+                if (byUser) {
+                    settingsRepository?.batteryEnableTx(
+                        accountId = item.accountId,
+                        type = item.supportedTransaction,
+                        enable = checked
+                    )
+                }
+            }
+        } else {
+            switchView.visibility = View.GONE
+        }
+
+        titleView.text = context.getString(item.titleRes).capitalized
+        subtitleView.text = context.resources.getQuantityString(
+            Plurals.battery_charges_per_action,
+            item.changes,
+            item.changes,
+            getString(item.typeTitleRes)
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitScreen.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitScreen.kt
index e6eee476c..2baa177c3 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitScreen.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/init/InitScreen.kt
@@ -6,6 +6,7 @@ import android.view.View
 import androidx.core.view.doOnLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.commit
 import com.tonapps.ledger.ton.LedgerConnectData
 import com.tonapps.tonkeeper.ui.base.BaseWalletScreen
 import com.tonapps.tonkeeper.ui.screen.init.list.AccountItem
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 a8d789988..d0adba2f5 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
@@ -21,6 +21,7 @@ import com.tonapps.tonkeeper.extensions.toast
 import com.tonapps.tonkeeper.fragment.tonconnect.auth.TCAuthFragment
 import com.tonapps.tonkeeper.ui.base.BaseWalletActivity
 import com.tonapps.tonkeeper.ui.screen.backup.main.BackupScreen
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryScreen
 import com.tonapps.tonkeeper.ui.screen.init.InitArgs
 import com.tonapps.tonkeeper.ui.screen.init.InitScreen
 import com.tonapps.tonkeeper.ui.screen.main.MainScreen
@@ -176,6 +177,7 @@ class RootActivity: BaseWalletActivity() {
             is RootEvent.OpenBackups -> add(BackupScreen.newInstance())
             is RootEvent.Staking -> add(StakingScreen.newInstance())
             is RootEvent.StakingPool -> add(StakeViewerScreen.newInstance(event.poolAddress, ""))
+            is RootEvent.Battery -> add(BatteryScreen.newInstance(event.promocode))
             else -> { }
         }
     }
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
index 02f6c6964..4b8c9aeef 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/root/RootEvent.kt
@@ -52,6 +52,10 @@ sealed class RootEvent {
         val event: HistoryItem.Event
     ): RootEvent()
 
+    data class Battery(
+        val promocode: String?
+    ): RootEvent()
+
     data object OpenBackups: RootEvent()
 
     data object Staking: RootEvent()
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 8affc6d5d..56e2d27ee 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
@@ -3,7 +3,6 @@ package com.tonapps.tonkeeper.ui.screen.root
 import android.app.Application
 import android.content.Context
 import android.net.Uri
-import android.util.Log
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.lifecycle.AndroidViewModel
@@ -41,6 +40,7 @@ import com.tonapps.wallet.data.core.WalletCurrency
 import com.tonapps.wallet.data.core.entity.SignRequestEntity
 import com.tonapps.wallet.data.passcode.PasscodeManager
 import com.tonapps.wallet.data.purchase.PurchaseRepository
+import com.tonapps.wallet.data.settings.BatteryTransaction
 import com.tonapps.wallet.data.settings.SettingsRepository
 import com.tonapps.wallet.data.token.TokenRepository
 import com.tonapps.wallet.data.tonconnect.TonConnectRepository
@@ -66,7 +66,6 @@ import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.lastOrNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.map
@@ -120,7 +119,6 @@ class RootViewModel(
     val tonConnectEventsFlow = tonConnectRepository.eventsFlow
 
     init {
-        Log.d("RootViewModel", "init")
         combine(
             settingsRepository.biometricFlow.take(1),
             settingsRepository.lockscreenFlow.take(1)
@@ -247,19 +245,23 @@ class RootViewModel(
 
     suspend fun requestSign(
         context: Context,
-        request: SignRequestEntity
+        request: SignRequestEntity,
+        batteryTxType: BatteryTransaction? = null,
+        forceRelayer: Boolean = false,
     ): String {
         val wallet = selectedWalletFlow.firstOrNull() ?: throw Exception("wallet is null")
-        return requestSign(context, wallet, request)
+        return requestSign(context, wallet, request, batteryTxType, forceRelayer)
     }
 
     suspend fun requestSign(
         context: Context,
         wallet: WalletEntity,
-        request: SignRequestEntity
+        request: SignRequestEntity,
+        batteryTxType: BatteryTransaction? = null,
+        forceRelayer: Boolean = false,
     ): String {
         val navigation = context.navigation ?: throw Exception("navigation is null")
-        return signManager.action(navigation, wallet, request)
+        return signManager.action(navigation, wallet, request, batteryTxType = batteryTxType, forceRelayer = forceRelayer)
     }
 
     suspend fun tonconnectBridgeEvent(
@@ -384,6 +386,9 @@ class RootViewModel(
             val ft = uri.getQueryParameter("ft") ?: "TON"
             val tt = uri.getQueryParameter("tt")
             _eventFlow.tryEmit(RootEvent.Swap(api.config.swapUri, wallet.address, ft, tt))
+        } else if (path?.startsWith("/battery") == true) {
+            val promocode = uri.getQueryParameter("promocode")
+            _eventFlow.tryEmit(RootEvent.Battery(promocode))
         } else if (path?.startsWith("/buy-ton") == true || uri.path == "/exchange" || uri.path == "/exchange/") {
             _eventFlow.tryEmit(RootEvent.BuyOrSell())
         } else if (path?.startsWith("/exchange") == true) {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendEvent.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendEvent.kt
index 1d790355c..a7a4056a8 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendEvent.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendEvent.kt
@@ -11,6 +11,7 @@ sealed class SendEvent {
     data class Fee(
         val value: Coins,
         val format: CharSequence,
-        val convertedFormat: CharSequence
+        val convertedFormat: CharSequence,
+        val isBattery: Boolean,
     ): SendEvent()
 }
\ No newline at end of file
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 3b606a5fc..cda74d154 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
@@ -467,6 +467,7 @@ class SendScreen: BaseWalletScreen(R.layout.fragment_send_new), BaseFragment.Bot
         } else {
             reviewRecipientFeeView.value = "≈ ${event.format}".withCustomSymbol(requireContext())
             reviewRecipientFeeView.description = "≈ ${event.convertedFormat}".withCustomSymbol(requireContext())
+            reviewRecipientFeeView.subtitle = if (event.isBattery) getString(Localization.will_be_paid_with_battery) else null
             reviewRecipientFeeView.setDefault()
             confirmButton.isEnabled = true
         }
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 d816bbbcd..956874239 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
@@ -23,10 +23,12 @@ 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.account.Wallet
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.collectibles.CollectiblesRepository
 import com.tonapps.wallet.data.collectibles.entities.NftEntity
 import com.tonapps.wallet.data.passcode.PasscodeManager
 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.token.TokenRepository
 import com.tonapps.wallet.data.token.entities.AccountTokenEntity
@@ -76,6 +78,7 @@ class SendViewModel(
     private val ratesRepository: RatesRepository,
     private val passcodeManager: PasscodeManager,
     private val collectiblesRepository: CollectiblesRepository,
+    private val batteryRepository: BatteryRepository,
 ): BaseWalletVM(app) {
 
     private val isNft: Boolean
@@ -100,6 +103,8 @@ class SendViewModel(
 
     private var lastTransferEntity: TransferEntity? = null
 
+    private var isBattery = false
+
     val walletTypeFlow = accountRepository.selectedWalletFlow.map { it.type }
 
     private val userInputAddressFlow = userInputFlow
@@ -141,7 +146,8 @@ class SendViewModel(
 
     val uiInputNftFlow = userInputFlow.map { it.nft }.distinctUntilChanged().filterNotNull()
 
-    val uiRequiredMemoFlow = destinationFlow.map { it as? SendDestination.Account }.map { it?.memoRequired == true }
+    val uiRequiredMemoFlow =
+        destinationFlow.map { it as? SendDestination.Account }.map { it?.memoRequired == true }
 
     val uiExistingTargetFlow = destinationFlow.map { it as? SendDestination.Account }.map { it?.existing == true }
 
@@ -258,8 +264,20 @@ class SendViewModel(
         SendTransaction.Amount(
             value = amount,
             converted = rates.convert(token.address, amount),
-            format = CurrencyFormatter.format(token.symbol, amount, token.decimals, RoundingMode.UP, false),
-            convertedFormat = CurrencyFormatter.format(currency.code, rates.convert(token.address, amount), token.decimals, RoundingMode.UP, false),
+            format = CurrencyFormatter.format(
+                token.symbol,
+                amount,
+                token.decimals,
+                RoundingMode.UP,
+                false
+            ),
+            convertedFormat = CurrencyFormatter.format(
+                currency.code,
+                rates.convert(token.address, amount),
+                token.decimals,
+                RoundingMode.UP,
+                false
+            ),
         )
     }
 
@@ -296,7 +314,8 @@ class SendViewModel(
         builder.setComment(comment, encryptedComment)
         builder.setValidUntil(sendMetadata.validUntil)
         if (isNft) {
-            val amount = getNftTotalAmount(wallet, sendMetadata, transaction.destination.address, comment)
+            val amount =
+                getNftTotalAmount(wallet, sendMetadata, transaction.destination.address, comment)
             builder.setNftAddress(nftAddress)
             builder.setBounceable(true)
             builder.setAmount(amount)
@@ -378,7 +397,7 @@ class SendViewModel(
             return
         }
         _uiEventFlow.tryEmit(SendEvent.Confirm)
-        transferFlow.take(1).map { calculateFee(it) }.map { eventFee(it) }.filterNotNull().onEach {
+        transferFlow.take(1).map { calculateFee(it) }.map { (coins, isBattery) -> eventFee(coins, isBattery) }.filterNotNull().onEach {
             _uiEventFlow.tryEmit(it)
         }.flowOn(Dispatchers.IO).launchIn(viewModelScope)
     }
@@ -392,21 +411,65 @@ class SendViewModel(
         }.flowOn(Dispatchers.IO).filterNotNull().onEach(::userInputNft).launchIn(viewModelScope)
     }
 
+    private fun shouldAttemptWithRelayer(transfer: TransferEntity): Boolean {
+        if ((transfer.isTon && !transfer.isNft) || transfer.wallet.isExternal) {
+            return false
+        }
+
+        val transactionType = if (transfer.isNft) {
+            BatteryTransaction.NFT
+        } else {
+            BatteryTransaction.JETTON
+        }
+
+        return settingsRepository.batteryIsEnabledTx(transfer.wallet.accountId, transactionType)
+    }
+
     private suspend fun calculateFee(
-        transfer: TransferEntity
-    ): Coins = withContext(Dispatchers.IO) {
+        transfer: TransferEntity,
+        retryWithoutRelayer: Boolean = false,
+    ): Pair<Coins, Boolean> = withContext(Dispatchers.IO) {
         val fakePrivateKey = if (transfer.commentEncrypted) {
             PrivateKeyEd25519()
         } else {
             EmptyPrivateKeyEd25519
         }
-        val message = transfer.toSignedMessage(fakePrivateKey)
-        val fee = api.emulate(message, transfer.wallet.testnet)?.totalFees ?: 0
-        Coins.of(fee)
+        val wallet = transfer.wallet
+        val withRelayer = shouldAttemptWithRelayer(transfer)
+
+        if (withRelayer && !retryWithoutRelayer) {
+            try {
+                if (api.config.isBatteryDisabled) {
+                    throw IllegalStateException("Battery is disabled")
+                }
+                val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: throw IllegalStateException("Can't find TonProof token")
+
+                val message = transfer.toSignedMessage(fakePrivateKey, true)
+                val (consequences, withBattery) = batteryRepository.emulate(
+                    tonProofToken = tonProofToken,
+                    publicKey = wallet.publicKey,
+                    testnet = wallet.testnet,
+                    boc = message
+                ) ?: throw IllegalStateException("Failed to emulate battery")
+
+                isBattery = withBattery
+                Pair(Coins.of(consequences.totalFees), withBattery)
+            } catch (e: Throwable) {
+                calculateFee(transfer, true)
+            }
+        } else {
+            val message = transfer.toSignedMessage(fakePrivateKey, false)
+            val fee = api.emulate(message, transfer.wallet.testnet)?.totalFees ?: 0
+
+            isBattery = false
+
+            Pair(Coins.of(fee), false)
+        }
     }
 
     private fun eventFee(
-        coins: Coins
+        coins: Coins,
+        isBattery: Boolean
     ): SendEvent.Fee? {
         return try {
             val code = TokenEntity.TON.symbol
@@ -421,6 +484,7 @@ class SendViewModel(
                     converted,
                     currency.decimals
                 ),
+                isBattery = isBattery,
             )
         } catch (e: Throwable) {
             null
@@ -466,7 +530,8 @@ class SendViewModel(
 
     fun swap() {
         val balance = uiBalanceFlow.value.copy()
-        val amountCurrency = _userInputFlow.updateAndGet { it.copy(amountCurrency = !it.amountCurrency) }.amountCurrency
+        val amountCurrency =
+            _userInputFlow.updateAndGet { it.copy(amountCurrency = !it.amountCurrency) }.amountCurrency
         if (amountCurrency != balance.amountCurrency) {
             _uiInputAmountFlow.tryEmit(balance.converted)
         }
@@ -517,13 +582,13 @@ class SendViewModel(
 
     fun sendSignedMessage(signature: BitString) {
         transferFlow.take(1).map { transfer ->
-            Pair(transfer.transferMessage(signature), transfer.testnet)
+            Pair(transfer.transferMessage(signature), transfer.wallet)
         }.sendTransfer()
     }
 
     fun sendLedgerSignedMessage(body: Cell) {
         transferFlow.take(1).map { transfer ->
-            Pair(transfer.transferMessage(body), transfer.testnet)
+            Pair(transfer.transferMessage(body), transfer.wallet)
         }.sendTransfer()
     }
 
@@ -534,25 +599,34 @@ class SendViewModel(
             if (!wallet.hasPrivateKey) {
                 throw SendException.UnableSendTransaction()
             }
-            val isValidPasscode = passcodeManager.confirmation(context, context.getString(Localization.app_name))
+            val isValidPasscode =
+                passcodeManager.confirmation(context, context.getString(Localization.app_name))
             if (!isValidPasscode) {
                 throw SendException.WrongPasscode()
             }
             val privateKey = accountRepository.getPrivateKey(wallet.id)
-            val boc = transfer.toSignedMessage(privateKey)
-            Pair(boc, wallet.testnet)
+            val excessesAddress = if (isBattery) batteryRepository.getConfig(wallet.testnet).excessesAddress else null
+            val boc = transfer.toSignedMessage(privateKey, isBattery, excessesAddress)
+            Pair(boc, wallet)
         }.sendTransfer()
     }
 
-    private suspend fun sendToBlockchain(message: Cell, testnet: Boolean) {
-        if (!api.sendToBlockchain(message, testnet)) {
+    private suspend fun sendToBlockchain(message: Cell, wallet: WalletEntity) {
+        val success = if (isBattery) {
+            val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: throw IllegalStateException("Can't find TonProof token")
+            api.sendToBlockchainWithBattery(message, tonProofToken, wallet.testnet)
+        } else {
+            api.sendToBlockchain(message, wallet.testnet)
+        }
+
+        if (!success) {
             throw SendException.FailedToSendTransaction()
         }
     }
 
-    private fun Flow<Pair<Cell, Boolean>>.sendTransfer() {
-        this.map { (boc, testnet) ->
-            sendToBlockchain(boc, testnet)
+    private fun Flow<Pair<Cell, WalletEntity>>.sendTransfer() {
+        this.map { (boc, wallet) ->
+            sendToBlockchain(boc, wallet)
             AnalyticsHelper.trackEvent("send_success")
         }.catch {
             _uiEventFlow.tryEmit(SendEvent.Failed)
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 fbc1ee503..eec6ea8e2 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
@@ -12,6 +12,7 @@ import com.tonapps.tonkeeper.core.widget.balance.WidgetBalanceProvider
 import com.tonapps.tonkeeper.popup.ActionSheet
 import com.tonapps.tonkeeper.ui.base.BaseListWalletScreen
 import com.tonapps.tonkeeper.ui.screen.backup.main.BackupScreen
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryScreen
 import com.tonapps.tonkeeper.ui.screen.root.RootActivity
 import com.tonapps.tonkeeper.ui.screen.settings.currency.CurrencyScreen
 import com.tonapps.tonkeeper.ui.screen.settings.language.LanguageScreen
@@ -68,6 +69,7 @@ class SettingsScreen: BaseListWalletScreen(), BaseFragment.SwipeBack {
             is Item.Contact -> navigation?.openURL(item.url, true)
             is Item.Tester -> navigation?.openURL(item.url, true)
             is Item.W5 -> navigation?.add(W5StoriesScreen.newInstance())
+            is Item.Battery -> navigation?.add(BatteryScreen.newInstance())
             is Item.Logout -> signOut(item.label)
             is Item.SearchEngine -> searchPicker(item)
             is Item.DeleteWatchAccount -> deleteWatchAccount()
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 a84f07e04..922159db4 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
@@ -119,6 +119,9 @@ class SettingsViewModel(
         if (!hasW5) {
             uiItems.add(Item.W5(ListCell.Position.MIDDLE))
         }
+        if (!wallet.isExternal && !api.config.batteryDisabled) {
+            uiItems.add(Item.Battery(ListCell.Position.MIDDLE))
+        }
         uiItems.add(Item.Theme(ListCell.Position.LAST))
 
         uiItems.add(Item.Space)
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/Item.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/Item.kt
index e8eb342d5..d9603acb5 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/Item.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/settings/main/list/Item.kt
@@ -221,4 +221,13 @@ sealed class Item(type: Int): BaseListItem(type) {
         position = position,
         secondaryIcon = false
     )
+
+    data class Battery(
+        override val position: ListCell.Position
+    ): Icon(
+        titleRes = Localization.battery,
+        iconRes = UIKitIcon.ic_battery_28,
+        position = position,
+        secondaryIcon = false
+    )
 }
\ No newline at end of file
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 34e4c9b0c..d03d17618 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
@@ -8,6 +8,7 @@ import com.tonapps.tonkeeper.core.AnalyticsHelper
 import com.tonapps.tonkeeper.ui.screen.root.RootViewModel
 import com.tonapps.tonkeeperx.R
 import com.tonapps.wallet.data.core.entity.SignRequestEntity
+import com.tonapps.wallet.data.settings.BatteryTransaction
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import uikit.base.BaseFragment
 import uikit.extensions.applyNavBottomPadding
@@ -58,7 +59,7 @@ class SwapScreen: BaseFragment(R.layout.fragment_swap), BaseFragment.BottomSheet
     private suspend fun sing(
         request: SignRequestEntity
     ): String {
-        return rootViewModel.requestSign(requireContext(), request)
+        return rootViewModel.requestSign(requireContext(), request, BatteryTransaction.SWAP)
     }
 
     override fun onDestroyView() {
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 555dec130..a73ccddd2 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
@@ -45,8 +45,6 @@ class TokenScreen: BaseListWalletScreen(), BaseFragment.SwipeBack {
         }
     }
 
-    private lateinit var headerView: HeaderView
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val padding = requireContext().getDimensionPixelSize(uikit.R.dimen.offsetMedium)
@@ -83,8 +81,6 @@ class TokenScreen: BaseListWalletScreen(), BaseFragment.SwipeBack {
         collectFlow(viewModel.tokenFlow, ::applyToken)
         collectFlow(viewModel.uiItemsFlow, tokenAdapter::submitList)
         collectFlow(viewModel.uiHistoryFlow, historyAdapter::submitList)
-
-        headerView = view.findViewById(R.id.header)
     }
 
     private fun applyToken(token: TokenData) {
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 682ad7e0a..856485bd6 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
@@ -9,6 +9,7 @@ import com.tonapps.tonkeeper.App
 import com.tonapps.tonkeeper.core.entities.AssetsEntity
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item.BalanceType
+import com.tonapps.tonkeeper.view.BatteryView
 import com.tonapps.uikit.icon.UIKitIcon
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.entity.ConfigEntity
@@ -32,6 +33,13 @@ sealed class State {
         Backup,
     }
 
+    data class Battery(
+        val balance: Coins,
+        val beta: Boolean,
+        val disabled: Boolean,
+        val viewed: Boolean,
+    ): State()
+
     data class Setup(
         val pushEnabled: Boolean,
         val biometryEnabled: Boolean,
@@ -78,7 +86,8 @@ sealed class State {
     data class Main(
         val wallet: WalletEntity,
         val assets: Assets,
-        val hasBackup: Boolean
+        val hasBackup: Boolean,
+        val battery: Battery,
     ): State() {
 
         private val totalBalanceFormat: CharSequence
@@ -138,7 +147,10 @@ sealed class State {
                 hiddenBalance = hiddenBalance,
                 hasBackup = hasBackup,
                 balanceType = balanceType,
-                lastUpdatedFormat = lastUpdatedFormat
+                lastUpdatedFormat = lastUpdatedFormat,
+                batteryBalance = battery.balance,
+                showBattery = !battery.disabled && (!battery.beta || !battery.balance.isZero),
+                batteryEmptyState = if (battery.viewed) BatteryView.EmptyState.SECONDARY else BatteryView.EmptyState.ACCENT,
             )
         }
 
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 b30f04c46..2651aa814 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
@@ -5,7 +5,9 @@ import android.util.Log
 import android.widget.Toast
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
+import com.tonapps.icu.Coins
 import com.tonapps.network.NetworkMonitor
+import com.tonapps.tonkeeper.billing.BillingManager
 import com.tonapps.tonkeeper.core.entities.AssetsEntity
 import com.tonapps.tonkeeper.core.entities.AssetsEntity.Companion.sort
 import com.tonapps.tonkeeper.core.entities.StakedEntity
@@ -21,6 +23,7 @@ import com.tonapps.wallet.data.account.AccountRepository
 import com.tonapps.wallet.data.account.Wallet
 import com.tonapps.wallet.data.account.entities.WalletEvent
 import com.tonapps.wallet.data.backup.BackupRepository
+import com.tonapps.wallet.data.battery.BatteryRepository
 import com.tonapps.wallet.data.core.ScreenCacheSource
 import com.tonapps.wallet.data.core.WalletCurrency
 import com.tonapps.wallet.data.push.PushManager
@@ -61,6 +64,8 @@ class WalletViewModel(
     private val backupRepository: BackupRepository,
     private val stakingRepository: StakingRepository,
     private val ratesRepository: RatesRepository,
+    private val batteryRepository: BatteryRepository,
+    private val billingManager: BillingManager,
 ): BaseWalletVM(app) {
 
     private val alertNotificationsFlow = MutableStateFlow<List<NotificationEntity>>(emptyList())
@@ -102,6 +107,8 @@ class WalletViewModel(
         }
     }.map { !it }
 
+    private val _streamFLow = combine(updateWalletSettings, _lastLtFlow) { _, _ -> }
+
     init {
         collectFlow(accountRepository.realtimeEventsFlow) { event ->
             if (event is WalletEvent.Boc) {
@@ -127,7 +134,7 @@ class WalletViewModel(
             settingsRepository.currencyFlow,
             backupRepository.stream,
             networkMonitor.isOnlineFlow,
-            updateWalletSettings,
+            _streamFLow,
         ) { wallet, currency, backups, isOnline, _ ->
             if (isOnline) {
                 setStatus(Status.Updating)
@@ -143,14 +150,38 @@ class WalletViewModel(
             val walletCurrency = getCurrency(wallet, currency)
 
             val localAssets = getLocalAssets(walletCurrency, wallet)
+            Log.d("WalletViewLog", "localAssets: $localAssets")
+            val batteryBalance = getBatteryBalance(wallet)
             if (localAssets != null) {
-                _stateMainFlow.value = State.Main(wallet = wallet, assets = localAssets, hasBackup)
+                _stateMainFlow.value = State.Main(
+                    wallet = wallet,
+                    assets = localAssets,
+                    hasBackup = hasBackup,
+                    battery = State.Battery(
+                        balance = batteryBalance,
+                        beta = api.config.batteryBeta,
+                        disabled = api.config.batteryDisabled,
+                        viewed = settingsRepository.batteryViewed,
+                    ),
+                )
             }
 
             if (isOnline) {
                 val remoteAssets = getRemoteAssets(walletCurrency, wallet)
+                Log.d("WalletViewLog", "remoteAssets: $remoteAssets")
+                val batteryBalance = getBatteryBalance(wallet, true)
                 if (remoteAssets != null) {
-                    _stateMainFlow.value = State.Main(wallet, remoteAssets, hasBackup)
+                    _stateMainFlow.value = State.Main(
+                        wallet,
+                        remoteAssets,
+                        hasBackup = hasBackup,
+                        battery = State.Battery(
+                            balance = batteryBalance,
+                            beta = api.config.batteryBeta,
+                            disabled = api.config.batteryDisabled,
+                            viewed = settingsRepository.batteryViewed,
+                        ),
+                    )
                     settingsRepository.setWalletLastUpdated(wallet.id)
                     setStatus(Status.Default)
                 }
@@ -178,7 +209,9 @@ class WalletViewModel(
             val isSetupHidden = settingsRepository.isSetupHidden(state.wallet.id)
             val uiSetup: State.Setup? = if (isSetupHidden) null else {
                 State.Setup(
-                    pushEnabled = context.hasPushPermission() && settingsRepository.getPushWallet(state.wallet.id),
+                    pushEnabled = context.hasPushPermission() && settingsRepository.getPushWallet(
+                        state.wallet.id
+                    ),
                     biometryEnabled = settingsRepository.biometric,
                     hasBackup = state.hasBackup,
                     showTelegramChannel = settingsRepository.isTelegramChannel(state.wallet.id)
@@ -234,6 +267,20 @@ class WalletViewModel(
         _statusFlow.tryEmit(status)
     }
 
+    private suspend fun getBatteryBalance(
+        wallet: WalletEntity,
+        ignoreCache: Boolean = false
+    ): Coins = withContext(Dispatchers.IO) {
+        val tonProofToken = accountRepository.requestTonProofToken(wallet) ?: return@withContext Coins.ZERO
+        val battery = batteryRepository.getBalance(
+            tonProofToken = tonProofToken,
+            publicKey = wallet.publicKey,
+            testnet = wallet.testnet,
+            ignoreCache = ignoreCache
+        )
+        return@withContext battery.balance
+    }
+
     private suspend fun getLocalAssets(
         currency: WalletCurrency,
         wallet: WalletEntity
@@ -285,7 +332,9 @@ class WalletViewModel(
             return null
         }
 
-        val assets = (filteredTokens.map { AssetsEntity.Token(it) } + stakedWithFiat.map { AssetsEntity.Staked(it) }).sortedBy { it.fiat }.reversed()
+        val assets = (filteredTokens.map { AssetsEntity.Token(it) } + stakedWithFiat.map {
+            AssetsEntity.Staked(it)
+        }).sortedBy { it.fiat }.reversed()
 
         return State.Assets(currency, assets.sort(wallet, settingsRepository), fromCache, rates)
     }
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 8b9bc74cc..279e83ab7 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
@@ -17,6 +17,7 @@ import com.tonapps.extensions.writeBooleanCompat
 import com.tonapps.extensions.writeCharSequenceCompat
 import com.tonapps.extensions.writeEnum
 import com.tonapps.icu.CurrencyFormatter
+import com.tonapps.tonkeeper.view.BatteryView
 import com.tonapps.uikit.list.BaseListItem
 import com.tonapps.uikit.list.ListCell
 import com.tonapps.wallet.api.entity.NotificationEntity
@@ -136,6 +137,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
         val hasBackup: Boolean,
         val balanceType: BalanceType,
         val lastUpdatedFormat: String,
+        val batteryBalance: Coins,
+        val showBattery: Boolean,
+        val batteryEmptyState: BatteryView.EmptyState,
     ): Item(TYPE_BALANCE) {
 
         constructor(parcel: Parcel) : this(
@@ -147,7 +151,10 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             parcel.readBooleanCompat(),
             parcel.readBooleanCompat(),
             parcel.readEnum(BalanceType::class.java)!!,
-            parcel.readString()!!
+            parcel.readString()!!,
+            parcel.readParcelableCompat()!!,
+            parcel.readBooleanCompat(),
+            parcel.readEnum(BatteryView.EmptyState::class.java)!!,
         )
 
         override fun marshall(dest: Parcel, flags: Int) {
@@ -160,6 +167,9 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             dest.writeBooleanCompat(hasBackup)
             dest.writeEnum(balanceType)
             dest.writeString(lastUpdatedFormat)
+            dest.writeParcelable(batteryBalance, flags)
+            dest.writeBooleanCompat(showBattery)
+            dest.writeEnum(batteryEmptyState)
         }
 
         companion object CREATOR : Parcelable.Creator<Balance> {
@@ -543,5 +553,4 @@ sealed class Item(type: Int): BaseListItem(type), Parcelable {
             dest.writeInt(settingsType)
         }
     }
-
 }
\ 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/BalanceHolder.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
index 6b32d90b8..60eb21071 100644
--- a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/wallet/main/list/holder/BalanceHolder.kt
@@ -5,7 +5,6 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Rect
 import android.graphics.RectF
-import android.util.Log
 import android.util.TypedValue
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +15,9 @@ import com.tonapps.icu.CurrencyFormatter.withCustomSymbol
 import com.tonapps.tonkeeper.api.shortAddress
 import com.tonapps.tonkeeper.extensions.copyWithToast
 import com.tonapps.tonkeeper.ui.screen.backup.main.BackupScreen
+import com.tonapps.tonkeeper.ui.screen.battery.BatteryScreen
 import com.tonapps.tonkeeper.ui.screen.wallet.main.list.Item
+import com.tonapps.tonkeeper.view.BatteryView
 import com.tonapps.tonkeeperx.R
 import com.tonapps.uikit.color.UIKitColor
 import com.tonapps.uikit.color.accentGreenColor
@@ -29,23 +30,24 @@ import com.tonapps.uikit.color.stateList
 import com.tonapps.uikit.color.textPrimaryColor
 import com.tonapps.uikit.color.textSecondaryColor
 import com.tonapps.wallet.data.account.Wallet
-import com.tonapps.wallet.localization.Localization
 import com.tonapps.wallet.data.core.HIDDEN_BALANCE
 import com.tonapps.wallet.data.settings.SettingsRepository
+import com.tonapps.wallet.localization.Localization
 import uikit.HapticHelper
 import uikit.base.BaseDrawable
 import uikit.extensions.dp
+import uikit.extensions.expandTouchArea
 import uikit.extensions.withAlpha
 import uikit.navigation.Navigation
-import uikit.navigation.Navigation.Companion.navigation
 import uikit.widget.LoaderView
 
 class BalanceHolder(
     parent: ViewGroup,
     private val settingsRepository: SettingsRepository
-): Holder<Item.Balance>(parent, R.layout.view_wallet_data) {
+) : Holder<Item.Balance>(parent, R.layout.view_wallet_data) {
 
     private val balanceView = itemView.findViewById<AppCompatTextView>(R.id.wallet_balance)
+    private val batteryView = itemView.findViewById<BatteryView>(R.id.wallet_battery)
     private val walletAddressView = itemView.findViewById<AppCompatTextView>(R.id.wallet_address)
     private val walletLoaderView = itemView.findViewById<LoaderView>(R.id.wallet_loader)
     private val walletTypeView = itemView.findViewById<AppCompatTextView>(R.id.wallet_type)
@@ -62,6 +64,10 @@ class BalanceHolder(
         backupIconView.setOnClickListener {
             Navigation.from(context)?.add(BackupScreen.newInstance())
         }
+        batteryView.expandTouchArea(left = 0, top = 10.dp, right = 24.dp, bottom = 10.dp)
+        batteryView.setOnClickListener {
+            Navigation.from(context)?.add(BatteryScreen.newInstance())
+        }
     }
 
     override fun onBind(item: Item.Balance) {
@@ -75,7 +81,8 @@ class BalanceHolder(
             balanceView.background = null
         }
 
-        val requestBackup = (item.walletType == Wallet.Type.Default || item.walletType == Wallet.Type.Lockup) && !item.hasBackup
+        val requestBackup =
+            (item.walletType == Wallet.Type.Default || item.walletType == Wallet.Type.Lockup) && !item.hasBackup
 
         if (requestBackup && item.balanceType == Item.BalanceType.Huge) {
             balanceView.setTextColor(context.accentRedColor)
@@ -90,6 +97,15 @@ class BalanceHolder(
             backupIconView.visibility = View.GONE
         }
 
+
+        if (item.showBattery) {
+            batteryView.visibility = View.VISIBLE
+            batteryView.setBatteryLevel(item.batteryBalance.value.toFloat())
+            batteryView.emptyState = item.batteryEmptyState
+        } else {
+            batteryView.visibility = View.GONE
+        }
+
         setWalletType(item.walletType, item.walletVersion)
         setWalletState(item.status, item.address, item.walletType, item.lastUpdatedFormat)
     }
@@ -170,7 +186,7 @@ class BalanceHolder(
         }
     }
 
-    private class HiddenBalanceDrawable(context: Context): BaseDrawable() {
+    private class HiddenBalanceDrawable(context: Context) : BaseDrawable() {
 
         private val radius = 20f.dp
         private val backgroundPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/BatteryView.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/BatteryView.kt
new file mode 100644
index 000000000..a70a421ba
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/view/BatteryView.kt
@@ -0,0 +1,199 @@
+package com.tonapps.tonkeeper.view
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.content.res.Resources
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
+import android.graphics.RectF
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.toRect
+import com.tonapps.tonkeeperx.R
+import com.tonapps.uikit.color.UIKitColor
+import com.tonapps.uikit.color.accentBlueColor
+import com.tonapps.uikit.color.accentGreenColor
+import com.tonapps.uikit.color.accentOrangeColor
+import com.tonapps.uikit.color.iconSecondaryColor
+import com.tonapps.uikit.color.resolveColor
+import uikit.extensions.dp
+import uikit.extensions.drawable
+import uikit.extensions.useAttributes
+
+class BatteryView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : View(context, attrs, defStyleAttr) {
+
+    enum class EmptyState(val value: Int) {
+        NONE(0),
+        SECONDARY(1),
+        ACCENT(2),
+        ACCENT_GREEN(3);
+
+        companion object {
+            fun from(value: Int): EmptyState {
+                return entries.firstOrNull { it.value == value } ?: NONE
+            }
+        }
+    }
+
+    private var isInitialSet = true
+    private var batteryLevel = 0f
+
+    var emptyState: EmptyState = EmptyState.NONE
+        set(value) {
+            field = value
+            invalidate()
+        }
+
+    private val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
+    }
+    private val borderPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = context.resolveColor(UIKitColor.iconTertiaryColor)
+        style = Paint.Style.FILL
+    }
+    private val levelPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        style = Paint.Style.FILL
+    }
+
+    private var levelAnimator: ValueAnimator? = null
+    private val iconDrawable = context.drawable(R.drawable.ic_flash_48)
+
+    private val outerRect = RectF()
+    private val capRect = RectF()
+    private val innerRect = RectF()
+    private val levelRect = RectF()
+    private val iconRect = RectF()
+
+    private var outerRadius: Float = 0f
+    private var innerRadius: Float = 0f
+    private var levelRadius: Float = 0f
+    private var borderSize: Float = 0f
+    private var capSize: Float = 0f
+
+    private val capLeft: Float
+        get() = (width.toFloat() - capSize) / 2
+
+    private var capRadius: Float = 0f
+    private var capOffset: Float = 0f
+    private var iconSize: Float = 0f
+
+    init {
+        context.useAttributes(attrs, R.styleable.BatteryView) {
+            emptyState = EmptyState.from(
+                it.getInt(
+                    R.styleable.BatteryView_emptyState,
+                    EmptyState.NONE.value
+                )
+            )
+
+            outerRadius = it.getDimension(R.styleable.BatteryView_outerRadius, 0f)
+            innerRadius = it.getDimension(R.styleable.BatteryView_innerRadius, 0f)
+            levelRadius = it.getDimension(R.styleable.BatteryView_levelRadius, 0f)
+            borderSize = it.getDimension(R.styleable.BatteryView_borderSize, 0f)
+            capSize = it.getDimension(R.styleable.BatteryView_capSize, 0f)
+            capRadius = it.getDimension(R.styleable.BatteryView_capRadius, 0f)
+            capOffset = it.getDimension(R.styleable.BatteryView_capOffset, 0f)
+            iconSize = it.getDimension(R.styleable.BatteryView_iconSize, 0f)
+        }
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+
+        val width = width.toFloat()
+        val height = height.toFloat()
+
+        val saveCount = canvas.saveLayer(null, null)
+
+        outerRect.set(0f, capOffset, width, height)
+        canvas.drawRoundRect(outerRect, outerRadius, outerRadius, borderPaint)
+
+        capRect.set(capLeft, 0f, capLeft + capSize, capSize)
+        canvas.drawRoundRect(capRect, capRadius, capRadius, borderPaint)
+
+        innerRect.set(
+            outerRect.left + borderSize,
+            outerRect.top + borderSize,
+            outerRect.right - borderSize,
+            outerRect.bottom - borderSize
+        )
+        canvas.drawRoundRect(innerRect, innerRadius, innerRadius, maskPaint)
+
+        if (batteryLevel > 0) {
+            val levelRectHeight = innerRect.height() - borderSize * 2
+            val levelHeight =
+                if (batteryLevel > MIN_LEVEL) {
+                    levelRectHeight * batteryLevel
+                } else levelRadius * 2
+            levelRect.set(
+                innerRect.left + borderSize,
+                innerRect.top + borderSize + (levelRectHeight - levelHeight),
+                innerRect.right - borderSize,
+                innerRect.bottom - borderSize
+            )
+
+            levelPaint.color = if (batteryLevel > MIN_LEVEL) {
+                context.accentBlueColor
+            } else {
+                context.accentOrangeColor
+            }
+
+            canvas.drawRoundRect(levelRect, levelRadius, levelRadius, levelPaint)
+        } else if (emptyState != EmptyState.NONE) {
+
+            val color = when (emptyState) {
+                EmptyState.SECONDARY -> context.iconSecondaryColor
+                EmptyState.ACCENT -> context.accentBlueColor
+                EmptyState.ACCENT_GREEN -> context.accentGreenColor
+                else -> Color.TRANSPARENT
+            }
+
+            val left = innerRect.left + (innerRect.width() - iconSize) / 2
+            val top = innerRect.top + (innerRect.height() - iconSize) / 2
+            iconRect.set(left, top, left + iconSize, top + iconSize)
+            iconDrawable.bounds = iconRect.toRect()
+            iconDrawable.setTint(color)
+            iconDrawable.draw(canvas)
+        }
+
+        canvas.restoreToCount(saveCount)
+    }
+
+    // Function to set battery level
+    fun setBatteryLevel(level: Float) {
+        levelAnimator?.cancel()
+
+        val nextValue = level.coerceIn(0f, 1f)
+        
+        if (level == 0f || isInitialSet) {
+            if (isInitialSet) {
+                isInitialSet = false
+            }
+            batteryLevel = nextValue
+            invalidate()
+            return
+        }
+
+        levelAnimator = ValueAnimator.ofFloat(batteryLevel, nextValue).apply {
+            duration = 400 // Animation duration in milliseconds
+            addUpdateListener { animation ->
+                batteryLevel = animation.animatedValue as Float
+                invalidate() // Trigger a redraw
+            }
+            start()
+        }
+    }
+
+    companion object {
+        private const val MIN_LEVEL = 0.14f
+    }
+}
\ No newline at end of file
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 12f5c50b0..535e2047c 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
@@ -33,6 +33,7 @@ class TransactionDetailView @JvmOverloads constructor(
         }
 
     private val titleView: AppCompatTextView
+    private val subtitleView: AppCompatTextView
     val valueView: AppCompatTextView
     private val descriptionView: AppCompatTextView
     private val loaderView: LoaderView
@@ -43,6 +44,17 @@ class TransactionDetailView @JvmOverloads constructor(
             titleView.text = value
         }
 
+    var subtitle: CharSequence?
+        get() = subtitleView.text
+        set(value) {
+            if (value.isNullOrEmpty()) {
+                subtitleView.visibility = GONE
+                return
+            }
+            subtitleView.visibility = VISIBLE
+            subtitleView.text = value
+        }
+
     var value: CharSequence?
         get() = valueView.text
         set(value) {
@@ -68,6 +80,7 @@ class TransactionDetailView @JvmOverloads constructor(
         minimumHeight = context.getDimensionPixelSize(uikit.R.dimen.itemHeight)
 
         titleView = findViewById(R.id.title)
+        subtitleView = findViewById(R.id.subtitle)
         valueView = findViewById(R.id.value)
         descriptionView = findViewById(R.id.description)
         loaderView = findViewById(R.id.loader)
diff --git a/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_battery_refund_44.png b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_battery_refund_44.png
new file mode 100644
index 000000000..9cb86426c
Binary files /dev/null and b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_battery_refund_44.png differ
diff --git a/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_gift_44.png b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_gift_44.png
new file mode 100644
index 000000000..c9590c380
Binary files /dev/null and b/apps/wallet/instance/app/src/main/res/drawable-nodpi/ic_gift_44.png differ
diff --git a/apps/wallet/instance/app/src/main/res/drawable/ic_flash_16.xml b/apps/wallet/instance/app/src/main/res/drawable/ic_flash_16.xml
new file mode 100644
index 000000000..ab5d11854
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/drawable/ic_flash_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="M4.601,6.482L7.639,2.836C8.59,1.696 9.065,1.126 9.412,1.285C9.76,1.445 9.638,2.177 9.394,3.641L9.125,5.255C9.066,5.609 9.036,5.786 9.125,5.918C9.215,6.051 9.39,6.09 9.74,6.167L10.297,6.291C11.73,6.61 12.447,6.769 12.628,7.3C12.809,7.832 12.339,8.396 11.399,9.524L8.361,13.17C7.411,14.31 6.936,14.88 6.588,14.721C6.24,14.561 6.362,13.829 6.606,12.365L6.876,10.751C6.935,10.397 6.964,10.22 6.875,10.087C6.786,9.955 6.61,9.916 6.26,9.839L5.704,9.715C4.27,9.396 3.554,9.237 3.372,8.706C3.191,8.174 3.661,7.61 4.601,6.482Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/apps/wallet/instance/app/src/main/res/drawable/ic_flash_48.xml b/apps/wallet/instance/app/src/main/res/drawable/ic_flash_48.xml
new file mode 100644
index 000000000..d3118b073
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/drawable/ic_flash_48.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M13.802,19.438L22.917,8.499C25.768,5.079 27.193,3.368 28.236,3.847C29.279,4.325 28.913,6.521 28.181,10.913L27.374,15.756C27.197,16.819 27.108,17.35 27.376,17.747C27.643,18.143 28.169,18.26 29.221,18.494L30.89,18.865C35.19,19.82 37.34,20.298 37.883,21.893C38.427,23.487 37.018,25.179 34.198,28.563L25.083,39.501C22.232,42.922 20.807,44.632 19.764,44.154C18.721,43.675 19.087,41.479 19.819,37.087L20.626,32.244C20.803,31.182 20.892,30.65 20.624,30.254C20.357,29.857 19.831,29.74 18.779,29.507L17.11,29.136C12.81,28.18 10.66,27.702 10.116,26.108C9.572,24.513 10.982,22.821 13.802,19.438Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/apps/wallet/instance/app/src/main/res/drawable/ic_ton_28.xml b/apps/wallet/instance/app/src/main/res/drawable/ic_ton_28.xml
new file mode 100644
index 000000000..090c817a3
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/drawable/ic_ton_28.xml
@@ -0,0 +1,10 @@
+<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="M15.156,23.467L22.016,11.993C22.707,10.837 23.052,10.259 23.146,9.8C23.421,8.453 22.659,7.11 21.362,6.655C20.92,6.5 20.247,6.5 18.9,6.5H9.1C7.753,6.5 7.08,6.5 6.637,6.655C5.341,7.11 4.579,8.453 4.854,9.8C4.947,10.259 5.293,10.837 5.984,11.993L12.844,23.467C13.089,23.877 13.212,24.082 13.342,24.191C13.722,24.513 14.278,24.513 14.658,24.191C14.788,24.082 14.911,23.877 15.156,23.467ZM13,8.5V19.9L7.177,9.992C6.992,9.677 6.9,9.52 6.875,9.395C6.803,9.029 7.011,8.665 7.363,8.542C7.483,8.5 7.666,8.5 8.03,8.5H13ZM15,19.9V8.5H19.97C20.334,8.5 20.517,8.5 20.637,8.542C20.989,8.665 21.197,9.029 21.125,9.395C21.1,9.52 21.008,9.677 20.823,9.992L15,19.9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_action.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_action.xml
index 070c3715d..f51ab630d 100644
--- a/apps/wallet/instance/app/src/main/res/layout/fragment_action.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_action.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <uikit.widget.ColumnLayout 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:paddingHorizontal="@dimen/offsetMedium">
 
     <FrameLayout
@@ -18,16 +18,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/confirm_action"
-                android:textColor="?attr/textPrimaryColor"
-                android:textAppearance="@style/TextAppearance.H3"/>
+                android:textAppearance="@style/TextAppearance.H3"
+                android:textColor="?attr/textPrimaryColor" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/action_wallet"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textAppearance="@style/TextAppearance.Body2"
                 android:singleLine="true"
-                android:textColor="?attr/textSecondaryColor"/>
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textSecondaryColor" />
 
         </uikit.widget.ColumnLayout>
 
@@ -36,40 +36,18 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_gravity="center_vertical|end"
+            android:background="@drawable/bg_oval_button_secondary"
+            android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
             android:scaleType="centerInside"
             android:src="@drawable/ic_close_16"
-            android:tint="?attr/buttonSecondaryForegroundColor"
-            android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
-            android:background="@drawable/bg_oval_button_secondary" />
+            android:tint="?attr/buttonSecondaryForegroundColor" />
 
     </FrameLayout>
 
     <uikit.widget.SimpleRecyclerView
         android:id="@+id/actions"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="@dimen/offsetExtraSmall">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|start"
-            android:text="@string/fee"
-            android:textAppearance="@style/TextAppearance.Body2"
-            android:textColor="?attr/textTertiaryColor"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/fee"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:textAppearance="@style/TextAppearance.Body2"
-            android:textColor="?attr/textTertiaryColor"/>
-    </FrameLayout>
+        android:layout_height="wrap_content" />
 
     <uikit.widget.ProcessTaskView
         android:id="@+id/process"
@@ -77,8 +55,8 @@
         android:layout_height="@dimen/itemHeight"
         android:layout_marginVertical="@dimen/offsetMedium"
         android:visibility="gone"
-        app:successLabel="@string/done"
-        app:errorLabel="@string/error"/>
+        app:errorLabel="@string/error"
+        app:successLabel="@string/done" />
 
     <uikit.widget.SlideActionView
         android:id="@+id/slide"
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_battery.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_battery.xml
new file mode 100644
index 000000000..a36bd41b5
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_battery.xml
@@ -0,0 +1,18 @@
+<?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">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_battery_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <uikit.widget.HeaderView
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:action="@drawable/ic_close_16"
+        app:ignoreSystemOffset="true" />
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_battery_promo.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_promo.xml
new file mode 100644
index 000000000..546dc6b7c
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_promo.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:backgroundTint="@color/accentBlueBlue"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <uikit.widget.InputView
+            android:id="@+id/promo_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/promocode_hint"/>
+
+        <uikit.widget.RowLayout
+            android:id="@+id/actions"
+            android:layout_width="wrap_content"
+            android:layout_height="32dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginRight="@dimen/offsetMedium">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/paste"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingHorizontal="@dimen/offsetMedium"
+                android:background="@drawable/bg_button_tertiary"
+                android:textAppearance="@style/TextAppearance.Label2"
+                android:gravity="center"
+                android:textColor="?attr/buttonTertiaryForegroundColor"
+                android:text="@string/paste"/>
+
+        </uikit.widget.RowLayout>
+
+    </FrameLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_battery_refill.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_refill.xml
new file mode 100644
index 000000000..6d0422025
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_refill.xml
@@ -0,0 +1,13 @@
+<?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">
+
+    <uikit.widget.SimpleRecyclerView
+        android:id="@+id/refill_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingHorizontal="16dp"
+        android:paddingTop="@dimen/barHeight"
+        android:clipToPadding="false" />
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_battery_settings.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_settings.xml
new file mode 100644
index 000000000..33365917e
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_battery_settings.xml
@@ -0,0 +1,13 @@
+<?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"
+    android:visibility="gone">
+    <uikit.widget.SimpleRecyclerView
+        android:id="@+id/settings_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingHorizontal="16dp"
+        android:paddingTop="@dimen/barHeight"
+        android:clipToPadding="false" />
+</uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_address.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_address.xml
new file mode 100644
index 000000000..e487e3b39
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_address.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:backgroundTint="@color/accentBlueBlue"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <uikit.widget.InputView
+            android:id="@+id/address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/address_hint"/>
+
+        <uikit.widget.RowLayout
+            android:id="@+id/address_actions"
+            android:layout_width="wrap_content"
+            android:layout_height="32dp"
+            android:layout_gravity="end|center_vertical"
+            android:layout_marginRight="@dimen/offsetMedium">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/paste"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingHorizontal="@dimen/offsetMedium"
+                android:background="@drawable/bg_button_tertiary"
+                android:textAppearance="@style/TextAppearance.Label2"
+                android:gravity="center"
+                android:textColor="?attr/buttonTertiaryForegroundColor"
+                android:text="@string/paste"/>
+
+            <View
+                android:layout_width="@dimen/offsetMedium"
+                android:layout_height="wrap_content"/>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/address_book"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:tint="?attr/accentBlueColor"
+                android:src="@drawable/ic_address_book_28"/>
+
+        </uikit.widget.RowLayout>
+
+    </FrameLayout>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_amount.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_amount.xml
new file mode 100644
index 000000000..0b32c56b4
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_amount.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_content"
+        android:paddingVertical="44dp">
+
+        <com.tonapps.tonkeeper.ui.component.coin.CoinEditText
+            android:id="@+id/amount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="6dp"
+            android:background="@null"
+            android:digits="0123456789.,"
+            android:fontFamily="@font/montserrat_semi_bold"
+            android:gravity="center"
+            android:hint="0"
+            android:inputType="numberDecimal"
+            android:singleLine="true"
+            android:textColor="?attr/textPrimaryColor"
+            android:textColorHint="?attr/textSecondaryColor"
+            android:textCursorDrawable="@drawable/cursor"
+            android:imeOptions="actionDone"
+            android:textSize="40sp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/currency"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/bg_island_border"
+            android:drawableRight="@drawable/ic_flash_16"
+            android:drawablePadding="4dp"
+            android:drawableTint="?attr/textSecondaryColor"
+            android:paddingVertical="8dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="12dp"
+            android:textAppearance="@style/TextAppearance.Body1"
+            android:textColor="?attr/textSecondaryColor" />
+
+
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/available"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:gravity="end"
+        android:layout_marginTop="12dp"
+        android:textAppearance="@style/TextAppearance.Body2"
+        android:textColor="?attr/textSecondaryColor" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_button.xml b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_button.xml
new file mode 100644
index 000000000..3070ecaa6
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/fragment_recharge_button.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:backgroundTint="@color/accentBlueBlue"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button"
+        style="@style/Widget.App.Button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/continue_action"
+        android:textAppearance="@style/TextAppearance.Label1" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_battery_icon.xml b/apps/wallet/instance/app/src/main/res/layout/view_battery_icon.xml
new file mode 100644
index 000000000..30b053ea9
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_battery_icon.xml
@@ -0,0 +1,56 @@
+<?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:id="@+id/battery_icon"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
+
+        <com.tonapps.tonkeeper.view.BatteryView
+            style="@style/Battery.VeryBig"
+            android:id="@+id/battery_view"
+            android:layout_gravity="center"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="24dp"
+            app:emptyState="accent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/beta"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/bg_wallet_type"
+            android:gravity="center"
+            android:paddingHorizontal="@dimen/offsetExtraSmall"
+            android:singleLine="true"
+            android:text="@string/beta"
+            android:textAppearance="@style/TextAppearance.Body4CAPS"
+            android:textColor="?attr/accentOrangeColor"
+            android:visibility="gone" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:gravity="center"
+            android:text="@string/battery_refill_title"
+            android:textAppearance="@style/TextAppearance.H2"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/battery_subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/battery_refill_subtitle"
+            android:textAppearance="@style/TextAppearance.Body1"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </uikit.widget.ColumnLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_battery_recharge_token.xml b/apps/wallet/instance/app/src/main/res/layout/view_battery_recharge_token.xml
new file mode 100644
index 000000000..20c5d836a
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_battery_recharge_token.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:id="@+id/token"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_button_secondary"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="4dp"
+        android:paddingRight="8dp"
+        android:paddingVertical="4dp">
+
+        <uikit.widget.FrescoView
+            android:id="@+id/token_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            android:background="@drawable/bg_oval"
+            android:backgroundTint="?attr/backgroundContentTintColor"
+            fresco:roundAsCircle="true"
+            android:layout_marginRight="4dp" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/token_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Label2"
+            android:textColor="?attr/buttonSecondaryForegroundColor" />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_switch_16"
+            android:layout_marginLeft="2dp"
+            android:tint="?attr/iconSecondaryColor" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_battery_settings.xml b/apps/wallet/instance/app/src/main/res/layout/view_battery_settings.xml
new file mode 100644
index 000000000..7aaaddca8
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_battery_settings.xml
@@ -0,0 +1,50 @@
+<?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:padding="@dimen/offsetMedium">
+
+    <uikit.widget.ColumnLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginRight="@dimen/offsetMedium"
+        android:layout_weight="1">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/battery_settings"
+            android:textAppearance="@style/TextAppearance.Label1"
+            android:textColor="?attr/textPrimaryColor" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/subtitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/offsetExtraExtraSmall"
+            android:text="@string/battery_will_be_paid"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor" />
+
+    </uikit.widget.ColumnLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/chevron"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_chevron_right_16"
+        android:tint="?attr/iconTertiaryColor" />
+
+    <uikit.widget.SwitchView
+        android:id="@+id/enabled"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+</uikit.widget.RowLayout>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_battery_settings_header.xml b/apps/wallet/instance/app/src/main/res/layout/view_battery_settings_header.xml
new file mode 100644
index 000000000..5ee421189
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_battery_settings_header.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<uikit.widget.TextHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:title="@string/battery_settings_title"
+    android:description="@string/battery_settings_subtitle"
+    android:layout_marginBottom="@dimen/offsetLarge"/>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_method.xml b/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_method.xml
new file mode 100644
index 000000000..90a4824c5
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_method.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat 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="76dp"
+    android:orientation="horizontal"
+    android:paddingHorizontal="@dimen/offsetMedium">
+
+    <uikit.widget.FrescoView
+        android:id="@+id/icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="center"
+        android:background="@drawable/bg_oval"
+        android:backgroundTint="?attr/backgroundContentTintColor"
+        fresco:roundAsCircle="true"
+        android:visibility="gone" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/gift_icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_gift_44"
+        android:visibility="gone" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/refund_icon"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_battery_refund_44"
+        android:visibility="gone" />
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/offsetMedium"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <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/subtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"
+            android:visibility="gone" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_chevron_right_16"
+            android:tint="?attr/iconTertiaryColor" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_pack.xml b/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_pack.xml
new file mode 100644
index 000000000..2adcfa6f5
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/layout/view_cell_recharge_pack.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat 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"
+    android:orientation="horizontal"
+    android:paddingHorizontal="@dimen/offsetMedium">
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="76dp"
+        android:gravity="center">
+        <com.tonapps.tonkeeper.view.BatteryView
+            android:id="@+id/battery"
+            style="@style/Battery.Big"
+            android:layout_gravity="center"
+            app:emptyState="accentGreen" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/offsetMedium"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="76dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="4dp"
+                android:drawableTint="?attr/iconTertiaryColor"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.Label1"
+                android:textColor="?attr/textPrimaryColor" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textSecondaryColor" />
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/details"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.Body2"
+            android:textColor="?attr/textSecondaryColor"
+            android:visibility="gone" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="76dp"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <uikit.widget.RadioView
+            android:id="@+id/radio"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_history_action.xml b/apps/wallet/instance/app/src/main/res/layout/view_history_action.xml
index 84b5817b5..a67929d5f 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_history_action.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_history_action.xml
@@ -46,15 +46,16 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/subtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/offsetMedium"
         android:layout_marginTop="2dp"
         android:singleLine="true"
-        android:maxLength="18"
+        android:ellipsize="end"
         android:textAppearance="@style/TextAppearance.Body2"
         android:textColor="?attr/textSecondaryColor"
         app:layout_constraintStart_toEndOf="@+id/icon"
+        app:layout_constraintEnd_toStartOf="@id/date"
         app:layout_constraintTop_toBottomOf="@+id/title"/>
 
     <androidx.appcompat.widget.AppCompatTextView
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 028297b36..30229ea66 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
@@ -1,47 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="4dp"
-        android:textColor="?attr/textSecondaryColor"
-        android:textAppearance="@style/TextAppearance.Body1"/>
-
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/offsetMedium"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/value"
-            android:layout_width="wrap_content"
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="end"
-            android:layout_gravity="end"
-            android:drawablePadding="4dp"
-            android:textAppearance="@style/TextAppearance.Label1"
-            android:textColor="?attr/textPrimaryColor"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/description"
-            android:layout_width="wrap_content"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="4dp"
+                android:textAppearance="@style/TextAppearance.Body1"
+                android:textColor="?attr/textSecondaryColor" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/offsetMedium"
+                android:layout_weight="1"
+                android:gravity="right">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="4dp"
+                    android:gravity="right"
+                    android:textAppearance="@style/TextAppearance.Label1"
+                    android:textColor="?attr/textPrimaryColor" />
+
+                <uikit.widget.LoaderView
+                    android:id="@+id/loader"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="end"
+                    android:visibility="gone" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:gravity="end"
-            android:layout_gravity="end"
-            android:textAppearance="@style/TextAppearance.Body2"
-            android:textColor="?attr/textSecondaryColor"/>
-
-        <uikit.widget.LoaderView
-            android:id="@+id/loader"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="end"
-            android:visibility="gone"/>
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="4dp"
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textTertiaryColor"
+                android:visibility="gone" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/offsetMedium"
+                android:layout_weight="1"
+                android:gravity="right">
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textAppearance="@style/TextAppearance.Body2"
+                    android:textColor="?attr/textSecondaryColor"
+                    android:visibility="gone" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
 </merge>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/layout/view_wallet_data.xml b/apps/wallet/instance/app/src/main/res/layout/view_wallet_data.xml
index 037f2437c..1fead5795 100644
--- a/apps/wallet/instance/app/src/main/res/layout/view_wallet_data.xml
+++ b/apps/wallet/instance/app/src/main/res/layout/view_wallet_data.xml
@@ -1,5 +1,6 @@
 <?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:id="@+id/data"
     android:layout_width="match_parent"
     android:layout_height="132dp">
@@ -14,17 +15,25 @@
             android:layout_height="56dp"
             android:layout_gravity="center"
             android:paddingHorizontal="@dimen/offsetMedium">
-            
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/wallet_balance"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="@font/montserrat_semi_bold"
+                android:gravity="center"
                 android:singleLine="true"
                 android:textColor="?attr/textPrimaryColor"
-                android:textSize="44sp"
-                android:fontFamily="@font/montserrat_semi_bold"
-                android:gravity="center"/>
-            
+                android:textSize="44sp" />
+
+            <com.tonapps.tonkeeper.view.BatteryView
+                style="@style/Battery.Medium"
+                android:id="@+id/wallet_battery"
+                android:layout_gravity="center"
+                android:layout_marginLeft="8dp"
+                app:emptyState="accent"
+                android:visibility="gone" />
+
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/backup_icon"
                 android:layout_width="24dp"
@@ -41,23 +50,24 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center">
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/wallet_address"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="@dimen/offsetExtraExtraSmall"
-                android:textColor="?attr/textSecondaryColor"
-                android:textAppearance="@style/TextAppearance.Body2"
+                android:gravity="center"
                 android:singleLine="true"
-                android:gravity="center"/>
-            
+                android:textAppearance="@style/TextAppearance.Body2"
+                android:textColor="?attr/textSecondaryColor" />
+
             <uikit.widget.LoaderView
                 android:id="@+id/wallet_loader"
                 android:layout_width="12dp"
                 android:layout_height="12dp"
-                android:layout_marginHorizontal="@dimen/offsetExtraExtraSmall"
-                android:layout_gravity="center"/>
+                android:layout_gravity="center"
+                android:layout_marginHorizontal="@dimen/offsetExtraExtraSmall" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/wallet_type"
@@ -65,12 +75,12 @@
                 android:layout_height="20dp"
                 android:layout_gravity="center"
                 android:layout_marginHorizontal="@dimen/offsetExtraExtraSmall"
-                android:paddingHorizontal="@dimen/offsetExtraSmall"
-                android:gravity="center"
                 android:background="@drawable/bg_wallet_type"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/offsetExtraSmall"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.Body4CAPS"
-                android:textColor="?attr/accentOrangeColor"/>
+                android:textColor="?attr/accentOrangeColor" />
         </uikit.widget.RowLayout>
 
     </uikit.widget.ColumnLayout>
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 ab898abe1..47388581c 100644
--- a/apps/wallet/instance/app/src/main/res/values/styleable.xml
+++ b/apps/wallet/instance/app/src/main/res/values/styleable.xml
@@ -8,4 +8,23 @@
         <attr name="position"/>
         <attr name="android:title" format="string|reference"/>
     </declare-styleable>
+
+    <declare-styleable name="BatteryView">
+        <attr name="emptyState"/>
+        <attr name="outerRadius" format="dimension|reference"/>
+        <attr name="innerRadius" format="dimension|reference"/>
+        <attr name="levelRadius" format="dimension|reference"/>
+        <attr name="borderSize" format="dimension|reference"/>
+        <attr name="capSize" format="dimension|reference"/>
+        <attr name="capRadius" format="dimension|reference"/>
+        <attr name="capOffset" format="dimension|reference"/>
+        <attr name="iconSize" format="dimension|reference"/>
+    </declare-styleable>
+
+    <attr name="emptyState">
+        <enum name="none" value="0"/>
+        <enum name="secondary" value="1"/>
+        <enum name="accent" value="2"/>
+        <enum name="accentGreen" value="3"/>
+    </attr>
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/instance/app/src/main/res/values/styles.xml b/apps/wallet/instance/app/src/main/res/values/styles.xml
new file mode 100644
index 000000000..056b98366
--- /dev/null
+++ b/apps/wallet/instance/app/src/main/res/values/styles.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Battery">
+        <item name="outerRadius">0dp</item>
+        <item name="innerRadius">0dp</item>
+        <item name="levelRadius">0dp</item>
+        <item name="borderSize">0dp</item>
+        <item name="capSize">0dp</item>
+        <item name="capRadius">0dp</item>
+        <item name="capOffset">0dp</item>
+        <item name="iconSize">0dp</item>
+    </style>
+
+    <style name="Battery.VeryBig">
+        <item name="android:layout_width">68dp</item>
+        <item name="android:layout_height">114dp</item>
+        <item name="outerRadius">16dp</item>
+        <item name="innerRadius">12dp</item>
+        <item name="levelRadius">8dp</item>
+        <item name="borderSize">4dp</item>
+        <item name="capSize">22dp</item>
+        <item name="capRadius">14dp</item>
+        <item name="capOffset">10dp</item>
+        <item name="iconSize">48dp</item>
+    </style>
+
+    <style name="Battery.Big">
+        <item name="android:layout_width">26dp</item>
+        <item name="android:layout_height">44dp</item>
+        <item name="outerRadius">6.5dp</item>
+        <item name="innerRadius">5dp</item>
+        <item name="levelRadius">3.5dp</item>
+        <item name="borderSize">1.5dp</item>
+        <item name="capSize">9dp</item>
+        <item name="capRadius">10dp</item>
+        <item name="capOffset">4dp</item>
+        <item name="iconSize">22dp</item>
+    </style>
+
+    <style name="Battery.Medium">
+        <item name="android:layout_width">20dp</item>
+        <item name="android:layout_height">34dp</item>
+        <item name="outerRadius">5dp</item>
+        <item name="innerRadius">3.5dp</item>
+        <item name="levelRadius">2dp</item>
+        <item name="borderSize">1.5dp</item>
+        <item name="capSize">7dp</item>
+        <item name="capRadius">4dp</item>
+        <item name="capOffset">3dp</item>
+        <item name="iconSize">16dp</item>
+    </style>
+
+    <style name="Battery.Small">
+        <item name="android:layout_width">12dp</item>
+        <item name="android:layout_height">24dp</item>
+        <item name="outerRadius">3.5dp</item>
+        <item name="innerRadius">2.5dp</item>
+        <item name="levelRadius">1.5dp</item>
+        <item name="borderSize">1dp</item>
+        <item name="capSize">2.5dp</item>
+        <item name="capRadius">3dp</item>
+        <item name="capOffset">2dp</item>
+        <item name="iconSize">12dp</item>
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/java/com/tonapps/wallet/localization/Localization.kt b/apps/wallet/localization/src/main/java/com/tonapps/wallet/localization/Localization.kt
index 96d7e2c84..8e04f5d6e 100644
--- a/apps/wallet/localization/src/main/java/com/tonapps/wallet/localization/Localization.kt
+++ b/apps/wallet/localization/src/main/java/com/tonapps/wallet/localization/Localization.kt
@@ -1,6 +1,7 @@
 package com.tonapps.wallet.localization
 
 typealias Localization = R.string
+typealias Plurals = R.plurals
 
 val SupportedLanguages = listOf(
     Language(),
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 11dd65fa5..f5aa4a157 100644
--- a/apps/wallet/localization/src/main/res/values-bg/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-bg/strings.xml
@@ -403,4 +403,29 @@
     <string name="biometric_enabled">Биометричните са активирани</string>
     <string name="sending_error">Грешка при изпращане, опитайте отново по-късно</string>
     <string name="testers_chat">Докладване за грешка (чат в Telegram)</string>
+    <string name="battery">Батерия</string>
+    <string name="battery_refill_title">Батерия Tonkeeper</string>
+    <string name="battery_refill_subtitle">Обменяйте чрез Tonkeeper, изпращайте токени.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s заряд</item>
+        <item quantity="other">%1$s заряда</item>
+    </plurals>
+    <string name="battery_refill_crypto">Заредете за %1$s</string>
+    <string name="battery_refill_gift">Батерия като подарък</string>
+    <string name="battery_refill_gift_subtitle">Споделете с приятели</string>
+    <string name="battery_supported_transaction">Поддържани транзакции</string>
+    <string name="battery_settings">Настройки на батерията</string>
+    <string name="battery_will_be_paid">Ще бъде платено: %1$s</string>
+    <string name="battery_nft">изпращане на NFT</string>
+    <string name="battery_swap">обмен чрез Tonkeeper</string>
+    <string name="battery_jetton">изпращане на токени</string>
+    <string name="battery_swap_single">обмен</string>
+    <string name="battery_transfer_single">изпращане</string>
+    <plurals name="battery_charges_per_action">
+        <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>
 </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 e56a70184..f2600c57e 100644
--- a/apps/wallet/localization/src/main/res/values-es/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-es/strings.xml
@@ -358,4 +358,29 @@
     <string name="spam">Spam</string>
     <string name="later">Más tarde</string>
     <string name="testers_chat">Reportar error (chat en Telegram)</string>
+    <string name="battery">Batería</string>
+    <string name="battery_refill_title">Batería de Tonkeeper</string>
+    <string name="battery_refill_subtitle">Intercambia a través de Tonkeeper, envía tokens y NFTs.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s carga</item>
+        <item quantity="other">%1$s cargas</item>
+    </plurals>
+    <string name="battery_refill_crypto">Recargar con %1$s</string>
+    <string name="battery_refill_gift">Regalo de batería</string>
+    <string name="battery_refill_gift_subtitle">Comparte con amigos</string>
+    <string name="battery_supported_transaction">Transacciones soportadas</string>
+    <string name="battery_settings">Configuración de la batería</string>
+    <string name="battery_will_be_paid">Se pagará: %1$s</string>
+    <string name="battery_nft">Transferencias de NFT</string>
+    <string name="battery_swap">intercambios a través de Tonkeeper</string>
+    <string name="battery_jetton">transferencias de tokens</string>
+    <string name="battery_swap_single">intercambio</string>
+    <string name="battery_transfer_single">transferencia</string>
+    <plurals name="battery_charges_per_action">
+        <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>
 </resources>
\ No newline at end of file
diff --git a/apps/wallet/localization/src/main/res/values-id/strings.xml b/apps/wallet/localization/src/main/res/values-id/strings.xml
index b6a97dad9..59ac00e83 100644
--- a/apps/wallet/localization/src/main/res/values-id/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-id/strings.xml
@@ -358,4 +358,27 @@
     <string name="spam">Spam</string>
     <string name="later">Nanti</string>
     <string name="testers_chat">Laporkan bug (obrolan di Telegram)</string>
+    <string name="battery">Baterai</string>
+    <string name="battery_refill_title">Baterai Tonkeeper</string>
+    <string name="battery_refill_subtitle">Tukar melalui Tonkeeper, kirim token dan NFT.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="other">%1$s pengisian</item>
+    </plurals>
+    <string name="battery_refill_crypto">Isi ulang dengan %1$s</string>
+    <string name="battery_refill_gift">Hadiah Baterai</string>
+    <string name="battery_refill_gift_subtitle">Bagikan dengan teman</string>
+    <string name="battery_supported_transaction">Transaksi yang didukung</string>
+    <string name="battery_settings">Pengaturan Baterai</string>
+    <string name="battery_will_be_paid">Akan dibayar: %1$s</string>
+    <string name="battery_nft">Transfer NFT</string>
+    <string name="battery_swap">penukaran melalui Tonkeeper</string>
+    <string name="battery_jetton">transfer token</string>
+    <string name="battery_swap_single">penukaran</string>
+    <string name="battery_transfer_single">transfer</string>
+    <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>
 </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 05257ec17..5a91ad027 100644
--- a/apps/wallet/localization/src/main/res/values-ru/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-ru/strings.xml
@@ -346,7 +346,7 @@
     <string name="language">Язык</string>
     <string name="sent">Отправлено</string>
     <string name="system">Системный</string>
-    <string name="network_fee">Комиссия сети</string>
+    <string name="network_fee">Комиссия</string>
     <string name="confirm">Подтвердить</string>
     <string name="send_request_comment">Обязательно укажите memo или тег при отправке на биржу.</string>
     <string name="banner_top">Сейчас вы используете экспериментальную версию Tonkeeper.</string>
@@ -402,4 +402,61 @@
     <string name="spam">Спам</string>
     <string name="later">Позже</string>
     <string name="testers_chat">Сообщить об ошибке (чат в Telegram)</string>
+
+    <string name="battery">Батарейка</string>
+    <string name="battery_refill_title">Батарейка Tonkeeper</string>
+    <string name="battery_refill_subtitle">Обменивайте через Tonkeeper, отправляйте токены.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s заряд</item>
+        <item quantity="few">%1$s заряда</item>
+        <item quantity="many">%1$s зарядов</item>
+        <item quantity="other">%1$s зарядов</item>
+    </plurals>
+    <string name="battery_refill_crypto">Зарядить за %1$s</string>
+    <string name="battery_refill_gift">Батарейка в подарок</string>
+    <string name="battery_refill_gift_subtitle">Поделись с друзьями</string>
+    <string name="battery_supported_transaction">Поддерживаемые транзакции</string>
+    <string name="battery_settings">Настройки батарейки</string>
+    <string name="battery_will_be_paid">Будут оплачены: %1$s</string>
+    <string name="battery_nft">отправка NFT</string>
+    <string name="battery_swap">обмен через Tonkeeper</string>
+    <string name="battery_jetton">отправка токенов</string>
+    <string name="battery_swap_single">обмен</string>
+    <string name="battery_transfer_single">отправку</string>
+    <plurals name="battery_charges_per_action">
+        <item quantity="one">≈ %1$s заряд за %2$s</item>
+        <item quantity="few">≈ %1$s заряда за %2$s</item>
+        <item quantity="many">≈ %1$s зарядов за %2$s</item>
+        <item quantity="other">≈ %1$s зарядов за %2$s</item>
+    </plurals>
+    <plurals name="battery_nft">
+        <item quantity="one">≈ %1$s отправка NFT</item>
+        <item quantity="few">≈ %1$s отправки NFT</item>
+        <item quantity="many">≈ %1$s отправок NFT</item>
+        <item quantity="other">≈ %1$s отправок NFT</item>
+    </plurals>
+    <plurals name="battery_swap">
+        <item quantity="one">≈ %1$s обмен через Tonkeeper</item>
+        <item quantity="few">≈ %1$s обмена через Tonkeeper</item>
+        <item quantity="many">≈ %1$s обменов через Tonkeeper</item>
+        <item quantity="other">≈ %1$s обменов через Tonkeeper</item>
+    </plurals>
+    <plurals name="battery_jetton">
+        <item quantity="one">≈ %1$s отправка токенов</item>
+        <item quantity="few">≈ %1$s отправки токенов</item>
+        <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>
+    <string name="battery_gift_title">Подарок</string>
+    <string name="battery_other_title">Другое количество</string>
+    <string name="battery_other_subtitle">Ввести вручную</string>
+    <string name="battery_max_input_amount">Максимальная сумма: %1$s</string>
+    <string name="battery_please_wait">Батарейка зарядится за пару минут</string>
+    <string name="battery_refund_title">История зарядов</string>
+    <string name="battery_refund_subtitle">Пополнения и возврат</string>
+    <string name="promocode_hint">Промокод</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 06a902023..e145a745f 100644
--- a/apps/wallet/localization/src/main/res/values-tr/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-tr/strings.xml
@@ -358,4 +358,29 @@
     <string name="spam">Spam</string>
     <string name="later">Daha sonra</string>
     <string name="testers_chat">Hata bildir (Telegram\'da sohbet)</string>
+    <string name="battery">Batarya</string>
+    <string name="battery_refill_title">Tonkeeper Batarya</string>
+    <string name="battery_refill_subtitle">Tonkeeper ile takas yapın, token ve NFT gönderin.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s şarj</item>
+        <item quantity="other">%1$s şarj</item>
+    </plurals>
+    <string name="battery_refill_crypto"> %1$s ile Şarj Et</string>
+    <string name="battery_refill_gift">Batarya Hediyesi</string>
+    <string name="battery_refill_gift_subtitle">Arkadaşlarla paylaş</string>
+    <string name="battery_supported_transaction">Desteklenen işlemler</string>
+    <string name="battery_settings">Batarya Ayarları</string>
+    <string name="battery_will_be_paid">Ödenecek: %1$s</string>
+    <string name="battery_nft">NFT transferleri</string>
+    <string name="battery_swap">Tonkeeper ile takas</string>
+    <string name="battery_jetton">token transferleri</string>
+    <string name="battery_swap_single">takas</string>
+    <string name="battery_transfer_single">transfer</string>
+    <plurals name="battery_charges_per_action">
+        <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>
 </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 615da3314..3b9bc202e 100644
--- a/apps/wallet/localization/src/main/res/values-uk/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-uk/strings.xml
@@ -358,4 +358,33 @@
     <string name="spam">Спам</string>
     <string name="later">Пізніше</string>
     <string name="testers_chat">Повідомити про баг (чат в Telegram)</string>
+    <string name="battery">Батарея</string>
+    <string name="battery_refill_title">Батарея Tonkeeper</string>
+    <string name="battery_refill_subtitle">Обмін через Tonkeeper, надсилання токенів і NFT.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s заряд</item>
+        <item quantity="few">%1$s заряди</item>
+        <item quantity="many">%1$s зарядів</item>
+        <item quantity="other">%1$s зарядів</item>
+    </plurals>
+    <string name="battery_refill_crypto">Поповнити за %1$s</string>
+    <string name="battery_refill_gift">Подарунок батареї</string>
+    <string name="battery_refill_gift_subtitle">Поділитися з друзями</string>
+    <string name="battery_supported_transaction">Підтримувані транзакції</string>
+    <string name="battery_settings">Налаштування батареї</string>
+    <string name="battery_will_be_paid">Буде сплачено: %1$s</string>
+    <string name="battery_nft">Трансфери NFT</string>
+    <string name="battery_swap">обміни через Tonkeeper</string>
+    <string name="battery_jetton">трансфери токенів</string>
+    <string name="battery_swap_single">обмін</string>
+    <string name="battery_transfer_single">трансфер</string>
+    <plurals name="battery_charges_per_action">
+        <item quantity="one">≈ %1$s заряд за %2$s</item>
+        <item quantity="few">≈ %1$s заряди за %2$s</item>
+        <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>
 </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 d3a456d05..9015a9f06 100644
--- a/apps/wallet/localization/src/main/res/values-uz/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-uz/strings.xml
@@ -358,4 +358,29 @@
     <string name="spam">Spam</string>
     <string name="later">Keyinchalik</string>
     <string name="testers_chat">Xato haqida xabar berish (Telegramda suhbat)</string>
+    <string name="battery">Batareya</string>
+    <string name="battery_refill_title">Tonkeeper Batareya</string>
+    <string name="battery_refill_subtitle">Tonkeeper orqali almashtirish, tokenlar va NFTlarni yuboring.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s zaryad</item>
+        <item quantity="other">%1$s zaryadlar</item>
+    </plurals>
+    <string name="battery_refill_crypto">%1$s bilan qayta zaryadlang</string>
+    <string name="battery_refill_gift">Batareya Sovg‘asi</string>
+    <string name="battery_refill_gift_subtitle">Do‘stlar bilan ulashing</string>
+    <string name="battery_supported_transaction">Qo‘llab-quvvatlanadigan tranzaktsiyalar</string>
+    <string name="battery_settings">Batareya Sozlamalari</string>
+    <string name="battery_will_be_paid">To‘lanadi: %1$s</string>
+    <string name="battery_nft">NFT o\'tkazmalari</string>
+    <string name="battery_swap">Tonkeeper orqali almashtirish</string>
+    <string name="battery_jetton">token o\'tkazmalari</string>
+    <string name="battery_swap_single">almashtirish</string>
+    <string name="battery_transfer_single">o‘tkazish</string>
+    <plurals name="battery_charges_per_action">
+        <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>
 </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 8e132139b..ae78e9804 100644
--- a/apps/wallet/localization/src/main/res/values-zh/strings.xml
+++ b/apps/wallet/localization/src/main/res/values-zh/strings.xml
@@ -358,4 +358,27 @@
     <string name="spam">垃圾邮件</string>
     <string name="later">之后</string>
     <string name="testers_chat">报告错误（在 Telegram 中聊天）</string>
+    <string name="battery">电池</string>
+    <string name="battery_refill_title">Tonkeeper 电池</string>
+    <string name="battery_refill_subtitle">通过 Tonkeeper 交换，发送代币和 NFT。</string>
+    <plurals name="battery_current_charges">
+        <item quantity="other">%1$s 次充电</item>
+    </plurals>
+    <string name="battery_refill_crypto">使用 %1$s 充值</string>
+    <string name="battery_refill_gift">电池礼物</string>
+    <string name="battery_refill_gift_subtitle">与朋友分享</string>
+    <string name="battery_supported_transaction">支持的交易</string>
+    <string name="battery_settings">电池设置</string>
+    <string name="battery_will_be_paid">将支付：%1$s</string>
+    <string name="battery_nft">NFT 转账</string>
+    <string name="battery_swap">通过 Tonkeeper 交换</string>
+    <string name="battery_jetton">代币转账</string>
+    <string name="battery_swap_single">交换</string>
+    <string name="battery_transfer_single">转账</string>
+    <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>
 </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 86528df3c..9d3b55671 100644
--- a/apps/wallet/localization/src/main/res/values/strings.xml
+++ b/apps/wallet/localization/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="toncoin" translatable="false">Toncoin</string>
     <string name="bitcoin" translatable="false">Bitcoin</string>
     <string name="w5beta" translatable="false">W5 Beta</string>
+    <string name="beta" translatable="false">Beta</string>
     <string name="ok" translatable="false">OK</string>
     <string name="w5" translatable="false">W5</string>
     <string name="w5_wallet">Wallet W5</string>
@@ -413,4 +414,62 @@
     <string name="bluetooth_permissions_alert_title">Bluetooth Permissions</string>
     <string name="bluetooth_permissions_alert_message">Please enable Bluetooth permissions in your settings to use this feature</string>
     <string name="bluetooth_permissions_alert_open_settings">Open Settings</string>
+
+    <string name="battery">Battery</string>
+    <string name="battery_refill_title">Tonkeeper Battery</string>
+    <string name="battery_refill_subtitle">Swap via Tonkeeper, send tokens and NFTs.</string>
+    <plurals name="battery_current_charges">
+        <item quantity="one">%1$s charge</item>
+        <item quantity="few">%1$s charges</item>
+        <item quantity="many">%1$s charges</item>
+        <item quantity="other">%1$s charges</item>
+    </plurals>
+    <string name="battery_refill_crypto">Recharge with %1$s</string>
+    <string name="battery_refill_gift">Battery Gift</string>
+    <string name="battery_refill_gift_subtitle">Share with friends</string>
+    <string name="battery_supported_transaction">Supported transactions</string>
+    <string name="transactions">Transactions</string>
+    <string name="battery_settings">Battery Settings</string>
+    <string name="battery_will_be_paid">Will be paid: %1$s</string>
+    <string name="battery_nft">NFT transfers</string>
+    <string name="battery_swap">swaps via Tonkeeper</string>
+    <string name="battery_jetton">token transfers</string>
+    <string name="battery_swap_single">swap</string>
+    <string name="battery_transfer_single">transfer</string>
+    <plurals name="battery_charges_per_action">
+        <item quantity="one">≈ %1$s charge per %2$s</item>
+        <item quantity="few">≈ %1$s charges per %2$s</item>
+        <item quantity="many">≈ %1$s charges per %2$s</item>
+        <item quantity="other">≈ %1$s charges per %2$s</item>
+    </plurals>
+    <plurals name="battery_nft">
+        <item quantity="one">≈ %1$s NFT transfer</item>
+        <item quantity="few">≈ %1$s NFT transfers</item>
+        <item quantity="many">≈ %1$s NFT transfers</item>
+        <item quantity="other">≈ %1$s NFT transfers</item>
+    </plurals>
+    <plurals name="battery_swap">
+        <item quantity="one">≈ %1$s swap via Tonkeeper</item>
+        <item quantity="few">≈ %1$s swaps via Tonkeeper</item>
+        <item quantity="many">≈ %1$s swaps via Tonkeeper</item>
+        <item quantity="other">≈ %1$s swaps via Tonkeeper</item>
+    </plurals>
+    <plurals name="battery_jetton">
+        <item quantity="one">≈ %1$s token transfer</item>
+        <item quantity="few">≈ %1$s token transfers</item>
+        <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>
+    <string name="battery_gift_title">Gift</string>
+    <string name="battery_other_title">Other</string>
+    <string name="battery_other_subtitle">Enter amount manually</string>
+    <string name="battery_max_input_amount">Max input amount is %1$s</string>
+    <string name="battery_please_wait">Battery will charge in a few minutes</string>
+    <string name="battery_refund_title">Charge History</string>
+    <string name="battery_refund_subtitle">Recharges and refunds</string>
+    <string name="promocode_hint">Promo Code</string>
 </resources>
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/Dependence.kt b/buildSrc/src/main/kotlin/Dependence.kt
index db37650f7..bc68f6140 100644
--- a/buildSrc/src/main/kotlin/Dependence.kt
+++ b/buildSrc/src/main/kotlin/Dependence.kt
@@ -140,6 +140,7 @@ object Dependence {
             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"
         }
 
     }
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/BaseWalletContract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/BaseWalletContract.kt
index b6a303f24..2adc78cd9 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/BaseWalletContract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/BaseWalletContract.kt
@@ -1,5 +1,7 @@
 package com.tonapps.blockchain.ton.contract
 
+import com.tonapps.blockchain.ton.tlb.CellStringTlbConstructor
+import kotlinx.io.bytestring.ByteString
 import org.ton.api.pk.PrivateKeyEd25519
 import org.ton.api.pub.PublicKeyEd25519
 import org.ton.bitstring.BitString
@@ -91,6 +93,12 @@ abstract class BaseWalletContract(
         SmartContract.address(workchain, stateInit)
     }
 
+    abstract val features: WalletFeature
+
+    fun isSupportedFeature(feature: WalletFeature): Boolean {
+        return features.contains(feature)
+    }
+
     abstract fun getStateCell(): Cell
 
     abstract fun getCode(): Cell
@@ -100,7 +108,7 @@ abstract class BaseWalletContract(
     abstract fun createTransferUnsignedBody(
         validUntil: Long,
         seqno: Int,
-        internalMessage: Boolean = true,
+        internalMessage: Boolean = false,
         queryId: BigInteger? = null,
         vararg gifts: WalletTransfer
     ): Cell
@@ -201,4 +209,20 @@ abstract class BaseWalletContract(
         }
         return cell
     }
+
+    fun createBatteryBody(address: MsgAddressInt? = null, appliedPromo: String? = null): Cell {
+        val cell = buildCell {
+            storeUInt(0xb7b2515f, 32)
+            storeBit(address != null)
+            if (address != null) {
+                storeTlb(MsgAddressInt, address)
+            }
+            storeBit(appliedPromo.isNullOrEmpty())
+            if (!appliedPromo.isNullOrEmpty()) {
+                storeTlb(CellStringTlbConstructor, ByteString(*appliedPromo.encodeToByteArray()))
+            }
+        }
+
+        return cell
+    }
 }
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/LockupContractV1.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/LockupContractV1.kt
index 7f9b8d2f2..e5c4f91a8 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/LockupContractV1.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/LockupContractV1.kt
@@ -15,6 +15,8 @@ class LockupContractV1(
     private val allowedDestinations: Boolean
 ): BaseWalletContract(publicKey = publicKey) {
 
+    override val features: WalletFeature = WalletFeature.NONE
+
     override fun getStateCell(): Cell {
         return CellBuilder.createCell {
             storeUInt(0, 32)
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletFeature.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletFeature.kt
new file mode 100644
index 000000000..904b0c1c7
--- /dev/null
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletFeature.kt
@@ -0,0 +1,16 @@
+package com.tonapps.blockchain.ton.contract
+
+@JvmInline
+value class WalletFeature(private val flag: Int) {
+
+    companion object {
+        val NONE = WalletFeature(0)
+        val GASLESS = WalletFeature(1)
+        val SIGNED_INTERNALS = WalletFeature(2)
+    }
+
+    infix fun and(other: WalletFeature): WalletFeature = WalletFeature(this.flag and other.flag)
+    infix fun or(other: WalletFeature): WalletFeature = WalletFeature(this.flag or other.flag)
+
+    operator fun contains(feature: WalletFeature): Boolean = (this.flag and feature.flag) == feature.flag
+}
\ No newline at end of file
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R1Contract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R1Contract.kt
index af92eebbe..3ac58c04a 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R1Contract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R1Contract.kt
@@ -17,6 +17,8 @@ open class WalletV3R1Contract(
     publicKey: PublicKeyEd25519,
 ) : BaseWalletContract(workchain, publicKey) {
 
+    override val features: WalletFeature = WalletFeature.NONE
+
     override fun getWalletVersion() = WalletVersion.V3R1
 
     override fun getStateCell(): Cell {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R2Contract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R2Contract.kt
index dca3fd48f..a07053aa8 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R2Contract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV3R2Contract.kt
@@ -10,6 +10,8 @@ class WalletV3R2Contract(
     publicKey: PublicKeyEd25519,
 ) : WalletV3R1Contract(workchain, publicKey) {
 
+    override val features: WalletFeature = WalletFeature.NONE
+
     override fun getWalletVersion() = WalletVersion.V3R2
 
     override fun getCode(): Cell {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R1Contract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R1Contract.kt
index 33b854d1a..7693e85a2 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R1Contract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R1Contract.kt
@@ -19,6 +19,8 @@ open class WalletV4R1Contract(
     publicKey: PublicKeyEd25519,
 ) : BaseWalletContract(workchain, publicKey) {
 
+    override val features: WalletFeature = WalletFeature.NONE
+
     override fun getWalletVersion() = WalletVersion.V4R1
 
     override fun getStateCell(): Cell {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R2Contract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R2Contract.kt
index 0f98990b2..d042e3238 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R2Contract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV4R2Contract.kt
@@ -17,6 +17,8 @@ class WalletV4R2Contract(
     publicKey: PublicKeyEd25519,
 ) : WalletV4R1Contract(workchain, publicKey) {
 
+    override val features: WalletFeature = WalletFeature.NONE
+
     override fun getWalletVersion() = WalletVersion.V4R2
 
     override fun getCode(): Cell {
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5BetaContract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5BetaContract.kt
index 992a31118..0bb16eaf3 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5BetaContract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5BetaContract.kt
@@ -24,6 +24,8 @@ class WalletV5BetaContract(
     private val subwalletNumber: Int = 0
 ) : BaseWalletContract(workchain, publicKey) {
 
+    override val features: WalletFeature = WalletFeature.GASLESS and WalletFeature.SIGNED_INTERNALS
+
     override fun getWalletVersion() = WalletVersion.V5BETA
 
     override fun getStateCell(): Cell {
@@ -70,8 +72,10 @@ class WalletV5BetaContract(
 
         val actions = packV5Actions(*gifts)
 
+        val opCode = if (internalMessage) 0x73696e74 else 0x7369676e
+
         return buildCell {
-            storeUInt(0x7369676e, 32)
+            storeUInt(opCode, 32)
             storeInt(networkGlobalId, 32)
             storeInt(workchain, 8)
             storeUInt(0, 8)
diff --git a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5R1Contract.kt b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5R1Contract.kt
index 6d3d07da4..b661dbb11 100644
--- a/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5R1Contract.kt
+++ b/lib/blockchain/src/main/java/com/tonapps/blockchain/ton/contract/WalletV5R1Contract.kt
@@ -66,9 +66,10 @@ class WalletV5R1Contract(
                 storeInt(id, 31)
             }
         }
-
     }
 
+    override val features: WalletFeature = WalletFeature.GASLESS and WalletFeature.SIGNED_INTERNALS
+
     constructor(publicKey: PublicKeyEd25519, network: TonNetwork) : this(
         publicKey = publicKey,
         networkGlobalId = network.value
@@ -117,8 +118,10 @@ class WalletV5R1Contract(
 
         val actions = packV5Actions(*gifts)
 
+        val opCode = if (internalMessage) 0x73696e74 else 0x7369676e
+
         return buildCell {
-            storeUInt(0x7369676e, 32)
+            storeUInt(opCode, 32)
             storeUInt(context.serialized, 32)
             storeSeqAndValidUntil(seqno, validUntil)
             storeBuilder(actions)
diff --git a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
index 4c20fb238..0f12c0f68 100644
--- a/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
+++ b/lib/extensions/src/main/java/com/tonapps/extensions/SharedPreferences.kt
@@ -21,6 +21,20 @@ fun SharedPreferences.putByteArray(key: String, value: ByteArray?) {
     }
 }
 
+fun SharedPreferences.getIntArray(key: String): IntArray? {
+    if (!contains(key)) {
+        return null
+    }
+    val value = getString(key, null) ?: return null
+    return value.split(",").mapNotNull { it.toIntOrNull() }.toIntArray()
+}
+
+fun SharedPreferences.putIntArray(key: String, value: IntArray) {
+    edit {
+        putString(key, value.joinToString(","))
+    }
+}
+
 fun SharedPreferences.remove(key: String) {
     edit {
         remove(key)
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 b5ef9fa85..05639cfe3 100644
--- a/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
+++ b/lib/icu/src/main/java/com/tonapps/icu/CurrencyFormatter.kt
@@ -58,7 +58,7 @@ object CurrencyFormatter {
 
     fun formatFiat(
         currency: String,
-        value: Coins,
+        value: BigDecimal,
         customScale: Int = 2,
         roundingMode: RoundingMode = RoundingMode.DOWN,
         replaceSymbol: Boolean = true,
@@ -66,6 +66,14 @@ object CurrencyFormatter {
         return format(currency, value, customScale, roundingMode, replaceSymbol)
     }
 
+    fun formatFiat(
+        currency: String,
+        value: Coins,
+        customScale: Int = 2,
+        roundingMode: RoundingMode = RoundingMode.DOWN,
+        replaceSymbol: Boolean = true,
+    ) = formatFiat(currency, value.value, customScale, roundingMode, replaceSymbol)
+
     fun CharSequence.withCustomSymbol(context: Context): CharSequence {
         if (true) { // Not now... maybe in future
             return this
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e0f0e08de..fcd7d957c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -66,3 +66,4 @@ include(":apps:wallet:data:rn")
 include(":apps:wallet:data:passcode")
 include(":apps:wallet:data:staking")
 include(":apps:wallet:data:purchase")
+include(":apps:wallet:data:battery")
diff --git a/tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
new file mode 100644
index 000000000..4c02ea5db
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/BatteryApi.kt
@@ -0,0 +1,1409 @@
+/**
+ *
+ * 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.apis
+
+import java.io.IOException
+import okhttp3.OkHttpClient
+import okhttp3.HttpUrl
+
+import io.batteryapi.models.AndroidBatteryPurchaseRequest
+import io.batteryapi.models.AndroidBatteryPurchaseStatus
+import io.batteryapi.models.AppStoreNotificationRequest
+import io.batteryapi.models.Balance
+import io.batteryapi.models.Config
+import io.batteryapi.models.CreateCustomRefundRequest
+import io.batteryapi.models.EmulateMessageToWalletRequest
+import io.batteryapi.models.EstimateGaslessCostRequest
+import io.batteryapi.models.GaslessEstimation
+import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
+import io.batteryapi.models.IOSBatteryPurchaseStatus
+import io.batteryapi.models.IosBatteryPurchaseRequest
+import io.batteryapi.models.PromoCodeBatteryPurchaseRequest
+import io.batteryapi.models.PromoCodeBatteryPurchaseStatus
+import io.batteryapi.models.Purchases
+import io.batteryapi.models.RechargeMethods
+import io.batteryapi.models.RequestRefundRequest
+import io.batteryapi.models.ResetUserBalanceRequest
+import io.batteryapi.models.Status
+import io.batteryapi.models.Transactions
+
+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: OkHttpClient = ApiClient.defaultClient) : ApiClient(basePath, client) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty(ApiClient.baseUrlKey, "https://battery.tonkeeper.com")
+        }
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = androidBatteryPurchaseWithHttpInfo(xTonConnectAuth = xTonConnectAuth, androidBatteryPurchaseRequest = androidBatteryPurchaseRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as AndroidBatteryPurchaseStatus
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = androidBatteryPurchaseRequestConfig(xTonConnectAuth = xTonConnectAuth, androidBatteryPurchaseRequest = androidBatteryPurchaseRequest)
+
+        return request<AndroidBatteryPurchaseRequest, AndroidBatteryPurchaseStatus>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/purchase-battery/android",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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 {
+        val localVarResponse = appStoreNotificationWithHttpInfo(appStoreNotificationRequest = appStoreNotificationRequest)
+
+        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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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?> {
+        val localVariableConfig = appStoreNotificationRequestConfig(appStoreNotificationRequest = appStoreNotificationRequest)
+
+        return request<AppStoreNotificationRequest, kotlin.Any>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/purchase-battery/ios/app-store-notification",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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> {
+        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.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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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>?> {
+        val localVariableConfig = createCustomRefundRequestConfig(token = token, createCustomRefundRequest = createCustomRefundRequest)
+
+        return request<CreateCustomRefundRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+            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>>()
+            .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/create-custom-refund",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as GaslessEstimation
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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)
+
+        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> {
+        val localVariableBody = estimateGaslessCostRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (walletAddress != null) {
+                    put("wallet_address", listOf(walletAddress.toString()))
+                }
+                if (walletPublicKey != null) {
+                    put("wallet_public_key", listOf(walletPublicKey.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth?.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/gasless/estimate-cost/{jetton_master}".replace("{"+"jetton_master"+"}", encodeURIComponent(jettonMaster.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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> {
+        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.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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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>?> {
+        val localVariableConfig = extendRefundPeriodRequestConfig(purchaseId = purchaseId, token = token)
+
+        return request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+            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>>()
+            .apply {
+                put("token", listOf(token.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/restricted/purchases/{purchase_id}/extend-refund-period".replace("{"+"purchase_id"+"}", encodeURIComponent(purchaseId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * enum for parameter units
+     */
+     enum class UnitsGetBalance(val value: kotlin.String) {
+         @Json(name = "usd") usd("usd"),
+         @Json(name = "ton") ton("ton")
+     }
+
+    /**
+     * 
+     * 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)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Balance
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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)
+
+        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> {
+        val localVariableBody = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, kotlin.collections.List<kotlin.String>>()
+            .apply {
+                if (units != null) {
+                    put("units", listOf(units.value))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/balance",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getConfigWithHttpInfo()
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Config
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = getConfigRequestConfig()
+
+        return request<Unit, Config>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * To obtain the request config of the operation getConfig
+     *
+     * @return RequestConfig
+     */
+    fun getConfigRequestConfig() : 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 = "/config",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getPurchasesWithHttpInfo(xTonConnectAuth = xTonConnectAuth, limit = limit, offset = offset, includeGiftsOnTheWay = includeGiftsOnTheWay)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Purchases
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = getPurchasesRequestConfig(xTonConnectAuth = xTonConnectAuth, limit = limit, offset = offset, includeGiftsOnTheWay = includeGiftsOnTheWay)
+
+        return request<Unit, Purchases>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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>>()
+            .apply {
+                if (limit != null) {
+                    put("limit", listOf(limit.toString()))
+                }
+                if (offset != null) {
+                    put("offset", listOf(offset.toString()))
+                }
+                if (includeGiftsOnTheWay != null) {
+                    put("include_gifts_on_the_way", listOf(includeGiftsOnTheWay.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/purchases",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getRechargeMethodsWithHttpInfo(includeRechargeOnly = includeRechargeOnly)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as RechargeMethods
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = getRechargeMethodsRequestConfig(includeRechargeOnly = includeRechargeOnly)
+
+        return request<Unit, RechargeMethods>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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>>()
+            .apply {
+                if (includeRechargeOnly != null) {
+                    put("include_recharge_only", listOf(includeRechargeOnly.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/recharge-methods",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getStatusWithHttpInfo(xTonConnectAuth = xTonConnectAuth)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Status
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = getStatusRequestConfig(xTonConnectAuth = xTonConnectAuth)
+
+        return request<Unit, Status>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/status",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getTransactionsWithHttpInfo(xTonConnectAuth = xTonConnectAuth, limit = limit, offset = offset)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Transactions
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = getTransactionsRequestConfig(xTonConnectAuth = xTonConnectAuth, limit = limit, offset = offset)
+
+        return request<Unit, Transactions>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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>>()
+            .apply {
+                if (limit != null) {
+                    put("limit", listOf(limit.toString()))
+                }
+                if (offset != null) {
+                    put("offset", listOf(offset.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/transactions",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 iosBatteryPurchase(xTonConnectAuth: kotlin.String, iosBatteryPurchaseRequest: IosBatteryPurchaseRequest) : IOSBatteryPurchaseStatus {
+        val localVarResponse = iosBatteryPurchaseWithHttpInfo(xTonConnectAuth = xTonConnectAuth, iosBatteryPurchaseRequest = iosBatteryPurchaseRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as IOSBatteryPurchaseStatus
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = iosBatteryPurchaseRequestConfig(xTonConnectAuth = xTonConnectAuth, iosBatteryPurchaseRequest = iosBatteryPurchaseRequest)
+
+        return request<IosBatteryPurchaseRequest, IOSBatteryPurchaseStatus>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/purchase-battery/ios",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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 promoCodeBatteryPurchase(xTonConnectAuth: kotlin.String, promoCodeBatteryPurchaseRequest: PromoCodeBatteryPurchaseRequest, acceptLanguage: kotlin.String? = "en") : PromoCodeBatteryPurchaseStatus {
+        val localVarResponse = promoCodeBatteryPurchaseWithHttpInfo(xTonConnectAuth = xTonConnectAuth, promoCodeBatteryPurchaseRequest = promoCodeBatteryPurchaseRequest, acceptLanguage = acceptLanguage)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as PromoCodeBatteryPurchaseStatus
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = promoCodeBatteryPurchaseRequestConfig(xTonConnectAuth = xTonConnectAuth, promoCodeBatteryPurchaseRequest = promoCodeBatteryPurchaseRequest, acceptLanguage = acceptLanguage)
+
+        return request<PromoCodeBatteryPurchaseRequest, PromoCodeBatteryPurchaseStatus>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/purchase-battery/promo-code",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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)
+
+        return request<RequestRefundRequest, Unit>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/request-refund",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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> {
+        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.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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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>?> {
+        val localVariableConfig = resetUserBalanceRequestConfig(userId = userId, token = token, resetUserBalanceRequest = resetUserBalanceRequest)
+
+        return request<ResetUserBalanceRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+            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>>()
+            .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}/reset-balance".replace("{"+"user_id"+"}", encodeURIComponent(userId.toString())),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 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)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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)
+
+        return request<EmulateMessageToWalletRequest, Unit>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/message",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            requiresAuthentication = false,
+            body = localVariableBody
+        )
+    }
+
+    /**
+     * 
+     * 
+     * @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> {
+        val localVarResponse = verifyPurchasePromoWithHttpInfo(promo = promo)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, 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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 
+     * @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>?> {
+        val localVariableConfig = verifyPurchasePromoRequestConfig(promo = promo)
+
+        return request<Unit, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+            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>>()
+            .apply {
+                if (promo != null) {
+                    put("promo", listOf(promo.toString()))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.GET,
+            path = "/purchase-battery/verify-purchase-promo",
+            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/batteryapi/apis/ConnectApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt
new file mode 100644
index 000000000..a03d3a5ba
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/ConnectApi.kt
@@ -0,0 +1,120 @@
+/**
+ *
+ * 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.apis
+
+import java.io.IOException
+import okhttp3.OkHttpClient
+import okhttp3.HttpUrl
+
+import io.batteryapi.models.GetTonConnectPayload200Response
+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
+
+class ConnectApi(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://battery.tonkeeper.com")
+        }
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = getTonConnectPayloadWithHttpInfo()
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as GetTonConnectPayload200Response
+            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 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?> {
+        val localVariableConfig = getTonConnectPayloadRequestConfig()
+
+        return request<Unit, GetTonConnectPayload200Response>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * To obtain the request config of the operation getTonConnectPayload
+     *
+     * @return RequestConfig
+     */
+    fun getTonConnectPayloadRequestConfig() : 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 = "/tonconnect/payload",
+            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/batteryapi/apis/EmulationApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt
new file mode 100644
index 000000000..fea2f16c0
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/EmulationApi.kt
@@ -0,0 +1,132 @@
+/**
+ *
+ * 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.apis
+
+import java.io.IOException
+import okhttp3.OkHttpClient
+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
+
+class EmulationApi(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://battery.tonkeeper.com")
+        }
+    }
+
+    /**
+     * 
+     * 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)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, 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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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)
+
+        return request<EmulateMessageToWalletRequest, kotlin.collections.Map<kotlin.String, kotlin.Any>>(
+            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> {
+        val localVariableBody = emulateMessageToWalletRequest
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        acceptLanguage?.apply { localVariableHeaders["Accept-Language"] = this.toString() }
+        xTonConnectAuth.apply { localVariableHeaders["X-TonConnect-Auth"] = this.toString() }
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/wallet/emulate",
+            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/batteryapi/apis/WalletApi.kt b/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt
new file mode 100644
index 000000000..aa4b6da37
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/apis/WalletApi.kt
@@ -0,0 +1,125 @@
+/**
+ *
+ * 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.apis
+
+import java.io.IOException
+import okhttp3.OkHttpClient
+import okhttp3.HttpUrl
+
+import io.batteryapi.models.GetTonConnectPayloadDefaultResponse
+import io.batteryapi.models.TonConnectProof200Response
+import io.batteryapi.models.TonConnectProofRequest
+
+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 WalletApi(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://battery.tonkeeper.com")
+        }
+    }
+
+    /**
+     * 
+     * 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 {
+        val localVarResponse = tonConnectProofWithHttpInfo(tonConnectProofRequest = tonConnectProofRequest)
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as TonConnectProof200Response
+            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)
+            }
+        }
+    }
+
+    /**
+     * 
+     * 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?> {
+        val localVariableConfig = tonConnectProofRequestConfig(tonConnectProofRequest = tonConnectProofRequest)
+
+        return request<TonConnectProofRequest, TonConnectProof200Response>(
+            localVariableConfig
+        )
+    }
+
+    /**
+     * 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()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        localVariableHeaders["Content-Type"] = "application/json"
+        localVariableHeaders["Accept"] = "application/json"
+
+        return RequestConfig(
+            method = RequestMethod.POST,
+            path = "/tonconnect/proof",
+            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/batteryapi/infrastructure/ApiAbstractions.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000..f2bdfe2ca
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package io.batteryapi.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/batteryapi/infrastructure/ApiClient.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiClient.kt
new file mode 100644
index 000000000..c1e39f4ec
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiClient.kt
@@ -0,0 +1,255 @@
+package io.batteryapi.infrastructure
+
+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 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
+
+ val EMPTY_REQUEST: RequestBody = ByteArray(0).toRequestBody()
+
+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.batteryapi.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.batteryapi", 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<?>>
+        @Suppress("UNNECESSARY_SAFE_CALL")
+        return response.use {
+            when {
+                it.isRedirect -> Redirection(
+                    it.code,
+                    it.headers.toMultimap()
+                )
+                it.isInformational -> Informational(
+                    it.message,
+                    it.code,
+                    it.headers.toMultimap()
+                )
+                it.isSuccessful -> Success(
+                    responseBody(it.body, accept),
+                    it.code,
+                    it.headers.toMultimap()
+                )
+                it.isClientError -> ClientError(
+                    it.message,
+                    it.body?.string(),
+                    it.code,
+                    it.headers.toMultimap()
+                )
+                else -> ServerError(
+                    it.message,
+                    it.body?.string(),
+                    it.code,
+                    it.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/batteryapi/infrastructure/ApiResponse.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiResponse.kt
new file mode 100644
index 000000000..b23b055c0
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ApiResponse.kt
@@ -0,0 +1,43 @@
+package io.batteryapi.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/batteryapi/infrastructure/BigDecimalAdapter.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigDecimalAdapter.kt
new file mode 100644
index 000000000..fc838489e
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigDecimalAdapter.kt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..374f9fba6
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/BigIntegerAdapter.kt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..42aa4cfa7
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..a64ba33f3
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@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
new file mode 100644
index 000000000..03fca3572
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..3520c7c07
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..6f867a2a1
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..eee5f0b93
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/PartConfig.kt
@@ -0,0 +1,11 @@
+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/RequestConfig.kt b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000..974122e57
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestConfig.kt
@@ -0,0 +1,19 @@
+package io.batteryapi.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 params: MutableMap<String, Any> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val requiresAuthentication: Boolean,
+    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
new file mode 100644
index 000000000..a8466c3fe
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 000000000..1c454c0d8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..39d9f9293
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/Serializer.kt
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000..9acbee786
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/URIAdapter.kt
@@ -0,0 +1,13 @@
+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) = 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
new file mode 100644
index 000000000..fea6b8cb9
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+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) = 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
new file mode 100644
index 000000000..3d99d4a72
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequest.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.AndroidBatteryPurchaseRequestPurchasesInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param purchases 
+ */
+
+
+data class AndroidBatteryPurchaseRequest (
+
+    @Json(name = "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
new file mode 100644
index 000000000..e558324c4
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseRequestPurchasesInner.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.batteryapi.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param token 
+ * @param productId 
+ * @param promo 
+ */
+
+
+data class AndroidBatteryPurchaseRequestPurchasesInner (
+
+    @Json(name = "token")
+    val token: kotlin.String,
+
+    @Json(name = "product_id")
+    val productId: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..c05509c8d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatus.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.AndroidBatteryPurchaseStatusPurchasesInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param purchases 
+ */
+
+
+data class AndroidBatteryPurchaseStatus (
+
+    @Json(name = "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
new file mode 100644
index 000000000..e76d03f8f
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInner.kt
@@ -0,0 +1,51 @@
+/**
+ *
+ * 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.AndroidBatteryPurchaseStatusPurchasesInnerError
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param productId 
+ * @param token 
+ * @param success 
+ * @param error 
+ */
+
+
+data class AndroidBatteryPurchaseStatusPurchasesInner (
+
+    @Json(name = "product_id")
+    val productId: kotlin.String,
+
+    @Json(name = "token")
+    val token: kotlin.String,
+
+    @Json(name = "success")
+    val success: kotlin.Boolean,
+
+    @Json(name = "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
new file mode 100644
index 000000000..8fb814156
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AndroidBatteryPurchaseStatusPurchasesInnerError.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.batteryapi.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param msg 
+ * @param code 
+ */
+
+
+data class AndroidBatteryPurchaseStatusPurchasesInnerError (
+
+    @Json(name = "msg")
+    val msg: kotlin.String,
+
+    @Json(name = "code")
+    val code: AndroidBatteryPurchaseStatusPurchasesInnerError.Code
+
+) {
+
+    /**
+     * 
+     *
+     * Values: invalidMinusProductMinusId,userMinusNotMinusFound,purchaseMinusIsMinusAlreadyMinusUsed,temporaryMinusError,unknown
+     */
+    @JsonClass(generateAdapter = false)
+    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");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt
new file mode 100644
index 000000000..31a89c08f
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/AppStoreNotificationRequest.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param signedPayload 
+ */
+
+
+data class AppStoreNotificationRequest (
+
+    @Json(name = "signedPayload")
+    val signedPayload: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Balance.kt
new file mode 100644
index 000000000..1bef4641a
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Balance.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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param balance 
+ * @param reserved reserved amount in units (TON/USD)
+ * @param units 
+ */
+
+
+data class Balance (
+
+    @Json(name = "balance")
+    val balance: kotlin.String,
+
+    /* reserved amount in units (TON/USD) */
+    @Json(name = "reserved")
+    val reserved: kotlin.String,
+
+    @Json(name = "units")
+    val units: Balance.Units
+
+) {
+
+    /**
+     * 
+     *
+     * Values: usd,ton
+     */
+    @JsonClass(generateAdapter = false)
+    enum class Units(val value: kotlin.String) {
+        @Json(name = "usd") usd("usd"),
+        @Json(name = "ton") ton("ton");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Config.kt
new file mode 100644
index 000000000..46e4e5749
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Config.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.batteryapi.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @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.
+ */
+
+
+data class Config (
+
+    /* 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")
+    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")
+    val excessAccount: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt
new file mode 100644
index 000000000..d25bd7161
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/CreateCustomRefundRequest.kt
@@ -0,0 +1,58 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param amount 
+ * @param currency 
+ * @param comment 
+ * @param reason 
+ * @param destination 
+ * @param relayerEventId 
+ */
+
+
+data class CreateCustomRefundRequest (
+
+    @Json(name = "amount")
+    val amount: kotlin.String,
+
+    @Json(name = "currency")
+    val currency: kotlin.String,
+
+    @Json(name = "comment")
+    val comment: kotlin.String,
+
+    @Json(name = "reason")
+    val reason: kotlin.String,
+
+    @Json(name = "destination")
+    val destination: kotlin.String,
+
+    @Json(name = "relayer_event_id")
+    val relayerEventId: kotlin.Int? = null
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt
new file mode 100644
index 000000000..2c0e44410
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EmulateMessageToWalletRequest.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param boc 
+ */
+
+
+data class EmulateMessageToWalletRequest (
+
+    @Json(name = "boc")
+    val boc: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt
new file mode 100644
index 000000000..de7235beb
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Error.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param error 
+ */
+
+
+data class Error (
+
+    @Json(name = "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
new file mode 100644
index 000000000..55ba0092d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/EstimateGaslessCostRequest.kt
@@ -0,0 +1,42 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param payload 
+ * @param battery 
+ */
+
+
+data class EstimateGaslessCostRequest (
+
+    @Json(name = "payload")
+    val payload: kotlin.String,
+
+    @Json(name = "battery")
+    val battery: kotlin.Boolean? = true
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt
new file mode 100644
index 000000000..a3a433cdf
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GaslessEstimation.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param commission 
+ */
+
+
+data class GaslessEstimation (
+
+    @Json(name = "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
new file mode 100644
index 000000000..718c852c1
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayload200Response.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param payload 
+ */
+
+
+data class GetTonConnectPayload200Response (
+
+    @Json(name = "payload")
+    val payload: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt b/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt
new file mode 100644
index 000000000..32638f98f
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/GetTonConnectPayloadDefaultResponse.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param error 
+ */
+
+
+data class GetTonConnectPayloadDefaultResponse (
+
+    @Json(name = "error")
+    val error: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.kt
new file mode 100644
index 000000000..9004569bf
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatus.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.IOSBatteryPurchaseStatusTransactionsInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param transactions 
+ */
+
+
+data class IOSBatteryPurchaseStatus (
+
+    @Json(name = "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
new file mode 100644
index 000000000..274ce23fb
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInner.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.batteryapi.models
+
+import io.batteryapi.models.IOSBatteryPurchaseStatusTransactionsInnerError
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param transactionId 
+ * @param success 
+ * @param error 
+ */
+
+
+data class IOSBatteryPurchaseStatusTransactionsInner (
+
+    @Json(name = "transaction_id")
+    val transactionId: kotlin.String,
+
+    @Json(name = "success")
+    val success: kotlin.Boolean,
+
+    @Json(name = "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
new file mode 100644
index 000000000..c18aec4af
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IOSBatteryPurchaseStatusTransactionsInnerError.kt
@@ -0,0 +1,56 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param msg 
+ * @param code 
+ */
+
+
+data class IOSBatteryPurchaseStatusTransactionsInnerError (
+
+    @Json(name = "msg")
+    val msg: kotlin.String,
+
+    @Json(name = "code")
+    val code: IOSBatteryPurchaseStatusTransactionsInnerError.Code
+
+) {
+
+    /**
+     * 
+     *
+     * Values: invalidMinusBundleMinusId,invalidMinusProductMinusId,userMinusNotMinusFound,purchaseMinusIsMinusAlreadyMinusUsed,temporaryMinusError,unknown
+     */
+    @JsonClass(generateAdapter = false)
+    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");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.kt
new file mode 100644
index 000000000..ed426738d
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequest.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.IosBatteryPurchaseRequestTransactionsInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param transactions 
+ */
+
+
+data class IosBatteryPurchaseRequest (
+
+    @Json(name = "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
new file mode 100644
index 000000000..b78519dfe
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/IosBatteryPurchaseRequestTransactionsInner.kt
@@ -0,0 +1,42 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param id 
+ * @param promo 
+ */
+
+
+data class IosBatteryPurchaseRequestTransactionsInner (
+
+    @Json(name = "id")
+    val id: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..01aae0599
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseRequest.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param promoCode 
+ */
+
+
+data class PromoCodeBatteryPurchaseRequest (
+
+    @Json(name = "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
new file mode 100644
index 000000000..d1a6ca9e4
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatus.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.batteryapi.models
+
+import io.batteryapi.models.PromoCodeBatteryPurchaseStatusError
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param balanceChange 
+ * @param success 
+ * @param error 
+ */
+
+
+data class PromoCodeBatteryPurchaseStatus (
+
+    @Json(name = "balance_change")
+    val balanceChange: kotlin.String,
+
+    @Json(name = "success")
+    val success: kotlin.Boolean,
+
+    @Json(name = "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
new file mode 100644
index 000000000..c92c46295
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PromoCodeBatteryPurchaseStatusError.kt
@@ -0,0 +1,53 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param msg 
+ * @param code 
+ */
+
+
+data class PromoCodeBatteryPurchaseStatusError (
+
+    @Json(name = "msg")
+    val msg: kotlin.String,
+
+    @Json(name = "code")
+    val code: PromoCodeBatteryPurchaseStatusError.Code
+
+) {
+
+    /**
+     * 
+     *
+     * Values: promoMinusCodeMinusNotMinusFound,promoMinusExceededMinusAttempts,temporaryMinusError
+     */
+    @JsonClass(generateAdapter = false)
+    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");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.kt
new file mode 100644
index 000000000..eb5d8d0b1
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Purchases.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.batteryapi.models
+
+import io.batteryapi.models.PurchasesPurchasesInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param totalPurchases 
+ * @param purchases 
+ */
+
+
+data class Purchases (
+
+    @Json(name = "total_purchases")
+    val totalPurchases: kotlin.Int,
+
+    @Json(name = "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
new file mode 100644
index 000000000..e4d979925
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInner.kt
@@ -0,0 +1,92 @@
+/**
+ *
+ * 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.PurchasesPurchasesInnerRefundInformation
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @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 
+ */
+
+
+data class PurchasesPurchasesInner (
+
+    @Json(name = "user_purchase_id")
+    @Deprecated(message = "This property is deprecated.")
+    val userPurchaseId: kotlin.Int,
+
+    @Json(name = "purchase_id")
+    val purchaseId: kotlin.Int,
+
+    @Json(name = "type")
+    val type: PurchasesPurchasesInner.Type,
+
+    @Json(name = "charges")
+    val charges: kotlin.Int,
+
+    @Json(name = "datetime")
+    val datetime: kotlin.String,
+
+    @Json(name = "promo")
+    val promo: kotlin.String? = null,
+
+    @Json(name = "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")
+    val amount: kotlin.String? = null,
+
+    /* Currency is set when we know it. For crypto purchases it is always set. */
+    @Json(name = "currency")
+    val currency: kotlin.String? = null,
+
+    @Json(name = "refund_information")
+    val refundInformation: PurchasesPurchasesInnerRefundInformation? = null
+
+) {
+
+    /**
+     * 
+     *
+     * Values: android,ios,promoMinusCode,crypto,gift,onMinusTheMinusWayMinusGift
+     */
+    @JsonClass(generateAdapter = false)
+    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");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.kt
new file mode 100644
index 000000000..baef29114
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformation.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.batteryapi.models
+
+import io.batteryapi.models.PurchasesPurchasesInnerRefundInformationRefunded
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param fullyRefunded 
+ * @param partiallyRefunded 
+ * @param pendingRefund 
+ * @param refunded 
+ * @param refundable 
+ */
+
+
+data class PurchasesPurchasesInnerRefundInformation (
+
+    @Json(name = "fully_refunded")
+    val fullyRefunded: kotlin.Boolean,
+
+    @Json(name = "partially_refunded")
+    val partiallyRefunded: kotlin.Boolean,
+
+    @Json(name = "pending_refund")
+    val pendingRefund: kotlin.Boolean,
+
+    @Json(name = "refunded")
+    val refunded: PurchasesPurchasesInnerRefundInformationRefunded? = null,
+
+    @Json(name = "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
new file mode 100644
index 000000000..efc958edf
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/PurchasesPurchasesInnerRefundInformationRefunded.kt
@@ -0,0 +1,42 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param amount 
+ * @param charges 
+ */
+
+
+data class PurchasesPurchasesInnerRefundInformationRefunded (
+
+    @Json(name = "amount")
+    val amount: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..eb031aad8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethods.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.RechargeMethodsMethodsInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param methods 
+ */
+
+
+data class RechargeMethods (
+
+    @Json(name = "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
new file mode 100644
index 000000000..6af745293
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RechargeMethodsMethodsInner.kt
@@ -0,0 +1,80 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param type 
+ * @param rate 
+ * @param symbol 
+ * @param decimals 
+ * @param supportGasless 
+ * @param supportRecharge 
+ * @param image 
+ * @param jettonMaster 
+ * @param minBootstrapValue 
+ */
+
+
+data class RechargeMethodsMethodsInner (
+
+    @Json(name = "type")
+    val type: RechargeMethodsMethodsInner.Type,
+
+    @Json(name = "rate")
+    val rate: kotlin.String,
+
+    @Json(name = "symbol")
+    val symbol: kotlin.String,
+
+    @Json(name = "decimals")
+    val decimals: kotlin.Int,
+
+    @Json(name = "support_gasless")
+    val supportGasless: kotlin.Boolean,
+
+    @Json(name = "support_recharge")
+    val supportRecharge: kotlin.Boolean,
+
+    @Json(name = "image")
+    val image: kotlin.String? = null,
+
+    @Json(name = "jetton_master")
+    val jettonMaster: kotlin.String? = null,
+
+    @Json(name = "min_bootstrap_value")
+    val minBootstrapValue: kotlin.String? = null
+
+) {
+
+    /**
+     * 
+     *
+     * Values: jetton,ton
+     */
+    @JsonClass(generateAdapter = false)
+    enum class Type(val value: kotlin.String) {
+        @Json(name = "jetton") jetton("jetton"),
+        @Json(name = "ton") ton("ton");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt b/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.kt
new file mode 100644
index 000000000..cb4ceba3a
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/RequestRefundRequest.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.batteryapi.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param userPurchaseId 
+ * @param purchaseId 
+ */
+
+
+data class RequestRefundRequest (
+
+    @Json(name = "user_purchase_id")
+    @Deprecated(message = "This property is deprecated.")
+    val userPurchaseId: kotlin.Int? = null,
+
+    @Json(name = "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
new file mode 100644
index 000000000..5012b3343
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/ResetUserBalanceRequest.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param reason 
+ */
+
+
+data class ResetUserBalanceRequest (
+
+    @Json(name = "reason")
+    val reason: kotlin.String
+
+) {
+
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt b/tonapi/src/main/kotlin/io/batteryapi/models/Status.kt
new file mode 100644
index 000000000..5e4555484
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Status.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.StatusPendingTransactionsInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param pendingTransactions 
+ */
+
+
+data class Status (
+
+    @Json(name = "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
new file mode 100644
index 000000000..6329fa7a8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/StatusPendingTransactionsInner.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param id 
+ */
+
+
+data class StatusPendingTransactionsInner (
+
+    @Json(name = "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
new file mode 100644
index 000000000..7e95734a8
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProof200Response.kt
@@ -0,0 +1,38 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param token 
+ */
+
+
+data class TonConnectProof200Response (
+
+    @Json(name = "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
new file mode 100644
index 000000000..f90901fdd
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequest.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.batteryapi.models
+
+import io.batteryapi.models.TonConnectProofRequestProof
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param address 
+ * @param proof 
+ */
+
+
+data class TonConnectProofRequest (
+
+    @Json(name = "address")
+    val address: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..3024447ee
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProof.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.batteryapi.models
+
+import io.batteryapi.models.TonConnectProofRequestProofDomain
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param timestamp 
+ * @param domain 
+ * @param signature 
+ * @param payload 
+ * @param stateInit 
+ */
+
+
+data class TonConnectProofRequestProof (
+
+    @Json(name = "timestamp")
+    val timestamp: kotlin.Long,
+
+    @Json(name = "domain")
+    val domain: TonConnectProofRequestProofDomain,
+
+    @Json(name = "signature")
+    val signature: kotlin.String,
+
+    @Json(name = "payload")
+    val payload: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..d39135b54
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TonConnectProofRequestProofDomain.kt
@@ -0,0 +1,42 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param `value` 
+ * @param lengthBytes 
+ */
+
+
+data class TonConnectProofRequestProofDomain (
+
+    @Json(name = "value")
+    val `value`: kotlin.String,
+
+    @Json(name = "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
new file mode 100644
index 000000000..74d2c37ba
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/Transactions.kt
@@ -0,0 +1,48 @@
+/**
+ *
+ * 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.TransactionsTransactionsInner
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @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.
+ */
+
+
+data class Transactions (
+
+    @Json(name = "total_transactions")
+    val totalTransactions: kotlin.Int,
+
+    @Json(name = "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")
+    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
new file mode 100644
index 000000000..a8e4f8715
--- /dev/null
+++ b/tonapi/src/main/kotlin/io/batteryapi/models/TransactionsTransactionsInner.kt
@@ -0,0 +1,62 @@
+/**
+ *
+ * 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 com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * 
+ *
+ * @param id 
+ * @param paidAmount represents the amount of money paid by the user for this transaction.
+ * @param status 
+ * @param createdAt 
+ */
+
+
+data class TransactionsTransactionsInner (
+
+    @Json(name = "id")
+    val id: kotlin.String,
+
+    /* represents the amount of money paid by the user for this transaction. */
+    @Json(name = "paid_amount")
+    val paidAmount: kotlin.String,
+
+    @Json(name = "status")
+    val status: TransactionsTransactionsInner.Status,
+
+    @Json(name = "created_at")
+    val createdAt: kotlin.String
+
+) {
+
+    /**
+     * 
+     *
+     * Values: pending,completed,failed
+     */
+    @JsonClass(generateAdapter = false)
+    enum class Status(val value: kotlin.String) {
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "completed") completed("completed"),
+        @Json(name = "failed") failed("failed");
+    }
+
+}
+
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Message.kt b/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
index 6c264011f..df636efdc 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Message.kt
@@ -78,7 +78,7 @@ data class Message (
     val createdAt: kotlin.Long,
 
     @Json(name = "hash")
-    val hash: kotlin.String,
+    val hash: kotlin.String? = null,
 
     @Json(name = "destination")
     val destination: AccountAddress? = null,
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt b/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
index 7cef5f75f..6ee498353 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/StateInit.kt
@@ -33,7 +33,7 @@ data class StateInit (
     val boc: kotlin.String,
 
     @Json(name = "interfaces")
-    val interfaces: kotlin.collections.List<kotlin.String>
+    val interfaces: kotlin.collections.List<kotlin.String>? = null
 
 )
 
diff --git a/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt b/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
index 2bad4b64b..710dde387 100644
--- a/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
+++ b/tonapi/src/main/kotlin/io/tonapi/models/Transaction.kt
@@ -62,7 +62,7 @@ import com.squareup.moshi.JsonClass
 data class Transaction (
 
     @Json(name = "hash")
-    val hash: kotlin.String,
+    val hash: kotlin.String? = null,
 
     @Json(name = "lt")
     val lt: kotlin.Long,
@@ -111,7 +111,7 @@ data class Transaction (
 
     /* hex encoded boc with raw transaction */
     @Json(name = "raw")
-    val raw: kotlin.String,
+    val raw: kotlin.String? = null,
 
     @Json(name = "in_msg")
     val inMsg: Message? = null,
diff --git a/tonapi/upd.sh b/tonapi/upd.sh
index 0af770c83..1ea4183de 100644
--- a/tonapi/upd.sh
+++ b/tonapi/upd.sh
@@ -1,8 +1,16 @@
 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'
 
 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
@@ -12,3 +20,4 @@ rm -rf build.gradle
 rm -rf .openapi-generator-ignore
 rm -rf gradlew
 rm -rf gradlew.bat
+rm -rf src/test
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 983d96540..98663005e 100644
--- a/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt
+++ b/ui/uikit/core/src/main/java/uikit/base/BaseFragment.kt
@@ -5,9 +5,7 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.os.Handler
 import android.text.SpannableString
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +14,6 @@ import android.view.WindowManager
 import android.widget.EditText
 import android.widget.FrameLayout
 import androidx.activity.BackEventCompat
-import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -26,13 +23,11 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.view.doOnLayout
-import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.tonapps.uikit.color.backgroundPageColor
 import uikit.extensions.getSpannable
 import uikit.navigation.Navigation.Companion.navigation
-import uikit.navigation.ScreenResultContract
 import uikit.widget.BottomSheetLayout
 import uikit.widget.ModalView
 import uikit.widget.SwipeBackLayout
@@ -113,6 +108,8 @@ open class BaseFragment(
 
     open val secure: Boolean = false
 
+    open val title: CharSequence? = null
+
     private var isFinished: Boolean = false
 
     fun setArgs(args: BaseArgs) {
diff --git a/ui/uikit/core/src/main/java/uikit/extensions/FragmentManager.kt b/ui/uikit/core/src/main/java/uikit/extensions/FragmentManager.kt
index 5653eed6a..b83caaf4a 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/FragmentManager.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/FragmentManager.kt
@@ -1,9 +1,9 @@
 package uikit.extensions
 
-import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
 
 inline fun <reified F> FragmentManager.findFragment(): F? {
     val f = fragments.find { it is F }
@@ -20,4 +20,18 @@ fun FragmentManager.findFragments(id: Int): List<Fragment> {
         val parent = fragment.view?.parent as? View ?: return@filter false
         parent.id == id
     }
-}
\ No newline at end of file
+}
+
+inline fun FragmentManager.commitChildAsSlide(
+    allowStateLoss: Boolean = false,
+    body: FragmentTransaction.() -> Unit
+) {
+    val transaction = beginTransaction()
+    transaction.setCustomAnimations(uikit.R.anim.fragment_enter_from_right, uikit.R.anim.fragment_exit_to_left, uikit.R.anim.fragment_enter_from_left, uikit.R.anim.fragment_exit_to_right)
+    transaction.body()
+    if (allowStateLoss) {
+        transaction.commitAllowingStateLoss()
+    } else {
+        transaction.commit()
+    }
+}
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 2a7100066..b3a32b256 100644
--- a/ui/uikit/core/src/main/java/uikit/extensions/View.kt
+++ b/ui/uikit/core/src/main/java/uikit/extensions/View.kt
@@ -185,6 +185,19 @@ fun View.expandTouchArea(extraPadding: Int) {
     }
 }
 
+fun View.expandTouchArea(left: Int, top: Int, right: Int, bottom: Int) {
+    val parent = parent as? View ?: return
+    parent.post {
+        val rect = Rect()
+        getHitRect(rect)
+        rect.top -= top
+        rect.left -= left
+        rect.right += right
+        rect.bottom += bottom
+        parent.touchDelegate = TouchDelegate(rect, this)
+    }
+}
+
 fun TextView.setEndDrawable(drawable: Drawable?) {
     setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
 }
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 da1e42c5c..8ad1092e8 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/HeaderView.kt
@@ -4,6 +4,7 @@ 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.ViewGroup
 import android.view.WindowInsets
@@ -12,6 +13,7 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
+import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.core.view.WindowInsetsCompat
 import uikit.R
 import uikit.drawable.BarDrawable
@@ -36,6 +38,8 @@ open class HeaderView @JvmOverloads constructor(
     val actionView: AppCompatImageView
     val titleView: AppCompatTextView
 
+    private val rightContentView: LinearLayoutCompat
+
     private val barHeight = context.getDimensionPixelSize(R.dimen.barHeight)
     private var ignoreSystemOffset = false
     private var topOffset: Int = 0
@@ -74,7 +78,7 @@ open class HeaderView @JvmOverloads constructor(
         }
 
 
-    var title: CharSequence
+    var title: CharSequence?
         get() = titleView.text
         set(value) {
             titleView.text = value
@@ -93,6 +97,7 @@ open class HeaderView @JvmOverloads constructor(
         subtitleView = findViewById(R.id.header_subtitle)
         loaderView = findViewById(R.id.header_loader)
         textView = findViewById(R.id.header_text)
+        rightContentView = findViewById(R.id.header_right_content)
 
         context.useAttributes(attrs, R.styleable.HeaderView) {
             ignoreSystemOffset = it.getBoolean(R.styleable.HeaderView_ignoreSystemOffset, false)
@@ -141,6 +146,16 @@ open class HeaderView @JvmOverloads constructor(
         setDrawableForView(actionView, resId)
     }
 
+    fun setRightContent(view: View?) {
+        rightContentView.removeAllViews()
+        if (view != null) {
+            rightContentView.visibility = View.VISIBLE
+            rightContentView.addView(view)
+        } else {
+            rightContentView.visibility = View.GONE
+        }
+    }
+
     fun contentMatchParent() {
         titleView.layoutParams = titleView.layoutParams.apply {
             width = ViewGroup.LayoutParams.MATCH_PARENT
@@ -192,6 +207,16 @@ open class HeaderView @JvmOverloads constructor(
         }
     }
 
+    fun hideIcon() {
+        closeView.visibility = View.GONE
+    }
+
+    fun setTitleGravity(gravity: Int) {
+        val layoutParams = titleView.layoutParams as LinearLayoutCompat.LayoutParams
+        layoutParams.gravity = gravity
+        titleView.gravity = gravity
+    }
+
     fun hideText() {
         withAnimation(duration = ANIMATION_DURATION) {
             textView.alpha = 0f
diff --git a/ui/uikit/core/src/main/java/uikit/widget/InputView.kt b/ui/uikit/core/src/main/java/uikit/widget/InputView.kt
index 20a7c7d5c..539f669d6 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/InputView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/InputView.kt
@@ -94,6 +94,7 @@ class InputView @JvmOverloads constructor(
     private val iconView: AppCompatImageView
     private val clearView: AppCompatImageView
     private val loaderView: LoaderView
+    private val donemarkView: AppCompatImageView
 
     var activeBorderColor: Int
         get() = inputDrawable.activeBorderColor
@@ -112,6 +113,19 @@ class InputView @JvmOverloads constructor(
             }
         }
 
+    var success: Boolean = false
+        set(value) {
+            if (field != value) {
+                field = value
+                if (value) {
+                    donemarkView.visibility = View.VISIBLE
+                } else {
+                    donemarkView.visibility = View.GONE
+                }
+                updateVisibleClearButton()
+            }
+        }
+
     var loading: Boolean = false
         set(value) {
             if (field != value) {
@@ -223,6 +237,7 @@ class InputView @JvmOverloads constructor(
         iconView = findViewById(R.id.input_icon)
         clearView = findViewById(R.id.input_clear)
         loaderView = findViewById(R.id.input_loader)
+        donemarkView = findViewById(R.id.input_donemark)
 
         clearView.setOnClickListener {
             if (isEnabled) {
@@ -246,7 +261,7 @@ class InputView @JvmOverloads constructor(
     }
 
     private fun updateVisibleClearButton() {
-        if (disableClearButton || loading || !visibleClearView || !isEnabled || !editText.isFocused) {
+        if (disableClearButton || loading || !visibleClearView || !isEnabled || !editText.isFocused || success) {
             clearView.visibility = View.GONE
         } else {
             clearView.visibility = View.VISIBLE
diff --git a/ui/uikit/core/src/main/java/uikit/widget/RadioView.kt b/ui/uikit/core/src/main/java/uikit/widget/RadioView.kt
index d8b796f00..488e0d6a2 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/RadioView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/RadioView.kt
@@ -5,8 +5,10 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
 import android.view.View
+import androidx.core.graphics.ColorUtils
 import com.tonapps.uikit.color.backgroundContentTintColor
 import com.tonapps.uikit.color.buttonPrimaryBackgroundColor
+import com.tonapps.uikit.color.iconTertiaryColor
 import uikit.extensions.dp
 
 class RadioView @JvmOverloads constructor(
@@ -27,18 +29,14 @@ class RadioView @JvmOverloads constructor(
         set(value) {
             if (field != value) {
                 field = value
-                defaultPaint.color = if (value) {
-                    context.buttonPrimaryBackgroundColor
-                } else {
-                    context.backgroundContentTintColor
-                }
+                updatePaintColors()
                 doOnCheckedChanged?.invoke(value)
                 invalidate()
             }
         }
 
     private val defaultPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color = context.backgroundContentTintColor
+        color = context.iconTertiaryColor
         style = Paint.Style.STROKE
         strokeWidth = strokeSize
     }
@@ -55,6 +53,16 @@ class RadioView @JvmOverloads constructor(
         checked = !checked
     }
 
+    private fun updatePaintColors() {
+        defaultPaint.color = if (checked) {
+            context.buttonPrimaryBackgroundColor
+        } else if (!isEnabled) {
+            ColorUtils.setAlphaComponent(context.iconTertiaryColor, 77)
+        } else {
+            context.iconTertiaryColor
+        }
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val radius = size / 2f
@@ -72,4 +80,10 @@ class RadioView @JvmOverloads constructor(
     }
 
     override fun hasOverlappingRendering() = false
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        updatePaintColors()
+        invalidate()
+    }
 }
\ No newline at end of file
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 70b455a40..c3588bc52 100644
--- a/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt
+++ b/ui/uikit/core/src/main/java/uikit/widget/SlideBetweenView.kt
@@ -49,6 +49,10 @@ class SlideBetweenView @JvmOverloads constructor(
         }
     }
 
+    fun getCurrentIndex(): Int {
+        return currentIndex
+    }
+
     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/res/layout/fragment_list.xml b/ui/uikit/core/src/main/res/layout/fragment_list.xml
index 28eb58938..dbf11ed3c 100644
--- a/ui/uikit/core/src/main/res/layout/fragment_list.xml
+++ b/ui/uikit/core/src/main/res/layout/fragment_list.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <uikit.widget.ColumnLayout 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">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <FrameLayout
         android:id="@+id/header_container"
         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"/>
+            android:layout_height="wrap_content"
+            app:ignoreSystemOffset="true" />
     </FrameLayout>
 
     <uikit.widget.SimpleRecyclerView
@@ -18,6 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:padding="@dimen/offsetMedium"/>
+        android:paddingHorizontal="@dimen/offsetMedium"
+        android:paddingBottom="@dimen/offsetMedium" />
 
 </uikit.widget.ColumnLayout>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/layout/view_header.xml b/ui/uikit/core/src/main/res/layout/view_header.xml
index 8649ec089..d2bb644b9 100644
--- a/ui/uikit/core/src/main/res/layout/view_header.xml
+++ b/ui/uikit/core/src/main/res/layout/view_header.xml
@@ -6,70 +6,84 @@
         android:layout_width="@dimen/actionSize"
         android:layout_height="@dimen/actionSize"
         android:layout_gravity="center"
-        android:tint="?attr/buttonSecondaryForegroundColor"
-        android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
+        android:alpha="0"
         android:background="@drawable/bg_oval_button_secondary"
+        android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
         android:scaleType="centerInside"
-        android:alpha="0"/>
+        android:tint="?attr/buttonSecondaryForegroundColor" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/offsetMedium"
         android:layout_gravity="center"
-        android:orientation="vertical"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:orientation="vertical">
+
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/header_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:singleLine="true"
             android:gravity="center"
+            android:singleLine="true"
             android:textAppearance="@style/TextAppearance.H3"
-            android:textColor="?attr/textPrimaryColor"/>
-        
+            android:textColor="?attr/textPrimaryColor" />
+
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/subtitle_container"
-            android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="20dp"
-            android:paddingHorizontal="@dimen/offsetMedium"
             android:layout_gravity="center"
-            android:orientation="horizontal">
-            
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/offsetMedium"
+            android:visibility="gone">
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/header_subtitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:singleLine="true"
+                android:fontFamily="@font/montserrat_medium"
                 android:gravity="center"
+                android:singleLine="true"
                 android:textColor="?attr/textSecondaryColor"
-                android:textSize="14sp"
-                android:fontFamily="@font/montserrat_medium"/>
-            
+                android:textSize="14sp" />
+
             <uikit.widget.LoaderView
                 android:id="@+id/header_loader"
                 android:layout_width="12dp"
                 android:layout_height="12dp"
-                android:layout_marginStart="@dimen/offsetExtraSmall"
                 android:layout_gravity="center"
-                android:visibility="gone"/>
-            
+                android:layout_marginStart="@dimen/offsetExtraSmall"
+                android:visibility="gone" />
+
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/header_action"
-        android:scaleType="centerInside"
-        android:layout_width="@dimen/actionSize"
-        android:layout_height="@dimen/actionSize"
-        android:layout_gravity="center"
-        android:tint="?attr/buttonSecondaryForegroundColor"
-        android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
-        android:background="@drawable/bg_oval_button_secondary"
-        android:alpha="0"/>
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/header_right_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/header_action"
+            android:layout_width="@dimen/actionSize"
+            android:layout_height="@dimen/actionSize"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:alpha="0"
+            android:background="@drawable/bg_oval_button_secondary"
+            android:backgroundTint="?attr/buttonSecondaryBackgroundColor"
+            android:scaleType="centerInside"
+            android:tint="?attr/buttonSecondaryForegroundColor" />
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 </merge>
\ No newline at end of file
diff --git a/ui/uikit/core/src/main/res/layout/view_input.xml b/ui/uikit/core/src/main/res/layout/view_input.xml
index 40c140687..42aa8434b 100644
--- a/ui/uikit/core/src/main/res/layout/view_input.xml
+++ b/ui/uikit/core/src/main/res/layout/view_input.xml
@@ -49,6 +49,15 @@
             android:tint="?attr/iconSecondaryColor"
             android:src="@drawable/ic_xmark_circle_16"/>
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/input_donemark"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_gravity="center"
+            android:tint="?attr/accentGreenColor"
+            android:visibility="gone"
+            android:src="@drawable/ic_donemark_otline_28"/>
+
         <uikit.widget.LoaderView
             android:id="@+id/input_loader"
             android:layout_width="16dp"
diff --git a/ui/uikit/icon/src/main/res/drawable/ic_battery_28.xml b/ui/uikit/icon/src/main/res/drawable/ic_battery_28.xml
new file mode 100644
index 000000000..75749d065
--- /dev/null
+++ b/ui/uikit/icon/src/main/res/drawable/ic_battery_28.xml
@@ -0,0 +1,15 @@
+<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="M14,0.006C12.227,0.006 10.762,1.324 10.532,3.034C8.649,3.096 7.471,3.3 6.561,3.961C6.137,4.269 5.763,4.643 5.455,5.067C4.5,6.381 4.5,8.256 4.5,12.006V18.006C4.5,21.756 4.5,23.631 5.455,24.945C5.763,25.369 6.137,25.743 6.561,26.051C7.875,27.006 9.75,27.006 13.5,27.006H14.5C18.25,27.006 20.125,27.006 21.439,26.051C21.863,25.743 22.237,25.369 22.545,24.945C23.5,23.631 23.5,21.756 23.5,18.006V12.006C23.5,8.256 23.5,6.381 22.545,5.067C22.237,4.643 21.863,4.269 21.439,3.961C20.529,3.3 19.351,3.097 17.468,3.034C17.238,1.324 15.773,0.006 14,0.006ZM7.718,17.098C7.5,17.526 7.5,18.086 7.5,19.206V20.806C7.5,21.926 7.5,22.486 7.718,22.914C7.91,23.29 8.216,23.596 8.592,23.788C9.02,24.006 9.58,24.006 10.7,24.006H17.3C18.42,24.006 18.98,24.006 19.408,23.788C19.784,23.596 20.09,23.29 20.282,22.914C20.5,22.486 20.5,21.926 20.5,20.806V19.206C20.5,18.086 20.5,17.526 20.282,17.098C20.09,16.722 19.784,16.416 19.408,16.224C18.98,16.006 18.42,16.006 17.3,16.006H10.7C9.58,16.006 9.02,16.006 8.592,16.224C8.216,16.416 7.91,16.722 7.718,17.098Z"
+      android:fillColor="#FFFFFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.5,19.206C7.5,18.086 7.5,17.526 7.718,17.098C7.91,16.722 8.216,16.416 8.592,16.224C9.02,16.006 9.58,16.006 10.7,16.006H17.3C18.42,16.006 18.98,16.006 19.408,16.224C19.784,16.416 20.09,16.722 20.282,17.098C20.5,17.526 20.5,18.086 20.5,19.206V20.806C20.5,21.926 20.5,22.486 20.282,22.914C20.09,23.29 19.784,23.596 19.408,23.788C18.98,24.006 18.42,24.006 17.3,24.006H10.7C9.58,24.006 9.02,24.006 8.592,23.788C8.216,23.596 7.91,23.29 7.718,22.914C7.5,22.486 7.5,21.926 7.5,20.806V19.206Z"
+      android:strokeAlpha="0.32"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.32"/>
+</vector>