diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
index 5a0a8805cd..eddc558945 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt
@@ -144,7 +144,7 @@ class SingleWalletView : WalletView() {
                     WalletAction.DialogAction.ChooseTradeActionDialog(
                         buyAllowed = walletData.isAvailableToBuy(exchangeManager),
                         sellAllowed = walletData.isAvailableToSell(exchangeManager),
-                        swapAllowed = false, //always disable for single wallet
+                        swapAllowed = false, // always disable for single wallet
                     ),
                 )
             }
diff --git a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
index 73b1f2dc55..e94a8d074c 100644
--- a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt
@@ -102,7 +102,6 @@ class UserWalletManagerImpl(
         }
         val mainStore = requireNotNull(appStateHolder.mainStore) { "mainStore is null" }
         mainStore.dispatchOnMain(action)
-        mainStore.dispatchOnMain(WalletAction.LoadData.Refresh)
     }
 
     override fun getWalletAddress(networkId: String): String {
diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt
index 379f312d25..b413b2aa14 100644
--- a/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt
+++ b/core/datasource/src/main/java/com/tangem/datasource/di/OneInchApisModule.kt
@@ -51,7 +51,7 @@ class OneInchApisModule {
     }
 
     companion object {
-        private const val ONE_INCH_BASE_URL = "https://api.1inch.io/v5.0/"
+        private const val ONE_INCH_BASE_URL = "https://api-tangem.1inch.io/v5.0/"
         private const val ONE_INCH_ETH_PATH = "1/"
         private const val ONE_INCH_BSC_PATH = "56/"
         private const val ONE_INCH_POLYGON_PATH = "137/"
diff --git a/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt b/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt
index e7a2597186..edd2270947 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/utils/InputFormatting.kt
@@ -9,16 +9,18 @@ package com.tangem.core.ui.utils
  * result string 123.46377372
  */
 fun getValidatedNumberWithFixedDecimals(text: String, decimals: Int): String {
-    val filteredChars = text.replace(",", ".").filterIndexed { index, c ->
-        val isOneOrZeroPoint = c == '.' && index != 0 && text.count { it == '.' } <= 1
-        val isIndexPointIndex = c == '.' && index != 0 && text.indexOf('.') == index
+    val comma = ','
+    val dot = ','
+    val filteredChars = text.replace(comma, dot).filterIndexed { index, c ->
+        val isOneOrZeroPoint = c == dot && index != 0 && text.count { it == dot } <= 1
+        val isIndexPointIndex = c == dot && index != 0 && text.indexOf(dot) == index
         c.isDigit() || isIndexPointIndex || isOneOrZeroPoint
     }
     // If dot is present, take first 3 digits before decimal and first decimals digits after decimal
-    return if (filteredChars.count { it == '.' } == 1) {
-        val beforeDecimal = filteredChars.substringBefore('.')
-        val afterDecimal = filteredChars.substringAfter('.')
-        beforeDecimal + "." + afterDecimal.take(decimals)
+    return if (filteredChars.count { it == dot } == 1) {
+        val beforeDecimal = filteredChars.substringBefore(dot)
+        val afterDecimal = filteredChars.substringAfter(dot)
+        beforeDecimal + dot + afterDecimal.take(decimals)
     }
     // If there is no dot, just take all digits
     else {