diff --git a/blockchain-demo/src/main/java/com/tangem/blockchain_demo/BlockchainDemoActivity.kt b/blockchain-demo/src/main/java/com/tangem/blockchain_demo/BlockchainDemoActivity.kt
index 76d9ce0ffa..de300d429a 100644
--- a/blockchain-demo/src/main/java/com/tangem/blockchain_demo/BlockchainDemoActivity.kt
+++ b/blockchain-demo/src/main/java/com/tangem/blockchain_demo/BlockchainDemoActivity.kt
@@ -78,13 +78,13 @@ class BlockchainDemoActivity : AppCompatActivity() {
             walletManager.update()
             withContext(Dispatchers.Main) {
                 binding.tvBalance.text =
-                        "${walletManager.wallet.balances[AmountType.Coin]?.value
+                        "${walletManager.wallet.balances[AmountType.Coin]?.value?.toPlainString()
                                 ?: "error"} ${walletManager.blockchain.currency}"
                 val token = walletManager.wallet.balances[AmountType.Token]
                 if (token != null) {
-                    binding.tvBalance.text = token.currencySymbol + " " + token.value
+                    binding.tvBalance.text = token.value?.toPlainString() + " " + token.currencySymbol
                     binding.etSumToSend.text = Editable.Factory.getInstance().newEditable(
-                            token.value.toString()
+                            token.value?.toPlainString() ?: ""
                     )
                 } else {
                     binding.etSumToSend.text =
diff --git a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt
index 769b5fd2de..fc3f1b41db 100644
--- a/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt
+++ b/blockchain/src/main/java/com/tangem/blockchain/bitcoin/BitcoinTransactionBuilder.kt
@@ -2,7 +2,7 @@ package com.tangem.blockchain.bitcoin
 
 import com.tangem.blockchain.common.TransactionData
 import com.tangem.blockchain.common.extensions.Result
-import com.tangem.blockchain.common.extensions.isZero
+import com.tangem.common.extensions.isZero
 import org.bitcoinj.core.*
 import org.bitcoinj.crypto.TransactionSignature
 import org.bitcoinj.script.Script
diff --git a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/BigDecimal.kt b/tangem-core/src/main/java/com/tangem/common/extensions/BigDecimal.kt
similarity index 70%
rename from blockchain/src/main/java/com/tangem/blockchain/common/extensions/BigDecimal.kt
rename to tangem-core/src/main/java/com/tangem/common/extensions/BigDecimal.kt
index 8014cd4174..6d23ffee09 100644
--- a/blockchain/src/main/java/com/tangem/blockchain/common/extensions/BigDecimal.kt
+++ b/tangem-core/src/main/java/com/tangem/common/extensions/BigDecimal.kt
@@ -1,4 +1,4 @@
-package com.tangem.blockchain.common.extensions
+package com.tangem.common.extensions
 
 import java.math.BigDecimal